corvic-engine 0.3.0rc81__cp38-abi3-win_amd64.whl → 0.3.0rc83__cp38-abi3-win_amd64.whl

corvic/{model/_base_model.py → transfer/_orm_backed_proto.py}

@@ -3,66 +3,59 @@ import contextlib
 import copy
 import datetime
 import functools
-import uuid
 from collections.abc import Callable, Iterable, Iterator, Sequence
-from typing import Final, Generic, Self
+from typing import Any, Final, Generic, Protocol, Self, TypeVar
 
 import sqlalchemy as sa
 import sqlalchemy.orm as sa_orm
 import structlog
 from google.protobuf import timestamp_pb2
 
-from corvic import eorm, system
-from corvic.model._proto_orm_convert import (
-    UNCOMMITTED_ID_PREFIX,
-    IdType,
-    OrmBelongsToOrgObj,
-    OrmBelongsToRoomObj,
-    OrmObj,
-    ProtoBelongsToOrgObj,
-    ProtoBelongsToRoomObj,
-    ProtoObj,
-)
-from corvic.result import (
-    InvalidArgumentError,
-    NotFoundError,
-    Ok,
-    UnavailableError,
+from corvic import orm, system
+from corvic.result import InvalidArgumentError, NotFoundError, Ok, UnavailableError
+from corvic.transfer._common_transformations import (
+    OrmIdT,
+    generate_uncommitted_id_str,
+    non_empty_timestamp_to_datetime,
 )
 
 _logger = structlog.get_logger()
 
-_EMPTY_PROTO_TIMESTAMP = timestamp_pb2.Timestamp(seconds=0, nanos=0)
 
+class OrmModel(Protocol):
+    @sa.ext.hybrid.hybrid_property
+    def created_at(self) -> datetime.datetime | None: ...
+
+    @created_at.inplace.expression
+    @classmethod
+    def _created_at_expression(cls): ...
+
+
+class OrmHasIdModel(OrmModel, Protocol[OrmIdT]):
+    id: sa_orm.Mapped[OrmIdT | None]
 
-def non_empty_timestamp_to_datetime(
-    timestamp: timestamp_pb2.Timestamp,
-) -> datetime.datetime | None:
-    if timestamp != _EMPTY_PROTO_TIMESTAMP:
-        return timestamp.ToDatetime(tzinfo=datetime.UTC)
-    return None
 
+OrmT = TypeVar("OrmT", bound=OrmModel)
+OrmHasIdT = TypeVar("OrmHasIdT", bound=OrmHasIdModel[Any])
 
-def _generate_uncommitted_id_str():
-    return f"{UNCOMMITTED_ID_PREFIX}{uuid.uuid4()}"
 
+class ProtoModel(Protocol):
+    created_at: timestamp_pb2.Timestamp
 
-@contextlib.contextmanager
-def _create_or_join_session(
-    client: system.Client, existing_session: sa_orm.Session | None
-) -> Iterator[sa_orm.Session]:
-    if existing_session:
-        yield existing_session
-    else:
-        with eorm.Session(client.sa_engine) as session:
-            yield session
 
+class ProtoHasIdModel(ProtoModel, Protocol):
+    id: str
 
-class HasProtoSelf(Generic[ProtoObj], abc.ABC):
+
+ProtoT = TypeVar("ProtoT", bound=ProtoModel)
+ProtoHasIdT = TypeVar("ProtoHasIdT", bound=ProtoHasIdModel)
+
+
+class HasProtoSelf(Generic[ProtoT], abc.ABC):
     client: Final[system.Client]
-    proto_self: Final[ProtoObj]
+    proto_self: Final[ProtoT]
 
-    def __init__(self, client: system.Client, proto_self: ProtoObj):
+    def __init__(self, client: system.Client, proto_self: ProtoT):
         self.proto_self = proto_self
         self.client = client
 
@@ -71,22 +64,22 @@ class HasProtoSelf(Generic[ProtoObj], abc.ABC):
         return non_empty_timestamp_to_datetime(self.proto_self.created_at)
 
 
-class UsesOrmID(Generic[IdType, ProtoObj], HasProtoSelf[ProtoObj]):
-    def __init__(self, client: system.Client, proto_self: ProtoObj):
+class UsesOrmID(Generic[OrmIdT, ProtoHasIdT], HasProtoSelf[ProtoHasIdT]):
+    def __init__(self, client: system.Client, proto_self: ProtoHasIdT):
         if not proto_self.id:
-            proto_self.id = _generate_uncommitted_id_str()
+            proto_self.id = generate_uncommitted_id_str()
         super().__init__(client, proto_self)
 
     @classmethod
     @abc.abstractmethod
-    def id_class(cls) -> type[IdType]: ...
+    def id_class(cls) -> type[OrmIdT]: ...
 
     @functools.cached_property
-    def id(self) -> IdType:
+    def id(self) -> OrmIdT:
         return self.id_class().from_str(self.proto_self.id)
 
 
-class BaseModel(Generic[IdType, ProtoObj, OrmObj], UsesOrmID[IdType, ProtoObj]):
+class OrmBackedProto(Generic[ProtoT, OrmT], HasProtoSelf[ProtoT]):
     """Base for orm wrappers providing a unified update mechanism."""
 
     @property
@@ -95,51 +88,29 @@ class BaseModel(Generic[IdType, ProtoObj, OrmObj], UsesOrmID[IdType, ProtoObj]):
 
     @classmethod
     @abc.abstractmethod
-    def orm_class(cls) -> type[OrmObj]: ...
+    def orm_class(cls) -> type[OrmT]: ...
 
     @classmethod
     @abc.abstractmethod
-    def orm_to_proto(cls, orm_obj: OrmObj) -> ProtoObj: ...
+    def orm_to_proto(cls, orm_obj: OrmT) -> ProtoT: ...
 
     @classmethod
     @abc.abstractmethod
     def proto_to_orm(
-        cls, proto_obj: ProtoObj, session: eorm.Session
-    ) -> Ok[OrmObj] | InvalidArgumentError: ...
-
-    @classmethod
-    @abc.abstractmethod
-    def delete_by_ids(
-        cls, ids: Sequence[IdType], session: eorm.Session
-    ) -> Ok[None] | InvalidArgumentError: ...
-
-    @classmethod
-    def load_proto_for(
-        cls,
-        obj_id: IdType,
-        client: system.Client,
-        existing_session: sa_orm.Session | None = None,
-    ) -> Ok[ProtoObj] | NotFoundError:
-        """Create a model object by loading it from the database."""
-        with _create_or_join_session(client, existing_session) as session:
-            orm_self = session.get(cls.orm_class(), obj_id)
-            if orm_self is None:
-                return NotFoundError("object with given id does not exist", id=obj_id)
-            proto_self = cls.orm_to_proto(orm_self)
-        return Ok(proto_self)
+        cls, proto_obj: ProtoT, session: orm.Session
+    ) -> Ok[OrmT] | InvalidArgumentError: ...
 
     @classmethod
     def _generate_query_results(
-        cls, query: sa.Select[tuple[OrmObj]], session: sa_orm.Session
-    ) -> Iterator[OrmObj]:
+        cls, query: sa.Select[tuple[OrmT]], session: sa_orm.Session
+    ) -> Iterator[OrmT]:
         it = iter(session.scalars(query))
         while True:
             try:
                 yield from it
             except Exception:
                 _logger.exception(
-                    "omitting source from list: "
-                    + "failed to parse source from database entry",
+                    "omitting model from list: " + "failed to parse database entry",
                 )
             else:
                 break
@@ -155,31 +126,27 @@ class BaseModel(Generic[IdType, ProtoObj, OrmObj], UsesOrmID[IdType, ProtoObj]):
         client: system.Client,
         *,
         limit: int | None = None,
-        room_id: eorm.RoomID | None = None,
         created_before: datetime.datetime | None = None,
-        ids: Iterable[IdType] | None = None,
         additional_query_transform: Callable[
-            [sa.Select[tuple[OrmObj]]], sa.Select[tuple[OrmObj]]
+            [sa.Select[tuple[OrmT]]], sa.Select[tuple[OrmT]]
         ]
         | None = None,
         existing_session: sa_orm.Session | None = None,
-    ) -> Ok[list[ProtoObj]] | NotFoundError | InvalidArgumentError:
+    ) -> Ok[list[ProtoT]] | NotFoundError | InvalidArgumentError:
         """List sources that exist in storage."""
         orm_class = cls.orm_class()
-        with _create_or_join_session(client, existing_session) as session:
+        with (
+            contextlib.nullcontext(existing_session)
+            if existing_session
+            else orm.Session(client.sa_engine) as session
+        ):
             query = sa.select(orm_class).order_by(sa.desc(orm_class.created_at))
             if limit is not None:
                 if limit < 0:
                     return InvalidArgumentError("limit cannot be negative")
                 query = query.limit(limit)
-            if room_id:
-                if session.get(eorm.Room, room_id) is None:
-                    return NotFoundError("room not found", room_id=room_id)
-                query = query.filter_by(room_id=room_id)
             if created_before:
                 query = query.filter(orm_class.created_at < created_before)
-            if ids is not None:
-                query = query.filter(orm_class.id.in_(ids))
             if additional_query_transform:
                 query = additional_query_transform(query)
             extra_orm_loaders = cls.orm_load_options()
@@ -198,7 +165,7 @@ class BaseModel(Generic[IdType, ProtoObj, OrmObj], UsesOrmID[IdType, ProtoObj]):
         This overwrites the entry at id in the database so that future readers will see
         this object. One of `id` or `derived_from_id` cannot be empty or None.
         """
-        with eorm.Session(self.client.sa_engine) as session:
+        with orm.Session(self.client.sa_engine) as session:
             try:
                 new_orm_self = self.proto_to_orm(
                     self.proto_self, session
@@ -230,7 +197,7 @@ class BaseModel(Generic[IdType, ProtoObj, OrmObj], UsesOrmID[IdType, ProtoObj]):
         return InvalidArgumentError.from_(err)
 
     def add_to_session(
-        self, session: eorm.Session
+        self, session: orm.Session
     ) -> Ok[None] | InvalidArgumentError | UnavailableError:
         """Like commit, but just calls session.flush to check for database errors.
 
@@ -246,8 +213,39 @@ class BaseModel(Generic[IdType, ProtoObj, OrmObj], UsesOrmID[IdType, ProtoObj]):
             return self._dbapi_error_to_result(err)
         return Ok(None)
 
+
+class HasIdOrmBackedProto(
+    Generic[OrmIdT, ProtoHasIdT, OrmHasIdT],
+    UsesOrmID[OrmIdT, ProtoHasIdT],
+    OrmBackedProto[ProtoHasIdT, OrmHasIdT],
+):
+    @classmethod
+    @abc.abstractmethod
+    def delete_by_ids(
+        cls, ids: Sequence[OrmIdT], session: orm.Session
+    ) -> Ok[None] | InvalidArgumentError: ...
+
+    @classmethod
+    def load_proto_for(
+        cls,
+        obj_id: OrmIdT,
+        client: system.Client,
+        existing_session: sa_orm.Session | None = None,
+    ) -> Ok[ProtoHasIdT] | NotFoundError:
+        """Create a model object by loading it from the database."""
+        with (
+            contextlib.nullcontext(existing_session)
+            if existing_session
+            else orm.Session(client.sa_engine) as session
+        ):
+            orm_self = session.get(cls.orm_class(), obj_id)
+            if orm_self is None:
+                return NotFoundError("object with given id does not exist", id=obj_id)
+            proto_self = cls.orm_to_proto(orm_self)
+        return Ok(proto_self)
+
     def delete(self) -> Ok[Self] | NotFoundError | InvalidArgumentError:
-        with eorm.Session(
+        with orm.Session(
             self.client.sa_engine, expire_on_commit=False, autoflush=False
         ) as session:
             try:
@@ -270,24 +268,33 @@ class BaseModel(Generic[IdType, ProtoObj, OrmObj], UsesOrmID[IdType, ProtoObj]):
                 )
             )
 
-
-class BelongsToOrgModel(
-    Generic[IdType, ProtoBelongsToOrgObj, OrmBelongsToOrgObj],
-    BaseModel[IdType, ProtoBelongsToOrgObj, OrmBelongsToOrgObj],
-):
-    """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 BelongsToRoomModel(
-    Generic[IdType, ProtoBelongsToRoomObj, OrmBelongsToRoomObj],
-    BelongsToOrgModel[IdType, ProtoBelongsToRoomObj, OrmBelongsToRoomObj],
-):
-    """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)
+    @classmethod
+    def list_as_proto(
+        cls,
+        client: system.Client,
+        *,
+        limit: int | None = None,
+        created_before: datetime.datetime | None = None,
+        ids: Iterable[OrmIdT] | None = None,
+        additional_query_transform: Callable[
+            [sa.Select[tuple[OrmHasIdT]]], sa.Select[tuple[OrmHasIdT]]
+        ]
+        | None = None,
+        existing_session: sa_orm.Session | None = None,
+    ) -> Ok[list[ProtoHasIdT]] | NotFoundError | InvalidArgumentError:
+        def query_transform(
+            query: sa.Select[tuple[OrmHasIdT]],
+        ) -> sa.Select[tuple[OrmHasIdT]]:
+            if ids:
+                query = query.where(cls.orm_class().id.in_(ids))
+            if additional_query_transform:
+                query = additional_query_transform(query)
+            return query
+
+        return super().list_as_proto(
+            client,
+            limit=limit,
+            created_before=created_before,
+            additional_query_transform=query_transform,
+            existing_session=existing_session,
+        )

{corvic_engine-0.3.0rc81.dist-info → corvic_engine-0.3.0rc83.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corvic-engine
-Version: 0.3.0rc81
+Version: 0.3.0rc83
 Classifier: Environment :: Console
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: Implementation :: CPython
@@ -22,11 +22,11 @@ Requires-Dist: sqlalchemy>=2
 Requires-Dist: sqlglot>=25.6.0,<26
 Requires-Dist: structlog>=24
 Requires-Dist: tqdm
-Requires-Dist: typing-extensions>=4.9
 Requires-Dist: umap-learn>=0.5.5 ; extra == 'ml'
 Requires-Dist: pillow>=10.0.0 ; extra == 'ml'
 Requires-Dist: scikit-learn>=1.4.0 ; extra == 'ml'
 Requires-Dist: transformers[torch]>=4.45.0 ; extra == 'ml'
+Requires-Dist: sentencepiece>=0.2.0 ; extra == 'ml'
 Requires-Dist: opentelemetry-api>=1.20.0 ; extra == 'telemetry'
 Requires-Dist: opentelemetry-sdk>=1.20.0 ; extra == 'telemetry'
 Provides-Extra: ml

{corvic_engine-0.3.0rc81.dist-info → corvic_engine-0.3.0rc83.dist-info}/RECORD

@@ -10,25 +10,25 @@ corvic/embed/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/embedding_metric/__init__.py,sha256=8a-QKSQNbiksueHk5LdkugjZr6wasP4ff8A-Jsn5gUI,536
 corvic/embedding_metric/embeddings.py,sha256=XCiMzoGdRSmCOJnBDnxm3xlU0L_vrXwUxEjwdMv1FMI,14036
 corvic/embedding_metric/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+corvic/emodel/__init__.py,sha256=x2uEl19O_mVqph3QhHq9FZIkFs-Q74gZ_dfNspGY6Q0,3377
+corvic/emodel/_base_model.py,sha256=jjjZCpGYcV6Hnaztdis8HpyifuyRZ9rnp2hujYa6TRI,5131
+corvic/emodel/_completion_model.py,sha256=dKxv4GxVoSFkO34FgtecQPb8axZNArUctYrXelc7HWw,7672
+corvic/emodel/_defaults.py,sha256=OnROutSYhCuNuIvJbWdp4NZyamYtWRjwc4BE2ZqNAm8,1529
+corvic/emodel/_errors.py,sha256=Ctlq04SDwHzJPvLaL1rzqzwVqf2b50EILfW3cH4vnh8,261
+corvic/emodel/_feature_type.py,sha256=39nnwfbHyKqHKiH6Y6N-W7muSvA4qmZsSB680ZMPrzs,918
+corvic/emodel/_feature_view.py,sha256=uFv9D0PNNC-MUzdYbTWCaa9ossgwEl6kBK3qeB6QAa4,49725
+corvic/emodel/_pipeline.py,sha256=jpMIY8u-LaC-GvTrtAttCGB3NUNFweGhIpvd-m0ACKw,18791
+corvic/emodel/_proto_orm_convert.py,sha256=nhyTxuwYk7rjxl8t89RIC_nsZmi9PfeMeDf9XVAfguo,24147
+corvic/emodel/_resource.py,sha256=7K4LcHrC72HGdTi5UT2TGimVfMfFQ7p8QXQTLtPB2BY,8512
+corvic/emodel/_room.py,sha256=D5V9YSo9Xcfnng-dACWAmpEBgUAOUVFS7Jj2bCsSXtM,2877
+corvic/emodel/_source.py,sha256=yWZeYHX_jFIwqRZ1eUHIMN9Gu8EIYEZ8fmXDO6QpfyQ,9799
+corvic/emodel/_space.py,sha256=ewAGHHVY4tkoMRjyKwAvLq_3Zky8Zaa7k3DEbhkhM7E,38549
+corvic/emodel/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/engine/__init__.py,sha256=XL4Vg7rNcBi29ccVelpeFizR9oJtGYXDn84W9zok9d4,975
-corvic/engine/_native.pyd,sha256=qr5bmOjrt1JfUr_JrvlhPY8Cz3GcqJ_REeAchdUnKm4,438272
+corvic/engine/_native.pyd,sha256=uHSk2hJH4b8Rxhbj3lb8hLPBsEYqvMsPtjfI18kIMSY,438272
 corvic/engine/_native.pyi,sha256=KYMPtvXqHZ-jMgZohLf4se3rr-rBpCihmjANcr6s8ag,1390
 corvic/engine/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/eorm/__init__.py,sha256=b4dFnu4fW7wj3Y0SMNVXOp8KoKOp_HAL4GyDN-S8fOY,13704
-corvic/model/__init__.py,sha256=umu7rhilpzsKgeGHfNnq1bFf3vRk5gECSOSNkRVfdfc,3215
-corvic/model/_base_model.py,sha256=BBcpX792AC8zb1_Jq_aFQ7KwB3H5Mn4z1NE9sAoReqA,10328
-corvic/model/_completion_model.py,sha256=e6vGrON3NTc9vXweunJ4hp9byMvMd-igMzaul-genK4,7643
-corvic/model/_defaults.py,sha256=OnROutSYhCuNuIvJbWdp4NZyamYtWRjwc4BE2ZqNAm8,1529
-corvic/model/_errors.py,sha256=Ctlq04SDwHzJPvLaL1rzqzwVqf2b50EILfW3cH4vnh8,261
-corvic/model/_feature_type.py,sha256=Y-_-wa9fv7XaCAkxfjjoCLxxK2Ftfba-PMefD7bNXzs,917
-corvic/model/_feature_view.py,sha256=3-MK8i6bVPp2wU24LHsjTLA7HnVJZ9MU4BrcmkDB_wI,49715
-corvic/model/_pipeline.py,sha256=LlKUbz4ZaWugfdGbHpL5flfrXizS7Bsyh_npesGyU38,18797
-corvic/model/_proto_orm_convert.py,sha256=czEE6qYjg4s73IMSA_mGYAyh9s2FKc2ofjE6YV2FMKc,24072
-corvic/model/_resource.py,sha256=3eeYJf8M8063Go0QVOM03QqRAshyChInqqdpSxRx8mQ,8519
-corvic/model/_room.py,sha256=OqceFrRZVt4OcHHbhAgCj0s77ErmIcaXRsf8Lv0nfrM,2868
-corvic/model/_source.py,sha256=f62oLSv3qdOmfVhEjqL5ie55YiDdGDq0IhSAfFvrkBw,9803
-corvic/model/_space.py,sha256=uBBi6H5VIg1z-r4DXOPqYb4DUznGkv2a8_YGr6wx3zo,38505
-corvic/model/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/op_graph/__init__.py,sha256=1DMrQfuuS3FkLa9DXYDjSDLurdxxpG5H1jB2ctaa9xo,1444
 corvic/op_graph/_schema.py,sha256=rDZt6xAFpvhBZlp54uvXlqTqOxO8uFtTtukBGSUylqA,5688
 corvic/op_graph/_transformations.py,sha256=tROo0uR0km06LAsx4CSrR0OWPhFbvToFEowGcuAuRAs,9606
@@ -36,7 +36,7 @@ corvic/op_graph/aggregation.py,sha256=8X6vqXD7dLHrhYJU0BqmhUsWGbzD1zSP5Db5VHdIru
 corvic/op_graph/encoders.py,sha256=93wYoBCn_us5lRCkqvjaP0LTg3LBB3yEfhzICv06bB0,10460
 corvic/op_graph/errors.py,sha256=I4NE5053d0deGm5xx5EmyP4f98qx42xnIsW1IA-2hy4,163
 corvic/op_graph/feature_types.py,sha256=YVbPzvMnHHmUfR5QAMSvQ6hjQcOrIjqR-su0VypYWFA,9627
-corvic/op_graph/ops.py,sha256=vKs6lXvXWUqJusp0SKp0y94OOvtJ5KAITejoPMb810w,111833
+corvic/op_graph/ops.py,sha256=aNXcBwrwSyX7seCYqhn0vmlcP-YblphP1ZnRwS3MHl0,112105
 corvic/op_graph/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/op_graph/row_filters/__init__.py,sha256=1sibH_kLw7t_9bpRccnEGWqdCiN0VaUh9LMMIMCRyL8,575
 corvic/op_graph/row_filters/_jsonlogic.py,sha256=0UdwOZmIGp4yuExHM3qqAnJYmcGv7iuc3vLub3GD-9Y,7685
@@ -68,15 +68,15 @@ corvic/result/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/sql/__init__.py,sha256=kZ1a39KVZ08P8Bg6XuXDLD_dTQX0k620u4nwxZF4SnY,303
 corvic/sql/parse_ops.py,sha256=5jm2CHycTqzdu9apXTgcvwwyBVpjf7n5waqKfIa84JA,29940
 corvic/sql/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-corvic/system/__init__.py,sha256=Qddpk3SoHgoiBJyr9w2bPkp477NZv5MDR8701A17nCY,2697
+corvic/system/__init__.py,sha256=PlsjTRklExrPA83n-PM5CqVmNcIQdIRhFHn3tZ0qh1Q,2765
 corvic/system/_column_encoding.py,sha256=feSWIv4vKstVq-aavWPk53YucUiq7rZvuyofqTicXBE,7574
 corvic/system/_dimension_reduction.py,sha256=2tg5SIHY4P480DJQj6PSjW1VgAJCAVJAH8D3BY-ZYXA,2964
-corvic/system/_embedder.py,sha256=WJC4RtPLoPDDIgquKhpmPmYi2bAoR5_oVkWyBAepJTE,6864
-corvic/system/_image_embedder.py,sha256=Af3MI3VkiZQxCQjgDwaCNNpgEsnAiqfa4bdET63bvss,12218
+corvic/system/_embedder.py,sha256=3TJayoEKMOaooY3M2CZml0znwjPCguD-pbrGOXwamIg,6921
+corvic/system/_image_embedder.py,sha256=SiyoITnMfHXoLmtROdNJ1JlY6sBhA_kTxvbKYvZnRqY,12760
 corvic/system/_planner.py,sha256=ecL-HW8PVz5eWJ1Ktf-RAD2IdZkHu3GuBtXdqElo4ts,8210
 corvic/system/_text_embedder.py,sha256=NDi--3_tzwIWVImjhFWmp8dHmydGGXNu6GYH8qODsIc,4000
 corvic/system/client.py,sha256=JcA-fPraqDkl9f8BiClS0qeGY6wzKcEDPymutWrJo54,812
-corvic/system/in_memory_executor.py,sha256=KzX8baGFROpv-5hqVC1qOMf7AlPD22ffYtyBesV-W-M,66076
+corvic/system/in_memory_executor.py,sha256=H51fob98zZ8weZtyaWd5TpZHv5KPIW3buTixYqCsOqU,66454
 corvic/system/op_graph_executor.py,sha256=tSKro-yb_y1_sgajZluM-6FCvDqO1oUPsiWw2DRxyMQ,3641
 corvic/system/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/system/staging.py,sha256=K5P5moiuAMfPx7lxK4mArxeURBwKoyB6x9HGu9JJ16E,1846
@@ -90,13 +90,17 @@ corvic/system_sqlite/staging.py,sha256=9WjXT_XT3wGCFgx9dieOGjHcuu2ZEaFWMChQaISME
 corvic/table/__init__.py,sha256=Gj0IR8BQF5PZK92Us7PP0ZigMsVyrfWJupzH8TgzRQk,588
 corvic/table/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/table/table.py,sha256=fvt6G20Jz1Cfhf9zrmYIDPjUR4lGAWKjlx4eWKvoqtk,25815
+corvic/transfer/__init__.py,sha256=NqxDZSYj08fdVU3L2ZGw0m3MveREqgxYr0vkPEVyUh0,936
+corvic/transfer/_common_transformations.py,sha256=kJ0HxrPqzuB0V3jURfGiLsXGVm26qBkVivJgsosLrn4,1007
+corvic/transfer/_orm_backed_proto.py,sha256=tjyAL7IxpmECo2n-rIx2npDtuWgG4k5y4pWT8kvxEMg,10426
+corvic/transfer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/version/__init__.py,sha256=JlkRLvKXsu3zIxhdynO_0Ub5NfQOvGjfwCRkNnaOu9U,1125
 corvic/version/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/well_known_types/__init__.py,sha256=Btbeqieik2AcmijeOXeqBptzueBpgNitvH9J5VNm12w,1289
 corvic/well_known_types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-corvic_engine-0.3.0rc81.dist-info/METADATA,sha256=xgNR-_243a1DK7ug0D9mgjiwstj5ht4OBfduUojkwMI,1814
-corvic_engine-0.3.0rc81.dist-info/WHEEL,sha256=qo08K5WTt1v9liGoFGXfI182ciKs5521XAErJtzFynQ,94
-corvic_engine-0.3.0rc81.dist-info/licenses/LICENSE,sha256=DSS1OD0oIgssKOmAzkMRBv5jvvVuZQbrIv8lpl9DXY8,1035
+corvic_engine-0.3.0rc83.dist-info/METADATA,sha256=--8vmdHNbuoemxu-cAytJy-VzCMw1avbGlbtNlA0eY4,1828
+corvic_engine-0.3.0rc83.dist-info/WHEEL,sha256=U8GAVPGuk_i_fNfXAys1dgH7mS1u7uA5UI-r13T9uEs,94
+corvic_engine-0.3.0rc83.dist-info/licenses/LICENSE,sha256=DSS1OD0oIgssKOmAzkMRBv5jvvVuZQbrIv8lpl9DXY8,1035
 corvic_generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic_generated/algorithm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic_generated/algorithm/graph/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -169,8 +173,8 @@ corvic_generated/model/v1alpha/models_pb2_grpc.py,sha256=_bXoS025FcWrXR1E_3Mh4GH
 corvic_generated/model/v1alpha/models_pb2_grpc.pyi,sha256=H9-ADaiKR9iyVZvmnXutZqWwRRCDxjUIktkfJrJFIHg,417
 corvic_generated/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic_generated/orm/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-corvic_generated/orm/v1/agent_pb2.py,sha256=4fHu4ZNwUX4eRThj23Te-QNR2NDCbbLWKeSQa0zoEbg,4147
-corvic_generated/orm/v1/agent_pb2.pyi,sha256=WRUrntKx3-eFEs2uYuZ__9H7VL-yY5dZ3HuWDyTsmvA,5069
+corvic_generated/orm/v1/agent_pb2.py,sha256=vYQnRmeYHZvh8X6jLOljXj30Ibro30XP4k6jjobMmfA,4290
+corvic_generated/orm/v1/agent_pb2.pyi,sha256=OW1SIqovfM4uxH4w8e-MMUDFfvw908Jop-HXPiIUPUw,5373
 corvic_generated/orm/v1/agent_pb2_grpc.py,sha256=_bXoS025FcWrXR1E_3Mh4GHB1RMvgz8lIpit-Awnf-s,163
 corvic_generated/orm/v1/agent_pb2_grpc.pyi,sha256=H9-ADaiKR9iyVZvmnXutZqWwRRCDxjUIktkfJrJFIHg,417
 corvic_generated/orm/v1/common_pb2.py,sha256=pu1Rto4Pm8ntdB12Rgb_qnz3qOalxlOnrLuKE1fCETs,3490
@@ -207,4 +211,4 @@ corvic_generated/status/v1/service_pb2.py,sha256=CKXPX2ahq8O4cFhPpt6wo6l--6VZcgj
 corvic_generated/status/v1/service_pb2.pyi,sha256=iXLR2FOKQJpBgvBzpD2kVwcYOCksP2aRwK4JYaI9CBw,558
 corvic_generated/status/v1/service_pb2_grpc.py,sha256=y-a5ldrphWlNJW-yKswyjNmXokK4-5bbEEfczjagJHo,2736
 corvic_generated/status/v1/service_pb2_grpc.pyi,sha256=OoAnaZ64FD0UTzPoRhYvQU8ecoilhHj3ySjSfHbVDaU,1501
-corvic_engine-0.3.0rc81.dist-info/RECORD,,
+corvic_engine-0.3.0rc83.dist-info/RECORD,,

{corvic_engine-0.3.0rc81.dist-info → corvic_engine-0.3.0rc83.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.8.6)
+Generator: maturin (1.8.7)
 Root-Is-Purelib: false
 Tag: cp38-abi3-win_amd64

corvic_generated/orm/v1/agent_pb2.py

@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x63orvic/orm/v1/agent.proto\x12\rcorvic.orm.v1\"\xf3\x01\n\x12\x45xecutorParameters\x12L\n\x15\x63ompletion_model_type\x18\x01 \x01(\x0e\x32\x18.corvic.orm.v1.ModelTypeR\x13\x63ompletionModelType\x12\x42\n\x1d\x63ompletion_system_instruction\x18\x02 \x01(\tR\x1b\x63ompletionSystemInstruction\x12\x33\n\x13\x63ompletion_model_id\x18\x03 \x01(\tH\x00R\x11\x63ompletionModelId\x88\x01\x01\x42\x16\n\x14_completion_model_id\"V\n\x10SpaceInstruction\x12 \n\x0binstruction\x18\x01 \x01(\tR\x0binstruction\x12 \n\x0cspace_run_id\x18\x02 \x01(\tR\nspaceRunId\"\x89\x02\n\x16OrchestratorParameters\x12\x1b\n\tspace_ids\x18\x01 \x03(\tR\x08spaceIds\x12k\n\x12space_instructions\x18\x02 \x03(\x0b\x32<.corvic.orm.v1.OrchestratorParameters.SpaceInstructionsEntryR\x11spaceInstructions\x1a\x65\n\x16SpaceInstructionsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32\x1f.corvic.orm.v1.SpaceInstructionR\x05value:\x02\x38\x01\"\xc5\x01\n\x0f\x41gentParameters\x12R\n\x13\x65xecutor_parameters\x18\x01 \x01(\x0b\x32!.corvic.orm.v1.ExecutorParametersR\x12\x65xecutorParameters\x12^\n\x17orchestrator_parameters\x18\x02 \x01(\x0b\x32%.corvic.orm.v1.OrchestratorParametersR\x16orchestratorParameters*\x80\x06\n\tModelType\x12\x1a\n\x16MODEL_TYPE_UNSPECIFIED\x10\x00\x12\x1d\n\x19MODEL_TYPE_GEMINI_1_5_PRO\x10\x01\x12%\n!MODEL_TYPE_GEMINI_1_5_PRO_PREVIEW\x10\x02\x12\x1f\n\x1bMODEL_TYPE_GEMINI_1_5_FLASH\x10\x03\x12\'\n#MODEL_TYPE_GEMINI_1_5_FLASH_PREVIEW\x10\x04\x12\'\n#MODEL_TYPE_GEMINI_2_0_FLASH_PREVIEW\x10\r\x12\x30\n,MODEL_TYPE_GEMINI_2_0_FLASH_THINKING_PREVIEW\x10\x10\x12\x1f\n\x1bMODEL_TYPE_GEMINI_2_0_FLASH\x10\x13\x12\x1b\n\x17MODEL_TYPE_GPT_4_O_MINI\x10\x05\x12\x16\n\x12MODEL_TYPE_GPT_4_O\x10\x06\x12\x1c\n\x18MODEL_TYPE_GPT_3_5_TURBO\x10\x07\x12\x12\n\x0eMODEL_TYPE_O_1\x10\x0e\x12\x17\n\x13MODEL_TYPE_O_1_MINI\x10\x0f\x12\x12\n\x0eMODEL_TYPE_O_3\x10\x17\x12\x17\n\x13MODEL_TYPE_O_3_MINI\x10\x12\x12\x17\n\x13MODEL_TYPE_O_4_MINI\x10\x18\x12\x16\n\x12MODEL_TYPE_GPT_4_1\x10\x14\x12\x1b\n\x17MODEL_TYPE_GPT_4_1_MINI\x10\x15\x12\x1b\n\x17MODEL_TYPE_GPT_4_1_NANO\x10\x16\x12 \n\x1cMODEL_TYPE_CLAUDE_3_5_SONNET\x10\x08\x12\x1d\n\x19MODEL_TYPE_CLAUDE_3_HAIKU\x10\t\x12\x1c\n\x18MODEL_TYPE_MISTRAL_LARGE\x10\n\x12\x1b\n\x17MODEL_TYPE_MISTRAL_NEMO\x10\x0b\x12 \n\x1cMODEL_TYPE_MISTRAL_CODESTRAL\x10\x0c\x12\x15\n\x11MODEL_TYPE_CUSTOM\x10\x11\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x63orvic/orm/v1/agent.proto\x12\rcorvic.orm.v1\"\xf3\x01\n\x12\x45xecutorParameters\x12L\n\x15\x63ompletion_model_type\x18\x01 \x01(\x0e\x32\x18.corvic.orm.v1.ModelTypeR\x13\x63ompletionModelType\x12\x42\n\x1d\x63ompletion_system_instruction\x18\x02 \x01(\tR\x1b\x63ompletionSystemInstruction\x12\x33\n\x13\x63ompletion_model_id\x18\x03 \x01(\tH\x00R\x11\x63ompletionModelId\x88\x01\x01\x42\x16\n\x14_completion_model_id\"V\n\x10SpaceInstruction\x12 \n\x0binstruction\x18\x01 \x01(\tR\x0binstruction\x12 \n\x0cspace_run_id\x18\x02 \x01(\tR\nspaceRunId\"\xbc\x02\n\x16OrchestratorParameters\x12\x1b\n\tspace_ids\x18\x01 \x03(\tR\x08spaceIds\x12k\n\x12space_instructions\x18\x02 \x03(\x0b\x32<.corvic.orm.v1.OrchestratorParameters.SpaceInstructionsEntryR\x11spaceInstructions\x12\x31\n\x14workflow_instruction\x18\x03 \x01(\tR\x13workflowInstruction\x1a\x65\n\x16SpaceInstructionsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32\x1f.corvic.orm.v1.SpaceInstructionR\x05value:\x02\x38\x01\"\xf6\x01\n\x0f\x41gentParameters\x12R\n\x13\x65xecutor_parameters\x18\x01 \x01(\x0b\x32!.corvic.orm.v1.ExecutorParametersR\x12\x65xecutorParameters\x12^\n\x17orchestrator_parameters\x18\x02 \x01(\x0b\x32%.corvic.orm.v1.OrchestratorParametersR\x16orchestratorParameters\x12/\n\x13persona_instruction\x18\x03 \x01(\tR\x12personaInstruction*\x80\x06\n\tModelType\x12\x1a\n\x16MODEL_TYPE_UNSPECIFIED\x10\x00\x12\x1d\n\x19MODEL_TYPE_GEMINI_1_5_PRO\x10\x01\x12%\n!MODEL_TYPE_GEMINI_1_5_PRO_PREVIEW\x10\x02\x12\x1f\n\x1bMODEL_TYPE_GEMINI_1_5_FLASH\x10\x03\x12\'\n#MODEL_TYPE_GEMINI_1_5_FLASH_PREVIEW\x10\x04\x12\'\n#MODEL_TYPE_GEMINI_2_0_FLASH_PREVIEW\x10\r\x12\x30\n,MODEL_TYPE_GEMINI_2_0_FLASH_THINKING_PREVIEW\x10\x10\x12\x1f\n\x1bMODEL_TYPE_GEMINI_2_0_FLASH\x10\x13\x12\x1b\n\x17MODEL_TYPE_GPT_4_O_MINI\x10\x05\x12\x16\n\x12MODEL_TYPE_GPT_4_O\x10\x06\x12\x1c\n\x18MODEL_TYPE_GPT_3_5_TURBO\x10\x07\x12\x12\n\x0eMODEL_TYPE_O_1\x10\x0e\x12\x17\n\x13MODEL_TYPE_O_1_MINI\x10\x0f\x12\x12\n\x0eMODEL_TYPE_O_3\x10\x17\x12\x17\n\x13MODEL_TYPE_O_3_MINI\x10\x12\x12\x17\n\x13MODEL_TYPE_O_4_MINI\x10\x18\x12\x16\n\x12MODEL_TYPE_GPT_4_1\x10\x14\x12\x1b\n\x17MODEL_TYPE_GPT_4_1_MINI\x10\x15\x12\x1b\n\x17MODEL_TYPE_GPT_4_1_NANO\x10\x16\x12 \n\x1cMODEL_TYPE_CLAUDE_3_5_SONNET\x10\x08\x12\x1d\n\x19MODEL_TYPE_CLAUDE_3_HAIKU\x10\t\x12\x1c\n\x18MODEL_TYPE_MISTRAL_LARGE\x10\n\x12\x1b\n\x17MODEL_TYPE_MISTRAL_NEMO\x10\x0b\x12 \n\x1cMODEL_TYPE_MISTRAL_CODESTRAL\x10\x0c\x12\x15\n\x11MODEL_TYPE_CUSTOM\x10\x11\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -23,16 +23,16 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_ORCHESTRATORPARAMETERS_SPACEINSTRUCTIONSENTRY']._options = None
   _globals['_ORCHESTRATORPARAMETERS_SPACEINSTRUCTIONSENTRY']._serialized_options = b'8\001'
-  _globals['_MODELTYPE']._serialized_start=847
-  _globals['_MODELTYPE']._serialized_end=1615
+  _globals['_MODELTYPE']._serialized_start=947
+  _globals['_MODELTYPE']._serialized_end=1715
   _globals['_EXECUTORPARAMETERS']._serialized_start=45
   _globals['_EXECUTORPARAMETERS']._serialized_end=288
   _globals['_SPACEINSTRUCTION']._serialized_start=290
   _globals['_SPACEINSTRUCTION']._serialized_end=376
   _globals['_ORCHESTRATORPARAMETERS']._serialized_start=379
-  _globals['_ORCHESTRATORPARAMETERS']._serialized_end=644
-  _globals['_ORCHESTRATORPARAMETERS_SPACEINSTRUCTIONSENTRY']._serialized_start=543
-  _globals['_ORCHESTRATORPARAMETERS_SPACEINSTRUCTIONSENTRY']._serialized_end=644
-  _globals['_AGENTPARAMETERS']._serialized_start=647
-  _globals['_AGENTPARAMETERS']._serialized_end=844
+  _globals['_ORCHESTRATORPARAMETERS']._serialized_end=695
+  _globals['_ORCHESTRATORPARAMETERS_SPACEINSTRUCTIONSENTRY']._serialized_start=594
+  _globals['_ORCHESTRATORPARAMETERS_SPACEINSTRUCTIONSENTRY']._serialized_end=695
+  _globals['_AGENTPARAMETERS']._serialized_start=698
+  _globals['_AGENTPARAMETERS']._serialized_end=944
 # @@protoc_insertion_point(module_scope)

corvic_generated/orm/v1/agent_pb2.pyi

@@ -78,7 +78,7 @@ class SpaceInstruction(_message.Message):
     def __init__(self, instruction: _Optional[str] = ..., space_run_id: _Optional[str] = ...) -> None: ...
 
 class OrchestratorParameters(_message.Message):
-    __slots__ = ("space_ids", "space_instructions")
+    __slots__ = ("space_ids", "space_instructions", "workflow_instruction")
     class SpaceInstructionsEntry(_message.Message):
         __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
@@ -88,14 +88,18 @@ class OrchestratorParameters(_message.Message):
         def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[SpaceInstruction, _Mapping]] = ...) -> None: ...
     SPACE_IDS_FIELD_NUMBER: _ClassVar[int]
     SPACE_INSTRUCTIONS_FIELD_NUMBER: _ClassVar[int]
+    WORKFLOW_INSTRUCTION_FIELD_NUMBER: _ClassVar[int]
     space_ids: _containers.RepeatedScalarFieldContainer[str]
     space_instructions: _containers.MessageMap[str, SpaceInstruction]
-    def __init__(self, space_ids: _Optional[_Iterable[str]] = ..., space_instructions: _Optional[_Mapping[str, SpaceInstruction]] = ...) -> None: ...
+    workflow_instruction: str
+    def __init__(self, space_ids: _Optional[_Iterable[str]] = ..., space_instructions: _Optional[_Mapping[str, SpaceInstruction]] = ..., workflow_instruction: _Optional[str] = ...) -> None: ...
 
 class AgentParameters(_message.Message):
-    __slots__ = ("executor_parameters", "orchestrator_parameters")
+    __slots__ = ("executor_parameters", "orchestrator_parameters", "persona_instruction")
     EXECUTOR_PARAMETERS_FIELD_NUMBER: _ClassVar[int]
     ORCHESTRATOR_PARAMETERS_FIELD_NUMBER: _ClassVar[int]
+    PERSONA_INSTRUCTION_FIELD_NUMBER: _ClassVar[int]
     executor_parameters: ExecutorParameters
     orchestrator_parameters: OrchestratorParameters
-    def __init__(self, executor_parameters: _Optional[_Union[ExecutorParameters, _Mapping]] = ..., orchestrator_parameters: _Optional[_Union[OrchestratorParameters, _Mapping]] = ...) -> None: ...
+    persona_instruction: str
+    def __init__(self, executor_parameters: _Optional[_Union[ExecutorParameters, _Mapping]] = ..., orchestrator_parameters: _Optional[_Union[OrchestratorParameters, _Mapping]] = ..., persona_instruction: _Optional[str] = ...) -> None: ...