corvic-engine 0.3.0rc82__cp38-abi3-win_amd64.whl → 0.3.0rc84__cp38-abi3-win_amd64.whl

corvic/{model → emodel}/__init__.py

@@ -1,26 +1,34 @@
 """Data modeling objects for creating corvic pipelines."""
 
-import corvic.model._feature_type as feature_type
-from corvic.model._base_model import (
-    BaseModel,
-    BelongsToOrgModel,
-    BelongsToRoomModel,
-    HasProtoSelf,
-    UsesOrmID,
-    non_empty_timestamp_to_datetime,
+import corvic.emodel._feature_type as feature_type
+from corvic import transfer
+from corvic.emodel._base_model import (
+    BelongsToOrgModelMixin,
+    BelongsToRoomModelMixin,
+    HasIdOrmBackedModel,
+    NoIdModel,
+    OrgWideStandardModel,
+    OrmBelongsToRoomT,
+    OrmHasIdBelongsToOrgT,
+    OrmHasIdBelongsToRoomT,
+    ProtoBelongsToOrgT,
+    ProtoBelongsToRoomT,
+    ProtoHasIdBelongsToOrgT,
+    ProtoHasIdBelongsToRoomT,
+    StandardModel,
 )
-from corvic.model._completion_model import (
+from corvic.emodel._completion_model import (
     CompletionModel,
     CompletionModelID,
 )
-from corvic.model._feature_view import (
+from corvic.emodel._feature_view import (
     Column,
     DeepGnnCsvUrlMetadata,
     FeatureView,
     FeatureViewEdgeTableMetadata,
     FeatureViewRelationshipsMetadata,
 )
-from corvic.model._pipeline import (
+from corvic.emodel._pipeline import (
     ChunkPdfsPipeline,
     OcrPdfsPipeline,
     Pipeline,
@@ -29,29 +37,22 @@ from corvic.model._pipeline import (
     SpecificPipeline,
     UnknownTransformationPipeline,
 )
-from corvic.model._proto_orm_convert import (
-    UNCOMMITTED_ID_PREFIX,
-    OrmBelongsToOrgObj,
-    OrmBelongsToRoomObj,
-    OrmObj,
-    ProtoBelongsToOrgObj,
-    ProtoBelongsToRoomObj,
-    ProtoObj,
+from corvic.emodel._proto_orm_convert import (
     add_orm_org_mixin_to_session,
     add_orm_room_mixin_to_session,
     space_orm_to_proto,
     timestamp_orm_to_proto,
 )
-from corvic.model._resource import (
+from corvic.emodel._resource import (
     Resource,
     ResourceID,
 )
-from corvic.model._room import (
+from corvic.emodel._room import (
     Room,
     RoomID,
 )
-from corvic.model._source import Source, SourceID
-from corvic.model._space import (
+from corvic.emodel._source import Source, SourceID
+from corvic.emodel._space import (
     ConcatAndEmbedParameters,
     EmbedAndConcatParameters,
     EmbedImageParameters,
@@ -71,11 +72,11 @@ from corvic.model._space import (
 )
 
 FeatureType = feature_type.FeatureType
+OrmIdT = transfer.OrmIdT
 
 __all__ = [
-    "BaseModel",
-    "BelongsToOrgModel",
-    "BelongsToRoomModel",
+    "BelongsToOrgModelMixin",
+    "BelongsToRoomModelMixin",
     "ChunkPdfsPipeline",
     "Column",
     "CompletionModel",
@@ -88,18 +89,22 @@ __all__ = [
     "FeatureView",
     "FeatureViewEdgeTableMetadata",
     "FeatureViewRelationshipsMetadata",
-    "HasProtoSelf",
+    "HasIdOrmBackedModel",
     "ImageSpace",
+    "NoIdModel",
     "Node2VecParameters",
     "OcrPdfsPipeline",
-    "OrmObj",
-    "OrmBelongsToOrgObj",
-    "OrmBelongsToRoomObj",
+    "OrgWideStandardModel",
+    "OrmBelongsToRoomT",
+    "OrmHasIdBelongsToOrgT",
+    "OrmHasIdBelongsToRoomT",
+    "OrmIdT",
     "Pipeline",
     "PipelineID",
-    "ProtoObj",
-    "ProtoBelongsToOrgObj",
-    "ProtoBelongsToRoomObj",
+    "ProtoBelongsToOrgT",
+    "ProtoBelongsToRoomT",
+    "ProtoHasIdBelongsToOrgT",
+    "ProtoHasIdBelongsToRoomT",
     "RelationalSpace",
     "Resource",
     "ResourceID",
@@ -113,11 +118,10 @@ __all__ = [
     "SpecificPipeline",
     "SpecificSpace",
     "SpecificSpaceParameters",
+    "StandardModel",
     "TabularSpace",
-    "UNCOMMITTED_ID_PREFIX",
-    "UnknownTransformationPipeline",
     "UnknownSpace",
-    "UsesOrmID",
+    "UnknownTransformationPipeline",
     "add_orm_org_mixin_to_session",
     "add_orm_room_mixin_to_session",
     "embedding_model_proto_to_name",
@@ -125,7 +129,6 @@ __all__ = [
     "image_model_can_embed_images",
     "image_model_can_embed_text",
     "image_model_proto_to_name",
-    "non_empty_timestamp_to_datetime",
     "space_orm_to_proto",
     "timestamp_orm_to_proto",
 ]

corvic/emodel/_base_model.py

@@ -0,0 +1,161 @@
+import datetime
+from collections.abc import Callable, Iterable
+from typing import Generic
+
+import sqlalchemy as sa
+import sqlalchemy.orm as sa_orm
+
+from corvic import eorm, system, transfer
+from corvic.emodel._proto_orm_convert import (
+    OrmBelongsToRoomT,
+    OrmHasIdBelongsToOrgT,
+    OrmHasIdBelongsToRoomT,
+    ProtoBelongsToOrgT,
+    ProtoBelongsToRoomT,
+    ProtoHasIdBelongsToOrgT,
+    ProtoHasIdBelongsToRoomT,
+)
+from corvic.result import (
+    InvalidArgumentError,
+    NotFoundError,
+    Ok,
+)
+
+
+def _make_room_filter_query_transfrom(
+    room_id: eorm.RoomID | None,
+    existing_transform: Callable[
+        [sa.Select[tuple[transfer.OrmT]]], sa.Select[tuple[transfer.OrmT]]
+    ]
+    | None,
+):
+    def query_transform(
+        query: sa.Select[tuple[transfer.OrmT]],
+    ) -> sa.Select[tuple[transfer.OrmT]]:
+        if room_id:
+            query = query.filter_by(room_id=room_id)
+        if existing_transform:
+            query = existing_transform(query)
+        return query
+
+    if room_id:
+        return query_transform
+    return existing_transform
+
+
+class OrmBackedModel(
+    Generic[transfer.ProtoT, transfer.OrmT],
+    transfer.OrmBackedProto[transfer.ProtoT, transfer.OrmT],
+):
+    @classmethod
+    def list_as_proto(
+        cls,
+        client: system.Client,
+        *,
+        limit: int | None = None,
+        room_id: eorm.RoomID | None = None,
+        created_before: datetime.datetime | None = None,
+        additional_query_transform: Callable[
+            [sa.Select[tuple[transfer.OrmT]]], sa.Select[tuple[transfer.OrmT]]
+        ]
+        | None = None,
+        existing_session: sa_orm.Session | None = None,
+    ) -> Ok[list[transfer.ProtoT]] | NotFoundError | InvalidArgumentError:
+        return super().list_as_proto(
+            client,
+            limit=limit,
+            created_before=created_before,
+            additional_query_transform=_make_room_filter_query_transfrom(
+                room_id, additional_query_transform
+            ),
+            existing_session=existing_session,
+        )
+
+
+class HasIdOrmBackedModel(
+    Generic[transfer.OrmIdT, transfer.ProtoHasIdT, transfer.OrmHasIdT],
+    transfer.HasIdOrmBackedProto[
+        transfer.OrmIdT, transfer.ProtoHasIdT, transfer.OrmHasIdT
+    ],
+):
+    @classmethod
+    def list_as_proto(
+        cls,
+        client: system.Client,
+        *,
+        limit: int | None = None,
+        room_id: eorm.RoomID | None = None,
+        created_before: datetime.datetime | None = None,
+        ids: Iterable[transfer.OrmIdT] | None = None,
+        additional_query_transform: Callable[
+            [sa.Select[tuple[transfer.OrmHasIdT]]], sa.Select[tuple[transfer.OrmHasIdT]]
+        ]
+        | None = None,
+        existing_session: sa_orm.Session | None = None,
+    ) -> Ok[list[transfer.ProtoHasIdT]] | NotFoundError | InvalidArgumentError:
+        return super().list_as_proto(
+            client,
+            limit=limit,
+            created_before=created_before,
+            ids=ids,
+            additional_query_transform=_make_room_filter_query_transfrom(
+                room_id, additional_query_transform
+            ),
+            existing_session=existing_session,
+        )
+
+
+class BelongsToOrgModelMixin(
+    Generic[ProtoBelongsToOrgT], transfer.HasProtoSelf[ProtoBelongsToOrgT]
+):
+    """Base for orm wrappers with org mixin providing a unified update mechanism."""
+
+    @property
+    def org_id(self) -> eorm.OrgID:
+        return eorm.OrgID().from_str(self.proto_self.org_id)
+
+
+class BelongsToRoomModelMixin(
+    Generic[ProtoBelongsToRoomT], transfer.HasProtoSelf[ProtoBelongsToRoomT]
+):
+    """Base for orm wrappers with room mixin providing a unified update mechanism."""
+
+    @property
+    def room_id(self) -> eorm.RoomID:
+        return eorm.RoomID().from_str(self.proto_self.room_id)
+
+
+class OrgWideStandardModel(
+    Generic[transfer.OrmIdT, ProtoHasIdBelongsToOrgT, OrmHasIdBelongsToOrgT],
+    BelongsToOrgModelMixin[ProtoHasIdBelongsToOrgT],
+    HasIdOrmBackedModel[
+        transfer.OrmIdT, ProtoHasIdBelongsToOrgT, OrmHasIdBelongsToOrgT
+    ],
+):
+    """Base for most models, though the lion's share are StandardModels.
+
+    Most models are typically referenced by an ID, and belong to an org.
+    """
+
+
+class StandardModel(
+    Generic[transfer.OrmIdT, ProtoHasIdBelongsToRoomT, OrmHasIdBelongsToRoomT],
+    BelongsToRoomModelMixin[ProtoHasIdBelongsToRoomT],
+    OrgWideStandardModel[
+        transfer.OrmIdT, ProtoHasIdBelongsToRoomT, OrmHasIdBelongsToRoomT
+    ],
+):
+    """Base for most models.
+
+    Like OrgWideStandardModel, but more specific. The majority of models belong to a
+    room.
+    """
+
+
+class NoIdModel(
+    Generic[ProtoBelongsToRoomT, OrmBelongsToRoomT],
+    BelongsToRoomModelMixin[ProtoBelongsToRoomT],
+    BelongsToOrgModelMixin[ProtoBelongsToRoomT],
+    transfer.OrmBackedProto[ProtoBelongsToRoomT, OrmBelongsToRoomT],
+):
+    """Like StandardModel, but for objects that are not usually referenced by ID."""

corvic/{model → emodel}/_completion_model.py

@@ -9,10 +9,10 @@ from typing import Literal, TypeAlias
 
 from sqlalchemy import orm as sa_orm
 
-from corvic import eorm, system
-from corvic.model._base_model import BelongsToOrgModel, non_empty_timestamp_to_datetime
-from corvic.model._defaults import Defaults
-from corvic.model._proto_orm_convert import (
+from corvic import eorm, system, transfer
+from corvic.emodel._base_model import OrgWideStandardModel
+from corvic.emodel._defaults import Defaults
+from corvic.emodel._proto_orm_convert import (
     completion_model_delete_orms,
     completion_model_orm_to_proto,
     completion_model_proto_to_orm,
@@ -26,9 +26,9 @@ OrgID: TypeAlias = eorm.OrgID
 
 
 class CompletionModel(
-    BelongsToOrgModel[
+    OrgWideStandardModel[
         CompletionModelID, models_pb2.CompletionModel, eorm.CompletionModel
-    ]
+    ],
 ):
     """Completion Models."""
 
@@ -112,11 +112,13 @@ class CompletionModel(
 
     @property
     def last_validation_time(self) -> datetime.datetime | None:
-        return non_empty_timestamp_to_datetime(self.proto_self.last_validation_time)
+        return transfer.non_empty_timestamp_to_datetime(
+            self.proto_self.last_validation_time
+        )
 
     @property
     def last_successful_validation(self) -> datetime.datetime | None:
-        return non_empty_timestamp_to_datetime(
+        return transfer.non_empty_timestamp_to_datetime(
             self.proto_self.last_successful_validation
         )
 

corvic/{model → emodel}/_feature_type.py

@@ -1,4 +1,4 @@
-import corvic.model._source as source
+import corvic.emodel._source as source
 from corvic.op_graph import feature_type
 
 # types

corvic/{model → emodel}/_feature_view.py

@@ -16,15 +16,15 @@ from more_itertools import flatten
 from sqlalchemy import orm as sa_orm
 from sqlalchemy.orm.interfaces import LoaderOption
 
-from corvic import eorm, op_graph, system
-from corvic.model._base_model import BelongsToRoomModel, UsesOrmID
-from corvic.model._defaults import Defaults
-from corvic.model._proto_orm_convert import (
+from corvic import eorm, op_graph, system, transfer
+from corvic.emodel._base_model import StandardModel
+from corvic.emodel._defaults import Defaults
+from corvic.emodel._proto_orm_convert import (
     feature_view_delete_orms,
     feature_view_orm_to_proto,
     feature_view_proto_to_orm,
 )
-from corvic.model._source import Source, SourceID
+from corvic.emodel._source import Source, SourceID
 from corvic.result import InvalidArgumentError, NotFoundError, Ok
 from corvic.table import (
     DataclassAsTypedMetadataMixin,
@@ -539,7 +539,9 @@ class RelationshipPath:
         return f"end-{uuid.uuid4()}"
 
 
-class FeatureViewSource(UsesOrmID[FeatureViewSourceID, models_pb2.FeatureViewSource]):
+class FeatureViewSource(
+    transfer.UsesOrmID[FeatureViewSourceID, models_pb2.FeatureViewSource]
+):
     """A table from a source with some extra operations defined by a feature view."""
 
     @classmethod
@@ -642,7 +644,7 @@ class DeepGnnCsvUrlMetadata(DataclassAsTypedMetadataMixin):
 
 
 class FeatureView(
-    BelongsToRoomModel[FeatureViewID, models_pb2.FeatureView, eorm.FeatureView]
+    StandardModel[FeatureViewID, models_pb2.FeatureView, eorm.FeatureView]
 ):
     """FeatureViews describe how Sources should be modeled to create a feature space.
 

corvic/{model → emodel}/_pipeline.py

@@ -14,14 +14,14 @@ from sqlalchemy.orm.interfaces import LoaderOption
 
 import corvic.table
 from corvic import eorm, op_graph, system
-from corvic.model._base_model import BelongsToRoomModel
-from corvic.model._defaults import Defaults
-from corvic.model._proto_orm_convert import (
+from corvic.emodel._base_model import StandardModel
+from corvic.emodel._defaults import Defaults
+from corvic.emodel._proto_orm_convert import (
     pipeline_delete_orms,
     pipeline_orm_to_proto,
     pipeline_proto_to_orm,
 )
-from corvic.model._source import Source
+from corvic.emodel._source import Source
 from corvic.result import InvalidArgumentError, NotFoundError, Ok, UnavailableError
 from corvic_generated.model.v1alpha import models_pb2
 from corvic_generated.orm.v1 import pipeline_pb2
@@ -30,7 +30,7 @@ PipelineID: TypeAlias = eorm.PipelineID
 RoomID: TypeAlias = eorm.RoomID
 
 
-class Pipeline(BelongsToRoomModel[PipelineID, models_pb2.Pipeline, eorm.Pipeline]):
+class Pipeline(StandardModel[PipelineID, models_pb2.Pipeline, eorm.Pipeline]):
     """Pipelines map resources to sources."""
 
     @classmethod

corvic/{model → emodel}/_proto_orm_convert.py

@@ -6,22 +6,13 @@ import sqlalchemy as sa
 import sqlalchemy.orm as sa_orm
 from google.protobuf import timestamp_pb2
 
-from corvic import eorm, orm
+from corvic import eorm, orm, transfer
 from corvic.result import InternalError, InvalidArgumentError, Ok
 from corvic_generated.model.v1alpha import models_pb2
 from corvic_generated.orm.v1 import feature_view_pb2
 
-UNCOMMITTED_ID_PREFIX = "__uncommitted_object-"
 
-IdType = TypeVar("IdType", bound=orm.BaseID[Any])
-
-
-class _ModelProto(Protocol):
-    id: str
-    created_at: timestamp_pb2.Timestamp
-
-
-class _ModelBelongsToOrgProto(_ModelProto, Protocol):
+class _ModelBelongsToOrgProto(transfer.ProtoModel, Protocol):
     org_id: str
 
 
@@ -29,33 +20,56 @@ class _ModelBelongsToRoomProto(_ModelBelongsToOrgProto, Protocol):
     room_id: str
 
 
-ProtoObj = TypeVar("ProtoObj", bound=_ModelProto)
-ProtoBelongsToOrgObj = TypeVar("ProtoBelongsToOrgObj", bound=_ModelBelongsToOrgProto)
-ProtoBelongsToRoomObj = TypeVar("ProtoBelongsToRoomObj", bound=_ModelBelongsToRoomProto)
+class _ModelHasIdBelongsToOrgProto(
+    transfer.ProtoHasIdModel, _ModelBelongsToOrgProto, Protocol
+):
+    pass
 
 
-class _OrmModel(Protocol[IdType]):
-    id: sa_orm.Mapped[IdType | None]
+class _ModelHasIdBelongsToRoomProto(
+    transfer.ProtoHasIdModel, _ModelBelongsToRoomProto, Protocol
+):
+    pass
 
-    @sa.ext.hybrid.hybrid_property
-    def created_at(self) -> datetime.datetime | None: ...
 
-    @created_at.inplace.expression
-    @classmethod
-    def _created_at_expression(cls): ...
+ProtoBelongsToOrgT = TypeVar("ProtoBelongsToOrgT", bound=_ModelBelongsToOrgProto)
+ProtoBelongsToRoomT = TypeVar("ProtoBelongsToRoomT", bound=_ModelBelongsToRoomProto)
+ProtoHasIdBelongsToOrgT = TypeVar(
+    "ProtoHasIdBelongsToOrgT", bound=_ModelHasIdBelongsToOrgProto
+)
+ProtoHasIdBelongsToRoomT = TypeVar(
+    "ProtoHasIdBelongsToRoomT", bound=_ModelHasIdBelongsToRoomProto
+)
 
 
-class _OrmBelongsToOrgModel(_OrmModel[IdType], Protocol):
+class _OrmBelongsToOrgModel(transfer.OrmModel, Protocol):
     org_id: sa_orm.Mapped[eorm.OrgID | None]
 
 
-class _OrmBelongsToRoomModel(_OrmBelongsToOrgModel[IdType], Protocol):
+class _OrmBelongsToRoomModel(_OrmBelongsToOrgModel, Protocol):
     room_id: sa_orm.Mapped[eorm.RoomID | None]
 
 
-OrmObj = TypeVar("OrmObj", bound=_OrmModel[Any])
-OrmBelongsToOrgObj = TypeVar("OrmBelongsToOrgObj", bound=_OrmBelongsToOrgModel[Any])
-OrmBelongsToRoomObj = TypeVar("OrmBelongsToRoomObj", bound=_OrmBelongsToRoomModel[Any])
+class _OrmHasIdBelongsToOrgModel(
+    transfer.OrmHasIdModel[transfer.OrmIdT], _OrmBelongsToOrgModel, Protocol
+):
+    pass
+
+
+class _OrmHasIdBelongsToRoomModel(
+    _OrmHasIdBelongsToOrgModel[transfer.OrmIdT], _OrmBelongsToRoomModel, Protocol
+):
+    pass
+
+
+OrmBelongsToOrgT = TypeVar("OrmBelongsToOrgT", bound=_OrmBelongsToOrgModel)
+OrmBelongsToRoomT = TypeVar("OrmBelongsToRoomT", bound=_OrmBelongsToRoomModel)
+OrmHasIdBelongsToOrgT = TypeVar(
+    "OrmHasIdBelongsToOrgT", bound=_OrmHasIdBelongsToOrgModel[Any]
+)
+OrmHasIdBelongsToRoomT = TypeVar(
+    "OrmHasIdBelongsToRoomT", bound=_OrmHasIdBelongsToRoomModel[Any]
+)
 
 
 def _orm_id_to_str(id: eorm.ID | None):
@@ -64,19 +78,6 @@ def _orm_id_to_str(id: eorm.ID | None):
     return ""
 
 
-def _translate_orm_id(
-    obj_id: str, id_class: type[IdType]
-) -> Ok[IdType | None] | orm.InvalidORMIdentifierError:
-    if obj_id.startswith(UNCOMMITTED_ID_PREFIX):
-        return Ok(None)
-    parsed_obj_id = id_class(obj_id)
-    match parsed_obj_id.to_db():
-        case orm.InvalidORMIdentifierError() as err:
-            return err
-        case Ok():
-            return Ok(parsed_obj_id)
-
-
 def timestamp_orm_to_proto(
     timestamp_orm: datetime.datetime | None,
 ) -> timestamp_pb2.Timestamp | None:
@@ -227,12 +228,12 @@ def completion_model_orm_to_proto(
 
 
 def add_orm_org_mixin_to_session(
-    orm_obj: OrmBelongsToOrgObj,
-    proto_obj: _ModelBelongsToOrgProto,
-    id_class: type[IdType],
+    orm_obj: OrmHasIdBelongsToOrgT,
+    proto_obj: _ModelHasIdBelongsToOrgProto,
+    id_class: type[transfer.OrmIdT],
     session: sa_orm.Session,
-) -> Ok[OrmBelongsToOrgObj] | orm.InvalidORMIdentifierError:
-    match _translate_orm_id(proto_obj.id, id_class):
+) -> Ok[OrmHasIdBelongsToOrgT] | orm.InvalidORMIdentifierError:
+    match transfer.translate_orm_id(proto_obj.id, id_class):
         case Ok(orm_id):
             orm_obj.id = orm_id
         case orm.InvalidORMIdentifierError() as err:
@@ -253,11 +254,11 @@ def add_orm_org_mixin_to_session(
 
 
 def add_orm_room_mixin_to_session(
-    orm_obj: OrmBelongsToRoomObj,
-    proto_obj: _ModelBelongsToRoomProto,
-    id_class: type[IdType],
+    orm_obj: OrmHasIdBelongsToRoomT,
+    proto_obj: _ModelHasIdBelongsToRoomProto,
+    id_class: type[transfer.OrmIdT],
     session: sa_orm.Session,
-) -> Ok[OrmBelongsToRoomObj] | orm.InvalidORMIdentifierError:
+) -> Ok[OrmHasIdBelongsToRoomT] | orm.InvalidORMIdentifierError:
     room_id = eorm.RoomID(proto_obj.room_id)
     match room_id.to_db():
         case Ok():
@@ -272,7 +273,7 @@ def _resource_pipeline_to_orm(
     proto_obj: models_pb2.Resource, orm_obj: eorm.Resource, session: sa_orm.Session
 ) -> Ok[None] | InvalidArgumentError:
     if proto_obj.pipeline_id:
-        match _translate_orm_id(proto_obj.pipeline_id, eorm.PipelineID):
+        match transfer.translate_orm_id(proto_obj.pipeline_id, eorm.PipelineID):
             case orm.InvalidORMIdentifierError() as err:
                 return err
             case Ok(pipeline_id):
@@ -318,14 +319,15 @@ def resource_proto_to_orm(
 
 
 def _ensure_id(
-    proto_obj: ProtoObj,
+    proto_obj: transfer.ProtoHasIdT,
     proto_to_orm: Callable[
-        [ProtoObj, sa_orm.Session], Ok[OrmObj] | InvalidArgumentError
+        [transfer.ProtoHasIdT, sa_orm.Session],
+        Ok[transfer.OrmHasIdT] | InvalidArgumentError,
     ],
-    id_type: type[IdType],
+    id_type: type[transfer.OrmIdT],
     session: sa_orm.Session,
-) -> Ok[IdType] | orm.InvalidORMIdentifierError | InvalidArgumentError:
-    match _translate_orm_id(proto_obj.id, id_type):
+) -> Ok[transfer.OrmIdT] | orm.InvalidORMIdentifierError | InvalidArgumentError:
+    match transfer.translate_orm_id(proto_obj.id, id_type):
         case orm.InvalidORMIdentifierError() as err:
             return err
         case Ok(orm_id):

corvic/{model → emodel}/_resource.py

@@ -14,9 +14,9 @@ from sqlalchemy import orm as sa_orm
 from sqlalchemy.orm.interfaces import LoaderOption
 
 from corvic import eorm, system
-from corvic.model._base_model import BelongsToRoomModel
-from corvic.model._defaults import Defaults
-from corvic.model._proto_orm_convert import (
+from corvic.emodel._base_model import StandardModel
+from corvic.emodel._defaults import Defaults
+from corvic.emodel._proto_orm_convert import (
     resource_delete_orms,
     resource_orm_to_proto,
     resource_proto_to_orm,
@@ -31,7 +31,7 @@ RoomID: TypeAlias = eorm.RoomID
 PipelineID: TypeAlias = eorm.PipelineID
 
 
-class Resource(BelongsToRoomModel[ResourceID, models_pb2.Resource, eorm.Resource]):
+class Resource(StandardModel[ResourceID, models_pb2.Resource, eorm.Resource]):
     """Resources represent import data."""
 
     @classmethod

corvic/{model → emodel}/_room.py

@@ -6,9 +6,9 @@ from collections.abc import Sequence
 from typing import TypeAlias
 
 from corvic import eorm, system
-from corvic.model._base_model import BelongsToOrgModel
-from corvic.model._defaults import Defaults
-from corvic.model._proto_orm_convert import (
+from corvic.emodel._base_model import OrgWideStandardModel
+from corvic.emodel._defaults import Defaults
+from corvic.emodel._proto_orm_convert import (
     room_delete_orms,
     room_orm_to_proto,
     room_proto_to_orm,
@@ -21,7 +21,7 @@ RoomID: TypeAlias = eorm.RoomID
 FeatureViewID: TypeAlias = eorm.FeatureViewID
 
 
-class Room(BelongsToOrgModel[RoomID, models_pb2.Room, eorm.Room]):
+class Room(OrgWideStandardModel[RoomID, models_pb2.Room, eorm.Room]):
     """Rooms contain conversations and tables."""
 
     @classmethod