liminal-orm 1.1.1__tar.gz → 1.1.3__tar.gz

{liminal_orm-1.1.1 → liminal_orm-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: liminal-orm
-Version: 1.1.1
+Version: 1.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.
 Home-page: https://github.com/dynotx/liminal-orm
 Author: DynoTx Open Source

{liminal_orm-1.1.1 → liminal_orm-1.1.3}/liminal/connection/benchling_connection.py

@@ -30,6 +30,8 @@ class BenchlingConnection(BaseModel):
     warehouse_access: bool = False
         Whether your Benchling tenant has access to the warehouse. If warehouse_connection_string is provided, this will default to True.
         warehouse_access is required to set a custom warehouse names on entity schemas and their fields.
+    fieldsets: bool = False
+        Whether your Benchling tenant has access to fieldsets.
     """
 
     tenant_name: str
@@ -41,6 +43,7 @@ class BenchlingConnection(BaseModel):
     internal_api_admin_email: str | None = None
     internal_api_admin_password: str | None = None
     warehouse_access: bool = False
+    fieldsets: bool = False
 
     @model_validator(mode="before")
     @classmethod

{liminal_orm-1.1.1 → liminal_orm-1.1.3}/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.1 → liminal_orm-1.1.3}/liminal/entity_schemas/operations.py

@@ -96,9 +96,11 @@ class CreateEntitySchema(BaseOperation):
             raise ValueError(
                 f"Entity schema warehouse name {self._validated_schema_properties.warehouse_name} already exists in Benchling."
             )
-        if self._validated_schema_properties.prefix in [
-            schema["prefix"] for schema in all_schemas
-        ]:
+        if (
+            not benchling_service.connection.fieldsets
+            and self._validated_schema_properties.prefix
+            in [schema["prefix"] for schema in all_schemas]
+        ):
             raise ValueError(
                 f"Entity schema prefix {self._validated_schema_properties.prefix} already exists in Benchling."
             )
@@ -235,9 +237,11 @@ class UpdateEntitySchema(BaseOperation):
             raise ValueError(
                 f"Entity schema warehouse name {self.update_props.warehouse_name} already exists in Benchling."
             )
-        if self.update_props.prefix and self.update_props.prefix in [
-            schema["prefix"] for schema in all_schemas
-        ]:
+        if (
+            not benchling_service.connection.fieldsets
+            and self.update_props.prefix
+            and self.update_props.prefix in [schema["prefix"] for schema in all_schemas]
+        ):
             raise ValueError(
                 f"Entity schema prefix {self.update_props.prefix} already exists in Benchling."
             )
@@ -439,7 +443,7 @@ class UnarchiveEntitySchemaField(BaseOperation):
 
 
 class UpdateEntitySchemaField(BaseOperation):
-    order: ClassVar[int] = 14
+    order: ClassVar[int] = 140
 
     def __init__(
         self,

{liminal_orm-1.1.1 → liminal_orm-1.1.3}/liminal/orm/base_model.py

@@ -12,8 +12,8 @@ from sqlalchemy.orm.decl_api import declared_attr
 
 from liminal.base.base_validation_filters import BaseValidatorFilters
 from liminal.orm.base import Base
+from liminal.orm.base_tables.user import User
 from liminal.orm.schema_properties import SchemaProperties
-from liminal.orm.user import User
 from liminal.validation import (
     BenchlingValidator,
     BenchlingValidatorReport,

liminal_orm-1.1.3/liminal/orm/base_tables/registry_entity.py

@@ -0,0 +1,60 @@
+from datetime import datetime
+
+from sqlalchemy import Column, ForeignKey
+from sqlalchemy.types import DATETIME, Boolean, String
+
+from liminal.orm.base import Base
+from liminal.orm.relationship import single_relationship
+
+
+class RegistryEntity(Base):
+    __tablename__ = "registry_entity$raw"
+
+    id = Column("id", String, nullable=True, primary_key=True)
+    archived = Column("archived$", Boolean, nullable=True)
+    archive_purpose = Column("archive_purpose$", String, nullable=True)
+    created_at = Column("created_at", DATETIME, nullable=True)
+    creator_id = Column("creator_id", String, ForeignKey("user$raw.id"), nullable=True)
+    file_registry_id = Column("file_registry_id", String, nullable=True)
+    folder_id = Column("folder_id", String, nullable=True)
+    modified_at = Column("modified_at", DATETIME, nullable=True)
+    name = Column("name", String, nullable=True)
+    project_id = Column("project_id", String, nullable=True)
+    schema_id = Column("schema_id", String, nullable=True)
+    source_id = Column("source_id", String, nullable=True)
+    url = Column("url", String, nullable=True)
+    validation_status = Column("validation_status", String, nullable=True)
+
+    creator = single_relationship("User", creator_id)
+
+    def __init__(
+        self,
+        id: str,
+        archived: bool,
+        archive_purpose: str,
+        created_at: datetime,
+        file_registry_id: str,
+        folder_id: str,
+        modified_at: datetime,
+        name: str,
+        project_id: str,
+        schema: str,
+        schema_id: str,
+        source_id: str,
+        url: str,
+        validation_status: str,
+    ):
+        self.id = id
+        self.archived = archived
+        self.archive_purpose = archive_purpose
+        self.created_at = created_at
+        self.file_registry_id = file_registry_id
+        self.folder_id = folder_id
+        self.modified_at = modified_at
+        self.name = name
+        self.project_id = project_id
+        self.schema = schema
+        self.schema_id = schema_id
+        self.source_id = source_id
+        self.url = url
+        self.validation_status = validation_status

liminal_orm-1.1.3/liminal/orm/base_tables/schema.py

@@ -0,0 +1,31 @@
+from sqlalchemy import Column
+from sqlalchemy.types import Boolean, String
+
+from liminal.orm.base import Base
+
+
+class Schema(Base):
+    __tablename__ = "schema$raw"
+
+    id = Column("id", String, nullable=True, primary_key=True)
+    schema_type = Column("schema_type", String, nullable=True)
+    name = Column("name", String, nullable=True)
+    system_name = Column("system_name", String, nullable=True)
+    archived = Column("archived$", Boolean, nullable=True)
+    archive_purpose = Column("archive_purpose$", String, nullable=True)
+
+    def __init__(
+        self,
+        id: str,
+        schema_type: str,
+        name: str,
+        system_name: str,
+        archived: bool,
+        archive_purpose: str,
+    ):
+        self.id = id
+        self.schema_type = schema_type
+        self.name = name
+        self.system_name = system_name
+        self.archived = archived
+        self.archive_purpose = archive_purpose

{liminal_orm-1.1.1 → liminal_orm-1.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "liminal-orm"
-version = "1.1.1"
+version = "1.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 = ["DynoTx Open Source <opensource@dynotx.com>"]
 readme = "README.md"