liminal-orm 5.1.2__tar.gz → 5.1.3__tar.gz

{liminal_orm-5.1.2 → liminal_orm-5.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: liminal-orm
-Version: 5.1.2
+Version: 5.1.3
 Summary: An ORM and toolkit that builds on top of Benchling's platform to keep your schemas and downstream code dependencies in sync.
 Project-URL: Homepage, https://github.com/dynotx/liminal-orm
 Project-URL: Repository, https://github.com/dynotx/liminal-orm

{liminal_orm-5.1.2 → liminal_orm-5.1.3}/liminal/base/properties/base_field_properties.py

@@ -75,7 +75,7 @@ class BaseFieldProperties(BaseModel):
         self._archived = value
         return self
 
-    def set_warehouse_name(self, wh_name: str) -> BaseFieldProperties:
+    def set_warehouse_name(self, wh_name: str | None) -> BaseFieldProperties:
         self.warehouse_name = wh_name
         return self
 
@@ -94,9 +94,8 @@ class BaseFieldProperties(BaseModel):
             self.__pydantic_fields_set__.remove("unit_name")
         return self
 
-    def unset_parent_link(self) -> BaseFieldProperties:
-        if "parent_link" in self.__pydantic_fields_set__:
-            self.__pydantic_fields_set__.remove("parent_link")
+    def set_parent_link(self, value: bool) -> BaseFieldProperties:
+        self.parent_link = value
         return self
 
     def set_type(self, new_type: BenchlingFieldType) -> BaseFieldProperties:

{liminal_orm-5.1.2 → liminal_orm-5.1.3}/liminal/dropdowns/operations.py

@@ -24,7 +24,6 @@ from liminal.dropdowns.utils import (
     dropdown_exists_in_benchling,
     get_benchling_dropdown_by_name,
     get_benchling_dropdown_summary_by_name,
-    get_schemas_with_dropdown,
 )
 
 LOGGER = logging.getLogger(__name__)
@@ -74,7 +73,7 @@ class CreateDropdown(BaseOperation):
 
 
 class ArchiveDropdown(BaseOperation):
-    order: ClassVar[int] = 180
+    order: ClassVar[int] = 190
 
     def __init__(self, dropdown_name: str) -> None:
         self.dropdown_name = dropdown_name
@@ -85,12 +84,6 @@ class ArchiveDropdown(BaseOperation):
             raise ValueError(f"Dropdown {self.dropdown_name} is already archived.")
         return archive_dropdown(benchling_service, dropdown.id)
 
-    def validate(self, benchling_service: BenchlingService) -> None:
-        if schemas_with_dropdown := get_schemas_with_dropdown(self.dropdown_name):
-            raise ValueError(
-                f"Dropdown {self.dropdown_name} is used in schemas {schemas_with_dropdown}. Cannot archive a dropdown that is in use in non-archived fields."
-            )
-
     def describe_operation(self) -> str:
         return f"{self.dropdown_name}: Archiving dropdown."
 

{liminal_orm-5.1.2 → liminal_orm-5.1.3}/liminal/entity_schemas/compare.py

@@ -335,14 +335,11 @@ def compare_entity_schemas(
                 if (p.parent_link and p.entity_link and p.warehouse_name)
             }
             field_props = [
-                f.unset_tooltip()
-                .unset_entity_link()
-                .unset_unit_name()
-                .unset_parent_link()
+                f.unset_tooltip().unset_entity_link().unset_unit_name()
                 for f in field_props
             ]
             field_props = [
-                f.unset_parent_link()
+                f.set_parent_link(False)
                 if f.warehouse_name in parent_links_to_update
                 else f
                 for f in field_props

{liminal_orm-5.1.2 → liminal_orm-5.1.3}/liminal/entity_schemas/operations.py

@@ -81,10 +81,10 @@ class CreateEntitySchema(BaseOperation):
         )
 
     def describe_operation(self) -> str:
-        return f"{self._validated_schema_properties.name}: Creating new entity schema with fields: {', '.join([f.warehouse_name for f in self.fields if f.warehouse_name is not None])}."
+        return f"{self._validated_schema_properties.warehouse_name}: Creating new entity schema with fields: {', '.join([f.warehouse_name for f in self.fields if f.warehouse_name is not None])}."
 
     def describe(self) -> str:
-        return f"{self._validated_schema_properties.name}: Schema is defined in code but not in Benchling."
+        return f"{self._validated_schema_properties.warehouse_name}: Schema is defined in code but not in Benchling."
 
     def validate(self, benchling_service: BenchlingService) -> None:
         if (
@@ -154,9 +154,13 @@ class CreateEntitySchema(BaseOperation):
                 schema, entity_schema_id_to_name_map, dropdowns_map, unit_id_to_name_map
             )
         )
+        # Warehouse name exists in the Liminal operation definition but not in Benchling converted list.
+        # Set the warehouse name to None for operation fields to compare properly.
+        cleaned_op_fields = [f.set_warehouse_name(None) for f in self.fields]
+        benchling_fields = [f for _, f in benchling_fields_props.items()]
         if (
             self._validated_schema_properties != benchling_schema_props
-            or self.fields != [f for _, f in benchling_fields_props.items()]
+            or cleaned_op_fields != benchling_fields
         ):
             raise ValueError(
                 f"Entity schema {self._validated_schema_properties.warehouse_name} is different in code versus Benchling. Cannot unarchive."

{liminal_orm-5.1.2 → liminal_orm-5.1.3}/liminal/orm/column.py

@@ -108,10 +108,6 @@ class Column(SqlColumn):
             raise ValueError(
                 f"Column {name}: Parent link can only be set if the field type is ENTITY_LINK."
             )
-        if parent_link and not entity_link:
-            raise ValueError(
-                f"Column {name}: Parent link cannot be set without an entity link."
-            )
         if type in BenchlingFieldType.get_non_multi_select_types() and is_multi is True:
             raise ValueError(
                 f"Column {name}: Field type {type} cannot have multi-value set as True."

{liminal_orm-5.1.2 → liminal_orm-5.1.3}/liminal/tests/test_entity_schema_compare.py

@@ -439,7 +439,8 @@ class TestCompareEntitySchemas:
             # The link is created without a target, which is set in the follow-up field update.
             created_field = create.fields[0]
             assert "entity_link" not in created_field.model_fields_set
-            assert "parent_link" not in created_field.model_fields_set
+            # parent_link is created as False, and set to True in the follow-up field update.
+            assert created_field.parent_link is False
 
             assert rename.wh_schema_name == "cell_line_batch"
             assert rename.update_props.model_dump(exclude_unset=True) == {

{liminal_orm-5.1.2 → liminal_orm-5.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "liminal-orm"
-version = "5.1.2"
+version = "5.1.3"
 description = "An ORM and toolkit that builds on top of Benchling's platform to keep your schemas and downstream code dependencies in sync."
 authors = [{ name = "DynoTx Open Source" }]
 requires-python = ">=3.10,<3.14"