liminal-orm 1.1.0__tar.gz → 1.1.2__tar.gz

{liminal_orm-1.1.0 → liminal_orm-1.1.2}/PKG-INFO

@@ -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 → liminal_orm-1.1.2}/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_orm-1.1.0 → liminal_orm-1.1.2}/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-1.1.0 → liminal_orm-1.1.2}/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_orm-1.1.0 → liminal_orm-1.1.2}/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_orm-1.1.0 → liminal_orm-1.1.2}/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 → liminal_orm-1.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "liminal-orm"
-version = "1.1.0"
+version = "1.1.2"
 description = "An ORM and toolkit that builds on top of Benchling's platform to keep your schemas and downstream code dependencies in sync."
 authors = ["DynoTx Open Source <opensource@dynotx.com>"]
 readme = "README.md"