Update generator_standard to gest_api

shuds13 · shuds13 · commit 1f207bf23285 · 2025-10-01T14:45:45.000-05:00
diff --git a/.github/workflows/unix-noax.yml b/.github/workflows/unix-noax.yml
@@ -31,7 +31,7 @@ jobs:
         conda install numpy pandas pytorch cpuonly -c pytorch
         conda install -c conda-forge mpi4py mpich
         pip install .[test]
-        pip install git+https://github.com/campa-consortium/generator_standard.git
+        pip install git+https://github.com/campa-consortium/gest-api.git
         pip uninstall --yes ax-platform # Run without Ax
     - shell: bash -l {0}
       name: Run unit tests without Ax
diff --git a/.github/workflows/unix-openmpi.yml b/.github/workflows/unix-openmpi.yml
@@ -31,7 +31,7 @@ jobs:
         conda install numpy pandas pytorch cpuonly -c pytorch
         conda install -c conda-forge mpi4py openmpi=5.*
         pip install .[test]
-        pip install git+https://github.com/campa-consortium/generator_standard.git
+        pip install git+https://github.com/campa-consortium/gest-api.git
     - shell: bash -l {0}
       name: Run unit tests with openMPI
       run: |
diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml
@@ -31,7 +31,7 @@ jobs:
         conda install numpy pandas pytorch cpuonly -c pytorch
         conda install -c conda-forge mpi4py mpich
         pip install .[test]
-        pip install git+https://github.com/campa-consortium/generator_standard.git
+        pip install git+https://github.com/campa-consortium/gest-api.git
     - shell: bash -l {0}
       name: Run unit tests with MPICH
       run: |
diff --git a/examples/astra/run_optimization_serial_ASTRA.py b/examples/astra/run_optimization_serial_ASTRA.py
@@ -12,7 +12,7 @@
 from optimas.generators import AxSingleFidelityGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 from analysis_script import analyze_simulation
 
 # Create VOCS object.
diff --git a/examples/dummy/run_example.py b/examples/dummy/run_example.py
@@ -1,6 +1,6 @@
 """Basic example of parallel Bayesian optimization with Ax."""
 
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 from optimas.generators import AxSingleFidelityGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
diff --git a/examples/dummy_grid_sampling/run_example.py b/examples/dummy_grid_sampling/run_example.py
@@ -1,6 +1,6 @@
 """Basic example of parallel grid sampling with simulations."""
 
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 from optimas.generators import GridSamplingGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
diff --git a/examples/dummy_line_sampling/run_example.py b/examples/dummy_line_sampling/run_example.py
@@ -1,6 +1,6 @@
 """Basic example of parallel line sampling with simulations."""
 
-from generator_standard.vocs import VOCS, ContinuousVariable
+from gest_api.vocs import VOCS, ContinuousVariable
 from optimas.generators import LineSamplingGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
diff --git a/examples/dummy_mf/run_example.py b/examples/dummy_mf/run_example.py
@@ -1,6 +1,6 @@
 """Basic example of parallel multi-fidelity Bayesian optimization with Ax."""
 
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 from optimas.generators import AxMultiFidelityGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
diff --git a/examples/dummy_mt/run_example.py b/examples/dummy_mt/run_example.py
@@ -1,6 +1,6 @@
 """Basic example of parallel multitask Bayesian optimization with Ax."""
 
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 from optimas.core import Task
 from optimas.generators import AxMultitaskGenerator
 from optimas.evaluators import TemplateEvaluator, MultitaskEvaluator
diff --git a/examples/dummy_random/run_example.py b/examples/dummy_random/run_example.py
@@ -1,6 +1,6 @@
 """Basic example of parallel random sampling with simulations."""
 
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 from optimas.generators import RandomSamplingGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
diff --git a/examples/hipace/run_example.py b/examples/hipace/run_example.py
@@ -13,7 +13,7 @@
 from optimas.generators import AxSingleFidelityGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from analysis_script import analyze_simulation
 
diff --git a/examples/ionization_injection/run_example.py b/examples/ionization_injection/run_example.py
@@ -16,7 +16,7 @@
 from optimas.generators import AxSingleFidelityGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from analysis_script import analyze_simulation
 
diff --git a/examples/ionization_injection_mf/run_example.py b/examples/ionization_injection_mf/run_example.py
@@ -16,7 +16,7 @@
 from optimas.generators import AxMultiFidelityGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from analysis_script import analyze_simulation
 
diff --git a/examples/multi_stage/run_example.py b/examples/multi_stage/run_example.py
@@ -13,7 +13,7 @@
 from optimas.generators import AxSingleFidelityGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from analysis_script import analyze_simulation
 
diff --git a/examples/multitask_lpa_fbpic_waket/run_opt.py b/examples/multitask_lpa_fbpic_waket/run_opt.py
@@ -6,7 +6,7 @@
 from optimas.generators import AxMultitaskGenerator
 from optimas.evaluators import TemplateEvaluator, MultitaskEvaluator
 from optimas.explorations import Exploration
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from analysis_script import analyze_simulation
 
diff --git a/examples/wake_t/run_example.py b/examples/wake_t/run_example.py
@@ -14,7 +14,7 @@
 from optimas.generators import AxSingleFidelityGenerator
 from optimas.evaluators import TemplateEvaluator
 from optimas.explorations import Exploration
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from analysis_script import analyze_simulation
 
diff --git a/examples/wake_t_fbpic_mt/run_example.py b/examples/wake_t_fbpic_mt/run_example.py
@@ -16,7 +16,7 @@
 from optimas.generators import AxMultitaskGenerator
 from optimas.evaluators import TemplateEvaluator, MultitaskEvaluator
 from optimas.explorations import Exploration
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from analysis_script import analyze_simulation
 
diff --git a/optimas/diagnostics/exploration_diagnostics.py b/optimas/diagnostics/exploration_diagnostics.py
@@ -19,7 +19,7 @@
 from optimas.explorations import Exploration
 from optimas.utils.other import get_df_with_selection
 from optimas.utils.ax import AxModelManager
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 
 class ExplorationDiagnostics:
diff --git a/optimas/generators/ax/base.py b/optimas/generators/ax/base.py
@@ -5,9 +5,9 @@
 
 import torch
 
-from optimas.core import Objective, TrialParameter, VaryingParameter, Parameter
+from optimas.core import TrialParameter
 from optimas.generators.base import Generator
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 
 # Disable Ax loggers to get cleaner output. In principle, setting
diff --git a/optimas/generators/ax/developer/multitask.py b/optimas/generators/ax/developer/multitask.py
@@ -59,15 +59,12 @@
 from optimas.generators.ax.base import AxGenerator
 from optimas.core import (
     TrialParameter,
-    VaryingParameter,
-    Objective,
-    Parameter,
     Task,
     Trial,
     TrialStatus,
 )
 from .ax_metric import AxMetric
-from generator_standard.vocs import VOCS, DiscreteVariable
+from gest_api.vocs import VOCS, DiscreteVariable
 
 # Define generator states.
 NOT_STARTED = "not_started"
diff --git a/optimas/generators/ax/service/ax_client.py b/optimas/generators/ax/service/ax_client.py
@@ -6,7 +6,7 @@
 from ax.core.objective import MultiObjective
 
 from optimas.core import Objective, VaryingParameter, Parameter
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 from .base import AxServiceGenerator
 
 
diff --git a/optimas/generators/ax/service/base.py b/optimas/generators/ax/service/base.py
@@ -19,9 +19,7 @@
 from ax import Arm
 
 from optimas.core import (
-    Objective,
     Trial,
-    VaryingParameter,
     Parameter,
 )
 from optimas.generators.ax.base import AxGenerator
@@ -30,7 +28,7 @@
     convert_optimas_to_ax_parameters,
     convert_optimas_to_ax_objectives,
 )
-from generator_standard.vocs import (
+from gest_api.vocs import (
     VOCS,
     LessThanConstraint,
     GreaterThanConstraint,
diff --git a/optimas/generators/ax/service/multi_fidelity.py b/optimas/generators/ax/service/multi_fidelity.py
@@ -9,9 +9,8 @@
 from ax.modelbridge.generation_strategy import GenerationStep
 from ax.modelbridge.registry import Models
 
-from optimas.core import Objective, VaryingParameter, Parameter
 from .base import AxServiceGenerator
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 
 class AxMultiFidelityGenerator(AxServiceGenerator):
diff --git a/optimas/generators/ax/service/single_fidelity.py b/optimas/generators/ax/service/single_fidelity.py
@@ -5,9 +5,8 @@
 from ax.modelbridge.generation_strategy import GenerationStep
 from ax.modelbridge.registry import Models
 
-from optimas.core import Objective, VaryingParameter, Parameter
 from .base import AxServiceGenerator
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 
 class AxSingleFidelityGenerator(AxServiceGenerator):
diff --git a/optimas/generators/base.py b/optimas/generators/base.py
@@ -20,8 +20,8 @@
     TrialParameter,
     TrialStatus,
 )
-from generator_standard.vocs import VOCS, ContinuousVariable, DiscreteVariable
-from generator_standard.generator import Generator as StandardGenerator
+from gest_api.vocs import VOCS, ContinuousVariable, DiscreteVariable
+from gest_api.generator import Generator as StandardGenerator
 
 logger = get_logger(__name__)
 
diff --git a/optimas/generators/grid_sampling.py b/optimas/generators/grid_sampling.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from optimas.core import Objective, Trial, VaryingParameter, Parameter
-from generator_standard.vocs import VOCS
+from optimas.core import Trial
+from gest_api.vocs import VOCS
 from .base import Generator
 
 
diff --git a/optimas/generators/line_sampling.py b/optimas/generators/line_sampling.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from optimas.core import Objective, Trial, VaryingParameter, Parameter
-from generator_standard.vocs import VOCS
+from optimas.core import Trial
+from gest_api.vocs import VOCS
 from .base import Generator
 
 
diff --git a/optimas/generators/random_sampling.py b/optimas/generators/random_sampling.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from optimas.core import Objective, Trial, VaryingParameter, Parameter
-from generator_standard.vocs import VOCS
+from optimas.core import Trial
+from gest_api.vocs import VOCS
 from .base import Generator
 
 
diff --git a/tests/test_analyzed_parameters.py b/tests/test_analyzed_parameters.py
@@ -1,10 +1,9 @@
 import numpy as np
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from optimas.explorations import Exploration
 from optimas.generators import RandomSamplingGenerator
 from optimas.evaluators import FunctionEvaluator
-from optimas.core import VaryingParameter, Objective, Parameter
 
 
 def eval_func(input_params, output_params):
diff --git a/tests/test_ax_generators.py b/tests/test_ax_generators.py
@@ -15,7 +15,7 @@
 )
 from optimas.evaluators import FunctionEvaluator, MultitaskEvaluator
 from optimas.core import Task
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 
 # Some tests will use threading (instead of multiprocessing) to be able to
diff --git a/tests/test_ax_model_manager.py b/tests/test_ax_model_manager.py
@@ -8,7 +8,7 @@
 from optimas.evaluators import FunctionEvaluator
 from optimas.diagnostics import ExplorationDiagnostics
 from optimas.utils.ax import AxModelManager
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 
 def eval_func_sf_moo(input_params, output_params):
diff --git a/tests/test_chain_evaluator.py b/tests/test_chain_evaluator.py
@@ -1,12 +1,11 @@
 import os
 
 import numpy as np
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from optimas.explorations import Exploration
 from optimas.generators import RandomSamplingGenerator
 from optimas.evaluators import TemplateEvaluator, ChainEvaluator
-from optimas.core import VaryingParameter, Objective, Parameter
 
 
 def analysis_func_1(sim_dir, output_params):
diff --git a/tests/test_comms.py b/tests/test_comms.py
@@ -1,10 +1,9 @@
 import numpy as np
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from optimas.explorations import Exploration
 from optimas.generators import RandomSamplingGenerator
 from optimas.evaluators import FunctionEvaluator
-from optimas.core import VaryingParameter, Objective
 
 
 def eval_func(input_params, output_params):
diff --git a/tests/test_env_script.py b/tests/test_env_script.py
@@ -1,12 +1,11 @@
 import os
 
 import numpy as np
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from optimas.explorations import Exploration
 from optimas.generators import RandomSamplingGenerator
 from optimas.evaluators import TemplateEvaluator
-from optimas.core import VaryingParameter, Objective, Parameter
 
 
 def analysis_func(sim_dir, output_params):
diff --git a/tests/test_exploration_diagnostics.py b/tests/test_exploration_diagnostics.py
@@ -4,12 +4,11 @@
 from matplotlib.gridspec import GridSpec
 import matplotlib.pyplot as plt
 import pytest
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from optimas.explorations import Exploration
 from optimas.generators import RandomSamplingGenerator
 from optimas.evaluators import TemplateEvaluator
-from optimas.core import VaryingParameter, Objective
 from optimas.diagnostics import ExplorationDiagnostics
 
 
diff --git a/tests/test_exploration_resume.py b/tests/test_exploration_resume.py
@@ -1,10 +1,9 @@
 import os
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from optimas.explorations import Exploration
 from optimas.generators import RandomSamplingGenerator
 from optimas.evaluators import TemplateEvaluator
-from optimas.core import VaryingParameter, Objective
 
 
 def analysis_func(sim_dir, output_params):
diff --git a/tests/test_exploration_run_exception.py b/tests/test_exploration_run_exception.py
@@ -1,6 +1,6 @@
 import os
 
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 from optimas.explorations import Exploration
 from optimas.generators import RandomSamplingGenerator
 from optimas.evaluators import FunctionEvaluator
diff --git a/tests/test_function_evaluator.py b/tests/test_function_evaluator.py
@@ -4,12 +4,11 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import pytest
-from generator_standard.vocs import VOCS
+from gest_api.vocs import VOCS
 
 from optimas.explorations import Exploration
 from optimas.generators import RandomSamplingGenerator
 from optimas.evaluators import FunctionEvaluator
-from optimas.core import VaryingParameter, Objective, Parameter
 from optimas.diagnostics import ExplorationDiagnostics
 
 
diff --git a/tests/test_gpu_resources.py b/tests/test_gpu_resources.py
diff --git a/tests/test_grid_sampling.py b/tests/test_grid_sampling.py
diff --git a/tests/test_grid_sampling_mpi.py b/tests/test_grid_sampling_mpi.py
diff --git a/tests/test_line_sampling.py b/tests/test_line_sampling.py
diff --git a/tests/test_manual_exploration.py b/tests/test_manual_exploration.py
diff --git a/tests/test_random_sampling.py b/tests/test_random_sampling.py
diff --git a/tests/test_template_evaluator.py b/tests/test_template_evaluator.py
