liminal-orm 3.1.0__py3-none-any.whl → 3.2.0__py3-none-any.whl

liminal/base/name_template_parts.py

@@ -3,7 +3,6 @@ import warnings
 from liminal.orm.name_template_parts import *  # noqa: F403
 
 warnings.warn(
-    "Importing from 'liminal.base.name_template_parts' is deprecated. Please import from 'liminal.orm.name_template_parts' instead.",
-    DeprecationWarning,
-    stacklevel=2,
+    "Importing from 'liminal.base.name_template_parts' is deprecated. Please import from 'liminal.orm.name_template_parts' instead. This will be removed in v4.",
+    FutureWarning,
 )

liminal/base/properties/base_field_properties.py

@@ -4,10 +4,7 @@ from typing import Any
 
 from pydantic import BaseModel, ConfigDict, PrivateAttr
 
-from liminal.base.base_dropdown import BaseDropdown
 from liminal.enums import BenchlingFieldType
-from liminal.orm.base_model import BaseModel as BenchlingBaseModel
-from liminal.utils import is_valid_wh_name
 
 
 class BaseFieldProperties(BaseModel):
@@ -71,25 +68,6 @@ class BaseFieldProperties(BaseModel):
         """If the Field Properties are meant to represent a column in Benchling,
         this will validate the properties and ensure that the entity_link and dropdowns are valid names that exist in our code.
         """
-        if self.entity_link:
-            if self.entity_link not in [
-                s.__schema_properties__.warehouse_name
-                for s in BenchlingBaseModel.get_all_subclasses()
-            ]:
-                raise ValueError(
-                    f"Field {wh_name}: could not find entity link {self.entity_link} as a warehouse name for any currently defined schemas."
-                )
-        if self.dropdown_link:
-            if self.dropdown_link not in [
-                d.__benchling_name__ for d in BaseDropdown.get_all_subclasses()
-            ]:
-                raise ValueError(
-                    f"Field {wh_name}: could not find dropdown link {self.dropdown_link} as a name to any defined dropdowns."
-                )
-        if not is_valid_wh_name(wh_name):
-            raise ValueError(
-                f"Field {wh_name}: invalid warehouse name '{wh_name}'. It should only contain alphanumeric characters and underscores."
-            )
         return True
 
     def merge(self, new_props: BaseFieldProperties) -> dict[str, Any]:

liminal/base/properties/base_schema_properties.py

@@ -91,7 +91,7 @@ class BaseSchemaProperties(BaseModel):
 
     def __init__(self, **data: Any):
         super().__init__(**data)
-        self._archived = data.get("_archived", None)
+        self._archived = data.get("_archived", None)  # TODO: WHY??
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 

liminal/cli/cli.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import warnings
 from pathlib import Path
 
 import typer
@@ -17,7 +18,9 @@ from liminal.cli.live_test_entity_schema_migration import (
     mock_entity_schema_full_migration,
 )
 from liminal.cli.utils import read_local_liminal_dir, update_env_revision_id
-from liminal.connection.benchling_service import BenchlingService
+from liminal.connection.benchling_service import (
+    BenchlingService,
+)
 from liminal.migrate.revisions_timeline import RevisionsTimeline
 
 
@@ -54,15 +57,22 @@ def init() -> None:
     new_revision_file_path = RevisionsTimeline(VERSIONS_DIR_PATH).init_versions(
         VERSIONS_DIR_PATH
     )
-    revision_id = new_revision_file_path.name.split("_")[0]
-    env_file = f"""# This file is auto-generated by Liminal.
+
+    env_file = """# This file is auto-generated by Liminal.
 # Import the models and dropdowns you want to keep in sync here.
 # Instantiate the BenchlingConnection(s) with the correct parameters for your tenant(s).
-# There must be a revision_id variable defined for each BenchlingConnection instance. The variable name should match the `current_revision_id_var_name` variable passed into the BenchlingConnection instance.
-# The revision_id variable name can also match the format `<tenant_name>_CURRENT_REVISION_ID` / `<tenant_alias>_CURRENT_REVISION_ID`.
-from liminal.connection import BenchlingConnection
+from liminal.connection import BenchlingConnection, TenantConfigFlags
 
-CURRENT_REVISION_ID = "{revision_id}"
+connection = BenchlingConnection(
+    tenant_name="pizzahouse-prod",
+    tenant_alias="prod",
+    api_client_id="my-secret-api-client-id",
+    api_client_secret="my-secret-api-client-secret",
+    warehouse_connection_string="...",
+    internal_api_admin_email="my-secret-internal-api-admin-email",
+    internal_api_admin_password="my-secret-internal-api-admin-password",
+    config_flags=TenantConfigFlags(...)
+)
 """
     with open(ENV_FILE_PATH, "w") as file:
         file.write(env_file)
@@ -86,9 +96,7 @@ def generate_files(
         help="The path to write the generated files to.",
     ),
 ) -> None:
-    current_revision_id, benchling_connection = read_local_liminal_dir(
-        LIMINAL_DIR_PATH, benchling_tenant
-    )
+    _, benchling_connection = read_local_liminal_dir(LIMINAL_DIR_PATH, benchling_tenant)
     benchling_service = BenchlingService(benchling_connection, use_internal_api=True)
     if not write_path.exists():
         write_path.mkdir()
@@ -98,7 +106,7 @@ def generate_files(
 
 @app.command(
     name="current",
-    help="Returns the CURRENT_REVISION_ID that your Benchling tenant is on. Reads from liminal/env.py.",
+    help="Returns the remote revision_id that your Benchling tenant is currently on. Reads this from the name on the '_liminal_remote' schema.",
 )
 def current(
     benchling_tenant: str = typer.Argument(
@@ -108,16 +116,34 @@ def current(
     current_revision_id, benchling_connection = read_local_liminal_dir(
         LIMINAL_DIR_PATH, benchling_tenant
     )
-    print(
-        f"[blue]{benchling_connection.current_revision_id_var_name}: {current_revision_id}[/blue]"
-    )
+    benchling_service = BenchlingService(benchling_connection, use_internal_api=True)
+    try:
+        remote_revision_id = benchling_service.get_remote_revision_id()
+        if current_revision_id is not None:
+            warnings.warn(
+                f"Accessing and using the revision_id variable in {LIMINAL_DIR_PATH/'env.py'} is deprecated. Delete the variable set in the env.py file, the revision_id is now stored in your Benchling tenant within the '_liminal_remote' schema. Support for reading/writing the local revision_id will end with the v4 release.",
+                FutureWarning,
+            )
+        current_revision_id = remote_revision_id
+    except Exception:
+        pass
+    print(f"[blue]Current revision_id: {current_revision_id}.")
 
 
 @app.command(
-    name="autogenerate",
+    name="head",
+    help="Returns the local heads, or the latest revision_id, in your linear revision timeline.",
+)
+def head() -> None:
+    revision_timeline = RevisionsTimeline(VERSIONS_DIR_PATH)
+    print(f"[blue]{revision_timeline.get_latest_revision().id}: (head)[/blue]")
+
+
+@app.command(
+    name="revision",
     help="Generates a revision file with a list of operations to bring the given Benchling tenant up to date with the locally defined schemas. Writes revision file to liminal/versions/.",
 )
-def autogenerate(
+def revision(
     benchling_tenant: str = typer.Argument(
         ..., help="Benchling tenant (or alias) to connect to."
     ),
@@ -125,19 +151,56 @@ def autogenerate(
         ...,
         help="A description of the revision being generated. This will also be included in the file name.",
     ),
+    autogenerate: bool = typer.Option(
+        True,
+        "--autogenerate",
+        help="Automatically generate the revision file based on comparisons.",
+    ),
 ) -> None:
     current_revision_id, benchling_connection = read_local_liminal_dir(
         LIMINAL_DIR_PATH, benchling_tenant
     )
     benchling_service = BenchlingService(benchling_connection, use_internal_api=True)
+    try:
+        remote_revision_id = benchling_service.get_remote_revision_id()
+        if current_revision_id is not None:
+            warnings.warn(
+                f"Accessing and using the revision_id variable in {LIMINAL_DIR_PATH/'env.py'} is deprecated. Delete the variable set in the env.py file, the revision_id is now stored in your Benchling tenant within the '_liminal_remote' schema. Support for reading/writing the local revision_id will end with the v4 release.",
+                FutureWarning,
+            )
+        current_revision_id = remote_revision_id
+    except Exception:
+        assert current_revision_id is not None
     autogenerate_revision_file(
-        benchling_service, VERSIONS_DIR_PATH, description, current_revision_id
+        benchling_service,
+        VERSIONS_DIR_PATH,
+        description,
+        current_revision_id,
+        autogenerate,
+    )
+
+
+@app.command(
+    name="autogenerate",
+    hidden=True,
+)
+def autogenerate(
+    benchling_tenant: str = typer.Argument(
+        ..., help="Benchling tenant (or alias) to connect to."
+    ),
+    description: str = typer.Argument(
+        ...,
+        help="A description of the revision being generated. This will also be included in the file name.",
+    ),
+) -> None:
+    raise DeprecationWarning(
+        "CLI command `liminal autogenerate ...` is deprecated and will be removed in v4. Please use `liminal revision ...` instead."
     )
 
 
 @app.command(
     name="upgrade",
-    help="Upgrades the Benchling tenant by running revision file(s) based on the CURRENT_REVISION_ID and the passed in parameters. Runs the upgrade operations of each revision file in order.",
+    help="Upgrades the Benchling tenant by running revision file(s) based on the passed in parameters. Uses the remote revision_id in Benchling as the starting point, and upgrades to the given revision by running the operations in the revision file(s).",
     context_settings={"ignore_unknown_options": True},
 )
 def upgrade(
@@ -146,19 +209,35 @@ def upgrade(
     ),
     upgrade_descriptor: str = typer.Argument(
         ...,
-        help="Determines the revision files that get run. Pass in the 'revision_id' to upgrade to that revision. Pass in 'head' to upgrade to the latest revision. Pass in '+n' to make a relative revision based on the current revision id.",
+        help="Determines the revision files that get run. Pass in the 'revision_id' to upgrade to that revision. Pass in 'head' to upgrade to the latest revision. Pass in '+n' to make a relative revision based on the current remote revision id.",
     ),
 ) -> None:
     current_revision_id, benchling_connection = read_local_liminal_dir(
         LIMINAL_DIR_PATH, benchling_tenant
     )
+    local_revision_id_exists = current_revision_id is not None
     benchling_service = BenchlingService(benchling_connection, use_internal_api=True)
+    try:
+        remote_revision_id = benchling_service.get_remote_revision_id()
+        if current_revision_id is not None:
+            warnings.warn(
+                f"Accessing and using the revision_id variable in {LIMINAL_DIR_PATH/'env.py'} is deprecated. Delete the variable set in the env.py file, the revision_id is now stored in your Benchling tenant within the '_liminal_remote' schema. Support for reading/writing the local revision_id will end with the v4 release.",
+                FutureWarning,
+            )
+        current_revision_id = remote_revision_id
+    except Exception:
+        assert current_revision_id is not None
     upgrade_revision_id = upgrade_benchling_tenant(
         benchling_service, VERSIONS_DIR_PATH, current_revision_id, upgrade_descriptor
     )
-    update_env_revision_id(ENV_FILE_PATH, benchling_tenant, upgrade_revision_id)
+    benchling_service.upsert_remote_revision_id(upgrade_revision_id)
+    if local_revision_id_exists:
+        update_env_revision_id(ENV_FILE_PATH, benchling_tenant, upgrade_revision_id)
+        print(
+            f"[dim red]Set local {benchling_tenant}_CURRENT_REVISION_ID to {upgrade_revision_id} in liminal/env.py"
+        )
     print(
-        f"[dim]Set {benchling_tenant}_CURRENT_REVISION_ID to {upgrade_revision_id} in liminal/env.py"
+        f"[dim]Set revision_id to {upgrade_revision_id} withinn '_liminal_remote' schema."
     )
     print("[bold green]Migration complete")
 
@@ -180,13 +259,29 @@ def downgrade(
     current_revision_id, benchling_connection = read_local_liminal_dir(
         LIMINAL_DIR_PATH, benchling_tenant
     )
+    local_revision_id_exists = current_revision_id is not None
     benchling_service = BenchlingService(benchling_connection, use_internal_api=True)
+    try:
+        remote_revision_id = benchling_service.get_remote_revision_id()
+        if current_revision_id is not None:
+            warnings.warn(
+                f"Accessing and using the revision_id variable in {LIMINAL_DIR_PATH/'env.py'} is deprecated. Delete the variable set in the env.py file, the revision_id is now stored in your Benchling tenant within the '_liminal_remote' schema. Support for reading/writing the local revision_id will end with the v4 release.",
+                FutureWarning,
+            )
+        current_revision_id = remote_revision_id
+    except Exception:
+        assert current_revision_id is not None
     downgrade_revision_id = downgrade_benchling_tenant(
         benchling_service, VERSIONS_DIR_PATH, current_revision_id, downgrade_descriptor
     )
-    update_env_revision_id(ENV_FILE_PATH, benchling_tenant, downgrade_revision_id)
+    benchling_service.upsert_remote_revision_id(downgrade_revision_id)
+    if local_revision_id_exists:
+        update_env_revision_id(ENV_FILE_PATH, benchling_tenant, downgrade_revision_id)
+        print(
+            f"[dim red]Set local {benchling_tenant}_CURRENT_REVISION_ID to {downgrade_revision_id} in liminal/env.py"
+        )
     print(
-        f"[dim]Set {benchling_tenant}_CURRENT_REVISION_ID to {downgrade_revision_id} in liminal/env.py"
+        f"[dim]Set revision_id to {downgrade_revision_id} withinn '_liminal_remote' schema."
     )
     print("[bold green]Migration complete")
 
@@ -217,9 +312,7 @@ def live_test(
         raise ValueError(
             "Only one of --entity-schema-migration or --dropdown-migration can be set."
         )
-    current_revision_id, benchling_connection = read_local_liminal_dir(
-        LIMINAL_DIR_PATH, benchling_tenant
-    )
+    _, benchling_connection = read_local_liminal_dir(LIMINAL_DIR_PATH, benchling_tenant)
     benchling_service = BenchlingService(benchling_connection, use_internal_api=True)
     if test_entity_schema_migration:
         mock_entity_schema_full_migration(

liminal/cli/controller.py

@@ -30,6 +30,7 @@ def autogenerate_revision_file(
     write_dir_path: Path,
     description: str,
     current_revision_id: str,
+    compare: bool = True,
 ) -> None:
     """Generates a revision file by comparing locally defined schemas to the given Benchling tenant.
     The revision file contains a unique revision id, the down_revision_id (which is the latest revision id that this revision is based on),
@@ -46,16 +47,20 @@ def autogenerate_revision_file(
         A description of the revision being generated. This will also be included in the file name.
     """
     revision_timeline = RevisionsTimeline(write_dir_path)
+    if current_revision_id not in revision_timeline.revisions_map.keys():
+        raise Exception(
+            f"Your target Benchling tenant is currently at revision_id {current_revision_id}. This does not exist within your revision timeline in any of your revision files. Ensure your current revision_id for your tenant is correct. The current local head revision is {revision_timeline.get_latest_revision().id}"
+        )
     if current_revision_id != revision_timeline.get_latest_revision().id:
         raise Exception(
-            f"Your target Benchling tenant is not up to date with the latest revision ({revision_timeline.get_latest_revision().id}). Please upgrade to the latest revision before generating a new revision."
+            f"Your target Benchling tenant is currently at revision_id {current_revision_id}, which is not up to date with the local head revision ({revision_timeline.get_latest_revision().id}). Please upgrade your tenant to the latest revision before generating a new revision."
         )
-    compare_ops = get_full_migration_operations(benchling_service)
-    write_path = revision_timeline.write_new_revision(description, compare_ops)
-    if write_path is None:
-        print("[bold green]No changes needed. Skipping revision file generation.")
+    if compare:
+        compare_ops = get_full_migration_operations(benchling_service)
     else:
-        print(f"[bold green]Revision file generated at {write_path}")
+        compare_ops = []
+    write_path = revision_timeline.write_new_revision(description, compare_ops)
+    print(f"[bold green]Revision file generated at {write_path}")
 
 
 def upgrade_benchling_tenant(

liminal/cli/utils.py

@@ -1,8 +1,11 @@
 import importlib.util
+from logging import Logger
 from pathlib import Path
 
 from liminal.connection.benchling_connection import BenchlingConnection
 
+LOGGER = Logger(name=__name__)
+
 
 def _check_liminal_directory_initialized(liminal_dir_path: Path) -> None:
     """Raises an exception if the liminal directory does not exist at the given path."""
@@ -19,7 +22,7 @@ def _check_liminal_directory_initialized(liminal_dir_path: Path) -> None:
 
 def read_local_liminal_dir(
     liminal_dir_path: Path, benchling_tenant: str
-) -> tuple[str, BenchlingConnection]:
+) -> tuple[str | None, BenchlingConnection]:
     """Imports the env.py file from /liminal/env.py and returns the CURRENT_REVISION_ID variable along with the BenchlingConnection object.
     The env.py file is expected to have the CURRENT_REVISION_ID variable set to the revision id you are currently on.
     The BenchlingConnection object is expected to be defined and have connection information for the Benchling API client and internal API.
@@ -34,7 +37,7 @@ def read_local_liminal_dir(
 
 def _read_local_env_file(
     env_file_path: Path, benchling_tenant: str
-) -> tuple[str, BenchlingConnection]:
+) -> tuple[str | None, BenchlingConnection]:
     """Imports the env.py file from the current working directory and returns the CURRENT_REVISION_ID variable along with the BenchlingConnection object.
     The env.py file is expected to have the CURRENT_REVISION_ID variable set to the revision id you are currently on.
     The BenchlingConnection object is expected to be defined and have connection information for the Benchling API client and internal API.
@@ -62,8 +65,8 @@ def _read_local_env_file(
                     "internal_api_admin_email and internal_api_admin_password must be provided in BenchlingConnection in liminal/env.py. This is necessary for the migration service."
                 )
             try:
-                current_revision_id: str = getattr(
-                    module, bc.current_revision_id_var_name
+                current_revision_id: str | None = getattr(
+                    module, bc.current_revision_id_var_name, None
                 )
                 return current_revision_id, bc
             except Exception as e:
@@ -78,7 +81,7 @@ def _read_local_env_file(
 def update_env_revision_id(
     env_file_path: Path, benchling_env: str, revision_id: str
 ) -> None:
-    """Updates the CURRENT_REVISION_ID variable in the env.py file to the given revision id."""
+    """Updates the CURRENT_REVISION_ID variable in the env.py file to the given revision id. REMOVE WITH v4 release."""
     env_file_content = env_file_path.read_text().split("\n")
     for i, line in enumerate(env_file_content):
         if f"{benchling_env}_CURRENT_REVISION_ID =" in line:

liminal/connection/__init__.py

@@ -1,2 +1,5 @@
-from liminal.connection.benchling_connection import BenchlingConnection  # noqa: F401
+from liminal.connection.benchling_connection import (
+    BenchlingConnection,  # noqa: F401
+    TenantConfigFlags,  # noqa: F401
+)
 from liminal.connection.benchling_service import BenchlingService  # noqa: F401

liminal/connection/benchling_service.py

@@ -16,10 +16,20 @@ from tenacity import (
     wait_exponential,
 )
 
+from liminal.base.properties.base_field_properties import BaseFieldProperties
+from liminal.base.properties.base_schema_properties import BaseSchemaProperties
 from liminal.connection.benchling_connection import BenchlingConnection
+from liminal.enums import (
+    BenchlingEntityType,
+    BenchlingFieldType,
+    BenchlingNamingStrategy,
+)
 
 logger = logging.getLogger(__name__)
 
+REMOTE_LIMINAL_SCHEMA_NAME = "_liminal_remote"
+REMOTE_REVISION_ID_FIELD_WH_NAME = "revision_id"
+
 
 class BenchlingService(Benchling):
     """
@@ -138,6 +148,99 @@ class BenchlingService(Benchling):
         """Closes all sessions and cleans up engine"""
         self.engine.dispose()
 
+    def get_remote_revision_id(self) -> str:
+        """
+        Uses internal API to to search for the _liminal_remote schema, where the revision_id is stored.
+        This schema contains the remote revision_id in the name of the revision_id field.
+
+        Returns the remote revision_id stored on the entity.
+        """
+        from liminal.entity_schemas.tag_schema_models import TagSchemaModel
+
+        try:
+            liminal_schema = TagSchemaModel.get_one(self, REMOTE_LIMINAL_SCHEMA_NAME)
+        except Exception:
+            raise ValueError(
+                f"Did not find any schema name '{REMOTE_LIMINAL_SCHEMA_NAME}'. Run a liminal migration to populate your registry with the Liminal entity that stores the remote revision_id."
+            )
+        revision_id_fields = [
+            f
+            for f in liminal_schema.fields
+            if f.systemName == REMOTE_REVISION_ID_FIELD_WH_NAME
+        ]
+        if len(revision_id_fields) == 1:
+            revision_id = revision_id_fields[0].name
+            assert revision_id is not None, "No revision_id set in field name."
+            return revision_id
+        else:
+            raise ValueError(
+                f"Error finding field on {REMOTE_LIMINAL_SCHEMA_NAME} schema with warehouse_name {REMOTE_REVISION_ID_FIELD_WH_NAME}. Check schema fields to ensure this field exists and is defined according to documentation."
+            )
+
+    def upsert_remote_revision_id(self, revision_id: str) -> None:
+        """Updates or inserts a remote Liminal schema into your tenant with the given revision_id stored in the name of a field.
+        If the '_liminal_remote' schema is found, check and make sure a field with warehouse_name 'revision_id' is present. If both are present, update the revision_id stored within the name.
+        If no schema is found, create the _liminal_remote entity schema.
+        Upsert is needed to migrate users from using the CURRENT_REVISION_ID stored in the env.py file smoothly to storing in Benchling itself.
+
+        Parameters
+        ----------
+        revision_id : str
+            revision_id of migration file to set in Benchling on remote liminal entity.
+
+        Returns
+        -------
+        CustomEntity
+            remote liminal entity with updated revision_id field.
+        """
+        from liminal.entity_schemas.tag_schema_models import TagSchemaModel
+
+        try:
+            liminal_schema = TagSchemaModel.get_one(self, REMOTE_LIMINAL_SCHEMA_NAME)
+        except Exception:
+            # No _liminal_remote schema found. Create schema.
+            from liminal.entity_schemas.operations import CreateEntitySchema
+
+            CreateEntitySchema(
+                schema_properties=BaseSchemaProperties(
+                    name={REMOTE_LIMINAL_SCHEMA_NAME},
+                    warehouse_name={REMOTE_LIMINAL_SCHEMA_NAME},
+                    prefix={REMOTE_LIMINAL_SCHEMA_NAME},
+                    entity_type=BenchlingEntityType.CUSTOM_ENTITY,
+                    naming_strategies={BenchlingNamingStrategy.NEW_IDS},
+                ),
+                fields=[
+                    BaseFieldProperties(
+                        name={revision_id},
+                        warehouse_name=REMOTE_REVISION_ID_FIELD_WH_NAME,
+                        type=BenchlingFieldType.TEXT,
+                        parent_link=False,
+                        is_multi=False,
+                        required=True,
+                    )
+                ],
+            ).execute(self)
+        # _liminal_remote schema found. Check if revision_id field exists on it.
+        revision_id_fields = [
+            f
+            for f in liminal_schema.fields
+            if f.systemName == REMOTE_REVISION_ID_FIELD_WH_NAME
+        ]
+        if len(revision_id_fields) == 1:
+            # _liminal_remote schema found, revision_id field found. Update revision_id field on it with given revision_id.
+            from liminal.entity_schemas.operations import UpdateEntitySchemaField
+
+            revision_id_field = revision_id_fields[0]
+            UpdateEntitySchemaField(
+                liminal_schema.sqlIdentifier,
+                revision_id_field.systemName,
+                BaseFieldProperties(name=revision_id),
+            ).execute(self)
+        else:
+            raise ValueError(
+                f"Error finding field on {REMOTE_LIMINAL_SCHEMA_NAME} schema with warehouse_name {REMOTE_REVISION_ID_FIELD_WH_NAME}. Check schema fields to ensure this field exists and is defined according to documentation."
+            )
+
     @classmethod
     @retry(
         stop=stop_after_attempt(3),

liminal/dropdowns/generate_files.py

@@ -4,7 +4,7 @@ from rich import print
 
 from liminal.connection import BenchlingService
 from liminal.dropdowns.utils import get_benchling_dropdowns_dict
-from liminal.utils import pascalize, to_snake_case
+from liminal.utils import to_pascal_case, to_snake_case
 
 
 def generate_all_dropdown_files(
@@ -24,7 +24,7 @@ def generate_all_dropdown_files(
     for dropdown_name, dropdown_options in dropdowns.items():
         dropdown_values = [option.name for option in dropdown_options.options]
         options_list = str(dropdown_values).replace("'", '"')
-        classname = pascalize(dropdown_name)
+        classname = to_pascal_case(dropdown_name)
         dropdown_content = f"""
 from liminal.base.base_dropdown import BaseDropdown
 

liminal/entity_schemas/generate_files.py

@@ -8,7 +8,7 @@ from liminal.entity_schemas.utils import get_converted_tag_schemas
 from liminal.enums import BenchlingEntityType, BenchlingFieldType
 from liminal.mappers import convert_benchling_type_to_python_type
 from liminal.orm.name_template import NameTemplate
-from liminal.utils import pascalize, to_snake_case
+from liminal.utils import to_pascal_case, to_snake_case
 
 
 def get_entity_mixin(entity_type: BenchlingEntityType) -> str:
@@ -59,18 +59,18 @@ def generate_all_entity_schema_files(
     subdirectory_map: dict[str, list[tuple[str, str]]] = {}
     benchling_dropdowns = get_benchling_dropdowns_dict(benchling_service)
     dropdown_name_to_classname_map: dict[str, str] = {
-        dropdown_name: pascalize(dropdown_name)
+        dropdown_name: to_pascal_case(dropdown_name)
         for dropdown_name in benchling_dropdowns.keys()
     }
     wh_name_to_classname: dict[str, str] = {
-        sp.warehouse_name: pascalize(sp.name) for sp, _, _ in models
+        sp.warehouse_name: to_pascal_case(sp.name) for sp, _, _ in models
     }
 
     for schema_properties, name_template, columns in models:
-        classname = pascalize(schema_properties.name)
+        classname = to_pascal_case(schema_properties.name)
 
     for schema_properties, name_template, columns in models:
-        classname = pascalize(schema_properties.name)
+        classname = to_pascal_case(schema_properties.name)
         filename = to_snake_case(schema_properties.name) + ".py"
         columns = {key: columns[key] for key in columns}
         import_strings = [
@@ -117,7 +117,7 @@ def generate_all_entity_schema_files(
                     )
                 else:
                     relationship_strings.append(
-                        f"""{tab}{col_name}_entities = multi_relationship("{wh_name_to_classname[col.entity_link]}", "{classname}", "{col_name}")"""
+                        f"""{tab}{col_name}_entities = multi_relationship("{wh_name_to_classname[col.entity_link]}", {col_name})"""
                     )
                     import_strings.append(
                         "from liminal.orm.relationship import multi_relationship"

liminal/entity_schemas/operations.py

@@ -313,10 +313,15 @@ class CreateEntitySchemaField(BaseOperation):
         self.index = index
 
         self._wh_field_name: str
+        self._field_name: str
         if field_props.warehouse_name:
             self._wh_field_name = field_props.warehouse_name
         else:
             raise ValueError("Field warehouse name is required.")
+        if field_props.name:
+            self._field_name = field_props.name
+        else:
+            raise ValueError("Field name is required.")
 
     def execute(self, benchling_service: BenchlingService) -> dict[str, Any]:
         try:
@@ -385,10 +390,10 @@ class CreateEntitySchemaField(BaseOperation):
         if (
             benchling_service.connection.config_flags.schemas_enable_change_warehouse_name
             is False
-            and self.field_props.warehouse_name != to_snake_case(self.field_props.name)
+            and self.field_props.warehouse_name != to_snake_case(self._field_name)
         ):
             raise ValueError(
-                f"{self.wh_schema_name}: Tenant config flag SCHEMAS_ENABLE_CHANGE_WAREHOUSE_NAME is required to set a custom field warehouse name. Reach out to Benchling support to turn this config flag to True and then set the flag to True in BenchlingConnection.config_flags. Otherwise, define the field warehouse_name in code to be the given Benchling warehouse name: {to_snake_case(self.field_props.name)}."
+                f"{self.wh_schema_name}: Tenant config flag SCHEMAS_ENABLE_CHANGE_WAREHOUSE_NAME is required to set a custom field warehouse name. Reach out to Benchling support to turn this config flag to True and then set the flag to True in BenchlingConnection.config_flags. Otherwise, define the field warehouse_name in code to be the given Benchling warehouse name: {to_snake_case(self._field_name)}."
             )
         if (
             self.field_props.unit_name

liminal/entity_schemas/tag_schema_models.py

@@ -388,7 +388,7 @@ class TagSchemaModel(BaseModel):
     shouldCreateAsOligo: bool | None
     shouldOrderNamePartsBySequence: bool | None
     showResidues: bool | None
-    sqlIdentifier: str | None
+    sqlIdentifier: str
     useOrganizationCollectionAliasForDisplayLabel: bool | None
     useRandomOrgAlias: bool | None
 
@@ -526,11 +526,14 @@ class TagSchemaModel(BaseModel):
         self.prefix = (
             update_props.prefix if "prefix" in update_diff_names else self.prefix
         )
-        self.sqlIdentifier = (
+
+        set_sql_identifier = (
             update_props.warehouse_name
             if "warehouse_name" in update_diff_names
             else self.sqlIdentifier
         )
+        assert type(set_sql_identifier) is str
+        self.sqlIdentifier = set_sql_identifier
         self.name = update_props.name if "name" in update_diff_names else self.name
         return self
 

liminal/entity_schemas/utils.py

@@ -33,6 +33,7 @@ def get_converted_tag_schemas(
         if include_archived
         else [s for s in all_schemas if not s.archiveRecord]
     )
+    all_schemas = [s for s in all_schemas if s.sqlIdentifier != "_liminal_remote"]
     return [
         convert_tag_schema_to_internal_schema(
             tag_schema, dropdowns_map, unit_id_to_name_map, include_archived

liminal/migrate/components.py

@@ -76,7 +76,9 @@ def execute_operations(
             o.execute(benchling_service)
         except Exception as e:
             traceback.print_exc()
-            print(f"[bold red]Error executing operation {o.__class__.__name__}: {e}]")
+            print(
+                f"[bold red]Error at step {index} executing operation {o.__class__.__name__}: {e}]"
+            )
             return False
         index += 1
     return True

liminal/migrate/revisions_timeline.py

@@ -222,7 +222,7 @@ class RevisionsTimeline:
 
     def write_new_revision(
         self, message: str, operations: list[CompareOperation]
-    ) -> str | None:
+    ) -> str:
         """Adds a new revision to the revisions map and writes the revision file to the versions directory if write is True.
         The added revision will be the latest revision.
         """
@@ -234,8 +234,6 @@ class RevisionsTimeline:
             upgrade_operations=[o.op for o in operations],
             downgrade_operations=reversed([o.reverse_op for o in operations]),
         )
-        if len(operations) == 0:
-            return None
         new_revision.write_revision_file(self.versions_dir_path)
         self.revisions_map[new_revision.id] = new_revision
         self.get_revision(

liminal/orm/base_model.py

@@ -11,6 +11,7 @@ from sqlalchemy import Column as SqlColumn
 from sqlalchemy.orm import Query, RelationshipProperty, Session, relationship
 from sqlalchemy.orm.decl_api import declared_attr
 
+from liminal.base.base_dropdown import BaseDropdown
 from liminal.base.base_validation_filters import BaseValidatorFilters
 from liminal.enums import BenchlingNamingStrategy
 from liminal.enums.benchling_entity_type import BenchlingEntityType
@@ -20,6 +21,7 @@ from liminal.orm.base_tables.user import User
 from liminal.orm.name_template import NameTemplate
 from liminal.orm.name_template_parts import FieldPart
 from liminal.orm.schema_properties import SchemaProperties
+from liminal.utils import is_valid_wh_name
 from liminal.validation import BenchlingValidatorReport
 
 if TYPE_CHECKING:
@@ -175,7 +177,7 @@ class BaseModel(Generic[T], Base):
         if len(models.keys()) != len(set(names)):
             missing_models = set(names) - set(models.keys())
             raise ValueError(
-                f"No model subclass found for the following class names or warehouse names: {', '.join(missing_models)}"
+                f"No model subclass found for the following class names or warehouse names: {', '.join(missing_models)}. Please ensure the entity schema model(s) are imported or defined."
             )
         return list(models.values())
 
@@ -218,11 +220,32 @@ class BaseModel(Generic[T], Base):
             )
         for wh_name, field in properties.items():
             try:
-                field.validate_column_definition(wh_name)
+                if field.entity_link:
+                    if field.entity_link not in [
+                        s.__schema_properties__.warehouse_name
+                        for s in cls.__base__.get_all_subclasses()
+                    ]:
+                        breakpoint()
+                        raise ValueError(
+                            f"Field {wh_name}: could not find entity link {field.entity_link} as a warehouse name for any currently defined schemas."
+                        )
+                if field.dropdown_link:
+                    if field.dropdown_link not in [
+                        d.__benchling_name__ for d in BaseDropdown.get_all_subclasses()
+                    ]:
+                        raise ValueError(
+                            f"Field {wh_name}: could not find dropdown link {field.dropdown_link} as a name to any defined dropdowns."
+                        )
+                if not is_valid_wh_name(wh_name):
+                    raise ValueError(
+                        f"Field {wh_name}: invalid warehouse name '{wh_name}'. It should only contain alphanumeric characters and underscores."
+                    )
             except ValueError as e:
                 errors.append(str(e))
         if errors:
-            raise ValueError(f"Invalid field properties: {' '.join(errors)}")
+            raise ValueError(
+                f"Invalid field properties for schema {cls.__tablename__}: {' '.join(errors)}"
+            )
         return True
 
     @classmethod

liminal/orm/relationship.py

@@ -1,5 +1,9 @@
-from sqlalchemy.orm import RelationshipProperty, relationship
+import warnings
+from typing import Any
 
+from sqlalchemy.orm import RelationshipProperty, object_session, relationship
+
+from liminal.orm.base_model import BaseModel
 from liminal.orm.column import Column
 
 
@@ -31,32 +35,80 @@ def single_relationship(
     )
 
 
-def multi_relationship(
+def multi_relationship(*args: Any, **kwargs: Any) -> RelationshipProperty:
+    """Wrapper for generating a multi-relationship. Supporting the usage of a deprecated signature until v4 release."""
+    if len(args) == 2 and isinstance(args[1], Column):
+        return multi_relationship_v2(*args, **kwargs)
+    else:
+        return multi_relationship_deprecated(*args, **kwargs)
+
+
+def multi_relationship_deprecated(
     target_class_name: str, current_class_name: str, entity_link_field_name: str
 ) -> RelationshipProperty:
-    """Wrapper for SQLAlchemy's relationship function. Liminal's recommendation for defining a relationship from
+    """
+    DEPRECATED: USE THE FUNCTION BELOW INSTEAD.
+    Wrapper for SQLAlchemy's relationship function. Liminal's recommendation for defining a relationship from
     a class to a linked entity field that has is_multi=True. This means the representation of that field is a list of entity_ids.
     Parameters
     ----------
     target_class_name : str
         Class name of the entity schema class that is being linked.
     current_class_name : str
-        Class name of the current class that this relationship is being defined on.
+        Name of the current class that is linking to the target class. This is not used.
     entity_link_field_name : str
+        Name of the column on the current class that links to the target class.
+
+    Returns
+    -------
+    SQLAlchemy RelationshipProperty
+    """
+    warnings.warn(
+        "This version of multi_relationship is deprecated. New function signature is multi_relationship(target_class_name: str, entity_link_field: Column). Support for this signature will end with the v4 release.",
+        FutureWarning,
+        stacklevel=2,
+    )
+
+    def getter(self: Any) -> list[Any]:
+        target_table = BaseModel.get_all_subclasses(names={target_class_name})[0]
+        session = object_session(self)
+
+        linked_entities = (
+            session.query(target_table)
+            .filter(target_table.id.in_(getattr(self, entity_link_field_name)))
+            .all()
+        )
+        return linked_entities
+
+    return property(getter)
+
+
+def multi_relationship_v2(
+    target_class_name: str, entity_link_field: Column
+) -> RelationshipProperty:
+    """Wrapper for SQLAlchemy's relationship function. Liminal's recommendation for defining a relationship from
+    a class to a linked entity field that has is_multi=True. This means the representation of that field is a list of entity_ids.
+    Parameters
+    ----------
+    target_class_name : str
+        Class name of the entity schema class that is being linked.
+    entity_link_field : Column
         Column on the current class that links to the target class.
 
     Returns
     -------
     SQLAlchemy RelationshipProperty
     """
-    if target_class_name == current_class_name:
-        return relationship(
-            target_class_name,
-            primaryjoin=f"remote({target_class_name}.id) == any_(foreign({current_class_name}.{entity_link_field_name}))",
-            uselist=True,
+
+    def getter(self: Any) -> list[Any]:
+        target_table = BaseModel.get_all_subclasses(names={target_class_name})[0]
+        session = object_session(self)
+
+        linked_entities = (
+            session.query(target_table)
+            .filter(target_table.id.in_(getattr(self, entity_link_field.name)))
+            .all()
         )
-    return relationship(
-        target_class_name,
-        primaryjoin=f"{target_class_name}.id == any_(foreign({current_class_name}.{entity_link_field_name}))",
-        uselist=True,
-    )
+        return linked_entities
+
+    return property(getter)

liminal/utils.py

@@ -10,30 +10,26 @@ from liminal.connection.benchling_service import BenchlingService
 
 
 def generate_random_id(length: int = 8) -> str:
-    """Generate a random ID with only lowercase letters."""
+    """Generate a pseudo-random ID with only lowercase letters."""
     return "".join(random.choices(string.ascii_lowercase, k=length))
 
 
-def pascalize(input_string: str) -> str:
+def to_pascal_case(input_string: str) -> str:
     """
-    Convert a string to PascalCase.
+    Convert a string to PascalCase. Filters out any non-alphanumeric characters.
     """
-    return "".join(
-        re.sub(r"[\[\]{}():]", "", word).capitalize()
-        for word in re.split(r"[ /_\-]", input_string)
-    )
+    words = re.split(r"[ /_\-]", input_string)
+    # Then remove any non-alphanumeric characters and capitalize each word
+    return "".join(re.sub(r"[^a-zA-Z0-9]", "", word).capitalize() for word in words)
 
 
-def to_snake_case(input_string: str | None) -> str:
+def to_snake_case(input_string: str) -> str:
     """
-    Convert a string to snake_case.
+    Convert a string to snake_case. Filters out any non-alphanumeric characters.
     """
-    if input_string is None:
-        return ""
-    return "_".join(
-        re.sub(r"[\[\]{}():]", "", word).lower()
-        for word in re.split(r"[ /_\-]", input_string)
-    )
+    words = re.split(r"[ /_\-]", input_string)
+    words = [word for word in words if word]
+    return "_".join(re.sub(r"[^a-zA-Z0-9]", "", word).lower() for word in words)
 
 
 def to_string_val(input_val: Any) -> str:
@@ -64,11 +60,14 @@ def is_valid_prefix(prefix: str) -> bool:
     It must be contain only alphanumeric characters and underscores, be less than 33 characters, and end with an alphabetic character.
     """
     valid = (
-        all(c.isalnum() or c == "_" or c == "-" for c in prefix) and len(prefix) <= 32
+        all(c.isalnum() or c == "_" or c == "-" for c in prefix)
+        and len(prefix) <= 32
+        and not prefix[-1].isdigit()
+        and " " not in prefix
     )
     if not valid:
         raise ValueError(
-            f"Invalid prefix '{prefix}'. It should only contain alphabetic characters or underscores."
+            f"Invalid prefix '{prefix}'. The prefix should only contain alphabetic characters or underscores, not end end in a digit, and not contain whitespace."
         )
     return valid
 

liminal/validation/__init__.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Any, Callable
 
 from pydantic import BaseModel, ConfigDict
 
-from liminal.utils import pascalize
+from liminal.utils import to_pascal_case
 from liminal.validation.validation_severity import ValidationSeverity
 
 if TYPE_CHECKING:
@@ -137,14 +137,14 @@ def liminal_validator(
                 valid=False,
                 level=validator_level,
                 entity=self,
-                validator_name=validator_name or pascalize(func.__name__),
+                validator_name=validator_name or to_pascal_case(func.__name__),
                 message=str(e),
             )
         return BenchlingValidatorReport.create_validation_report(
             valid=True,
             level=validator_level,
             entity=self,
-            validator_name=validator_name or pascalize(func.__name__),
+            validator_name=validator_name or to_pascal_case(func.__name__),
         )
 
     setattr(wrapper, "_is_liminal_validator", True)

{liminal_orm-3.1.0.dist-info → liminal_orm-3.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: liminal-orm
-Version: 3.1.0
+Version: 3.2.0
 Summary: An ORM and toolkit that builds on top of Benchling's platform to keep your schemas and downstream code dependencies in sync.
 Home-page: https://github.com/dynotx/liminal-orm
 Author: DynoTx Open Source
@@ -11,7 +11,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: benchling-sdk (>=1.8.0)
 Requires-Dist: bs4 (>=0.0.2,<0.0.3)
 Requires-Dist: lxml (>=5.3.0,<6.0.0)

{liminal_orm-3.1.0.dist-info → liminal_orm-3.2.0.dist-info}/RECORD

@@ -1,33 +1,34 @@
+liminal/.DS_Store,sha256=s_ehSI1aIzOjVRnFlcSzhtWS3irmEDSGHyS6l0QRcus,8196
 liminal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 liminal/base/base_dropdown.py,sha256=Unk4l_5Y8rj_eSWYqzFi2BAFSQToQDWW2qdXwiCHTg8,2523
 liminal/base/base_operation.py,sha256=opQfFZeC49YAFkg5ahE6CFpeSUNPh1ootWZxXyEXfFI,3128
 liminal/base/base_validation_filters.py,sha256=kHG3G5gXkuNHQosMTrxRc57OTmczcaoSx0DmkrScIr4,1043
 liminal/base/compare_operation.py,sha256=hkpv4ewHhxy4dlTPKgJuzBjsAqO6Km7OrrKB44pRA_o,352
-liminal/base/name_template_parts.py,sha256=dJeyrhhhZHDwKXe_p7AtgDlbZlzsnYQ8FoM8FXVF7q0,271
-liminal/base/properties/base_field_properties.py,sha256=TqHLJnRx7EK7grzad6MOHpGJeZr0Srm9bPhshHslJRk,5047
+liminal/base/name_template_parts.py,sha256=uWKRIqlhxI6eMllRHBX2UDRyZ8xQFdi1fKAFoYBub3I,276
+liminal/base/properties/base_field_properties.py,sha256=3n5tg3SqXellBQk-phDnN3qIXUnMP0iR5sC-IqD6_dY,3918
 liminal/base/properties/base_name_template.py,sha256=AOtaW4QEDRC-mjZOZk6jgc_mopUMsHS2Fj6VVsO07WY,3150
-liminal/base/properties/base_schema_properties.py,sha256=11QaxtUoHZx25QFv7HP8gQBpknrFthVeyWuMnI_lV5g,5891
+liminal/base/properties/base_schema_properties.py,sha256=jm7dG218gzHITOPdnILY4BUnOCW-KA8yiQjgz5FgQUI,5906
 liminal/base/str_enum.py,sha256=jF3d-Lo8zsHUe6GsctX2L-TSj92Y3qCYDrTD-saeJoc,210
-liminal/cli/cli.py,sha256=30ZCkbQUY8p9WLS6OIBWgig0hGM2QlMQweHMGQe1gwQ,9119
-liminal/cli/controller.py,sha256=QNj3QO9TMb9hfc6U-VhLuFa0_aohOHZUmvY4XkATPhw,10118
+liminal/cli/cli.py,sha256=F4JK-SrsC62-ufOJgaf8BMhgiuVMGv7pdUdTBmHg3aQ,13389
+liminal/cli/controller.py,sha256=iIoyIq091vbS1hkjAG1Mc0K033lPnOjxlyXgFBBknK0,10573
 liminal/cli/live_test_dropdown_migration.py,sha256=87JwxGD4A5ExjfsEEev9jgBNuldUj4CLoaFwsZ-BjEI,2889
 liminal/cli/live_test_entity_schema_migration.py,sha256=_JawaiJNHkAjIrtwe9_K15OoJSFq_4vaTK5vrmz-b6s,5576
-liminal/cli/utils.py,sha256=hiBDeCDMjXdGnzjA7kwC9pYgNhSyF-oK_IicdO5u3U0,4478
-liminal/connection/__init__.py,sha256=3z4pSANIOkc9mh1Xp763oYQuJZDEh4lauN901PU4vqI,166
+liminal/cli/utils.py,sha256=vm35SuYapw7Kl8vZI5Kc9taE_WNvpsf7FF8QnVsR7yQ,4588
+liminal/connection/__init__.py,sha256=60SyUzDxiTv9wn7cNyoqB4b9BuI3E6susqanYGvLnG8,212
 liminal/connection/benchling_connection.py,sha256=PLiaI4v9EcJDNBEO5ZF3jERuI6AYo8NAYpqPYLxVYdQ,3237
-liminal/connection/benchling_service.py,sha256=lEYCHF1U8nII8Rn3rMBPTffTFiVFjoFeNmX2Kq36-qE,7170
+liminal/connection/benchling_service.py,sha256=v9sKYvwW6NX53a4OBpKJAmb4fZWaUN5AvcY2N_oArZU,12070
 liminal/dropdowns/api.py,sha256=n5oxi1EhkmpmPpNi1LOI4xcIQmk1C069XFaGP5XSBx8,6959
 liminal/dropdowns/compare.py,sha256=-UbCkeTKx3THwvjMTUubyYVXBkhmvyhEKzwrIzBkthY,7141
-liminal/dropdowns/generate_files.py,sha256=IqnBs-IyLsIZE0NUkdB99zd5EAF-1f9CPBeblz-GzJE,2041
+liminal/dropdowns/generate_files.py,sha256=Y6biJOrt1XtWcTMoIV_eC2Yqwg6JYQxyF85U78s6M7U,2051
 liminal/dropdowns/operations.py,sha256=-TRIsxqnUtrIUjhrt5k_PdiBCDUXsXDzsOUmznJE-6Q,13516
 liminal/dropdowns/utils.py,sha256=1-H7bTszCUeqeRBpiYXjRjreDzhn1Fd1MFwIsrEI-o4,4109
 liminal/entity_schemas/api.py,sha256=Emn_Y95cAG9Wis6tpchw6QBVKQh4If86LOdgKk0Ndjw,3575
 liminal/entity_schemas/compare.py,sha256=t6tl67GWaMoNNcPxyLpCuNAlN3OWNqURTo3EUEMtETE,17549
 liminal/entity_schemas/entity_schema_models.py,sha256=v5A1ELaiuBnUSl1HkUNAeMuIRQeQnIKzfpFxmsiKWh0,8349
-liminal/entity_schemas/generate_files.py,sha256=u9SoDO9f4qL2nZaddln__2J0zJ3QMFBQhiUabn22aUY,9032
-liminal/entity_schemas/operations.py,sha256=cMJ5P1drs-Gv9E3YbsT3jTe48wJswxgPWYdV1qSawq0,26952
-liminal/entity_schemas/tag_schema_models.py,sha256=DZQYzlxt3aEHbLy00qEyDZC_mRyi9I325ggkfcNgR1I,24153
-liminal/entity_schemas/utils.py,sha256=2ZHyLxnYITVEuyAWxNdsq5hcNSgvN7pN3-uUzyocYSk,6161
+liminal/entity_schemas/generate_files.py,sha256=X-o6B2kSgVgJG9Nkc0fCEO60yfqveJepsXgEWvVQI2A,9040
+liminal/entity_schemas/operations.py,sha256=N58H8LP1fuRCjRecG6G43ZdAX7MEL2lxPLQPmc23Wlw,27119
+liminal/entity_schemas/tag_schema_models.py,sha256=HCtiJPMsPksX3wOBpfDdyIElNH3XybM7w25OUpIYoWM,24242
+liminal/entity_schemas/utils.py,sha256=ngWqBq9RKVjHAODok85yeuReHXaqmrexHiSmyVx30Vg,6244
 liminal/enums/__init__.py,sha256=-szuqAwMED4ai0NaPVUfgihQJAJ27wPu_nDnj4cEgTk,518
 liminal/enums/benchling_api_field_type.py,sha256=0QamSWEMnxZtedZXlh6zNhSRogS9ZqvWskdHHN19xJo,633
 liminal/enums/benchling_entity_type.py,sha256=H_6ZlHJsiVNMpezPBrNKo2eP0pDrt--HU-P7PgznaMA,846
@@ -39,11 +40,11 @@ liminal/enums/name_template_part_type.py,sha256=Z3Zv5PpzoUrIj_EvwPVgDDkY2G0kO-wE
 liminal/enums/sequence_constraint.py,sha256=CT3msm8qzJpcivfbQZ3NOWNRsedH4mSlfhzvQBLrHWA,407
 liminal/external/__init__.py,sha256=EundQBe68_ZIhcsuSOhc-CznzYauNDYlNG1CjRDui_Y,1348
 liminal/mappers.py,sha256=TgPMQsLrESAI6D7KBl0UoBBpnxYgcgGOT7a2faWsuhY,9587
-liminal/migrate/components.py,sha256=2HuFp5KDNhofROMRI-BioUoA4CCjhQ_v_F0QmGJzUBU,3480
+liminal/migrate/components.py,sha256=bzt-5eJbhWVNs_zk9WieKmTkGgQrn58sm9GOuHUlM3Q,3526
 liminal/migrate/revision.py,sha256=KppU0u-d0JsfPsXsmncxy9Q_XBJyf-o4e16wNZAJODM,7774
-liminal/migrate/revisions_timeline.py,sha256=G9VwxPrLhLqKOrIXyxrXyHpujc-72m7omsZjI5-0D0M,14520
+liminal/migrate/revisions_timeline.py,sha256=FSKzjUnZwnD3v2o7qoilBUkmKmJVvLVqozo25WnTo-w,14456
 liminal/orm/base.py,sha256=fFSpiNRYgK5UG7lbXdQGV8KgO8pwjMqt0pycM3rWJ2o,615
-liminal/orm/base_model.py,sha256=goJY17riXGqAP3hobHqa-koe8_EijMZ_LgZSXgD69vc,15576
+liminal/orm/base_model.py,sha256=ydUk_tno-iqPHL4N_yJLLxhbkZKE8_jy6hA7vdAz8uk,16897
 liminal/orm/base_tables/registry_entity.py,sha256=4ET1cepTGjZ3AMFI5q-iMYxMObzXwuUDBD0jNNqCipE,2126
 liminal/orm/base_tables/schema.py,sha256=7_btCVSUJxjVdGcKVRKL8sKcNw7-_gazTpfEh1jru3o,921
 liminal/orm/base_tables/user.py,sha256=elRAHj7HgO3iVLK_pNCIwf_9Rl_9k6vkBgaYazoJSQc,818
@@ -51,20 +52,21 @@ liminal/orm/column.py,sha256=aK-MrKabOK5tf3UFPpRACq83YVVrjXITZF_rcOU-wPQ,6207
 liminal/orm/mixins.py,sha256=yEeUDF1qEBLP523q8bZra4KtNVK0gwZN9mXJSNe3GEE,4802
 liminal/orm/name_template.py,sha256=ftXZOiRR6gGGvGaZkFVDXKOboIHFWauhQENRguBGWMI,1739
 liminal/orm/name_template_parts.py,sha256=iI4S9ZGvckQbYjhgFdn6xeJ3rS90lzCvjH0863HnAi8,3201
-liminal/orm/relationship.py,sha256=Zl4bMHbtDSPx1psGHYnojGGJpA8B8hwcPJdgjB1lmW0,2490
+liminal/orm/relationship.py,sha256=Rn35E1tr4ZW6_-BINpdL20Sdvhb-hsUGzCQa9rv-E_I,4324
 liminal/orm/schema_properties.py,sha256=vqqjnxbh7AYh9ZvSmhCsl69BqSBPpQutNKImb-TBCGg,4167
 liminal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liminal/tests/.DS_Store,sha256=0sTLf7flLKL2_3KGceYriAB8_gXTcYwn0c2RVSYmLZk,6148
 liminal/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 liminal/tests/conftest.py,sha256=B463eOfe1uCHDJsUNvG-6tY8Qx8FJMByGDOtuyM87lA,17669
 liminal/tests/from benchling_sdk.py,sha256=CjRUHFB3iaa4rUPLGOqDiBq5EPKldm-Fd8aQQr92zF4,147
 liminal/tests/test_dropdown_compare.py,sha256=yHB0ovQlBLRu8-qYkqIPd8VtYEOmOft_93FQM86g_z8,8198
 liminal/tests/test_entity_schema_compare.py,sha256=-26Bu5eYIuHRswB5kYjGDo5Wed5LUWjm1e6IRI1Q-lE,18952
 liminal/unit_dictionary/utils.py,sha256=o3K06Yyt33iIUSMHPT8f1vSuUSgWjZLf51p78lx4SZs,1817
-liminal/utils.py,sha256=radRtRsZmCiNblMvxOX1DH0rcO5TR09kFlp6OONIPBU,2951
-liminal/validation/__init__.py,sha256=TVaHrSF3GnSd4mbZrPn8TBHscGWkAPKAUUPq7-symC8,5275
+liminal/utils.py,sha256=Eu_o5qfx1Thy26UaDOL-QnrB67FeJf3kOrTavGNRSo0,3248
+liminal/validation/__init__.py,sha256=NsjzmivSRwGki1k9ykJgjtcYNcILR_PHSf6RkI1w2n0,5290
 liminal/validation/validation_severity.py,sha256=ib03PTZCQHcbBDc01v4gJF53YtA-ANY6QSFnhTV-FbU,259
-liminal_orm-3.1.0.dist-info/LICENSE.md,sha256=oVA877F_D1AV44dpjsv4f-4k690uNGApX1EtzOo3T8U,11353
-liminal_orm-3.1.0.dist-info/METADATA,sha256=jC90ZQqaPXCKH8dvJ4oyA5HjPG-dAX3gnPDCEWLfsIk,11032
-liminal_orm-3.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-liminal_orm-3.1.0.dist-info/entry_points.txt,sha256=atIrU63rrzH81dWC2sjUbFLlc5FWMmYRdMxXEWexIZA,47
-liminal_orm-3.1.0.dist-info/RECORD,,
+liminal_orm-3.2.0.dist-info/LICENSE.md,sha256=oVA877F_D1AV44dpjsv4f-4k690uNGApX1EtzOo3T8U,11353
+liminal_orm-3.2.0.dist-info/METADATA,sha256=040mqvMPY3eJJ2Rrkb6ZaVdIjtMjyor44wQjdcwGJdE,10981
+liminal_orm-3.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+liminal_orm-3.2.0.dist-info/entry_points.txt,sha256=atIrU63rrzH81dWC2sjUbFLlc5FWMmYRdMxXEWexIZA,47
+liminal_orm-3.2.0.dist-info/RECORD,,

{liminal_orm-3.1.0.dist-info → liminal_orm-3.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any