liminal-orm 4.1.1__tar.gz → 4.1.2__tar.gz

{liminal_orm-4.1.1 → liminal_orm-4.1.2}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: liminal-orm
-Version: 4.1.1
+Version: 4.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
 Author-email: opensource@dynotx.com
 Requires-Python: >=3.9,<4
@@ -11,6 +10,7 @@ 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.21.2,<2.0.0)
 Requires-Dist: bs4 (>=0.0.2,<0.0.3)
 Requires-Dist: lxml (>=5.3.0,<6.0.0)
@@ -26,6 +26,7 @@ Requires-Dist: tornado (==6.5.0)
 Requires-Dist: typer (>=0.12.5,<0.13.0)
 Project-URL: Bug Tracker, https://github.com/dynotx/liminal-orm/issues
 Project-URL: Documentation, https://dynotx.github.io/liminal-orm/
+Project-URL: Homepage, https://github.com/dynotx/liminal-orm
 Project-URL: Repository, https://github.com/dynotx/liminal-orm
 Description-Content-Type: text/markdown
 

{liminal_orm-4.1.1 → liminal_orm-4.1.2}/liminal/cli/cli.py

@@ -83,7 +83,7 @@ connection = BenchlingConnection(
 
 @app.command(
     name="generate-files",
-    help="Generates the dropdown, entity schema, and results schema files from your Benchling tenant and writes to the given path. By default, this will overwrite any existing files within the {write_path}/dropdowns/, {write_path}/entity_schemas/, and {write_path}/results_schemas/ directories.",
+    help="Generates the dropdown, entity schema, and results schema files from your Benchling tenant and writes to the given path. By default, this will not overwrite existing files.",
 )
 def generate_files(
     benchling_tenant: str = typer.Argument(
@@ -117,7 +117,7 @@ def generate_files(
         False,
         "-o",
         "--overwrite",
-        help="Overwrite existing files within the {write_path}/dropdowns/, {write_path}/entity_schemas/, and {write_path}/results_schemas/ directories.",
+        help="Overwrite the whole write directory at the given path.",
     ),
 ) -> None:
     _, benchling_connection = read_local_liminal_dir(LIMINAL_DIR_PATH, benchling_tenant)

{liminal_orm-4.1.1 → liminal_orm-4.1.2}/liminal/dropdowns/generate_files.py

@@ -21,7 +21,7 @@ def generate_all_dropdown_files(
     write_path : Path
         The path to write the generated files to. dropdowns/ directory will be created within this path.
     overwrite : bool
-        Whether to overwrite existing the existing dropdowns/ directory.
+        Whether to overwrite existing files in the dropdowns/ directory.
     """
     write_path = write_path / "dropdowns"
     if write_path.exists() and overwrite:
@@ -33,6 +33,7 @@ def generate_all_dropdown_files(
 
     dropdowns = get_benchling_dropdowns_dict(benchling_service)
     file_names_to_classname = []
+    num_files_written = 0
     for dropdown_name, dropdown_options in dropdowns.items():
         dropdown_values = [option.name for option in dropdown_options.options]
         options_list = str(dropdown_values).replace("'", '"')
@@ -46,8 +47,10 @@ class {classname}(BaseDropdown):
     __allowed_values__ = {options_list}
 """
         filename = to_snake_case(dropdown_name) + ".py"
-        with open(write_path / filename, "w") as file:
-            file.write(dropdown_content)
+        if overwrite or not (write_path / filename).exists():
+            with open(write_path / filename, "w") as file:
+                file.write(dropdown_content)
+            num_files_written += 1
         file_names_to_classname.append((filename, classname))
 
     file_names_to_classname.sort(key=lambda x: x[0])
@@ -55,8 +58,13 @@ class {classname}(BaseDropdown):
         f"from .{filename[:-3]} import {classname}"
         for filename, classname in file_names_to_classname
     )
-    with open(write_path / "__init__.py", "w") as file:
-        file.write(import_statements)
+    if num_files_written > 0:
+        with open(write_path / "__init__.py", "w") as file:
+            file.write(import_statements)
         print(
-            f"[green]Generated {write_path / '__init__.py'} with {len(file_names_to_classname)} dropdown imports."
+            f"[green]Generated {write_path / '__init__.py'} with {len(file_names_to_classname)} dropdown imports. {num_files_written} dropdown files written."
+        )
+    else:
+        print(
+            "[green dim]No new dropdown files to be written. If you want to overwrite existing files, run with -o flag."
         )

{liminal_orm-4.1.1 → liminal_orm-4.1.2}/liminal/entity_schemas/generate_files.py

@@ -63,7 +63,7 @@ def generate_all_entity_schema_files(
     write_path : Path
         The path to write the generated files to. entity_schemas/ directory will be created within this path.
     overwrite : bool
-        Whether to overwrite existing the existing entity_schemas/ directory.
+        Whether to overwrite existing files in the entity_schemas/ directory.
     """
     write_path = write_path / "entity_schemas"
     if write_path.exists() and overwrite:
@@ -76,6 +76,7 @@ def generate_all_entity_schema_files(
     models = get_converted_tag_schemas(benchling_service)
     has_date = False
     subdirectory_map: dict[str, list[tuple[str, str]]] = {}
+    subdirectory_num_files_written: dict[str, int] = {}
     dropdown_name_to_classname_map = _get_dropdown_name_to_classname_map(
         benchling_service
     )
@@ -188,39 +189,45 @@ class {classname}(BaseModel, {get_entity_mixin(schema_properties.entity_type)}):
 {init_string}
 
 """
-        write_directory_path = write_path / get_file_subdirectory(
-            schema_properties.entity_type
-        )
-        subdirectory_map[get_file_subdirectory(schema_properties.entity_type)] = (
-            subdirectory_map.get(
-                get_file_subdirectory(schema_properties.entity_type), []
-            )
-            + [(filename, classname)]
-        )
+        subdirectory_name = get_file_subdirectory(schema_properties.entity_type)
+        write_directory_path = write_path / subdirectory_name
+        if not subdirectory_map.get(subdirectory_name):
+            subdirectory_map[subdirectory_name] = []
+            subdirectory_num_files_written[subdirectory_name] = 0
+        subdirectory_map[subdirectory_name].append((filename, classname))
         write_directory_path.mkdir(exist_ok=True)
-        with open(write_directory_path / filename, "w") as file:
-            file.write(full_content)
+        if overwrite or not (write_directory_path / filename).exists():
+            with open(write_directory_path / filename, "w") as file:
+                file.write(full_content)
+            subdirectory_num_files_written[subdirectory_name] += 1
 
     for subdir, names in subdirectory_map.items():
-        init_content = (
-            "\n".join(
-                f"from .{filename[:-3]} import {classname}"
-                for filename, classname in names
+        if subdirectory_num_files_written[subdir] > 0:
+            init_content = (
+                "\n".join(
+                    f"from .{filename[:-3]} import {classname}"
+                    for filename, classname in names
+                )
+                + "\n"
             )
-            + "\n"
-        )
-        with open(write_path / subdir / "__init__.py", "w") as file:
-            file.write(init_content)
-
-    with open(write_path / "__init__.py", "w") as file:
-        file.write(
-            "\n".join(
-                f"from .{subdir} import * # noqa" for subdir in subdirectory_map.keys()
+            with open(write_path / subdir / "__init__.py", "w") as file:
+                file.write(init_content)
+
+    if sum(subdirectory_num_files_written.values()) > 0:
+        with open(write_path / "__init__.py", "w") as file:
+            file.write(
+                "\n".join(
+                    f"from .{subdir} import * # noqa"
+                    for subdir in subdirectory_map.keys()
+                )
+                + "\n"
             )
-            + "\n"
-        )
+            print(
+                f"[green]Generated {write_path / '__init__.py'} with {sum(subdirectory_num_files_written.values())} entity schema files written."
+            )
+    else:
         print(
-            f"[green]Generated {write_path / '__init__.py'} with {len(models)} entity schema imports."
+            "[green dim]No new entity schema files to be written. If you want to overwrite existing files, run with -o flag."
         )
 
 
@@ -237,8 +244,7 @@ def _get_dropdown_name_to_classname_map(
             for dropdown in BaseDropdown.get_all_subclasses()
         }
     benchling_dropdowns = get_benchling_dropdowns_dict(benchling_service)
-    if len(benchling_dropdowns) > 0:
-        raise Exception(
-            "No dropdowns found locally. Please ensure your env.py file imports your dropdown classes or generate dropdowns from your Benchling tenant first."
-        )
-    return {}
+    return {
+        dropdown_name: to_pascal_case(dropdown_name)
+        for dropdown_name in benchling_dropdowns.keys()
+    }

{liminal_orm-4.1.1 → liminal_orm-4.1.2}/liminal/results_schemas/generate_files.py

@@ -29,7 +29,7 @@ def generate_all_results_schema_files(
     write_path : Path
         The path to write the generated files to. results_schemas/ directory will be created within this path.
     overwrite : bool
-        Whether to overwrite existing the existing results_schemas/ directory.
+        Whether to overwrite existing files in the results_schemas/ directory.
     """
     write_path = write_path / "results_schemas"
     if write_path.exists() and overwrite:
@@ -47,6 +47,7 @@ def generate_all_results_schema_files(
         benchling_service
     )
     init_file_imports = []
+    num_files_written = 0
 
     for schema_properties, field_properties_dict in results_schemas:
         has_date = False
@@ -147,14 +148,21 @@ class {schema_name}(BaseResultsModel):
 {init_string}
 """
 
-        with open(write_path / file_name, "w") as file:
-            file.write(schema_content)
+        if overwrite or not (write_path / file_name).exists():
+            with open(write_path / file_name, "w") as file:
+                file.write(schema_content)
+            num_files_written += 1
 
-    with open(write_path / "__init__.py", "w") as file:
-        file.write("\n".join(init_file_imports))
-    print(
-        f"[green]Generated {write_path / '__init__.py'} with {len(results_schemas)} entity schema imports."
-    )
+    if num_files_written > 0:
+        with open(write_path / "__init__.py", "w") as file:
+            file.write("\n".join(init_file_imports))
+        print(
+            f"[green]Generated {write_path / '__init__.py'} with {len(results_schemas)} entity schema imports. {num_files_written} results schema files written."
+        )
+    else:
+        print(
+            "[green dim]No new results schema files to be written. If you want to overwrite existing files, run with -o flag."
+        )
 
 
 def _get_dropdown_name_to_classname_map(
@@ -170,11 +178,10 @@ def _get_dropdown_name_to_classname_map(
             for dropdown in BaseDropdown.get_all_subclasses()
         }
     benchling_dropdowns = get_benchling_dropdowns_dict(benchling_service)
-    if len(benchling_dropdowns) > 0:
-        raise Exception(
-            "No dropdowns found locally. Please ensure your env.py file imports your dropdown classes or generate dropdowns from your Benchling tenant first."
-        )
-    return {}
+    return {
+        dropdown_name: to_pascal_case(dropdown_name)
+        for dropdown_name in benchling_dropdowns.keys()
+    }
 
 
 def _get_entity_schemas_wh_name_to_classname(
@@ -190,8 +197,7 @@ def _get_entity_schemas_wh_name_to_classname(
             for s in BaseModel.get_all_subclasses()
         }
     tag_schemas = get_converted_tag_schemas(benchling_service)
-    if len(tag_schemas) > 0:
-        raise Exception(
-            "No entity schemas found locally. Please ensure your env.py file imports your entity schema classes or generate entity schemas from your Benchling tenant first."
-        )
-    return {}
+    return {
+        schema_props.warehouse_name: to_pascal_case(schema_props.warehouse_name)
+        for schema_props, _, _ in tag_schemas
+    }

{liminal_orm-4.1.1 → liminal_orm-4.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "liminal-orm"
-version = "4.1.1"
+version = "4.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"