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

liminal/entity_schemas/generate_files.py

@@ -74,7 +74,6 @@ def generate_all_entity_schema_files(
         columns = {key: columns[key] for key in columns}
         import_strings = [
             "from sqlalchemy import Column as SqlColumn",
-            "from sqlalchemy.orm import Query, Session",
             "from liminal.orm.column import Column",
             "from liminal.orm.base_model import BaseModel",
             "from liminal.orm.schema_properties import SchemaProperties",

liminal/entity_schemas/operations.py

@@ -439,7 +439,7 @@ class UnarchiveEntitySchemaField(BaseOperation):
 
 
 class UpdateEntitySchemaField(BaseOperation):
-    order: ClassVar[int] = 14
+    order: ClassVar[int] = 140
 
     def __init__(
         self,

liminal/orm/column.py

@@ -26,12 +26,16 @@ class Column(SqlColumn):
         Whether the field is a multi-value field.
     parent_link : bool = False
         Whether the entity link field is a parent of the entity schema.
+    tooltip : str | None = None
+        The tooltip text for the field.
     dropdown : Type[BaseDropdown] | None = None
         The dropdown for the field.
     entity_link : str | None = None
         The warehouse name of the entity the field links to.
-    tooltip : str | None = None
-        The tooltip text for the field.
+    _warehouse_name : str | None = None
+        The warehouse name of the column. Necessary when the variable name is not the same as the warehouse name.
+    _archived : bool = False
+        Whether the field is archived.
     """
 
     def __init__(
@@ -44,6 +48,7 @@ class Column(SqlColumn):
         tooltip: str | None = None,
         dropdown: Type[BaseDropdown] | None = None,  # noqa: UP006
         entity_link: str | None = None,
+        _warehouse_name: str | None = None,
         _archived: bool = False,
         **kwargs: Any,
     ):
@@ -82,6 +87,8 @@ class Column(SqlColumn):
         foreign_key = None
         if type == BenchlingFieldType.ENTITY_LINK and entity_link:
             foreign_key = ForeignKey(f"{entity_link}$raw.id")
+        if _warehouse_name:
+            kwargs["name"] = _warehouse_name
         super().__init__(
             self.sqlalchemy_type,
             foreign_key,

liminal/tests/conftest.py

@@ -215,6 +215,24 @@ def mock_benchling_schema(
             tooltip=None,
             _archived=False,
         ),
+        "archived_field": Props(
+            name="Archived Field",
+            type=Type.TEXT,
+            required=False,
+            is_multi=False,
+            _archived=True,
+        ),
+        "wh_name_field_different": Props(
+            name="Different Wh Name Field",
+            type=Type.TEXT,
+            required=False,
+            is_multi=False,
+            parent_link=False,
+            dropdown_link=None,
+            entity_link=None,
+            tooltip=None,
+            _archived=False,
+        ),
     }
     return [(schema_props, fields)]
 
@@ -369,6 +387,20 @@ def mock_benchling_subclass(mock_benchling_dropdown) -> list[type[BaseModel]]:
             is_multi=True,
             dropdown=mock_benchling_dropdown,
         )
+        archived_field: SqlColumn = Column(
+            name="Archived Field",
+            type=Type.TEXT,
+            required=False,
+            is_multi=False,
+            _archived=True,
+        )
+        different_wh_name_field: SqlColumn = Column(
+            name="Different Wh Name Field",
+            type=Type.TEXT,
+            required=False,
+            is_multi=False,
+            _warehouse_name="wh_name_field_different",
+        )
 
         def __init__(
             self,

liminal/tests/test_entity_schema_compare.py

@@ -330,3 +330,14 @@ class TestCompareEntitySchemas:
             assert isinstance(
                 invalid_models["mock_entity"][0].op, ReorderEntitySchemaFields
             )
+
+            # Test when the Benchling schema archived field becomes unarchived
+            benchling_rearchived_field = copy.deepcopy(mock_benchling_schema)
+            benchling_rearchived_field[0][1]["archived_field"].set_archived(False)
+            mock_get_benchling_entity_schemas.return_value = benchling_rearchived_field
+            invalid_models = compare_entity_schemas(mock_benchling_sdk)
+            assert len(invalid_models["mock_entity"]) == 1
+            assert isinstance(
+                invalid_models["mock_entity"][0].op, ArchiveEntitySchemaField
+            )
+            assert invalid_models["mock_entity"][0].op.wh_field_name == "archived_field"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: liminal-orm
-Version: 1.1.0
+Version: 1.1.2
 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
@@ -10,6 +10,8 @@ Classifier: Programming Language :: Python :: 3
 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-1.1.0.dist-info → liminal_orm-1.1.2.dist-info}/RECORD

@@ -21,8 +21,8 @@ liminal/dropdowns/utils.py,sha256=1-H7bTszCUeqeRBpiYXjRjreDzhn1Fd1MFwIsrEI-o4,41
 liminal/entity_schemas/api.py,sha256=Dkd44NGJ4JqRTJLJtPsZ8Qan2owbEYf446A6EuP8iL0,2786
 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=WQUvK7VZkyVs6u1DNoscVgB9W-slGCDf6ZE62xyd3o4,8572
-liminal/entity_schemas/operations.py,sha256=8uCBTwu-CqjHhy3ImmkKiqzic010GgBynZEEEHct5OI,23017
+liminal/entity_schemas/generate_files.py,sha256=SW0EccfODptNkZUVwJxa8-8ssd1RWdBqzrCGph4_vSI,8515
+liminal/entity_schemas/operations.py,sha256=C5Qg7IQVwFqjmk6egIZkV4HaJUmygWRFhLIDqwjOnYQ,23018
 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
@@ -41,21 +41,21 @@ liminal/migrate/revisions_timeline.py,sha256=06qf_7E1Hecucfczpm85rV3ATLDjpCf7y6T
 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/column.py,sha256=hYhEiT0n1MwK8xKf6IAQEVfFyy3W8qqzZj_31nnRLe8,4775
+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=QXVvNZps9gKZ2mYuOBT_NEBvyX2ptdzuPIXj61UG81c,16344
+liminal/tests/conftest.py,sha256=1RGiI_h8izLjT9txJ1IkRHYf8yrN_r6yjUn5SI2bxr8,17311
 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=mnHD3mBJ-lW_MCwbqRNSBkrBfxztNF74bSvTRnpRcis,15768
+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.0.dist-info/LICENSE.md,sha256=oVA877F_D1AV44dpjsv4f-4k690uNGApX1EtzOo3T8U,11353
-liminal_orm-1.1.0.dist-info/METADATA,sha256=xRc0SSZkYct2RcE7uQlKSKkss-LxA2KFr4eH1RkJXXM,11211
-liminal_orm-1.1.0.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-liminal_orm-1.1.0.dist-info/entry_points.txt,sha256=atIrU63rrzH81dWC2sjUbFLlc5FWMmYRdMxXEWexIZA,47
-liminal_orm-1.1.0.dist-info/RECORD,,
+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.0.dist-info → liminal_orm-1.1.2.dist-info}/WHEEL

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