liminal-orm 4.4.5__tar.gz → 4.4.7__tar.gz

{liminal_orm-4.4.5 → liminal_orm-4.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liminal-orm
-Version: 4.4.5
+Version: 4.4.7
 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-4.4.5 → liminal_orm-4.4.7}/liminal/entity_schemas/generate_files.py

@@ -3,7 +3,6 @@ from pathlib import Path
 
 from rich import print
 
-from liminal.base.base_dropdown import BaseDropdown
 from liminal.connection.benchling_service import BenchlingService
 from liminal.dropdowns.utils import get_benchling_dropdowns_dict
 from liminal.entity_schemas.utils import get_converted_tag_schemas
@@ -140,20 +139,22 @@ def generate_all_entity_schema_files(
                 col.type in BenchlingFieldType.get_entity_link_types()
                 and col.entity_link is not None
             ):
-                if not col.is_multi:
-                    relationship_strings.append(
-                        f"""{TAB}{col_name}_entity = single_relationship("{wh_name_to_classname[col.entity_link]}", {col_name})"""
-                    )
-                    import_strings.append(
-                        "from liminal.orm.relationship import single_relationship"
-                    )
-                else:
-                    relationship_strings.append(
-                        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"
-                    )
+                entity_classname = wh_name_to_classname.get(col.entity_link)
+                if entity_classname is not None:
+                    if not col.is_multi:
+                        relationship_strings.append(
+                            f"""{TAB}{col_name}_entity = single_relationship("{wh_name_to_classname[col.entity_link]}", {col_name})"""
+                        )
+                        import_strings.append(
+                            "from liminal.orm.relationship import single_relationship"
+                        )
+                    else:
+                        relationship_strings.append(
+                            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"
+                        )
         for col_name, col in columns.items():
             if not col.required and col.type:
                 init_strings.append(
@@ -241,15 +242,7 @@ class {classname}(BaseModel, {get_entity_mixin(schema_properties.entity_type)}):
 def _get_dropdown_name_to_classname_map(
     benchling_service: BenchlingService,
 ) -> dict[str, str]:
-    """Gets the dropdown name to classname map.
-    If there are dropdowns imported, use BenchlingDropdown.get_all_subclasses()
-    Otherwise, it will query for Benchling dropdowns and use those.
-    """
-    if len(BaseDropdown.get_all_subclasses()) > 0:
-        return {
-            dropdown.__benchling_name__: dropdown.__name__
-            for dropdown in BaseDropdown.get_all_subclasses()
-        }
+    """Gets the dropdown name to classname map by querying Benchling dropdowns and using the dropdown name to create the classname."""
     benchling_dropdowns = get_benchling_dropdowns_dict(benchling_service)
     return {
         dropdown_name: to_pascal_case(dropdown_name)

{liminal_orm-4.4.5 → liminal_orm-4.4.7}/liminal/entity_schemas/tag_schema_models.py

@@ -93,7 +93,7 @@ class TagSchemaConstraint(BaseModel):
 
     areUniqueResiduesCaseSensitive: bool | None = None
     fields: list[TagSchemaFieldModel] | None = None
-    uniqueCanonicalSmilers: bool | None = None
+    uniqueCanonicalSmiles: bool | None = None
     uniqueResidues: bool | None = None
 
     @classmethod
@@ -118,7 +118,7 @@ class TagSchemaConstraint(BaseModel):
         return cls(
             fields=constraint_fields,
             uniqueResidues=uniqueResidues,
-            uniqueCanonicalSmilers=False,
+            uniqueCanonicalSmiles=False,
             areUniqueResiduesCaseSensitive=areUniqueResiduesCaseSensitive,
         )
 

{liminal_orm-4.4.5 → liminal_orm-4.4.7}/liminal/results_schemas/generate_files.py

@@ -97,20 +97,24 @@ def generate_all_results_schema_files(
                 col.type in BenchlingFieldType.get_entity_link_types()
                 and col.entity_link is not None
             ):
-                if not col.is_multi:
-                    relationship_strings.append(
-                        f"""{TAB}{col_name}_entity = single_relationship("{entity_schemas_wh_name_to_classname[col.entity_link]}", {col_name})"""
-                    )
-                    import_strings.append(
-                        "from liminal.orm.relationship import single_relationship"
-                    )
-                else:
-                    relationship_strings.append(
-                        f"""{TAB}{col_name}_entities = multi_relationship("{entity_schemas_wh_name_to_classname[col.entity_link]}", {col_name})"""
-                    )
-                    import_strings.append(
-                        "from liminal.orm.relationship import multi_relationship"
-                    )
+                entity_classname = entity_schemas_wh_name_to_classname.get(
+                    col.entity_link
+                )
+                if entity_classname is not None:
+                    if not col.is_multi:
+                        relationship_strings.append(
+                            f"""{TAB}{col_name}_entity = single_relationship("{entity_classname}", {col_name})"""
+                        )
+                        import_strings.append(
+                            "from liminal.orm.relationship import single_relationship"
+                        )
+                    else:
+                        relationship_strings.append(
+                            f"""{TAB}{col_name}_entities = multi_relationship("{entity_classname}", {col_name})"""
+                        )
+                        import_strings.append(
+                            "from liminal.orm.relationship import multi_relationship"
+                        )
         for col_name, col in field_properties_dict.items():
             if not col.required and col.type:
                 init_strings.append(

{liminal_orm-4.4.5 → liminal_orm-4.4.7}/liminal/results_schemas/models/results_schema_model.py

@@ -15,7 +15,6 @@ class ResultsSchemaModel(BaseModel):
 
     allFields: list[TagSchemaFieldModel]
     archiveRecord: dict[str, str] | None
-    derivedParent: Any | None
     fields: list[TagSchemaFieldModel]
     id: str
     name: str | None

{liminal_orm-4.4.5 → liminal_orm-4.4.7}/liminal/results_schemas/utils.py

@@ -12,7 +12,7 @@ from liminal.unit_dictionary.utils import get_unit_id_to_name_map
 
 
 def get_converted_results_schemas(
-    benchling_service: BenchlingService,
+    benchling_service: BenchlingService, include_archived: bool = False
 ) -> list[tuple[ResultsSchemaProperties, dict[str, BaseFieldProperties]]]:
     """This functions gets all Results Schema schemas from Benchling and converts them to our internal representation of a schema and its fields.
     It parses the Results Schema and creates ResultsSchemaProperties and a list of FieldProperties for each field in the schema.
@@ -21,6 +21,8 @@ def get_converted_results_schemas(
     dropdowns_map = get_benchling_dropdown_id_name_map(benchling_service)
     unit_id_to_name_map = get_unit_id_to_name_map(benchling_service)
     results_schemas_list = []
+    if not include_archived:
+        results_schemas = [s for s in results_schemas if not s.archiveRecord]
     for schema in results_schemas:
         schema_properties = ResultsSchemaProperties(
             name=schema.name,

{liminal_orm-4.4.5 → liminal_orm-4.4.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "liminal-orm"
-version = "4.4.5"
+version = "4.4.7"
 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", email = "opensource@dynotx.com" }]
 requires-python = ">=3.9,<4"