corvic-engine 0.3.0rc77__cp38-abi3-win_amd64.whl → 0.3.0rc79__cp38-abi3-win_amd64.whl

corvic/model/_room.py

@@ -5,9 +5,7 @@ from __future__ import annotations
 from collections.abc import Sequence
 from typing import TypeAlias
 
-import structlog
-
-from corvic import orm, system
+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 (
@@ -18,37 +16,35 @@ from corvic.model._proto_orm_convert import (
 from corvic.result import InvalidArgumentError, NotFoundError, Ok
 from corvic_generated.model.v1alpha import models_pb2
 
-_logger = structlog.get_logger()
-
-OrgID: TypeAlias = orm.OrgID
-RoomID: TypeAlias = orm.RoomID
-FeatureViewID: TypeAlias = orm.FeatureViewID
+OrgID: TypeAlias = eorm.OrgID
+RoomID: TypeAlias = eorm.RoomID
+FeatureViewID: TypeAlias = eorm.FeatureViewID
 
 
-class Room(BelongsToOrgModel[RoomID, models_pb2.Room, orm.Room]):
+class Room(BelongsToOrgModel[RoomID, models_pb2.Room, eorm.Room]):
     """Rooms contain conversations and tables."""
 
     @classmethod
     def orm_class(cls):
-        return orm.Room
+        return eorm.Room
 
     @classmethod
     def id_class(cls):
         return RoomID
 
     @classmethod
-    def orm_to_proto(cls, orm_obj: orm.Room) -> models_pb2.Room:
+    def orm_to_proto(cls, orm_obj: eorm.Room) -> models_pb2.Room:
         return room_orm_to_proto(orm_obj)
 
     @classmethod
     def proto_to_orm(
-        cls, proto_obj: models_pb2.Room, session: orm.Session
-    ) -> Ok[orm.Room] | InvalidArgumentError:
+        cls, proto_obj: models_pb2.Room, session: eorm.Session
+    ) -> Ok[eorm.Room] | InvalidArgumentError:
         return room_proto_to_orm(proto_obj, session)
 
     @classmethod
     def delete_by_ids(
-        cls, ids: Sequence[RoomID], session: orm.Session
+        cls, ids: Sequence[RoomID], session: eorm.Session
     ) -> Ok[None] | InvalidArgumentError:
         return room_delete_orms(ids, session)
 

corvic/model/_source.py

@@ -13,7 +13,7 @@ import sqlalchemy as sa
 import sqlalchemy.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
 from corvic.model._defaults import Defaults
 from corvic.model._proto_orm_convert import (
@@ -26,9 +26,9 @@ from corvic.result import InvalidArgumentError, NotFoundError, Ok
 from corvic.table import Table
 from corvic_generated.model.v1alpha import models_pb2
 
-SourceID: TypeAlias = orm.SourceID
-RoomID: TypeAlias = orm.RoomID
-PipelineID: TypeAlias = orm.PipelineID
+SourceID: TypeAlias = eorm.SourceID
+RoomID: TypeAlias = eorm.RoomID
+PipelineID: TypeAlias = eorm.PipelineID
 
 
 def foreign_key(
@@ -45,7 +45,7 @@ def foreign_key(
             )
 
 
-class Source(BelongsToRoomModel[SourceID, models_pb2.Source, orm.Source]):
+class Source(BelongsToRoomModel[SourceID, models_pb2.Source, eorm.Source]):
     """Sources describe how resources should be treated.
 
     Example:
@@ -56,25 +56,25 @@ class Source(BelongsToRoomModel[SourceID, models_pb2.Source, orm.Source]):
 
     @classmethod
     def orm_class(cls):
-        return orm.Source
+        return eorm.Source
 
     @classmethod
     def id_class(cls):
         return SourceID
 
     @classmethod
-    def orm_to_proto(cls, orm_obj: orm.Source) -> models_pb2.Source:
+    def orm_to_proto(cls, orm_obj: eorm.Source) -> models_pb2.Source:
         return source_orm_to_proto(orm_obj)
 
     @classmethod
     def proto_to_orm(
-        cls, proto_obj: models_pb2.Source, session: orm.Session
-    ) -> Ok[orm.Source] | InvalidArgumentError:
+        cls, proto_obj: models_pb2.Source, session: eorm.Session
+    ) -> Ok[eorm.Source] | InvalidArgumentError:
         return source_proto_to_orm(proto_obj, session)
 
     @classmethod
     def delete_by_ids(
-        cls, ids: Sequence[SourceID], session: orm.Session
+        cls, ids: Sequence[SourceID], session: eorm.Session
     ) -> Ok[None] | InvalidArgumentError:
         return source_delete_orms(ids, session)
 
@@ -197,8 +197,8 @@ class Source(BelongsToRoomModel[SourceID, models_pb2.Source, orm.Source]):
     @classmethod
     def orm_load_options(cls) -> list[LoaderOption]:
         return [
-            sa_orm.selectinload(orm.Source.pipeline_ref).selectinload(
-                orm.PipelineOutput.source
+            sa_orm.selectinload(eorm.Source.pipeline_ref).selectinload(
+                eorm.PipelineOutput.source
             ),
         ]
 
@@ -224,13 +224,13 @@ class Source(BelongsToRoomModel[SourceID, models_pb2.Source, orm.Source]):
                     return NotFoundError("resource not found", resource_id=resource_id)
                 case Ok(resource):
 
-                    def resource_filter(query: sa.Select[tuple[orm.Source]]):
+                    def resource_filter(query: sa.Select[tuple[eorm.Source]]):
                         return query.where(
-                            orm.Source.id.in_(
-                                sa.select(orm.PipelineOutput.source_id)
-                                .join(orm.Pipeline)
-                                .join(orm.PipelineInput)
-                                .where(orm.PipelineInput.resource_id == resource.id)
+                            eorm.Source.id.in_(
+                                sa.select(eorm.PipelineOutput.source_id)
+                                .join(eorm.Pipeline)
+                                .join(eorm.PipelineInput)
+                                .where(eorm.PipelineInput.resource_id == resource.id)
                             )
                         )
 

corvic/model/_space.py

@@ -13,7 +13,7 @@ import pyarrow as pa
 import sqlalchemy as sa
 from sqlalchemy import orm as sa_orm
 
-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._feature_view import FeatureView, FeatureViewEdgeTableMetadata
@@ -29,9 +29,9 @@ from corvic_generated.embedding.v1 import models_pb2 as embedding_models_pb2
 from corvic_generated.model.v1alpha import models_pb2
 from corvic_generated.orm.v1 import space_pb2
 
-FeatureViewID: TypeAlias = orm.FeatureViewID
-RoomID: TypeAlias = orm.RoomID
-SpaceID: TypeAlias = orm.SpaceID
+FeatureViewID: TypeAlias = eorm.FeatureViewID
+RoomID: TypeAlias = eorm.RoomID
+SpaceID: TypeAlias = eorm.SpaceID
 
 _DEFAULT_CONCAT_SEPARATOR = " "
 
@@ -61,7 +61,7 @@ name_to_proto_image_model = {
 }
 
 
-class Space(BelongsToRoomModel[SpaceID, models_pb2.Space, orm.Space]):
+class Space(BelongsToRoomModel[SpaceID, models_pb2.Space, eorm.Space]):
     """Spaces apply embedding methods to FeatureViews.
 
     Example:
@@ -70,35 +70,35 @@ class Space(BelongsToRoomModel[SpaceID, models_pb2.Space, orm.Space]):
 
     @classmethod
     def orm_class(cls):
-        return orm.Space
+        return eorm.Space
 
     @classmethod
     def id_class(cls):
         return SpaceID
 
     @classmethod
-    def orm_to_proto(cls, orm_obj: orm.Space) -> models_pb2.Space:
+    def orm_to_proto(cls, orm_obj: eorm.Space) -> models_pb2.Space:
         return space_orm_to_proto(orm_obj)
 
     @classmethod
     def proto_to_orm(
-        cls, proto_obj: models_pb2.Space, session: orm.Session
-    ) -> Ok[orm.Space] | InvalidArgumentError:
+        cls, proto_obj: models_pb2.Space, session: eorm.Session
+    ) -> Ok[eorm.Space] | InvalidArgumentError:
         return space_proto_to_orm(proto_obj, session)
 
     @classmethod
     def delete_by_ids(
-        cls, ids: Sequence[SpaceID], session: orm.Session
+        cls, ids: Sequence[SpaceID], session: eorm.Session
     ) -> Ok[None] | InvalidArgumentError:
         return space_delete_orms(ids, session)
 
     @classmethod
     def orm_load_options(cls) -> list[sa.LoaderOption]:
         return [
-            sa_orm.selectinload(orm.Space.feature_view)
-            .selectinload(orm.FeatureView.feature_view_sources)
-            .selectinload(orm.FeatureViewSource.source)
-            .selectinload(orm.Source.pipeline_ref)
+            sa_orm.selectinload(eorm.Space.feature_view)
+            .selectinload(eorm.FeatureView.feature_view_sources)
+            .selectinload(eorm.FeatureViewSource.source)
+            .selectinload(eorm.Source.pipeline_ref)
         ]
 
     @property
@@ -227,10 +227,10 @@ class Space(BelongsToRoomModel[SpaceID, models_pb2.Space, orm.Space]):
         cls,
         *,
         limit: int | None = None,
-        room_id: orm.RoomID | None = None,
+        room_id: eorm.RoomID | None = None,
         created_before: datetime.datetime | None = None,
         client: system.Client | None = None,
-        ids: Iterable[orm.SpaceID] | None = None,
+        ids: Iterable[eorm.SpaceID] | None = None,
         existing_session: sa_orm.Session | None = None,
     ) -> Ok[list[SpecificSpace]] | InvalidArgumentError | NotFoundError:
         client = client or Defaults.get_default_client()
@@ -367,7 +367,7 @@ class RelationalSpace(Space):
         feature_view: FeatureView,
         parameters: Node2VecParameters,
         client: system.Client | None = None,
-        room_id: orm.RoomID | None = None,
+        room_id: eorm.RoomID | None = None,
         *,
         auto_sync: bool = False,
     ) -> Ok[RelationalSpace] | InvalidArgumentError:
@@ -556,7 +556,7 @@ class SemanticSpace(Space):
         feature_view: FeatureView,
         parameters: ConcatAndEmbedParameters,
         client: system.Client | None = None,
-        room_id: orm.RoomID | None = None,
+        room_id: eorm.RoomID | None = None,
         *,
         auto_sync: bool = False,
     ) -> Ok[SemanticSpace] | InvalidArgumentError:
@@ -691,7 +691,7 @@ class TabularSpace(Space):
         feature_view: FeatureView,
         parameters: EmbedAndConcatParameters,
         client: system.Client | None = None,
-        room_id: orm.RoomID | None = None,
+        room_id: eorm.RoomID | None = None,
         *,
         auto_sync: bool = False,
     ) -> Ok[Self] | InvalidArgumentError:
@@ -943,7 +943,7 @@ class ImageSpace(Space):
     def output_source(self):
         return self.feature_view.output_sources[0]
 
-    def _sub_orm_objects(self, orm_object: orm.Space) -> Iterable[orm.Base]:
+    def _sub_orm_objects(self, orm_object: eorm.Space) -> Iterable[eorm.Base]:
         return []
 
     @property
@@ -958,7 +958,7 @@ class ImageSpace(Space):
         feature_view: FeatureView,
         parameters: EmbedImageParameters,
         client: system.Client | None = None,
-        room_id: orm.RoomID | None = None,
+        room_id: eorm.RoomID | None = None,
         *,
         auto_sync: bool = False,
     ) -> Ok[Self] | InvalidArgumentError:

corvic/op_graph/_schema.py

@@ -6,7 +6,7 @@ import polars as pl
 import pyarrow as pa
 
 import corvic.op_graph.feature_types as feature_type
-from corvic import orm
+from corvic import eorm
 from corvic.op_graph.feature_types import FeatureType
 
 
@@ -20,7 +20,7 @@ def _infer_possible_feature_types(
             feature_type.identifier(),
             feature_type.primary_key(),
             feature_type.categorical(),
-            feature_type.foreign_key(referenced_source_id=orm.SourceID()),
+            feature_type.foreign_key(referenced_source_id=eorm.SourceID()),
             feature_type.unknown(),
         ]
     if pa.types.is_decimal(data_type) | pa.types.is_floating(data_type):
@@ -41,7 +41,7 @@ def _infer_possible_feature_types(
             feature_type.identifier(),
             feature_type.primary_key(),
             feature_type.categorical(),
-            feature_type.foreign_key(referenced_source_id=orm.SourceID()),
+            feature_type.foreign_key(referenced_source_id=eorm.SourceID()),
             feature_type.image(),
             feature_type.unknown(),
         ]

corvic/op_graph/feature_types.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any, Final, overload
 
-from corvic import orm
+from corvic import eorm
 from corvic.op_graph.errors import OpParseError
 from corvic.proto_wrapper import OneofProtoWrapper
 from corvic.result import InvalidArgumentError
@@ -200,8 +200,8 @@ class ForeignKey(_Base):
     __match_args__ = ("referenced_source_id",)
 
     @property
-    def referenced_source_id(self) -> orm.SourceID:
-        return orm.SourceID(self._proto.foreign_key.referenced_source_id)
+    def referenced_source_id(self) -> eorm.SourceID:
+        return eorm.SourceID(self._proto.foreign_key.referenced_source_id)
 
 
 class Identifier(_Base):
@@ -248,7 +248,7 @@ def primary_key(*, is_excluded: bool = False):
 
 
 def foreign_key(
-    referenced_source_id: orm.SourceID, *, is_excluded: bool = False
+    referenced_source_id: eorm.SourceID, *, is_excluded: bool = False
 ) -> ForeignKey:
     """Build a ForeignKey FeatureType."""
     return from_proto(

corvic/op_graph/ops.py

@@ -46,7 +46,7 @@ from google.protobuf import json_format, struct_pb2
 from more_itertools import flatten
 
 import corvic.op_graph.feature_types as feature_type
-from corvic import orm, pa_scalar
+from corvic import eorm, pa_scalar
 from corvic.op_graph._schema import Field
 from corvic.op_graph.aggregation import Aggregation
 from corvic.op_graph.aggregation import from_proto as aggregation_from_proto
@@ -3290,7 +3290,7 @@ class Schema(Sequence[Field]):
                     pass
         return None
 
-    def get_foreign_keys(self, source_id: orm.SourceID) -> list[Field]:
+    def get_foreign_keys(self, source_id: eorm.SourceID) -> list[Field]:
         def generate_matching_fields():
             for field in self:
                 match field.ftype: