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

corvic/model/_feature_view.py

@@ -16,7 +16,7 @@ from more_itertools import flatten
 from sqlalchemy import orm as sa_orm
 from sqlalchemy.orm.interfaces import LoaderOption
 
-from corvic import op_graph, orm, system
+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 (
@@ -37,9 +37,9 @@ from corvic.table import (
 from corvic_generated.model.v1alpha import models_pb2
 from corvic_generated.orm.v1 import feature_view_pb2
 
-FeatureViewID: TypeAlias = orm.FeatureViewID
-FeatureViewSourceID: TypeAlias = orm.FeatureViewSourceID
-RoomID: TypeAlias = orm.RoomID
+FeatureViewID: TypeAlias = eorm.FeatureViewID
+FeatureViewSourceID: TypeAlias = eorm.FeatureViewSourceID
+RoomID: TypeAlias = eorm.RoomID
 
 
 def _validate_deepgnn_nodes(
@@ -553,7 +553,7 @@ class FeatureViewSource(UsesOrmID[FeatureViewSourceID, models_pb2.FeatureViewSou
         source: Source,
         *,
         drop_disconnected: bool,
-        room_id: orm.RoomID,
+        room_id: eorm.RoomID,
     ):
         return cls(
             source.client,
@@ -642,7 +642,7 @@ class DeepGnnCsvUrlMetadata(DataclassAsTypedMetadataMixin):
 
 
 class FeatureView(
-    BelongsToRoomModel[FeatureViewID, models_pb2.FeatureView, orm.FeatureView]
+    BelongsToRoomModel[FeatureViewID, models_pb2.FeatureView, eorm.FeatureView]
 ):
     """FeatureViews describe how Sources should be modeled to create a feature space.
 
@@ -662,25 +662,25 @@ class FeatureView(
 
     @classmethod
     def orm_class(cls):
-        return orm.FeatureView
+        return eorm.FeatureView
 
     @classmethod
     def id_class(cls):
         return FeatureViewID
 
     @classmethod
-    def orm_to_proto(cls, orm_obj: orm.FeatureView) -> models_pb2.FeatureView:
+    def orm_to_proto(cls, orm_obj: eorm.FeatureView) -> models_pb2.FeatureView:
         return feature_view_orm_to_proto(orm_obj)
 
     @classmethod
     def proto_to_orm(
-        cls, proto_obj: models_pb2.FeatureView, session: orm.Session
-    ) -> Ok[orm.FeatureView] | InvalidArgumentError:
+        cls, proto_obj: models_pb2.FeatureView, session: eorm.Session
+    ) -> Ok[eorm.FeatureView] | InvalidArgumentError:
         return feature_view_proto_to_orm(proto_obj, session)
 
     @classmethod
     def delete_by_ids(
-        cls, ids: Sequence[FeatureViewID], session: orm.Session
+        cls, ids: Sequence[FeatureViewID], session: eorm.Session
     ) -> Ok[None] | InvalidArgumentError:
         return feature_view_delete_orms(ids, session)
 
@@ -706,10 +706,10 @@ class FeatureView(
     @classmethod
     def orm_load_options(cls) -> list[LoaderOption]:
         return [
-            sa_orm.selectinload(orm.FeatureView.feature_view_sources)
-            .selectinload(orm.FeatureViewSource.source)
-            .selectinload(orm.Source.pipeline_ref)
-            .selectinload(orm.PipelineOutput.source)
+            sa_orm.selectinload(eorm.FeatureView.feature_view_sources)
+            .selectinload(eorm.FeatureViewSource.source)
+            .selectinload(eorm.Source.pipeline_ref)
+            .selectinload(eorm.PipelineOutput.source)
         ]
 
     @classmethod
@@ -958,7 +958,7 @@ class FeatureView(
         node_type = -1
         for node_id, node_table in node_tables.items():
             match node_id.to_db():
-                case orm.InvalidORMIdentifierError():
+                case eorm.InvalidORMIdentifierError():
                     node_type += 1
                 case Ok(db_id):
                     node_type = db_id
@@ -992,7 +992,7 @@ class FeatureView(
 
     @classmethod
     def create(
-        cls, client: system.Client | None = None, room_id: orm.RoomID | None = None
+        cls, client: system.Client | None = None, room_id: eorm.RoomID | None = None
     ) -> FeatureView:
         """Create a FeatureView."""
         client = client or Defaults.get_default_client()

corvic/model/_pipeline.py

@@ -13,7 +13,7 @@ from sqlalchemy import orm as sa_orm
 from sqlalchemy.orm.interfaces import LoaderOption
 
 import corvic.table
-from corvic import op_graph, orm, system
+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 (
@@ -26,34 +26,34 @@ from corvic.result import InvalidArgumentError, NotFoundError, Ok, UnavailableEr
 from corvic_generated.model.v1alpha import models_pb2
 from corvic_generated.orm.v1 import pipeline_pb2
 
-PipelineID: TypeAlias = orm.PipelineID
-RoomID: TypeAlias = orm.RoomID
+PipelineID: TypeAlias = eorm.PipelineID
+RoomID: TypeAlias = eorm.RoomID
 
 
-class Pipeline(BelongsToRoomModel[PipelineID, models_pb2.Pipeline, orm.Pipeline]):
+class Pipeline(BelongsToRoomModel[PipelineID, models_pb2.Pipeline, eorm.Pipeline]):
     """Pipelines map resources to sources."""
 
     @classmethod
     def orm_class(cls):
-        return orm.Pipeline
+        return eorm.Pipeline
 
     @classmethod
     def id_class(cls):
         return PipelineID
 
     @classmethod
-    def orm_to_proto(cls, orm_obj: orm.Pipeline) -> models_pb2.Pipeline:
+    def orm_to_proto(cls, orm_obj: eorm.Pipeline) -> models_pb2.Pipeline:
         return pipeline_orm_to_proto(orm_obj)
 
     @classmethod
     def proto_to_orm(
-        cls, proto_obj: models_pb2.Pipeline, session: orm.Session
-    ) -> Ok[orm.Pipeline] | InvalidArgumentError:
+        cls, proto_obj: models_pb2.Pipeline, session: eorm.Session
+    ) -> Ok[eorm.Pipeline] | InvalidArgumentError:
         return pipeline_proto_to_orm(proto_obj, session)
 
     @classmethod
     def delete_by_ids(
-        cls, ids: Sequence[PipelineID], session: orm.Session
+        cls, ids: Sequence[PipelineID], session: eorm.Session
     ) -> Ok[None] | InvalidArgumentError:
         return pipeline_delete_orms(ids, session)
 
@@ -120,9 +120,9 @@ class Pipeline(BelongsToRoomModel[PipelineID, models_pb2.Pipeline, orm.Pipeline]
     @classmethod
     def orm_load_options(cls) -> list[LoaderOption]:
         return [
-            sa_orm.selectinload(orm.Pipeline.outputs)
-            .selectinload(orm.PipelineOutput.source)
-            .selectinload(orm.Source.pipeline_ref),
+            sa_orm.selectinload(eorm.Pipeline.outputs)
+            .selectinload(eorm.PipelineOutput.source)
+            .selectinload(eorm.Source.pipeline_ref),
         ]
 
     @classmethod