liminal-orm 3.1.0__py3-none-any.whl → 3.1.1__py3-none-any.whl

liminal/dropdowns/generate_files.py

@@ -4,7 +4,7 @@ from rich import print
 
 from liminal.connection import BenchlingService
 from liminal.dropdowns.utils import get_benchling_dropdowns_dict
-from liminal.utils import pascalize, to_snake_case
+from liminal.utils import to_pascal_case, to_snake_case
 
 
 def generate_all_dropdown_files(
@@ -24,7 +24,7 @@ def generate_all_dropdown_files(
     for dropdown_name, dropdown_options in dropdowns.items():
         dropdown_values = [option.name for option in dropdown_options.options]
         options_list = str(dropdown_values).replace("'", '"')
-        classname = pascalize(dropdown_name)
+        classname = to_pascal_case(dropdown_name)
         dropdown_content = f"""
 from liminal.base.base_dropdown import BaseDropdown
 

liminal/entity_schemas/generate_files.py

@@ -8,7 +8,7 @@ from liminal.entity_schemas.utils import get_converted_tag_schemas
 from liminal.enums import BenchlingEntityType, BenchlingFieldType
 from liminal.mappers import convert_benchling_type_to_python_type
 from liminal.orm.name_template import NameTemplate
-from liminal.utils import pascalize, to_snake_case
+from liminal.utils import to_pascal_case, to_snake_case
 
 
 def get_entity_mixin(entity_type: BenchlingEntityType) -> str:
@@ -59,18 +59,18 @@ def generate_all_entity_schema_files(
     subdirectory_map: dict[str, list[tuple[str, str]]] = {}
     benchling_dropdowns = get_benchling_dropdowns_dict(benchling_service)
     dropdown_name_to_classname_map: dict[str, str] = {
-        dropdown_name: pascalize(dropdown_name)
+        dropdown_name: to_pascal_case(dropdown_name)
         for dropdown_name in benchling_dropdowns.keys()
     }
     wh_name_to_classname: dict[str, str] = {
-        sp.warehouse_name: pascalize(sp.name) for sp, _, _ in models
+        sp.warehouse_name: to_pascal_case(sp.name) for sp, _, _ in models
     }
 
     for schema_properties, name_template, columns in models:
-        classname = pascalize(schema_properties.name)
+        classname = to_pascal_case(schema_properties.name)
 
     for schema_properties, name_template, columns in models:
-        classname = pascalize(schema_properties.name)
+        classname = to_pascal_case(schema_properties.name)
         filename = to_snake_case(schema_properties.name) + ".py"
         columns = {key: columns[key] for key in columns}
         import_strings = [

liminal/entity_schemas/operations.py

@@ -313,10 +313,15 @@ class CreateEntitySchemaField(BaseOperation):
         self.index = index
 
         self._wh_field_name: str
+        self._field_name: str
         if field_props.warehouse_name:
             self._wh_field_name = field_props.warehouse_name
         else:
             raise ValueError("Field warehouse name is required.")
+        if field_props.name:
+            self._field_name = field_props.name
+        else:
+            raise ValueError("Field name is required.")
 
     def execute(self, benchling_service: BenchlingService) -> dict[str, Any]:
         try:
@@ -385,10 +390,10 @@ class CreateEntitySchemaField(BaseOperation):
         if (
             benchling_service.connection.config_flags.schemas_enable_change_warehouse_name
             is False
-            and self.field_props.warehouse_name != to_snake_case(self.field_props.name)
+            and self.field_props.warehouse_name != to_snake_case(self._field_name)
         ):
             raise ValueError(
-                f"{self.wh_schema_name}: Tenant config flag SCHEMAS_ENABLE_CHANGE_WAREHOUSE_NAME is required to set a custom field warehouse name. Reach out to Benchling support to turn this config flag to True and then set the flag to True in BenchlingConnection.config_flags. Otherwise, define the field warehouse_name in code to be the given Benchling warehouse name: {to_snake_case(self.field_props.name)}."
+                f"{self.wh_schema_name}: Tenant config flag SCHEMAS_ENABLE_CHANGE_WAREHOUSE_NAME is required to set a custom field warehouse name. Reach out to Benchling support to turn this config flag to True and then set the flag to True in BenchlingConnection.config_flags. Otherwise, define the field warehouse_name in code to be the given Benchling warehouse name: {to_snake_case(self._field_name)}."
             )
         if (
             self.field_props.unit_name

liminal/utils.py

@@ -10,30 +10,25 @@ from liminal.connection.benchling_service import BenchlingService
 
 
 def generate_random_id(length: int = 8) -> str:
-    """Generate a random ID with only lowercase letters."""
+    """Generate a pseudo-random ID with only lowercase letters."""
     return "".join(random.choices(string.ascii_lowercase, k=length))
 
 
-def pascalize(input_string: str) -> str:
+def to_pascal_case(input_string: str) -> str:
     """
-    Convert a string to PascalCase.
+    Convert a string to PascalCase. Filters out any non-alphanumeric characters.
     """
-    return "".join(
-        re.sub(r"[\[\]{}():]", "", word).capitalize()
-        for word in re.split(r"[ /_\-]", input_string)
-    )
+    words = re.split(r"[ /_\-]", input_string)
+    # Then remove any non-alphanumeric characters and capitalize each word
+    return "".join(re.sub(r"[^a-zA-Z0-9]", "", word).capitalize() for word in words)
 
 
-def to_snake_case(input_string: str | None) -> str:
+def to_snake_case(input_string: str) -> str:
     """
-    Convert a string to snake_case.
+    Convert a string to snake_case. Filters out any non-alphanumeric characters.
     """
-    if input_string is None:
-        return ""
-    return "_".join(
-        re.sub(r"[\[\]{}():]", "", word).lower()
-        for word in re.split(r"[ /_\-]", input_string)
-    )
+    words = re.split(r"[ /_\-]", input_string)
+    return "_".join(re.sub(r"[^a-zA-Z0-9]", "", word).lower() for word in words)
 
 
 def to_string_val(input_val: Any) -> str:

liminal/validation/__init__.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Any, Callable
 
 from pydantic import BaseModel, ConfigDict
 
-from liminal.utils import pascalize
+from liminal.utils import to_pascal_case
 from liminal.validation.validation_severity import ValidationSeverity
 
 if TYPE_CHECKING:
@@ -137,14 +137,14 @@ def liminal_validator(
                 valid=False,
                 level=validator_level,
                 entity=self,
-                validator_name=validator_name or pascalize(func.__name__),
+                validator_name=validator_name or to_pascal_case(func.__name__),
                 message=str(e),
             )
         return BenchlingValidatorReport.create_validation_report(
             valid=True,
             level=validator_level,
             entity=self,
-            validator_name=validator_name or pascalize(func.__name__),
+            validator_name=validator_name or to_pascal_case(func.__name__),
         )
 
     setattr(wrapper, "_is_liminal_validator", True)

{liminal_orm-3.1.0.dist-info → liminal_orm-3.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: liminal-orm
-Version: 3.1.0
+Version: 3.1.1
 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-3.1.0.dist-info → liminal_orm-3.1.1.dist-info}/RECORD

@@ -18,14 +18,14 @@ liminal/connection/benchling_connection.py,sha256=PLiaI4v9EcJDNBEO5ZF3jERuI6AYo8
 liminal/connection/benchling_service.py,sha256=lEYCHF1U8nII8Rn3rMBPTffTFiVFjoFeNmX2Kq36-qE,7170
 liminal/dropdowns/api.py,sha256=n5oxi1EhkmpmPpNi1LOI4xcIQmk1C069XFaGP5XSBx8,6959
 liminal/dropdowns/compare.py,sha256=-UbCkeTKx3THwvjMTUubyYVXBkhmvyhEKzwrIzBkthY,7141
-liminal/dropdowns/generate_files.py,sha256=IqnBs-IyLsIZE0NUkdB99zd5EAF-1f9CPBeblz-GzJE,2041
+liminal/dropdowns/generate_files.py,sha256=Y6biJOrt1XtWcTMoIV_eC2Yqwg6JYQxyF85U78s6M7U,2051
 liminal/dropdowns/operations.py,sha256=-TRIsxqnUtrIUjhrt5k_PdiBCDUXsXDzsOUmznJE-6Q,13516
 liminal/dropdowns/utils.py,sha256=1-H7bTszCUeqeRBpiYXjRjreDzhn1Fd1MFwIsrEI-o4,4109
 liminal/entity_schemas/api.py,sha256=Emn_Y95cAG9Wis6tpchw6QBVKQh4If86LOdgKk0Ndjw,3575
 liminal/entity_schemas/compare.py,sha256=t6tl67GWaMoNNcPxyLpCuNAlN3OWNqURTo3EUEMtETE,17549
 liminal/entity_schemas/entity_schema_models.py,sha256=v5A1ELaiuBnUSl1HkUNAeMuIRQeQnIKzfpFxmsiKWh0,8349
-liminal/entity_schemas/generate_files.py,sha256=u9SoDO9f4qL2nZaddln__2J0zJ3QMFBQhiUabn22aUY,9032
-liminal/entity_schemas/operations.py,sha256=cMJ5P1drs-Gv9E3YbsT3jTe48wJswxgPWYdV1qSawq0,26952
+liminal/entity_schemas/generate_files.py,sha256=AwthMaPLG9DA7sb_mrQcDag3XxMOEZqTkj5DWFMEy98,9057
+liminal/entity_schemas/operations.py,sha256=N58H8LP1fuRCjRecG6G43ZdAX7MEL2lxPLQPmc23Wlw,27119
 liminal/entity_schemas/tag_schema_models.py,sha256=DZQYzlxt3aEHbLy00qEyDZC_mRyi9I325ggkfcNgR1I,24153
 liminal/entity_schemas/utils.py,sha256=2ZHyLxnYITVEuyAWxNdsq5hcNSgvN7pN3-uUzyocYSk,6161
 liminal/enums/__init__.py,sha256=-szuqAwMED4ai0NaPVUfgihQJAJ27wPu_nDnj4cEgTk,518
@@ -60,11 +60,11 @@ liminal/tests/from benchling_sdk.py,sha256=CjRUHFB3iaa4rUPLGOqDiBq5EPKldm-Fd8aQQ
 liminal/tests/test_dropdown_compare.py,sha256=yHB0ovQlBLRu8-qYkqIPd8VtYEOmOft_93FQM86g_z8,8198
 liminal/tests/test_entity_schema_compare.py,sha256=-26Bu5eYIuHRswB5kYjGDo5Wed5LUWjm1e6IRI1Q-lE,18952
 liminal/unit_dictionary/utils.py,sha256=o3K06Yyt33iIUSMHPT8f1vSuUSgWjZLf51p78lx4SZs,1817
-liminal/utils.py,sha256=radRtRsZmCiNblMvxOX1DH0rcO5TR09kFlp6OONIPBU,2951
-liminal/validation/__init__.py,sha256=TVaHrSF3GnSd4mbZrPn8TBHscGWkAPKAUUPq7-symC8,5275
+liminal/utils.py,sha256=ZiehcgE0We5i9Ry6tQO_f8QoQEOaiO4SFOQnFbq-29o,3068
+liminal/validation/__init__.py,sha256=NsjzmivSRwGki1k9ykJgjtcYNcILR_PHSf6RkI1w2n0,5290
 liminal/validation/validation_severity.py,sha256=ib03PTZCQHcbBDc01v4gJF53YtA-ANY6QSFnhTV-FbU,259
-liminal_orm-3.1.0.dist-info/LICENSE.md,sha256=oVA877F_D1AV44dpjsv4f-4k690uNGApX1EtzOo3T8U,11353
-liminal_orm-3.1.0.dist-info/METADATA,sha256=jC90ZQqaPXCKH8dvJ4oyA5HjPG-dAX3gnPDCEWLfsIk,11032
-liminal_orm-3.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-liminal_orm-3.1.0.dist-info/entry_points.txt,sha256=atIrU63rrzH81dWC2sjUbFLlc5FWMmYRdMxXEWexIZA,47
-liminal_orm-3.1.0.dist-info/RECORD,,
+liminal_orm-3.1.1.dist-info/LICENSE.md,sha256=oVA877F_D1AV44dpjsv4f-4k690uNGApX1EtzOo3T8U,11353
+liminal_orm-3.1.1.dist-info/METADATA,sha256=u4jC_Fbe5Idl6MDpUMbIauCIhmgFEQiXMZyNkUv_QmE,11032
+liminal_orm-3.1.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+liminal_orm-3.1.1.dist-info/entry_points.txt,sha256=atIrU63rrzH81dWC2sjUbFLlc5FWMmYRdMxXEWexIZA,47
+liminal_orm-3.1.1.dist-info/RECORD,,