liminal-orm 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

liminal/connection/benchling_connection.py

@@ -30,6 +30,8 @@ class BenchlingConnection(BaseModel):
     warehouse_access: bool = False
         Whether your Benchling tenant has access to the warehouse. If warehouse_connection_string is provided, this will default to True.
         warehouse_access is required to set a custom warehouse names on entity schemas and their fields.
+    fieldsets: bool = False
+        Whether your Benchling tenant has access to fieldsets.
     """
 
     tenant_name: str
@@ -41,6 +43,7 @@ class BenchlingConnection(BaseModel):
     internal_api_admin_email: str | None = None
     internal_api_admin_password: str | None = None
     warehouse_access: bool = False
+    fieldsets: bool = False
 
     @model_validator(mode="before")
     @classmethod

liminal/entity_schemas/operations.py

@@ -96,9 +96,11 @@ class CreateEntitySchema(BaseOperation):
             raise ValueError(
                 f"Entity schema warehouse name {self._validated_schema_properties.warehouse_name} already exists in Benchling."
             )
-        if self._validated_schema_properties.prefix in [
-            schema["prefix"] for schema in all_schemas
-        ]:
+        if (
+            not benchling_service.connection.fieldsets
+            and self._validated_schema_properties.prefix
+            in [schema["prefix"] for schema in all_schemas]
+        ):
             raise ValueError(
                 f"Entity schema prefix {self._validated_schema_properties.prefix} already exists in Benchling."
             )
@@ -235,9 +237,11 @@ class UpdateEntitySchema(BaseOperation):
             raise ValueError(
                 f"Entity schema warehouse name {self.update_props.warehouse_name} already exists in Benchling."
             )
-        if self.update_props.prefix and self.update_props.prefix in [
-            schema["prefix"] for schema in all_schemas
-        ]:
+        if (
+            not benchling_service.connection.fieldsets
+            and self.update_props.prefix
+            and self.update_props.prefix in [schema["prefix"] for schema in all_schemas]
+        ):
             raise ValueError(
                 f"Entity schema prefix {self.update_props.prefix} already exists in Benchling."
             )

liminal/orm/base_model.py

@@ -12,8 +12,8 @@ from sqlalchemy.orm.decl_api import declared_attr
 
 from liminal.base.base_validation_filters import BaseValidatorFilters
 from liminal.orm.base import Base
+from liminal.orm.base_tables.user import User
 from liminal.orm.schema_properties import SchemaProperties
-from liminal.orm.user import User
 from liminal.validation import (
     BenchlingValidator,
     BenchlingValidatorReport,
@@ -55,8 +55,8 @@ class BaseModel(Generic[T], Base):
                 f"Schema name '{cls.__schema_properties__.name}' is already used by another subclass."
             )
         if cls.__schema_properties__.prefix.lower() in cls._existing_schema_prefixes:
-            raise ValueError(
-                f"Schema prefix '{cls.__schema_properties__.prefix}' is already used by another subclass."
+            logger.warning(
+                f"Schema prefix '{cls.__schema_properties__.prefix}' is already used by another subclass. Please ensure fieldsets=True in BenchlingConnection you are updating/creating this schema."
             )
 
         cls._existing_schema_warehouse_names.add(warehouse_name)

liminal/orm/base_tables/registry_entity.py

@@ -0,0 +1,60 @@
+from datetime import datetime
+
+from sqlalchemy import Column, ForeignKey
+from sqlalchemy.types import DATETIME, Boolean, String
+
+from liminal.orm.base import Base
+from liminal.orm.relationship import single_relationship
+
+
+class RegistryEntity(Base):
+    __tablename__ = "registry_entity$raw"
+
+    id = Column("id", String, nullable=True, primary_key=True)
+    archived = Column("archived$", Boolean, nullable=True)
+    archive_purpose = Column("archive_purpose$", String, nullable=True)
+    created_at = Column("created_at", DATETIME, nullable=True)
+    creator_id = Column("creator_id", String, ForeignKey("user$raw.id"), nullable=True)
+    file_registry_id = Column("file_registry_id", String, nullable=True)
+    folder_id = Column("folder_id", String, nullable=True)
+    modified_at = Column("modified_at", DATETIME, nullable=True)
+    name = Column("name", String, nullable=True)
+    project_id = Column("project_id", String, nullable=True)
+    schema_id = Column("schema_id", String, nullable=True)
+    source_id = Column("source_id", String, nullable=True)
+    url = Column("url", String, nullable=True)
+    validation_status = Column("validation_status", String, nullable=True)
+
+    creator = single_relationship("User", creator_id)
+
+    def __init__(
+        self,
+        id: str,
+        archived: bool,
+        archive_purpose: str,
+        created_at: datetime,
+        file_registry_id: str,
+        folder_id: str,
+        modified_at: datetime,
+        name: str,
+        project_id: str,
+        schema: str,
+        schema_id: str,
+        source_id: str,
+        url: str,
+        validation_status: str,
+    ):
+        self.id = id
+        self.archived = archived
+        self.archive_purpose = archive_purpose
+        self.created_at = created_at
+        self.file_registry_id = file_registry_id
+        self.folder_id = folder_id
+        self.modified_at = modified_at
+        self.name = name
+        self.project_id = project_id
+        self.schema = schema
+        self.schema_id = schema_id
+        self.source_id = source_id
+        self.url = url
+        self.validation_status = validation_status

liminal/orm/base_tables/schema.py

@@ -0,0 +1,31 @@
+from sqlalchemy import Column
+from sqlalchemy.types import Boolean, String
+
+from liminal.orm.base import Base
+
+
+class Schema(Base):
+    __tablename__ = "schema$raw"
+
+    id = Column("id", String, nullable=True, primary_key=True)
+    schema_type = Column("schema_type", String, nullable=True)
+    name = Column("name", String, nullable=True)
+    system_name = Column("system_name", String, nullable=True)
+    archived = Column("archived$", Boolean, nullable=True)
+    archive_purpose = Column("archive_purpose$", String, nullable=True)
+
+    def __init__(
+        self,
+        id: str,
+        schema_type: str,
+        name: str,
+        system_name: str,
+        archived: bool,
+        archive_purpose: str,
+    ):
+        self.id = id
+        self.schema_type = schema_type
+        self.name = name
+        self.system_name = system_name
+        self.archived = archived
+        self.archive_purpose = archive_purpose

{liminal_orm-1.1.2.dist-info → liminal_orm-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: liminal-orm
-Version: 1.1.2
+Version: 1.1.4
 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

{liminal_orm-1.1.2.dist-info → liminal_orm-1.1.4.dist-info}/RECORD

@@ -11,7 +11,7 @@ liminal/cli/controller.py,sha256=QNj3QO9TMb9hfc6U-VhLuFa0_aohOHZUmvY4XkATPhw,101
 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/connection/__init__.py,sha256=3z4pSANIOkc9mh1Xp763oYQuJZDEh4lauN901PU4vqI,166
-liminal/connection/benchling_connection.py,sha256=a69pIwQX7t0wd6GnI1IwUG3VnNOb4u6vcBINs_V1o-Y,2743
+liminal/connection/benchling_connection.py,sha256=nALLAA-hPIO2Eb_KhUL-nU3jOlMDSIrPMUgUyDKGRRw,2862
 liminal/connection/benchling_service.py,sha256=lEYCHF1U8nII8Rn3rMBPTffTFiVFjoFeNmX2Kq36-qE,7170
 liminal/dropdowns/api.py,sha256=n5oxi1EhkmpmPpNi1LOI4xcIQmk1C069XFaGP5XSBx8,6959
 liminal/dropdowns/compare.py,sha256=5cz8djtaStozUun_Cp8t_5PVjq-aovme2Qq5J8FXFg4,6829
@@ -22,7 +22,7 @@ liminal/entity_schemas/api.py,sha256=Dkd44NGJ4JqRTJLJtPsZ8Qan2owbEYf446A6EuP8iL0
 liminal/entity_schemas/compare.py,sha256=C5qr9amGCKvkV61pa29obN883vSdFzSoiebD7hKEHY4,14128
 liminal/entity_schemas/entity_schema_models.py,sha256=SNScXY3SeF0lhdAXwqKXrrgpCphpLg6s5tU9fO3juB4,5239
 liminal/entity_schemas/generate_files.py,sha256=SW0EccfODptNkZUVwJxa8-8ssd1RWdBqzrCGph4_vSI,8515
-liminal/entity_schemas/operations.py,sha256=C5Qg7IQVwFqjmk6egIZkV4HaJUmygWRFhLIDqwjOnYQ,23018
+liminal/entity_schemas/operations.py,sha256=E12U-F0PtViBApbkoXbEtOlIEcOSSYn_gBx-2Z-vGGM,23164
 liminal/entity_schemas/tag_schema_models.py,sha256=rRCAvpjx7iAiIxOh9MRBrpH603zHbFxKOY7sLgOutnE,16260
 liminal/entity_schemas/utils.py,sha256=X53KNfguWtu7z-tAliBHuCYpSwTqBGgRSGsdR_BU9Vc,4206
 liminal/enums/__init__.py,sha256=jz_c-B_fifatvrYoESlHZ9ljYdz-3rNl0sBazoESiHI,523
@@ -40,12 +40,14 @@ liminal/migrate/revision.py,sha256=KppU0u-d0JsfPsXsmncxy9Q_XBJyf-o4e16wNZAJODM,7
 liminal/migrate/revisions_timeline.py,sha256=06qf_7E1Hecucfczpm85rV3ATLDjpCf7y6TUfah5aLM,14450
 liminal/migrate/utils.py,sha256=HdSr3N2WN_1S-PLRGVWSMYl-4gIcP-Ph2wPycGi2cGg,3404
 liminal/orm/base.py,sha256=fFSpiNRYgK5UG7lbXdQGV8KgO8pwjMqt0pycM3rWJ2o,615
-liminal/orm/base_model.py,sha256=8p-JnqBJYjLe3bJxgjhTteecRsxCeonljrAfxk4reFM,10963
+liminal/orm/base_model.py,sha256=QoOmA3S_9nLgPiyboleh-WvJRXcfn4VeDSrWmvyx8aA,11064
+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
 liminal/orm/column.py,sha256=e4JWn97s_4EVJ1LOO5l6iucHQUd39Vl0stqMEj0uet8,5114
 liminal/orm/mixins.py,sha256=yEeUDF1qEBLP523q8bZra4KtNVK0gwZN9mXJSNe3GEE,4802
 liminal/orm/relationship.py,sha256=Zl4bMHbtDSPx1psGHYnojGGJpA8B8hwcPJdgjB1lmW0,2490
 liminal/orm/schema_properties.py,sha256=UEIIayhiwHw7YexSGoKU9Z7gj57d7_C1CMUv51-HcGk,2158
-liminal/orm/user.py,sha256=elRAHj7HgO3iVLK_pNCIwf_9Rl_9k6vkBgaYazoJSQc,818
 liminal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 liminal/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 liminal/tests/conftest.py,sha256=1RGiI_h8izLjT9txJ1IkRHYf8yrN_r6yjUn5SI2bxr8,17311
@@ -54,8 +56,8 @@ liminal/tests/test_dropdown_compare.py,sha256=yHB0ovQlBLRu8-qYkqIPd8VtYEOmOft_93
 liminal/tests/test_entity_schema_compare.py,sha256=p-9inAZM4GOm4e1cadO191LNsnqceUGGyy0YVIXXxVw,16440
 liminal/utils.py,sha256=vMjSasDnEghwqULDo14joxxJ56G4-9cBsw719nQ8C7g,2798
 liminal/validation/__init__.py,sha256=SBd48xxBMJrBzI48G2RcK056EMlevt5YjmZMkfCWN1I,6924
-liminal_orm-1.1.2.dist-info/LICENSE.md,sha256=oVA877F_D1AV44dpjsv4f-4k690uNGApX1EtzOo3T8U,11353
-liminal_orm-1.1.2.dist-info/METADATA,sha256=UM5xJJCO9Hy5N8_uxpTqqxgEnxr0bWmKi8LB6R_pLik,11313
-liminal_orm-1.1.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-liminal_orm-1.1.2.dist-info/entry_points.txt,sha256=atIrU63rrzH81dWC2sjUbFLlc5FWMmYRdMxXEWexIZA,47
-liminal_orm-1.1.2.dist-info/RECORD,,
+liminal_orm-1.1.4.dist-info/LICENSE.md,sha256=oVA877F_D1AV44dpjsv4f-4k690uNGApX1EtzOo3T8U,11353
+liminal_orm-1.1.4.dist-info/METADATA,sha256=824ba_KuKxfRginOGqJiZYHKPu3yMzsxk7N32CuZzwI,11313
+liminal_orm-1.1.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+liminal_orm-1.1.4.dist-info/entry_points.txt,sha256=atIrU63rrzH81dWC2sjUbFLlc5FWMmYRdMxXEWexIZA,47
+liminal_orm-1.1.4.dist-info/RECORD,,