corvic-engine 0.3.0rc76__cp38-abi3-win_amd64.whl → 0.3.0rc78__cp38-abi3-win_amd64.whl

corvic/model/_proto_orm_convert.py

@@ -6,14 +6,14 @@ import sqlalchemy as sa
 import sqlalchemy.orm as sa_orm
 from google.protobuf import timestamp_pb2
 
-from corvic import orm
+from corvic import eorm, orm
 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-"
 
-ID = TypeVar("ID", bound=orm.BaseID[Any])
+IdType = TypeVar("IdType", bound=orm.BaseID[Any])
 
 
 class _ModelProto(Protocol):
@@ -34,8 +34,8 @@ ProtoBelongsToOrgObj = TypeVar("ProtoBelongsToOrgObj", bound=_ModelBelongsToOrgP
 ProtoBelongsToRoomObj = TypeVar("ProtoBelongsToRoomObj", bound=_ModelBelongsToRoomProto)
 
 
-class _OrmModel(Protocol[ID]):
-    id: sa_orm.Mapped[ID | None]
+class _OrmModel(Protocol[IdType]):
+    id: sa_orm.Mapped[IdType | None]
 
     @sa.ext.hybrid.hybrid_property
     def created_at(self) -> datetime.datetime | None: ...
@@ -45,12 +45,12 @@ class _OrmModel(Protocol[ID]):
     def _created_at_expression(cls): ...
 
 
-class _OrmBelongsToOrgModel(_OrmModel[ID], Protocol):
-    org_id: sa_orm.Mapped[orm.OrgID | None]
+class _OrmBelongsToOrgModel(_OrmModel[IdType], Protocol):
+    org_id: sa_orm.Mapped[eorm.OrgID | None]
 
 
-class _OrmBelongsToRoomModel(_OrmBelongsToOrgModel[ID], Protocol):
-    room_id: sa_orm.Mapped[orm.RoomID | None]
+class _OrmBelongsToRoomModel(_OrmBelongsToOrgModel[IdType], Protocol):
+    room_id: sa_orm.Mapped[eorm.RoomID | None]
 
 
 OrmObj = TypeVar("OrmObj", bound=_OrmModel[Any])
@@ -58,15 +58,15 @@ OrmBelongsToOrgObj = TypeVar("OrmBelongsToOrgObj", bound=_OrmBelongsToOrgModel[A
 OrmBelongsToRoomObj = TypeVar("OrmBelongsToRoomObj", bound=_OrmBelongsToRoomModel[Any])
 
 
-def _orm_id_to_str(id: orm.ID | None):
+def _orm_id_to_str(id: eorm.ID | None):
     if id:
         return str(id)
     return ""
 
 
 def _translate_orm_id(
-    obj_id: str, id_class: type[ID]
-) -> Ok[ID | None] | orm.InvalidORMIdentifierError:
+    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)
@@ -88,7 +88,7 @@ def timestamp_orm_to_proto(
     return timestamp_proto
 
 
-def resource_orm_to_proto(resource_orm: orm.Resource) -> models_pb2.Resource:
+def resource_orm_to_proto(resource_orm: eorm.Resource) -> models_pb2.Resource:
     pipeline_input_name = ""
     pipeline_id = ""
     if resource_orm.pipeline_ref:
@@ -113,7 +113,7 @@ def resource_orm_to_proto(resource_orm: orm.Resource) -> models_pb2.Resource:
     )
 
 
-def source_orm_to_proto(source_orm: orm.Source) -> models_pb2.Source:
+def source_orm_to_proto(source_orm: eorm.Source) -> models_pb2.Source:
     return models_pb2.Source(
         id=_orm_id_to_str(source_orm.id),
         name=source_orm.name,
@@ -128,7 +128,7 @@ def source_orm_to_proto(source_orm: orm.Source) -> models_pb2.Source:
 
 
 def feature_view_source_orm_to_proto(
-    feature_view_source_orm: orm.FeatureViewSource,
+    feature_view_source_orm: eorm.FeatureViewSource,
 ) -> models_pb2.FeatureViewSource:
     if feature_view_source_orm.table_op_graph.WhichOneof("op") is not None:
         op = feature_view_source_orm.table_op_graph
@@ -148,7 +148,7 @@ def feature_view_source_orm_to_proto(
 
 
 def feature_view_orm_to_proto(
-    feature_view_orm: orm.FeatureView,
+    feature_view_orm: eorm.FeatureView,
 ) -> models_pb2.FeatureView:
     return models_pb2.FeatureView(
         id=_orm_id_to_str(feature_view_orm.id),
@@ -166,7 +166,7 @@ def feature_view_orm_to_proto(
 
 
 def pipeline_orm_to_proto(
-    pipeline_orm: orm.Pipeline,
+    pipeline_orm: eorm.Pipeline,
 ) -> models_pb2.Pipeline:
     return models_pb2.Pipeline(
         id=_orm_id_to_str(pipeline_orm.id),
@@ -183,7 +183,7 @@ def pipeline_orm_to_proto(
     )
 
 
-def space_orm_to_proto(space_orm: orm.Space) -> models_pb2.Space:
+def space_orm_to_proto(space_orm: eorm.Space) -> models_pb2.Space:
     return models_pb2.Space(
         id=_orm_id_to_str(space_orm.id),
         name=space_orm.name,
@@ -197,7 +197,7 @@ def space_orm_to_proto(space_orm: orm.Space) -> models_pb2.Space:
     )
 
 
-def room_orm_to_proto(room_orm: orm.Room) -> models_pb2.Room:
+def room_orm_to_proto(room_orm: eorm.Room) -> models_pb2.Room:
     return models_pb2.Room(
         id=_orm_id_to_str(room_orm.id),
         name=room_orm.name,
@@ -207,7 +207,7 @@ def room_orm_to_proto(room_orm: orm.Room) -> models_pb2.Room:
 
 
 def completion_model_orm_to_proto(
-    completion_model_orm: orm.CompletionModel,
+    completion_model_orm: eorm.CompletionModel,
 ) -> models_pb2.CompletionModel:
     return models_pb2.CompletionModel(
         id=_orm_id_to_str(completion_model_orm.id),
@@ -229,7 +229,7 @@ def completion_model_orm_to_proto(
 def add_orm_org_mixin_to_session(
     orm_obj: OrmBelongsToOrgObj,
     proto_obj: _ModelBelongsToOrgProto,
-    id_class: type[ID],
+    id_class: type[IdType],
     session: sa_orm.Session,
 ) -> Ok[OrmBelongsToOrgObj] | orm.InvalidORMIdentifierError:
     match _translate_orm_id(proto_obj.id, id_class):
@@ -238,7 +238,7 @@ def add_orm_org_mixin_to_session(
         case orm.InvalidORMIdentifierError() as err:
             return err
     if proto_obj.org_id:
-        org_id = orm.OrgID(proto_obj.org_id)
+        org_id = eorm.OrgID(proto_obj.org_id)
         match org_id.to_db():
             case Ok():
                 orm_obj.org_id = org_id
@@ -255,24 +255,24 @@ def add_orm_org_mixin_to_session(
 def add_orm_room_mixin_to_session(
     orm_obj: OrmBelongsToRoomObj,
     proto_obj: _ModelBelongsToRoomProto,
-    id_class: type[ID],
+    id_class: type[IdType],
     session: sa_orm.Session,
 ) -> Ok[OrmBelongsToRoomObj] | orm.InvalidORMIdentifierError:
-    room_id = orm.RoomID(proto_obj.room_id)
+    room_id = eorm.RoomID(proto_obj.room_id)
     match room_id.to_db():
         case Ok():
             pass
         case orm.InvalidORMIdentifierError() as err:
             return err
-    orm_obj.room_id = orm.RoomID(proto_obj.room_id)
+    orm_obj.room_id = eorm.RoomID(proto_obj.room_id)
     return add_orm_org_mixin_to_session(orm_obj, proto_obj, id_class, session)
 
 
 def _resource_pipeline_to_orm(
-    proto_obj: models_pb2.Resource, orm_obj: orm.Resource, session: sa_orm.Session
+    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, orm.PipelineID):
+        match _translate_orm_id(proto_obj.pipeline_id, eorm.PipelineID):
             case orm.InvalidORMIdentifierError() as err:
                 return err
             case Ok(pipeline_id):
@@ -282,7 +282,7 @@ def _resource_pipeline_to_orm(
         session.flush()
         if not orm_obj.id:
             raise InternalError("internal assertion did not hold")
-        pipeline_input = orm.PipelineInput(
+        pipeline_input = eorm.PipelineInput(
             resource_id=orm_obj.id,
             name=proto_obj.pipeline_input_name,
             pipeline_id=pipeline_id,
@@ -296,8 +296,8 @@ def _resource_pipeline_to_orm(
 
 def resource_proto_to_orm(
     proto_obj: models_pb2.Resource, session: sa_orm.Session
-) -> Ok[orm.Resource] | InvalidArgumentError:
-    orm_obj = orm.Resource(
+) -> Ok[eorm.Resource] | InvalidArgumentError:
+    orm_obj = eorm.Resource(
         name=proto_obj.name,
         description=proto_obj.description,
         mime_type=proto_obj.mime_type,
@@ -308,7 +308,7 @@ def resource_proto_to_orm(
         latest_event=proto_obj.recent_events[-1] if proto_obj.recent_events else None,
         is_terminal=proto_obj.is_terminal,
     )
-    add_orm_room_mixin_to_session(orm_obj, proto_obj, orm.ResourceID, session)
+    add_orm_room_mixin_to_session(orm_obj, proto_obj, eorm.ResourceID, session)
 
     match _resource_pipeline_to_orm(proto_obj, orm_obj, session):
         case Ok(None):
@@ -322,9 +322,9 @@ def _ensure_id(
     proto_to_orm: Callable[
         [ProtoObj, sa_orm.Session], Ok[OrmObj] | InvalidArgumentError
     ],
-    id_type: type[ID],
+    id_type: type[IdType],
     session: sa_orm.Session,
-) -> Ok[ID] | orm.InvalidORMIdentifierError | InvalidArgumentError:
+) -> Ok[IdType] | orm.InvalidORMIdentifierError | InvalidArgumentError:
     match _translate_orm_id(proto_obj.id, id_type):
         case orm.InvalidORMIdentifierError() as err:
             return err
@@ -343,15 +343,15 @@ def _ensure_id(
 
 def pipeline_proto_to_orm(  # noqa: C901
     proto_obj: models_pb2.Pipeline, session: sa_orm.Session
-) -> Ok[orm.Pipeline] | orm.InvalidORMIdentifierError | InvalidArgumentError:
-    orm_obj = orm.Pipeline(
+) -> Ok[eorm.Pipeline] | orm.InvalidORMIdentifierError | InvalidArgumentError:
+    orm_obj = eorm.Pipeline(
         name=proto_obj.name,
         transformation=proto_obj.pipeline_transformation,
         description=proto_obj.description,
     )
     if proto_obj.org_id:
-        orm_obj.org_id = orm.OrgID(proto_obj.org_id)
-    match add_orm_room_mixin_to_session(orm_obj, proto_obj, orm.PipelineID, session):
+        orm_obj.org_id = eorm.OrgID(proto_obj.org_id)
+    match add_orm_room_mixin_to_session(orm_obj, proto_obj, eorm.PipelineID, session):
         case Ok(orm_obj):
             pass
         case orm.InvalidORMIdentifierError() as err:
@@ -361,15 +361,15 @@ def pipeline_proto_to_orm(  # noqa: C901
     if not orm_obj.id:
         raise InternalError("internal assertion did not hold")
 
-    outputs = list[orm.PipelineOutput]()
+    outputs = list[eorm.PipelineOutput]()
     for name, val in proto_obj.source_outputs.items():
-        match _ensure_id(val, source_proto_to_orm, orm.SourceID, session):
+        match _ensure_id(val, source_proto_to_orm, eorm.SourceID, session):
             case orm.InvalidORMIdentifierError() | InvalidArgumentError() as err:
                 return err
             case Ok(source_id):
                 pass
         outputs.append(
-            orm.PipelineOutput(
+            eorm.PipelineOutput(
                 source_id=source_id,
                 name=name,
                 pipeline_id=orm_obj.id,
@@ -388,19 +388,19 @@ def pipeline_proto_to_orm(  # noqa: C901
 
 def source_proto_to_orm(
     proto_obj: models_pb2.Source, session: sa_orm.Session
-) -> Ok[orm.Source] | orm.InvalidORMIdentifierError | InvalidArgumentError:
-    orm_obj = orm.Source(
+) -> Ok[eorm.Source] | orm.InvalidORMIdentifierError | InvalidArgumentError:
+    orm_obj = eorm.Source(
         name=proto_obj.name,
         table_op_graph=proto_obj.table_op_graph,
     )
-    return add_orm_room_mixin_to_session(orm_obj, proto_obj, orm.SourceID, session)
+    return add_orm_room_mixin_to_session(orm_obj, proto_obj, eorm.SourceID, session)
 
 
 def space_proto_to_orm(
     proto_obj: models_pb2.Space, session: sa_orm.Session
-) -> Ok[orm.Space] | orm.InvalidORMIdentifierError | InvalidArgumentError:
+) -> Ok[eorm.Space] | orm.InvalidORMIdentifierError | InvalidArgumentError:
     match _ensure_id(
-        proto_obj.feature_view, feature_view_proto_to_orm, orm.FeatureViewID, session
+        proto_obj.feature_view, feature_view_proto_to_orm, eorm.FeatureViewID, session
     ):
         case orm.InvalidORMIdentifierError() | InvalidArgumentError() as err:
             return err
@@ -410,26 +410,28 @@ def space_proto_to_orm(
     if not feature_view_id:
         raise InternalError("internal assertion did not hold")
 
-    orm_obj = orm.Space(
+    orm_obj = eorm.Space(
         name=proto_obj.name,
         description=proto_obj.description,
         feature_view_id=feature_view_id,
         parameters=proto_obj.space_parameters,
         auto_sync=proto_obj.auto_sync,
     )
-    return add_orm_room_mixin_to_session(orm_obj, proto_obj, orm.SpaceID, session)
+    return add_orm_room_mixin_to_session(orm_obj, proto_obj, eorm.SpaceID, session)
 
 
 def feature_view_proto_to_orm(
     proto_obj: models_pb2.FeatureView, session: sa_orm.Session
-) -> Ok[orm.FeatureView] | orm.InvalidORMIdentifierError | InvalidArgumentError:
-    orm_obj = orm.FeatureView(
+) -> Ok[eorm.FeatureView] | orm.InvalidORMIdentifierError | InvalidArgumentError:
+    orm_obj = eorm.FeatureView(
         name=proto_obj.name,
         description=proto_obj.description,
     )
     if proto_obj.org_id:
-        orm_obj.org_id = orm.OrgID(proto_obj.org_id)
-    match add_orm_room_mixin_to_session(orm_obj, proto_obj, orm.FeatureViewID, session):
+        orm_obj.org_id = eorm.OrgID(proto_obj.org_id)
+    match add_orm_room_mixin_to_session(
+        orm_obj, proto_obj, eorm.FeatureViewID, session
+    ):
         case Ok(orm_obj):
             pass
         case orm.InvalidORMIdentifierError() as err:
@@ -439,7 +441,7 @@ def feature_view_proto_to_orm(
     if not orm_obj.id or not orm_obj.room_id:
         raise InternalError("internal assertion did not hold")
 
-    new_fv_sources = list[orm.FeatureViewSource]()
+    new_fv_sources = list[eorm.FeatureViewSource]()
     for fvs in proto_obj.feature_view_sources:
         match _feature_view_source_proto_to_orm(
             fvs, orm_obj.room_id, orm_obj.id, session
@@ -487,39 +489,39 @@ def feature_view_proto_to_orm(
 
 def _feature_view_source_proto_to_orm(
     proto_obj: models_pb2.FeatureViewSource,
-    room_id: orm.RoomID,
-    feature_view_id: orm.FeatureViewID,
+    room_id: eorm.RoomID,
+    feature_view_id: eorm.FeatureViewID,
     session: sa_orm.Session,
-) -> Ok[orm.FeatureViewSource] | orm.InvalidORMIdentifierError | InvalidArgumentError:
-    match _ensure_id(proto_obj.source, source_proto_to_orm, orm.SourceID, session):
+) -> Ok[eorm.FeatureViewSource] | orm.InvalidORMIdentifierError | InvalidArgumentError:
+    match _ensure_id(proto_obj.source, source_proto_to_orm, eorm.SourceID, session):
         case orm.InvalidORMIdentifierError() | InvalidArgumentError() as err:
             return err
         case Ok(source_id):
             pass
 
     proto_obj.room_id = proto_obj.room_id or str(room_id)
-    orm_obj = orm.FeatureViewSource(
+    orm_obj = eorm.FeatureViewSource(
         table_op_graph=proto_obj.table_op_graph,
         drop_disconnected=proto_obj.drop_disconnected,
         source_id=source_id,
         feature_view_id=feature_view_id,
     )
     return add_orm_room_mixin_to_session(
-        orm_obj, proto_obj, orm.FeatureViewSourceID, session
+        orm_obj, proto_obj, eorm.FeatureViewSourceID, session
     )
 
 
 def room_proto_to_orm(
     proto_obj: models_pb2.Room, session: sa_orm.Session
-) -> Ok[orm.Room] | orm.InvalidORMIdentifierError | InvalidArgumentError:
-    orm_obj = orm.Room(name=proto_obj.name)
-    return add_orm_org_mixin_to_session(orm_obj, proto_obj, orm.RoomID, session)
+) -> Ok[eorm.Room] | orm.InvalidORMIdentifierError | InvalidArgumentError:
+    orm_obj = eorm.Room(name=proto_obj.name)
+    return add_orm_org_mixin_to_session(orm_obj, proto_obj, eorm.RoomID, session)
 
 
 def completion_model_proto_to_orm(
     proto_obj: models_pb2.CompletionModel, session: sa_orm.Session
-) -> Ok[orm.CompletionModel] | InvalidArgumentError:
-    orm_obj = orm.CompletionModel(
+) -> Ok[eorm.CompletionModel] | InvalidArgumentError:
+    orm_obj = eorm.CompletionModel(
         name=proto_obj.name,
         description=proto_obj.description,
         parameters=proto_obj.parameters,
@@ -528,18 +530,18 @@ def completion_model_proto_to_orm(
         last_successful_validation=proto_obj.last_successful_validation.ToDatetime(),
     )
     return add_orm_org_mixin_to_session(
-        orm_obj, proto_obj, orm.CompletionModelID, session
+        orm_obj, proto_obj, eorm.CompletionModelID, session
     )
 
 
 def source_delete_orms(
-    orm_ids: Sequence[orm.SourceID],
+    orm_ids: Sequence[eorm.SourceID],
     session: sa_orm.Session,
 ) -> Ok[None] | InvalidArgumentError:
     feat_view_refs = list(
         session.scalars(
-            sa.select(orm.FeatureViewSource.id)
-            .where(orm.FeatureViewSource.source_id.in_(orm_ids))
+            sa.select(eorm.FeatureViewSource.id)
+            .where(eorm.FeatureViewSource.source_id.in_(orm_ids))
             .limit(1)
         )
     )
@@ -548,20 +550,20 @@ def source_delete_orms(
         return InvalidArgumentError(
             "cannot delete a source that still has feature views"
         )
-    session.execute(sa.delete(orm.Source).where(orm.Source.id.in_(orm_ids)))
+    session.execute(sa.delete(eorm.Source).where(eorm.Source.id.in_(orm_ids)))
     return Ok(None)
 
 
 def pipeline_delete_orms(
-    ids: Sequence[orm.PipelineID], session: sa_orm.Session
+    ids: Sequence[eorm.PipelineID], session: sa_orm.Session
 ) -> Ok[None] | InvalidArgumentError:
     source_ids = [
         val[0]
         for val in session.execute(
-            sa.select(orm.Source.id).where(
-                orm.Source.id.in_(
-                    sa.select(orm.PipelineOutput.source_id).where(
-                        orm.PipelineOutput.pipeline_id.in_(ids)
+            sa.select(eorm.Source.id).where(
+                eorm.Source.id.in_(
+                    sa.select(eorm.PipelineOutput.source_id).where(
+                        eorm.PipelineOutput.pipeline_id.in_(ids)
                     )
                 )
             )
@@ -575,26 +577,26 @@ def pipeline_delete_orms(
             pass
 
     session.execute(
-        sa.delete(orm.Resource).where(
-            orm.Resource.id.in_(
-                sa.select(orm.PipelineInput.resource_id)
-                .join(orm.Pipeline)
-                .where(orm.Pipeline.id.in_(ids))
+        sa.delete(eorm.Resource).where(
+            eorm.Resource.id.in_(
+                sa.select(eorm.PipelineInput.resource_id)
+                .join(eorm.Pipeline)
+                .where(eorm.Pipeline.id.in_(ids))
             )
         )
     )
-    session.execute(sa.delete(orm.Pipeline).where(orm.Pipeline.id.in_(ids)))
+    session.execute(sa.delete(eorm.Pipeline).where(eorm.Pipeline.id.in_(ids)))
     return Ok(None)
 
 
 def resource_delete_orms(
-    ids: Sequence[orm.ResourceID],
-    session: orm.Session,
+    ids: Sequence[eorm.ResourceID],
+    session: eorm.Session,
 ) -> Ok[None] | InvalidArgumentError:
     pipeline_refs = list(
         session.execute(
-            sa.select(orm.PipelineInput.pipeline_id)
-            .where(orm.PipelineInput.resource_id.in_(ids))
+            sa.select(eorm.PipelineInput.pipeline_id)
+            .where(eorm.PipelineInput.resource_id.in_(ids))
             .limit(1)
         )
     )
@@ -603,20 +605,20 @@ def resource_delete_orms(
         return InvalidArgumentError(
             "sources exist that reference resources to be deleted"
         )
-    session.execute(sa.delete(orm.Resource).where(orm.Resource.id.in_(ids)))
+    session.execute(sa.delete(eorm.Resource).where(eorm.Resource.id.in_(ids)))
     return Ok(None)
 
 
 def feature_view_source_delete_orms(
-    ids: Sequence[orm.FeatureViewSourceID], session: orm.Session
+    ids: Sequence[eorm.FeatureViewSourceID], session: eorm.Session
 ) -> Ok[None] | InvalidArgumentError:
     feat_view_refs = list(
         session.execute(
-            sa.select(orm.FeatureView.id)
+            sa.select(eorm.FeatureView.id)
             .where(
-                orm.FeatureView.id.in_(
-                    sa.select(orm.FeatureViewSource.feature_view_id).where(
-                        orm.FeatureViewSource.id.in_(ids)
+                eorm.FeatureView.id.in_(
+                    sa.select(eorm.FeatureViewSource.feature_view_id).where(
+                        eorm.FeatureViewSource.id.in_(ids)
                     )
                 )
             )
@@ -629,54 +631,54 @@ def feature_view_source_delete_orms(
         )
 
     session.execute(
-        sa.delete(orm.FeatureViewSource).where(orm.FeatureViewSource.id.in_(ids))
+        sa.delete(eorm.FeatureViewSource).where(eorm.FeatureViewSource.id.in_(ids))
     )
     return Ok(None)
 
 
 def feature_view_delete_orms(
-    ids: Sequence[orm.FeatureViewID], session: orm.Session
+    ids: Sequence[eorm.FeatureViewID], session: eorm.Session
 ) -> Ok[None] | InvalidArgumentError:
     space_refs = list(
         session.execute(
-            sa.select(orm.Space.id).where(orm.Space.feature_view_id.in_(ids))
+            sa.select(eorm.Space.id).where(eorm.Space.feature_view_id.in_(ids))
         )
     )
     if space_refs:
         return InvalidArgumentError(
             "spaces exist that reference feature_views to be deleted"
         )
-    session.execute(sa.delete(orm.FeatureView).where(orm.FeatureView.id.in_(ids)))
+    session.execute(sa.delete(eorm.FeatureView).where(eorm.FeatureView.id.in_(ids)))
     return Ok(None)
 
 
 def space_delete_orms(
-    ids: Sequence[orm.SpaceID], session: orm.Session
+    ids: Sequence[eorm.SpaceID], session: eorm.Session
 ) -> Ok[None] | InvalidArgumentError:
-    session.execute(sa.delete(orm.Space).where(orm.Space.id.in_(ids)))
+    session.execute(sa.delete(eorm.Space).where(eorm.Space.id.in_(ids)))
     return Ok(None)
 
 
 def room_delete_orms(
-    ids: Sequence[orm.RoomID], session: orm.Session
+    ids: Sequence[eorm.RoomID], session: eorm.Session
 ) -> Ok[None] | InvalidArgumentError:
     source_refs = list(
         session.scalars(
-            sa.select(orm.Source).where(orm.Source.room_id.in_(ids)).limit(1)
+            sa.select(eorm.Source).where(eorm.Source.room_id.in_(ids)).limit(1)
         )
     )
     if source_refs:
         return InvalidArgumentError("cannot delete a room that still has sources")
 
-    session.execute(sa.delete(orm.Room).where(orm.Room.id.in_(ids)))
+    session.execute(sa.delete(eorm.Room).where(eorm.Room.id.in_(ids)))
     return Ok(None)
 
 
 def completion_model_delete_orms(
-    ids: Sequence[orm.CompletionModelID],
-    session: orm.Session,
+    ids: Sequence[eorm.CompletionModelID],
+    session: eorm.Session,
 ) -> Ok[None] | InvalidArgumentError:
     session.execute(
-        sa.delete(orm.CompletionModel).where(orm.CompletionModel.id.in_(ids))
+        sa.delete(eorm.CompletionModel).where(eorm.CompletionModel.id.in_(ids))
     )
     return Ok(None)

corvic/model/_resource.py

@@ -13,7 +13,7 @@ import sqlalchemy as sa
 from sqlalchemy import orm as sa_orm
 from sqlalchemy.orm.interfaces import LoaderOption
 
-from corvic import orm, system
+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 (
@@ -25,36 +25,36 @@ from corvic.result import InternalError, InvalidArgumentError, NotFoundError, Ok
 from corvic_generated.model.v1alpha import models_pb2
 from corvic_generated.status.v1 import event_pb2
 
-SourceID: TypeAlias = orm.SourceID
-ResourceID: TypeAlias = orm.ResourceID
-RoomID: TypeAlias = orm.RoomID
-PipelineID: TypeAlias = orm.PipelineID
+SourceID: TypeAlias = eorm.SourceID
+ResourceID: TypeAlias = eorm.ResourceID
+RoomID: TypeAlias = eorm.RoomID
+PipelineID: TypeAlias = eorm.PipelineID
 
 
-class Resource(BelongsToRoomModel[ResourceID, models_pb2.Resource, orm.Resource]):
+class Resource(BelongsToRoomModel[ResourceID, models_pb2.Resource, eorm.Resource]):
     """Resources represent import data."""
 
     @classmethod
     def orm_class(cls):
-        return orm.Resource
+        return eorm.Resource
 
     @classmethod
     def id_class(cls):
         return ResourceID
 
     @classmethod
-    def orm_to_proto(cls, orm_obj: orm.Resource) -> models_pb2.Resource:
+    def orm_to_proto(cls, orm_obj: eorm.Resource) -> models_pb2.Resource:
         return resource_orm_to_proto(orm_obj)
 
     @classmethod
     def proto_to_orm(
-        cls, proto_obj: models_pb2.Resource, session: orm.Session
-    ) -> Ok[orm.Resource] | InvalidArgumentError:
+        cls, proto_obj: models_pb2.Resource, session: eorm.Session
+    ) -> Ok[eorm.Resource] | InvalidArgumentError:
         return resource_proto_to_orm(proto_obj, session)
 
     @classmethod
     def delete_by_ids(
-        cls, ids: Sequence[ResourceID], session: orm.Session
+        cls, ids: Sequence[ResourceID], session: eorm.Session
     ) -> Ok[None] | InvalidArgumentError:
         return resource_delete_orms(ids, session)
 
@@ -119,8 +119,8 @@ class Resource(BelongsToRoomModel[ResourceID, models_pb2.Resource, orm.Resource]
     @classmethod
     def orm_load_options(cls) -> list[LoaderOption]:
         return [
-            sa_orm.selectinload(orm.Resource.pipeline_ref).selectinload(
-                orm.PipelineInput.resource
+            sa_orm.selectinload(eorm.Resource.pipeline_ref).selectinload(
+                eorm.PipelineInput.resource
             ),
         ]
 
@@ -141,25 +141,25 @@ class Resource(BelongsToRoomModel[ResourceID, models_pb2.Resource, orm.Resource]
         """List resources."""
         client = client or Defaults.get_default_client()
 
-        def query_transform(query: sa.Select[tuple[orm.Resource]]):
+        def query_transform(query: sa.Select[tuple[eorm.Resource]]):
             if url:
-                query = query.where(orm.Resource.url == url)
+                query = query.where(eorm.Resource.url == url)
             if pipeline_id:
                 query = query.where(
-                    orm.Resource.id.in_(
-                        sa.select(orm.PipelineInput.resource_id).where(
-                            orm.PipelineInput.pipeline_id == pipeline_id
+                    eorm.Resource.id.in_(
+                        sa.select(eorm.PipelineInput.resource_id).where(
+                            eorm.PipelineInput.pipeline_id == pipeline_id
                         )
                     )
                 )
             match is_terminal:
                 case True:
-                    query = query.where(orm.Resource.is_terminal.is_(True))
+                    query = query.where(eorm.Resource.is_terminal.is_(True))
                 case False:
                     query = query.where(
                         sa.or_(
-                            orm.Resource.is_terminal.is_(False),
-                            orm.Resource.is_terminal.is_(None),
+                            eorm.Resource.is_terminal.is_(False),
+                            eorm.Resource.is_terminal.is_(None),
                         )
                     )
                 case None:
@@ -207,7 +207,7 @@ class Resource(BelongsToRoomModel[ResourceID, models_pb2.Resource, orm.Resource]
         client: system.Client | None,
         original_path: str = "",
         description: str = "",
-        room_id: orm.RoomID | None = None,
+        room_id: eorm.RoomID | None = None,
     ) -> Self:
         client = client or Defaults.get_default_client()
         room_id = room_id or Defaults.get_default_room_id(client)
@@ -236,7 +236,7 @@ class Resource(BelongsToRoomModel[ResourceID, models_pb2.Resource, orm.Resource]
         cls,
         data_frame: pl.DataFrame,
         client: system.Client | None = None,
-        room_id: orm.RoomID | None = None,
+        room_id: eorm.RoomID | None = None,
     ) -> Self:
         client = client or Defaults.get_default_client()
         room_id = room_id or Defaults.get_default_room_id(client)
@@ -251,7 +251,7 @@ class Resource(BelongsToRoomModel[ResourceID, models_pb2.Resource, orm.Resource]
         blob.patch()
         return cls.from_blob(blob.url, blob, client, room_id=room_id)
 
-    def as_input_to(self, pipeline_id: orm.PipelineID) -> Self:
+    def as_input_to(self, pipeline_id: eorm.PipelineID) -> Self:
         new_proto = copy.deepcopy(self.proto_self)
         new_proto.pipeline_id = str(pipeline_id)
         new_proto.pipeline_input_name = f"output-{uuid.uuid4()}"