corvic-engine 0.3.0rc86__tar.gz → 0.3.0rc88__tar.gz

{corvic_engine-0.3.0rc86 → corvic_engine-0.3.0rc88}/Cargo.lock

@@ -10,13 +10,13 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "corvic-engine"
-version = "0.3.0-rc.86"
+version = "0.3.0-rc.88"
 dependencies = [
  "numpy",
  "pyo3",
@@ -57,7 +57,7 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "engine-walk"
-version = "0.3.0-rc.86"
+version = "0.3.0-rc.88"
 dependencies = [
  "version_check",
 ]
@@ -293,9 +293,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "syn"
-version = "2.0.101"
+version = "2.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "f6397daf94fa90f058bd0fd88429dd9e5738999cca8d701813c80723add80462"
 dependencies = [
  "proc-macro2",
  "quote",

{corvic_engine-0.3.0rc86 → corvic_engine-0.3.0rc88}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["python"]
 
 [workspace.package]
-version = "0.3.0-rc.86"
+version = "0.3.0-rc.88"
 edition = "2021"
 publish = false
 

{corvic_engine-0.3.0rc86 → corvic_engine-0.3.0rc88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corvic-engine
-Version: 0.3.0rc86
+Version: 0.3.0rc88
 Classifier: Environment :: Console
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: Implementation :: CPython

{corvic_engine-0.3.0rc86 → corvic_engine-0.3.0rc88}/pyproject.toml

@@ -18,7 +18,7 @@ authors = [
 ]
 readme = "README.md"
 description = "Seamless embedding generation and retrieval."
-version = "0.3.0-rc.86" # sync this with tool.poetry.version below
+version = "0.3.0-rc.88" # sync this with tool.poetry.version below
 
 # TODO(ddn): Pull dependencies from tool.poetry.dependencies. We use maturin as
 # the build system but poetry for the development environment.
@@ -73,7 +73,7 @@ packages = [
 ]
 description = ""
 authors = []
-version = "0.3.0-rc.86"
+version = "0.3.0-rc.88"
 
 [tool.poetry.scripts]
 check = "corvic_check.cli:main"
@@ -123,13 +123,12 @@ pre-commit = "^4.0.0"
 psycopg = { extras = ["binary"], version = "^3.2" }
 pyright = "1.1.400"
 pytest = "^8.1.1"
-pytest-asyncio = "^0.26"
 pytest-benchmark = "^4.0.0"
 pytest-fail-slow = "^0.6.0"
 pytest-socket = "^0.7.0"
 pytest-timeout = "^2.2.0"
 ruff = "^0.6.9"
-hypothesis = "^6.102.4"
+hypothesis = "^6.135"
 yq = "^3.4.3" # includes xq for parsing xml test results
 
 # Required to generate stubs for pyarrow, but not used by corvic itself

{corvic_engine-0.3.0rc86 → corvic_engine-0.3.0rc88}/python/corvic/emodel/_base_model.py

@@ -49,7 +49,6 @@ class OrmBackedModel(
     @classmethod
     def list_as_proto(
         cls,
-        client: system.Client,
         *,
         limit: int | None = None,
         room_id: eorm.RoomID | None = None,
@@ -59,9 +58,10 @@ class OrmBackedModel(
         ]
         | None = None,
         existing_session: eorm.Session | None = None,
+        client: system.Client,
     ) -> Ok[list[transfer.ProtoT]] | NotFoundError | InvalidArgumentError:
         return super().list_as_proto(
-            client,
+            client=client,
             limit=limit,
             created_before=created_before,
             additional_query_transform=_make_room_filter_query_transfrom(
@@ -80,7 +80,6 @@ class HasIdOrmBackedModel(
     @classmethod
     def list_as_proto(
         cls,
-        client: system.Client,
         *,
         limit: int | None = None,
         room_id: eorm.RoomID | None = None,
@@ -91,9 +90,10 @@ class HasIdOrmBackedModel(
         ]
         | None = None,
         existing_session: eorm.Session | None = None,
+        client: system.Client,
     ) -> Ok[list[transfer.ProtoHasIdT]] | NotFoundError | InvalidArgumentError:
         return super().list_as_proto(
-            client,
+            client=client,
             limit=limit,
             created_before=created_before,
             ids=ids,

{corvic_engine-0.3.0rc86 → corvic_engine-0.3.0rc88}/python/corvic/emodel/_completion_model.py

@@ -9,7 +9,6 @@ from typing import Literal, TypeAlias
 
 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,
@@ -128,17 +127,16 @@ class CompletionModel(
         description: str,
         parameters: completion_model_pb2.CompletionModelParameters,
         secret_api_key: str,
-        client: system.Client | None = None,
+        client: system.Client,
     ):
-        client = client or Defaults.get_default_client()
         return cls(
-            client,
-            models_pb2.CompletionModel(
+            proto_self=models_pb2.CompletionModel(
                 name=name,
                 description=description,
                 parameters=parameters,
                 secret_api_key=secret_api_key,
             ),
+            client=client,
         )
 
     @classmethod
@@ -147,75 +145,112 @@ class CompletionModel(
         *,
         limit: int | None = None,
         created_before: datetime.datetime | None = None,
-        client: system.Client | None = None,
         ids: Iterable[CompletionModelID] | None = None,
         existing_session: eorm.Session | None = None,
+        client: system.Client,
     ) -> Ok[list[CompletionModel]] | NotFoundError | InvalidArgumentError:
         """List completion models."""
-        client = client or Defaults.get_default_client()
         match cls.list_as_proto(
-            client,
             limit=limit,
             created_before=created_before,
             ids=ids,
             existing_session=existing_session,
+            client=client,
         ):
             case NotFoundError() | InvalidArgumentError() as err:
                 return err
             case Ok(protos):
-                return Ok([cls.from_proto(proto, client) for proto in protos])
+                return Ok(
+                    [
+                        cls.from_proto(
+                            proto=proto,
+                            client=client,
+                        )
+                        for proto in protos
+                    ]
+                )
 
     @classmethod
     def from_proto(
-        cls, proto: models_pb2.CompletionModel, client: system.Client | None = None
+        cls,
+        *,
+        proto: models_pb2.CompletionModel,
+        client: system.Client,
     ) -> CompletionModel:
-        client = client or Defaults.get_default_client()
-        return cls(client, proto)
+        return cls(
+            proto_self=proto,
+            client=client,
+        )
 
     @classmethod
     def from_id(
         cls,
+        *,
         completion_model_id: CompletionModelID,
-        client: system.Client | None = None,
         session: eorm.Session | None = None,
+        client: system.Client,
     ) -> Ok[CompletionModel] | NotFoundError:
-        client = client or Defaults.get_default_client()
-        return cls.load_proto_for(completion_model_id, client, session).map(
-            lambda proto_self: cls.from_proto(proto_self, client)
+        return cls.load_proto_for(
+            obj_id=completion_model_id,
+            client=client,
+            existing_session=session,
+        ).map(
+            lambda proto_self: cls.from_proto(
+                proto=proto_self,
+                client=client,
+            )
         )
 
     def with_name(self, name: str) -> CompletionModel:
         proto_self = copy.deepcopy(self.proto_self)
         proto_self.name = name
-        return CompletionModel(self.client, proto_self)
+        return CompletionModel(
+            proto_self=proto_self,
+            client=self.client,
+        )
 
     def with_description(self, description: str) -> CompletionModel:
         proto_self = copy.deepcopy(self.proto_self)
         proto_self.description = description
-        return CompletionModel(self.client, proto_self)
+        return CompletionModel(
+            proto_self=proto_self,
+            client=self.client,
+        )
 
     def with_parameters(
         self, parameters: completion_model_pb2.CompletionModelParameters
     ) -> CompletionModel:
         proto_self = copy.deepcopy(self.proto_self)
         proto_self.parameters.CopyFrom(parameters)
-        return CompletionModel(self.client, proto_self)
+        return CompletionModel(
+            proto_self=proto_self,
+            client=self.client,
+        )
 
     def with_secret_api_key(self, secret_api_key: str) -> CompletionModel:
         proto_self = copy.deepcopy(self.proto_self)
         proto_self.secret_api_key = secret_api_key
-        return CompletionModel(self.client, proto_self)
+        return CompletionModel(
+            proto_self=proto_self,
+            client=self.client,
+        )
 
     def with_last_validation_time(
         self, last_validation_time: datetime.datetime
     ) -> CompletionModel:
         proto_self = copy.deepcopy(self.proto_self)
         proto_self.last_validation_time.FromDatetime(last_validation_time)
-        return CompletionModel(self.client, proto_self)
+        return CompletionModel(
+            proto_self=proto_self,
+            client=self.client,
+        )
 
     def with_last_successful_validation(
         self, last_successful_validation: datetime.datetime
     ) -> CompletionModel:
         proto_self = copy.deepcopy(self.proto_self)
         proto_self.last_successful_validation.FromDatetime(last_successful_validation)
-        return CompletionModel(self.client, proto_self)
+        return CompletionModel(
+            proto_self=proto_self,
+            client=self.client,
+        )

{corvic_engine-0.3.0rc86 → corvic_engine-0.3.0rc88}/python/corvic/emodel/_defaults.py

@@ -1,37 +1,14 @@
 """Utilities to choose a default client when the caller doesn't provide one."""
 
-import functools
-import pathlib
-import tempfile
-
 import sqlalchemy as sa
 
-from corvic import eorm, system, system_sqlite
+from corvic import eorm, system
 from corvic.result import NotFoundError
 
 
-@functools.cache
-def _tmp_directory():
-    # with "cache" holding onto the object, this directory
-    # will get blown away when the program exits gracefully
-    return tempfile.TemporaryDirectory()
-
-
-@functools.cache
-def _default_default_client():
-    return system_sqlite.Client(
-        pathlib.Path(_tmp_directory().name) / "corvic_data.sqlite3",
-    )
-
-
 class Defaults:
     # TODO(thunt): add mechanism for library init to override this default
     # e.g., when running as corvic-cloud this should return a system_cloud.Client
-    @staticmethod
-    def get_default_client() -> system.Client:
-        """Return a reasonable default implementation of system.Client."""
-        return _default_default_client()
-
     @staticmethod
     def get_default_room_id(client: system.Client) -> eorm.RoomID:
         with eorm.Session(client.sa_engine) as session:

{corvic_engine-0.3.0rc86 → corvic_engine-0.3.0rc88}/python/corvic/emodel/_feature_view.py

@@ -8,7 +8,7 @@ import datetime
 import functools
 import uuid
 from collections.abc import AsyncIterable, Iterable, Mapping, MutableMapping, Sequence
-from typing import Any, Final, Self, TypeAlias
+from typing import Any, Final, TypeAlias
 
 import pyarrow as pa
 from google.protobuf import struct_pb2
@@ -558,30 +558,37 @@ class FeatureViewSource(
         room_id: eorm.RoomID,
     ):
         return cls(
-            source.client,
-            models_pb2.FeatureViewSource(
+            proto_self=models_pb2.FeatureViewSource(
                 source=source.proto_self,
                 table_op_graph=table.op_graph.to_proto(),
                 drop_disconnected=drop_disconnected,
                 room_id=str(room_id),
             ),
+            client=source.client,
         )
 
     def with_table(self, table: Table | op_graph.Op) -> FeatureViewSource:
         if isinstance(table, Table):
             table = table.op_graph
-        new_proto_self = copy.deepcopy(self.proto_self)
-        new_proto_self.table_op_graph.CopyFrom(table.to_proto())
-        return self.__class__(self.client, proto_self=new_proto_self)
+        proto_self = copy.deepcopy(self.proto_self)
+        proto_self.table_op_graph.CopyFrom(table.to_proto())
+        return FeatureViewSource(
+            proto_self=proto_self,
+            client=self.client,
+        )
 
     @functools.cached_property
     def source(self):
-        return Source(self.client, self.proto_self.source)
+        return Source(
+            proto_self=self.proto_self.source,
+            client=self.client,
+        )
 
     @functools.cached_property
     def table(self):
         return Table.from_ops(
-            self.client, op_graph.op.from_proto(self.proto_self.table_op_graph)
+            op=op_graph.op.from_proto(self.proto_self.table_op_graph),
+            client=self.client,
         )
 
 
@@ -689,21 +696,33 @@ class FeatureView(
     @classmethod
     def from_id(
         cls,
+        *,
         feature_view_id: FeatureViewID,
-        client: system.Client | None = None,
         session: eorm.Session | None = None,
-    ) -> Ok[Self] | NotFoundError:
-        client = client or Defaults.get_default_client()
-        return cls.load_proto_for(feature_view_id, client, session).map(
-            lambda proto_self: cls(client, proto_self)
+        client: system.Client,
+    ) -> Ok[FeatureView] | NotFoundError:
+        return cls.load_proto_for(
+            obj_id=feature_view_id,
+            client=client,
+            existing_session=session,
+        ).map(
+            lambda proto_self: cls.from_proto(
+                proto=proto_self,
+                client=client,
+            )
         )
 
     @classmethod
     def from_proto(
-        cls, proto: models_pb2.FeatureView, client: system.Client | None = None
+        cls,
+        *,
+        proto: models_pb2.FeatureView,
+        client: system.Client,
     ) -> FeatureView:
-        client = client or Defaults.get_default_client()
-        return cls(client, proto)
+        return cls(
+            proto_self=proto,
+            client=client,
+        )
 
     @classmethod
     def orm_load_options(cls) -> list[LoaderOption]:
@@ -721,14 +740,13 @@ class FeatureView(
         room_id: RoomID | None = None,
         limit: int | None = None,
         created_before: datetime.datetime | None = None,
-        client: system.Client | None = None,
         ids: Iterable[FeatureViewID] | None = None,
         existing_session: eorm.Session | None = None,
+        client: system.Client,
     ) -> Ok[list[FeatureView]] | NotFoundError | InvalidArgumentError:
         """List resources."""
-        client = client or Defaults.get_default_client()
         match cls.list_as_proto(
-            client,
+            client=client,
             limit=limit,
             room_id=room_id,
             created_before=created_before,
@@ -739,7 +757,7 @@ class FeatureView(
                 return err
             case Ok(protos):
                 pass
-        return Ok([cls.from_proto(proto, client) for proto in protos])
+        return Ok([cls.from_proto(proto=proto, client=client) for proto in protos])
 
     @property
     def source_ids(self):
@@ -759,7 +777,7 @@ class FeatureView(
     @functools.cached_property
     def feature_view_sources(self) -> Sequence[FeatureViewSource]:
         return [
-            FeatureViewSource(self.client, fvs)
+            FeatureViewSource(proto_self=fvs, client=self.client)
             for fvs in self.proto_self.feature_view_sources
         ]
 
@@ -792,7 +810,7 @@ class FeatureView(
             case Source():
                 return Ok(source)
             case SourceID():
-                return Source.from_id(source, self.client)
+                return Source.from_id(source_id=source, client=self.client)
 
     def _get_feature_view_source(
         self, source: Source | SourceID | str
@@ -994,15 +1012,14 @@ class FeatureView(
 
     @classmethod
     def create(
-        cls, client: system.Client | None = None, room_id: eorm.RoomID | None = None
+        cls, *, room_id: eorm.RoomID | None = None, client: system.Client
     ) -> FeatureView:
         """Create a FeatureView."""
-        client = client or Defaults.get_default_client()
-        room_id = room_id or Defaults.get_default_room_id(client)
+        room_id = room_id or Defaults.get_default_room_id(client=client)
         proto_feature_view = models_pb2.FeatureView(room_id=str(room_id))
         return FeatureView(
-            client,
-            proto_feature_view,
+            proto_self=proto_feature_view,
+            client=client,
         )
 
     @staticmethod
@@ -1025,15 +1042,21 @@ class FeatureView(
                     pass
         return renames
 
-    def with_name(self, name: str) -> Self:
-        new_proto_self = copy.deepcopy(self.proto_self)
-        new_proto_self.name = name
-        return self.__class__(self.client, proto_self=new_proto_self)
+    def with_name(self, name: str) -> FeatureView:
+        proto_self = copy.deepcopy(self.proto_self)
+        proto_self.name = name
+        return FeatureView(
+            proto_self=proto_self,
+            client=self.client,
+        )
 
-    def with_description(self, description: str) -> Self:
-        new_proto_self = copy.deepcopy(self.proto_self)
-        new_proto_self.description = description
-        return self.__class__(self.client, proto_self=new_proto_self)
+    def with_description(self, description: str) -> FeatureView:
+        proto_self = copy.deepcopy(self.proto_self)
+        proto_self.description = description
+        return FeatureView(
+            proto_self=proto_self,
+            client=self.client,
+        )
 
     def with_source(
         self,
@@ -1082,8 +1105,8 @@ class FeatureView(
             source=source,
         )
 
-        new_proto_self = copy.deepcopy(self.proto_self)
-        new_proto_self.feature_view_sources.append(fvs.proto_self)
+        proto_self = copy.deepcopy(self.proto_self)
+        proto_self.feature_view_sources.append(fvs.proto_self)
 
         if output:
             primary_key = source.table.schema.get_primary_key()
@@ -1091,13 +1114,13 @@ class FeatureView(
                 raise InvalidArgumentError(
                     "source must have a primary key to part of the output"
                 )
-            new_proto_self.feature_view_output.output_sources.append(
+            proto_self.feature_view_output.output_sources.append(
                 feature_view_pb2.OutputSource(source_id=str(source.id))
             )
 
-        return self.__class__(
-            self.client,
-            proto_self=new_proto_self,
+        return FeatureView(
+            proto_self=proto_self,
+            client=self.client,
         )
 
     @staticmethod
@@ -1302,9 +1325,9 @@ class FeatureView(
                 "foreign key relationship was not provided and could not be inferred"
             )
 
-        new_proto_self = copy.deepcopy(self.proto_self)
+        proto_self = copy.deepcopy(self.proto_self)
 
-        new_proto_self.feature_view_output.relationships.append(
+        proto_self.feature_view_output.relationships.append(
             feature_view_pb2.FeatureViewRelationship(
                 start_source_id=str(start_fv_source.source.id),
                 end_source_id=str(end_fv_source.source.id),
@@ -1312,7 +1335,7 @@ class FeatureView(
             )
         )
         if not directional:
-            new_proto_self.feature_view_output.relationships.append(
+            proto_self.feature_view_output.relationships.append(
                 feature_view_pb2.FeatureViewRelationship(
                     start_source_id=str(end_fv_source.source.id),
                     end_source_id=str(start_fv_source.source.id),
@@ -1320,9 +1343,9 @@ class FeatureView(
                 )
             )
 
-        return self.__class__(
-            self.client,
-            proto_self=new_proto_self,
+        return FeatureView(
+            proto_self=proto_self,
+            client=self.client,
         )
 
     def with_row_numbers(
@@ -1333,8 +1356,8 @@ class FeatureView(
         Row indices are unique across all output sources.
         """
         offset = 0
-        new_proto_self = copy.deepcopy(self.proto_self)
-        del new_proto_self.feature_view_sources[:]
+        proto_self = copy.deepcopy(self.proto_self)
+        del proto_self.feature_view_sources[:]
 
         for fvs in self.feature_view_sources:
             if fvs.source.id in self.output_source_ids:
@@ -1350,11 +1373,11 @@ class FeatureView(
                 offset += system.OpGraphPlanner.count_rows_upperbound(
                     new_fvs.table.op_graph
                 )
-                new_proto_self.feature_view_sources.append(new_fvs.proto_self)
+                proto_self.feature_view_sources.append(new_fvs.proto_self)
             else:
-                new_proto_self.feature_view_sources.append(fvs.proto_self)
+                proto_self.feature_view_sources.append(fvs.proto_self)
 
-        return self.__class__(
-            self.client,
-            proto_self=new_proto_self,
+        return FeatureView(
+            proto_self=proto_self,
+            client=self.client,
         )