cimsi 0.8.2.dev1__tar.gz → 0.8.3__tar.gz

cimsi-0.8.3/.gitlab/issue_templates/bug.md

@@ -0,0 +1,50 @@
+<!--
+** Please read **
+
+* Do not report bugs that are specific to your model repository source here.
+
+* Before opening a new issue, make sure to search for keywords in the issues
+  list and verify the issue you're about to submit isn't a duplicate:
+
+- internal: https://gitlab.science.gc.ca/CanESM/imsi/-/issues
+- external: https://gitlab.com/cccma/imsi/-/issues
+-->
+
+## Summary
+
+<!-- Provide a short summary of the bug encountered. -->
+
+### Current `bug` behaviour
+
+<!-- Describe what actually happens. -->
+
+### Expected `correct` behaviour
+
+<!-- Describe what you should see instead. -->
+
+### Steps to reproduce
+
+<!-- Describe how to reproduce the issue - use a numbered list. -->
+
+1.
+2.
+
+<!-- Where appropriate:
+- Add link to a branch with this error or other supporting pages.
+- Add relevant screenshots, logs, code, or output.
+-->
+
+<!-- v OPTIONAL, uncomment title v -->
+<!-- ## Possible fixes -->
+
+<!--
+Provide a link to the line of code that might be responsible for the problem; and/or suggest a fix.
+-->
+
+## Environment
+
+<!-- Include the version of imsi you used (run `which imsi`). -->
+**imsi version**:
+
+<!-- Leave this label, do not add others -->
+/label ~"bug"

cimsi-0.8.3/.gitlab/issue_templates/documentation.md

@@ -0,0 +1,26 @@
+<!--
+** Please read **
+
+* Use this issue template for suggesting new or updates to existing documentation.
+  Note: changes to documentation as part of feature development should be included
+  in those relevant issues.
+
+* Do not report documentation updates that are specific to your model repository source here.
+-->
+
+## Summary
+
+<!-- Provide a short summary of the documentation request here. -->
+
+## Details
+
+<!-- Provide more details, such as:
+- Describe the content that's erroneous or missing.
+- Provide link to file path or url that is affected.
+- Suggest cross-references that should be included in the content.
+- Suggest specific wording, graphics, or other helpful content.
+-->
+
+
+<!-- Leave this label, do not add others -->
+/label ~"docs"

cimsi-0.8.3/.gitlab/issue_templates/enhancement.md

@@ -0,0 +1,48 @@
+<!--
+** Please read **
+
+* Do not request enhancements that are specific to your model repository source here.
+
+* Before opening a new issue, make sure to search for keywords in the issues
+  list and verify the issue you're about to submit isn't a duplicate:
+
+- internal: https://gitlab.science.gc.ca/CanESM/imsi/-/issues
+- external: https://gitlab.com/cccma/imsi/-/issues
+-->
+
+## Summary
+
+<!-- Provide a short summary of the enhancement request here.
+- This should summarize the main idea and use-case of the feature.
+- Add links to related issues
+-->
+
+### Problem to solve
+
+<!-- Describe what this feature enhacement is trying to solve. -->
+
+### Proposal
+
+<!-- Describe the feature in detail and how it will work. -->
+
+<!-- Where appropriate:
+- Add relevant diagrams, mock-ups of interfaces, expected output, etc.
+- List potential risk factors, if known.
+-->
+
+### Importance
+
+<!-- Describe why this feature is important
+e.g., how this impacts workflow, how this may improve software functionality, why users might want to use it.
+-->
+
+<!-- v OPTIONAL, uncomment title v -->
+<!-- ## Implementation Plan -->
+
+<!--
+Provide an outline of where in the imsi code base this feature
+might live, which classes it may interact with, etc.
+-->
+
+<!-- Leave this label, do not add others -->
+/label ~"enhancement"

cimsi-0.8.3/.gitlab/issue_templates/feature.md

@@ -0,0 +1,48 @@
+<!--
+** Please read **
+
+* Do not request features that are specific to your model repository source here.
+
+* Before opening a new issue, make sure to search for keywords in the issues
+  list and verify the issue you're about to submit isn't a duplicate:
+
+- internal: https://gitlab.science.gc.ca/CanESM/imsi/-/issues
+- external: https://gitlab.com/cccma/imsi/-/issues
+-->
+
+## Summary
+
+<!-- Provide a short summary of the feature request here.
+- This should summarize the main idea and use-case of the feature.
+- Add links to related issues
+-->
+
+### Problem to solve
+
+<!-- Describe what this new feature is trying to solve. -->
+
+### Proposal
+
+<!-- Describe the feature in detail and how it will work. -->
+
+<!-- Where appropriate:
+- Add relevant diagrams, mock-ups of interfaces, expected output, etc.
+- List potential risk factors, if known.
+-->
+
+### Importance
+
+<!-- Describe why this feature is important
+e.g., how this impacts workflow, how this may improve software functionality, why users might want to use it.
+-->
+
+<!-- v OPTIONAL, uncomment title v -->
+<!-- ## Implementation Plan -->
+
+<!--
+Provide an outline of where in the imsi code base this feature
+might live, which classes it may interact with, etc.
+-->
+
+<!-- Leave this label, do not add others -->
+/label ~"feature"

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/.gitlab-ci.yml

@@ -16,13 +16,24 @@ variables:
   UV_BINARY: "/home/scrd102/.local/bin/uv"
   CANESM_REF_REPO: "/home/scrd102/cccma_libs/canesm/"  # change once we have CD for CanE
 
+
 before_script:
-  # clone to the CI_JOB_RUN_DIR
-  - mkdir -p "${CI_JOB_RUN_DIR}"
-  - git clone "${CI_REPOSITORY_URL}" "${CI_JOB_RUN_DIR}"
-  - cd "${CI_JOB_RUN_DIR}"
-  - git checkout "${CI_COMMIT_SHA}"
-    
+  - mkdir -p "$CI_JOB_RUN_DIR"
+  - |
+    if [[ -n "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" ]]; then
+      echo "Cloning fork with CI job token"
+      AUTH_URL=$(echo "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" \
+        | sed "s#https://#https://gitlab-ci-token:${CI_JOB_TOKEN}@#")
+      git clone "$AUTH_URL" "$CI_JOB_RUN_DIR"
+    else
+      git clone "$CI_REPOSITORY_URL" "$CI_JOB_RUN_DIR"
+    fi
+
+  - cd "$CI_JOB_RUN_DIR"
+  - git fetch --tags origin
+  - git fetch origin "$CI_COMMIT_REF_NAME"
+  - git checkout "${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
+
 
 after_script:
   # this only cleans up the single job
@@ -123,10 +134,9 @@ deploy:
   script: |
     # make the deploy location
     mkdir -p ${IMSI_DEPLOY_PATH}/latest
-    cd ${IMSI_DEPLOY_PATH}
 
     # pass Python version, tag, and deploy path as arguments
-    source ${CI_JOB_RUN_DIR}/tests/deploy_imsi_env.sh "${IMSI_DEPLOYED_PYTHON_VER}" "${CI_COMMIT_TAG}" "${IMSI_DEPLOY_PATH}" "${CANESM_REF_REPO}"
+    source tests/deploy_imsi_env.sh "${IMSI_DEPLOYED_PYTHON_VER}" "${CI_COMMIT_TAG}" "${IMSI_DEPLOY_PATH}" "${CANESM_REF_REPO}"
   rules:
     # Only run these rules on gitlab.science.gc.ca
     - if: '$CI_SERVER_HOST != "gitlab.science.gc.ca"'
@@ -145,6 +155,7 @@ publish:
       when: never
 
     - if: $CI_COMMIT_TAG
+  allow_failure: true
 
 
 cleanup:

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/CONTRIBUTING.md

@@ -77,4 +77,29 @@ Integration Reviewers will:
 
  - [ ] The change is compatible with CCCma systems and operational pipelines.
  - [ ] Integration dependencies and environments are respected.
- - [ ] Broader model interactions have been considered.
+ - [ ] Broader model interactions have been considered.
+
+
+## Creating an Issue
+
+**Before you open an Issue**, search the issue tracker for similar entries. If you find an existing Issue is already open, upvote it or add context there is needed.
+
+### Opening an Issue
+
+- Open an Issue for bugs, requests, or documentation.
+- Use the appropriate Issue template.
+- Use the template to describe the Issue.
+- Do not open an Issue for general disussion or support.
+
+### Types of Issues
+
+All Issues must be opened as one of the following types:
+
+| Label   | Description |
+|:--      | :--         |
+| **bug** | Something is broken. |
+| **enhancement** | Improvement to an existing feature. |
+| **feature** | New additions or functionality. |
+| **docs** | Standalone changes or additions to documentation. |
+
+The Issue template you use will be pre-populated with one of these labels. **For Contributors, do not** add other labels to the Issue.

{cimsi-0.8.2.dev1/cimsi.egg-info → cimsi-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cimsi
-Version: 0.8.2.dev1
+Version: 0.8.3
 Summary: Integrated Modelling System Infrastructure (IMSI) is a comprehensive software project used to download, configure, build and run the suite of models in the CCCma Integrated Modelling System.
 Author: CCCma Technical Development Team
 License: OGL-Canada-2.0
@@ -24,6 +24,7 @@ Requires-Dist: rich
 Requires-Dist: pyarrow
 Requires-Dist: python-dotenv
 Requires-Dist: questionary
+Requires-Dist: paramiko
 Provides-Extra: tests
 Requires-Dist: coverage; extra == "tests"
 Requires-Dist: pytest; extra == "tests"

{cimsi-0.8.2.dev1 → cimsi-0.8.3/cimsi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cimsi
-Version: 0.8.2.dev1
+Version: 0.8.3
 Summary: Integrated Modelling System Infrastructure (IMSI) is a comprehensive software project used to download, configure, build and run the suite of models in the CCCma Integrated Modelling System.
 Author: CCCma Technical Development Team
 License: OGL-Canada-2.0
@@ -24,6 +24,7 @@ Requires-Dist: rich
 Requires-Dist: pyarrow
 Requires-Dist: python-dotenv
 Requires-Dist: questionary
+Requires-Dist: paramiko
 Provides-Extra: tests
 Requires-Dist: coverage; extra == "tests"
 Requires-Dist: pytest; extra == "tests"

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/cimsi.egg-info/SOURCES.txt

@@ -11,6 +11,10 @@ environment.yml
 logo.png
 pyproject.toml
 uv.lock
+.gitlab/issue_templates/bug.md
+.gitlab/issue_templates/documentation.md
+.gitlab/issue_templates/enhancement.md
+.gitlab/issue_templates/feature.md
 .gitlab/merge_request_templates/imsi_mr.md
 cimsi.egg-info/PKG-INFO
 cimsi.egg-info/SOURCES.txt
@@ -111,6 +115,8 @@ imsi/tools/list/list_cli.py
 imsi/tools/list/list_manager.py
 imsi/tools/menu/menu_cli.py
 imsi/tools/menu/menu_helpers.py
+imsi/tools/qswide/qswide.py
+imsi/tools/qswide/qswide_cli.py
 imsi/tools/simple_sequencer/__init__.py
 imsi/tools/simple_sequencer/iss.py
 imsi/tools/simple_sequencer/iss_cli.py
@@ -178,6 +184,8 @@ tests/test_ensemble/test_table_utils/test_yaml_table_vars.py
 tests/test_ensemble/test_table_utils/test_yaml_vars.py
 tests/test_list/test_list_cli.py
 tests/test_list/test_list_manager.py
+tests/test_override/test_apply_options_overrides.py
+tests/test_override/test_parse_override_cli.py
 tests/test_schema/test_compiler.py
 tests/test_schema/test_components.py
 tests/test_schema/test_experiment.py

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/cimsi.egg-info/requires.txt

@@ -11,6 +11,7 @@ rich
 pyarrow
 python-dotenv
 questionary
+paramiko
 
 [docs]
 sphinxcontrib-programoutput

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/docs/developing_configurations.rst

@@ -87,6 +87,7 @@ interconnected nature between:
 - models & experiments, which dictate:
    - what jobs you want to run
    - how many simulated years you might want
+   - the explicit `flow` that you might want to use and configure
 - machines, which dictates:
    - what sequencers are available
    - what resource configurations are allowed (i.e. how many days can be simulated in the allowable wall-clock?)
@@ -178,7 +179,7 @@ To define what jobs will run and with what resources, ``imsi`` relies on the
 key path.
 
 Specifically, ``imsi`` will look for ``sequencing:sequencing_flow:FLOW_NAME``, where
-the flow name is determined by one of two methods:
+the flow name is determined by one of three methods:
 
 1. **automatically via the** ``machine`` **and sequencer specific configuration**
 
@@ -190,7 +191,27 @@ the flow name is determined by one of two methods:
    4. extracts the `non-machine specific` ``FLOW_NAME`` from ``sequencing:sequencers:SEQUENCER_NAME:baseflows:model_type``
    5. appends ``default_sequencing_suffix`` to the `non-machine specific` ``FLOW_NAME`` such that ``FLOW_NAME=${FLOW_NAME}-${default_sequencing_suffix}``
 
-2. **from the** ``--flow`` **argument to** ``imsi setup``
+2. **from the** ``flow: FLOW_NAME`` **entry in the experiment/model configuration**
+   
+   This is an extension of the above automatic method, but allows users to explicitly
+   define what `non-machine specific` flow they want to use for this experiment/model. The machine specific suffixing
+   still occurs as per the automatic method. For example, if a user wanted to use the
+   ``basic`` flow for a ``ESM`` model type on a machine with a ``-maestro`` suffix, they would
+   add the following to their experiment/model configuration:
+
+   .. code-block:: yaml
+      models:
+        some_canesm_model:
+          flow: basic
+
+   and to their sequencing flow configuration, ``imsi`` would look for
+   ``sequencing:sequencing_flow:canesm_split_job_flow-basic-hallN``.
+
+   If the user does not provide a ``flow: FLOW_NAME`` entry in the experiment/model configuration,
+   ``imsi`` will fall back to the automatic method described in (1) above. If ``flow`` is specified under 
+   both ``model`` and ``experiment``, the experiment definition takes precedence.
+
+3. **from the** ``--flow`` **argument to** ``imsi setup``
 
 With this in mind, modifications/development of sequencer flows can be achieved via:
 

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/docs/imsi_tracking.rst

@@ -79,6 +79,7 @@ By default, ``imsi`` only logs the above information for certain ``cli`` command
 
 * ``imsi config``
 * ``imsi reload``
+* ``imsi override``
 * ``imsi set``
 * ``imsi build```
 * ``imsi submit``

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/docs/usage.rst

@@ -257,34 +257,30 @@ on the workflow.
       >> imsi set -s model=model-x -s exp=exp-y
 
 
-4\. Apply blocks of pre-defined modifications using ``imsi set --options``
+4\. Apply blocks of pre-defined modifications using ``imsi override --option``
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-   .. warning::
-
-      imsi |version|: this command is a WIP and there may be unexpected behaviour.
 
    +------------------+------------------------------------------------------------------+
    | **Command**      | .. code-block:: bash                                             |
    |                  |                                                                  |
-   |                  |     >> imsi set --options <option_block>=<option_key>            |
+   |                  |     >> imsi override --option <option_block>/<option_file>       |
    |                  |                                                                  |
    +------------------+------------------------------------------------------------------+
    | **Steps**        | Run the command above. The options are defined in the imsi       |
-   |                  | Configuration Files for the source, nominally in                 |
-   |                  | ``model_options.yaml``.                                          |
+   |                  | Configuration Files for the source, nominally in YAML files      |
+   |                  | under ``imsi-config/options/<option_block>/<option_file>``.      |
    +------------------+------------------------------------------------------------------+
    | **Purpose**      | Apply pre-defined sets of modifications to the run               |
-   |                  | configuration. The ``option_block`` and contents can be generally|
-   |                  | thought of as common modifications to configuration that are not |
-   |                  | otherwise captured in the structured imsi Configuration Files.   |
-   +------------------+------------------------------------------------------------------+
-   | **Caveats**      | **This command is currently under development**                  |
+   |                  | configuration. The directory ``<option_block>`` and its contents |
+   |                  | can be generally thought of as common modifications to           |
+   |                  | configuration that are not otherwise captured in the structured  |
+   |                  | configuration system.                                            |
    +------------------+------------------------------------------------------------------+
 
-   **What does** ``imsi set -o`` **do?**
+   **What does** ``imsi override --option`` **do?**
 
-   In simple terms, ``imsi set -o`` is analogous to manually modifying the Resolved
+   In simple terms, ``imsi override --option`` is analogous to manually modifying the Resolved
    Configuration File and running ``imsi config``.
 
 .. warning::
@@ -352,11 +348,6 @@ Any further modifications to the upstream Configuration File for ``exp-B``
 can be applied by using ``imsi reload`` for simplicity thereafter.
 
 
-.. warning::
-
-   ``imsi set --options`` is a WIP.
-
-
 Validating imsi configuration files with ``imsi validate``
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/imsi/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.8.2.dev1'
-__version_tuple__ = version_tuple = (0, 8, 2, 'dev1')
+__version__ = version = '0.8.3'
+__version_tuple__ = version_tuple = (0, 8, 3)
 
-__commit_id__ = commit_id = 'g904569cbb'
+__commit_id__ = commit_id = 'g0bb919958'

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/imsi/cli/core_cli.py

@@ -303,27 +303,49 @@ def reload(ctx):
 @click.option(
     "-o",
     "--options",
-    metavar="OPTION_BLOCK=VALUE",
+    is_flag=True,
+    required=False,
+    default=None,
+    deprecated="See 'imsi override --help' for details.",)
+@click.pass_context
+@log_cli
+def set(ctx, selections, options):
+    import imsi.user_interface.ui_manager as uim
+
+    if options or options is not None:
+        sys.exit(1)
+
+    if not selections:
+        print(ctx.command.get_help(ctx))
+        sys.exit(1)
+
+    force_dirs(Path("src"))
+    uim.validate_version_reqs()
+    # tmp disabling parm_file -> None
+    uim.set_selections(None, selections, force=ctx.obj["FORCE"])
+
+
+@click.command(
+    short_help="Override settings.",
+    help="Override configuration options from imsi-config."
+)
+@click.option(
+    "-o", "--option",
+    metavar="PATH/FILE.yaml",
     multiple=True,
-    help="""A key-value pair for an option block and it's value, as
-    stored in the *_options.yaml files of the imsi Configuration Files.
-    [Example: block_a=option_1]""",
+    help="File paths under imsi-config/options. If specifying multiple paths, options are applied in the order provided."
 )
 @click.pass_context
 @log_cli
-def set(ctx, selections, options):
+def override(ctx, option):
     import imsi.user_interface.ui_manager as uim
 
     force_dirs(Path("src"))
     uim.validate_version_reqs()
-    if any([selections, options]):
-        # tmp disabling parm_file -> None
-        uim.set_selections(None, selections, options, force=ctx.obj["FORCE"])
+    if option:
+        uim.parse_override(option, force=ctx.obj["FORCE"])
     else:
-        click.echo(
-            "Error: Must provide at least one --selections or --options",
-            err=True,
-        )
+        click.echo("Error: Provide at least one --option.", err=True)
 
 
 @click.command(

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/imsi/cli/entry.py

@@ -73,6 +73,7 @@ cli.add_lazy_command("imsi.cli.core_cli.status")
 cli.add_lazy_command("imsi.cli.core_cli.reload")
 cli.add_lazy_command("imsi.cli.core_cli.set")
 cli.add_lazy_command("imsi.cli.core_cli.get_src", name='get-src')
+cli.add_lazy_command("imsi.cli.core_cli.override")
 cli.add_lazy_command("imsi.tools.disk_tools.disk_tools_cli.clean")
 cli.add_lazy_command("imsi.tools.list.list_cli.list")
 cli.add_lazy_command("imsi.tools.menu.menu_cli.setup_menu", name="setup-menu")
@@ -82,3 +83,5 @@ cli.add_lazy_command("imsi.tools.ensemble.ensemble_cli.ensemble")
 cli.add_lazy_command("imsi.tools.validate.validate_cli.validate", name="validate")
 cli.add_lazy_command("imsi.tools.time_manager.timer_cli.chunk_manager", name="chunk-manager")
 cli.add_lazy_command("imsi.tools.simple_sequencer.iss_cli.iss")
+
+cli.add_lazy_command("imsi.tools.qswide.qswide_cli.qswide")

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/imsi/config_manager/config_manager.py

@@ -90,6 +90,8 @@ class SequencingFactory:
     def create_from_database(
         db: ConfigDatabase,
         machine: Machine,
+        experiment: Experiment,
+        model: Model,
         sequencer_name: str,
         flow_name: str = None,
         model_type: str = None,
@@ -116,8 +118,10 @@ class SequencingFactory:
             model_type,
             sequencer_name,
             sequencing_config["sequencer"].get("baseflows"),
-            flows=sequencing_configs["sequencing_flow"],
+            machine_specific_flows=sequencing_configs["sequencing_flow"],
             machine=machine,
+            experiment=experiment,
+            model=model
         )
 
         sequencing_config["sequencing_flow"] = SequencingFactory.set_flow_config(
@@ -160,8 +164,10 @@ class SequencingFactory:
         model_type: str,
         sequencer_name: str,
         sequencer_baseflows: dict,
-        flows,
+        machine_specific_flows,
         machine: Machine,
+        experiment: Experiment,
+        model: Model,
     ):
         """Get the default sequencing flow, which handles the selected model_type, and
         also has configuration support for the selected sequencer and machine.
@@ -183,17 +189,24 @@ class SequencingFactory:
         # The platform/machine specific implementation of baseflows is denoted with a suffix on baseflow
         # This will return the first baseflow/machine specific flow in the list (which is constrain to be
         # only those suppoting the specific model_type)
+        # Prefer explicit 'experiment' field, fall back to 'model'; error if neither present
+        experiment_or_model_flow = experiment.flow or model.flow
+
         for baseflow in base_flows:
-            machine_specific_flow = f"{baseflow}-{machine.default_sequencing_suffix}"  # convention for the naming
-            if machine_specific_flow in flows:
+            if experiment_or_model_flow is not None:
+                machine_specific_flow = f"{baseflow}-{experiment_or_model_flow}-{machine.default_sequencing_suffix}"
+            else:
+                machine_specific_flow = f"{baseflow}-{machine.default_sequencing_suffix}"
+            if machine_specific_flow in machine_specific_flows:
                 return machine_specific_flow
+
         supported_base_flows = ", ".join(base_flows)
         raise KeyError(
-            f"Could not determine a default sequencing flow for sequencer: {sequencer_name} "
-            f"on machine: {machine.name}/{machine.default_sequencing_suffix} that supports model_type: {model_type}. "
-            f"Support baseflows found for {model_type} are: {supported_base_flows}. "
-            f"Machine specific version(s) for {machine.default_sequencing_suffix} are "
-            "not implemented but required."
+            f"Could not determine a default sequencing flow for sequencer '{sequencer_name}' "
+            f"on machine '{machine.name}' (suffix '{machine.default_sequencing_suffix}'), "
+            f"for model_type '{model_type}' and experiment or model flow '{experiment_or_model_flow}'. "
+            f"Supported baseflows for this model_type are: {supported_base_flows}. "
+            "Machine-specific versions for this combination are not implemented but required."
         )
 
     @staticmethod
@@ -414,7 +427,7 @@ class ConfigManager:
         setup_params = self.create_SetupParams(setup_params, machine)  # improvable
         utilities = self.create_utilities()
         (SEQ_N, FLOW_N), sequencing = self.create_sequencing(
-            machine, setup_params.sequencer_name, flow_name, experiment
+            machine, experiment, model, setup_params.sequencer_name, flow_name
         )
         POST_N, postproc = self.create_postproc(model, experiment, postproc_profile)
 
@@ -483,13 +496,16 @@ class ConfigManager:
     def create_sequencing(
         self,
         machine: Machine,
+        experiment: Experiment,
+        model: Model,
         sequencer_name: str,
         flow_name: str,
-        experiment: Experiment,
     ) -> Sequencing:
         return SequencingFactory.create_from_database(
             self.db,
             machine=machine,
+            experiment=experiment,
+            model=model,
             sequencer_name=sequencer_name,
             flow_name=flow_name,
             model_type=experiment.model_type,

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/imsi/config_manager/schema/experiment.py

@@ -1,4 +1,4 @@
-from typing import Optional, List
+from typing import Optional, Union, List
 
 from pydantic import Field, BaseModel, ConfigDict
 
@@ -23,8 +23,9 @@ class Experiment(BaseModel):
     )
     parent_runid: str
     parent_branch_time: str
-    inherits_from: Optional[str] = None
+    inherits_from: Optional[Union[List[str], str]] = None
     supported_models: List[str]
+    flow: Optional[str] = None # overrides flow specified in model
 
     def validate_model_name(self, model_name: str):
         if model_name not in self.supported_models:

{cimsi-0.8.2.dev1 → cimsi-0.8.3}/imsi/config_manager/schema/model.py

@@ -19,3 +19,4 @@ class Model(BaseModel):
     prefix: Optional[str] = None
     model_filename_prefix: Optional[str] = None
     model_rs_filename_prefix: Optional[str] = None
+    flow: Optional[str] = None