corvic-engine 0.3.0rc59__tar.gz → 0.3.0rc60__tar.gz

{corvic_engine-0.3.0rc59 → corvic_engine-0.3.0rc60}/Cargo.lock

@@ -22,7 +22,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "corvic-engine"
-version = "0.3.0-rc.59"
+version = "0.3.0-rc.60"
 dependencies = [
  "numpy",
  "pyo3",
@@ -63,7 +63,7 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "engine-walk"
-version = "0.3.0-rc.59"
+version = "0.3.0-rc.60"
 dependencies = [
  "version_check",
 ]

{corvic_engine-0.3.0rc59 → corvic_engine-0.3.0rc60}/Cargo.toml

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

{corvic_engine-0.3.0rc59 → corvic_engine-0.3.0rc60}/PKG-INFO

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

{corvic_engine-0.3.0rc59 → corvic_engine-0.3.0rc60}/pyproject.toml

@@ -20,7 +20,7 @@ authors = [
 ]
 readme = "README.md"
 description = "Seamless embedding generation and retrieval."
-version = "0.3.0-rc.59" # sync this with tool.poetry.version below
+version = "0.3.0-rc.60" # 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.
@@ -74,7 +74,7 @@ packages = [
 ]
 description = ""
 authors = []
-version = "0.3.0-rc.59"
+version = "0.3.0-rc.60"
 
 [tool.poetry.scripts]
 check = "corvic_check.cli:main"

{corvic_engine-0.3.0rc59 → corvic_engine-0.3.0rc60}/python/corvic/model/__init__.py

@@ -1,7 +1,6 @@
 """Data modeling objects for creating corvic pipelines."""
 
 import corvic.model._feature_type as feature_type
-from corvic.model._agent import Agent, AgentID
 from corvic.model._base_model import (
     BaseModel,
     BelongsToOrgModel,
@@ -71,8 +70,6 @@ from corvic.model._space import (
 FeatureType = feature_type.FeatureType
 
 __all__ = [
-    "Agent",
-    "AgentID",
     "BaseModel",
     "BelongsToOrgModel",
     "BelongsToRoomModel",

{corvic_engine-0.3.0rc59 → corvic_engine-0.3.0rc60}/python/corvic/model/_base_model.py

@@ -215,12 +215,15 @@ class BaseModel(Generic[ID, ProtoObj, OrmObj], UsesOrmID[ID, ProtoObj]):
         with orm.Session(
             self.client.sa_engine, expire_on_commit=False, autoflush=False
         ) as session:
-            match self.delete_by_ids([self.id], session):
-                case InvalidArgumentError() as err:
-                    return err
-                case Ok(None):
-                    pass
-            session.commit()
+            try:
+                match self.delete_by_ids([self.id], session):
+                    case InvalidArgumentError() as err:
+                        return err
+                    case Ok(None):
+                        pass
+                session.commit()
+            except sa.exc.IntegrityError as exc:
+                return InvalidArgumentError.from_(exc)
 
             new_proto_self = copy.copy(self.proto_self)
             new_proto_self.id = ""

{corvic_engine-0.3.0rc59 → corvic_engine-0.3.0rc60}/python/corvic/model/_proto_orm_convert.py

@@ -121,17 +121,6 @@ def source_orm_to_proto(source_orm: orm.Source) -> models_pb2.Source:
     )
 
 
-def agent_orm_to_proto(agent_orm: orm.Agent) -> models_pb2.Agent:
-    return models_pb2.Agent(
-        id=str(agent_orm.id),
-        name=agent_orm.name,
-        room_id=str(agent_orm.room_id),
-        agent_parameters=agent_orm.parameters,
-        org_id=str(agent_orm.org_id),
-        created_at=timestamp_orm_to_proto(agent_orm.created_at),
-    )
-
-
 def feature_view_source_orm_to_proto(
     feature_view_source_orm: orm.FeatureViewSource,
 ) -> models_pb2.FeatureViewSource:
@@ -401,62 +390,6 @@ def source_proto_to_orm(
     return add_orm_room_mixin_to_session(orm_obj, proto_obj, orm.SourceID, session)
 
 
-def _update_agent_associations(
-    agent: orm.Agent,
-    session: sa_orm.Session,
-) -> list[orm.SpaceID]:
-    associated_space_ids = list[orm.SpaceID]()
-    agent_id = agent.id
-    agent_parameters = agent.parameters
-    if not agent_id or not agent_parameters:
-        return associated_space_ids
-    for (
-        raw_space_id,
-        instruction,
-    ) in agent_parameters.orchestrator_parameters.space_instructions.items():
-        space_id = orm.SpaceID(raw_space_id)
-        space_run_id = (
-            orm.SpaceRunID(instruction.space_run_id)
-            if instruction.space_run_id
-            else None
-        )
-        associated_space_ids.append(space_id)
-        session.merge(
-            orm.AgentSpaceAssociation(
-                room_id=agent.room_id,
-                agent_id=agent_id,
-                space_id=space_id,
-                space_run_id=space_run_id,
-            )
-        )
-    return associated_space_ids
-
-
-def agent_proto_to_orm(
-    proto_obj: models_pb2.Agent, session: sa_orm.Session
-) -> Ok[orm.Agent] | orm.InvalidORMIdentifierError | InvalidArgumentError:
-    orm_obj = orm.Agent(
-        name=proto_obj.name,
-        parameters=proto_obj.agent_parameters,
-    )
-    match add_orm_room_mixin_to_session(orm_obj, proto_obj, orm.AgentID, session):
-        case Ok(agent):
-            pass
-        case orm.InvalidORMIdentifierError() as err:
-            return err
-    session.flush()
-
-    if not agent.id:
-        return InvalidArgumentError("failed to add agent to session")
-    associated_space_ids = _update_agent_associations(agent, session)
-    session.execute(
-        sa.delete(orm.AgentSpaceAssociation)
-        .where(orm.AgentSpaceAssociation.agent_id == agent.id)
-        .where(orm.AgentSpaceAssociation.space_id.not_in(associated_space_ids))
-    )
-    return Ok(agent)
-
-
 def space_proto_to_orm(
     proto_obj: models_pb2.Space, session: sa_orm.Session
 ) -> Ok[orm.Space] | orm.InvalidORMIdentifierError | InvalidArgumentError:
@@ -664,18 +597,6 @@ def resource_delete_orms(
     return Ok(None)
 
 
-def agent_delete_orms(
-    ids: Sequence[orm.AgentID], session: orm.Session
-) -> Ok[None] | InvalidArgumentError:
-    session.execute(
-        sa.delete(orm.AgentSpaceAssociation).where(
-            orm.AgentSpaceAssociation.agent_id.in_(ids)
-        )
-    )
-    session.execute(sa.delete(orm.Agent).where(orm.Agent.id.in_(ids)))
-    return Ok(None)
-
-
 def feature_view_source_delete_orms(
     ids: Sequence[orm.FeatureViewSourceID], session: orm.Session
 ) -> Ok[None] | InvalidArgumentError:
@@ -722,16 +643,6 @@ def feature_view_delete_orms(
 def space_delete_orms(
     ids: Sequence[orm.SpaceID], session: orm.Session
 ) -> Ok[None] | InvalidArgumentError:
-    existing_agents = list(
-        session.scalars(
-            sa.select(orm.AgentSpaceAssociation)
-            .where(orm.AgentSpaceAssociation.space_id.in_(ids))
-            .limit(1)
-        )
-    )
-    if existing_agents:
-        return InvalidArgumentError("cannot delete a space that still has agents")
-
     session.execute(sa.delete(orm.Space).where(orm.Space.id.in_(ids)))
     return Ok(None)
 

{corvic_engine-0.3.0rc59 → corvic_engine-0.3.0rc60}/python/corvic/orm/__init__.py

@@ -48,7 +48,6 @@ from corvic.orm.mixins import (
     live_unique_constraint,
 )
 from corvic_generated.orm.v1 import (
-    agent_pb2,
     common_pb2,
     completion_model_pb2,
     feature_view_pb2,
@@ -292,77 +291,6 @@ class Space(BelongsToOrgMixin, BelongsToRoomMixin, Base, kw_only=True):
         return self.name
 
 
-class SpaceRun(BelongsToOrgMixin, BelongsToRoomMixin, Base, kw_only=True):
-    """A Space run."""
-
-    __tablename__ = "space_run"
-
-    id: sa_orm.Mapped[SpaceRunID | None] = primary_key_identity_column()
-    table_op_graph: sa_orm.Mapped[table_pb2.TableComputeOp] = sa_orm.mapped_column(
-        default_factory=table_pb2.TableComputeOp
-    )
-    space_id: sa_orm.Mapped[SpaceID] = sa_orm.mapped_column(
-        ForeignKey(Space).make(ondelete="CASCADE"), nullable=False
-    )
-    space: sa_orm.Mapped[Space] = sa_orm.relationship(init=False, viewonly=True)
-    result_url: sa_orm.Mapped[str | None] = sa_orm.mapped_column(sa.Text, default=None)
-    coordinates_urls: sa_orm.Mapped[common_pb2.BlobUrlList | None] = (
-        sa_orm.mapped_column(default=None)
-    )
-    latest_event: sa_orm.Mapped[event_pb2.Event | None] = sa_orm.mapped_column(
-        default=None, nullable=True
-    )
-    vector_urls: sa_orm.Mapped[common_pb2.BlobUrlList | None] = sa_orm.mapped_column(
-        default=None
-    )
-
-    embedding_metrics: sa_orm.Mapped[common_pb2.EmbeddingMetrics | None] = (
-        sa_orm.mapped_column(default=None)
-    )
-    insight_tools: sa_orm.Mapped[table_pb2.NamedTables | None] = sa_orm.mapped_column(
-        default=None
-    )
-    combine_embeddings_from: sa_orm.Mapped[SpaceRunID | None] = sa_orm.mapped_column(
-        sa.ForeignKey("space_run.id"), nullable=True, default=None
-    )
-
-
-class Agent(SoftDeleteMixin, BelongsToOrgMixin, BelongsToRoomMixin, Base, kw_only=True):
-    """An Agent."""
-
-    __tablename__ = "agent"
-    __table_args__ = (live_unique_constraint("name", "room_id"),)
-
-    id: sa_orm.Mapped[AgentID | None] = primary_key_identity_column()
-    name: sa_orm.Mapped[str] = sa_orm.mapped_column(sa.Text, default=None)
-
-    @property
-    def agent_key(self):
-        return self.name
-
-    parameters: sa_orm.Mapped[agent_pb2.AgentParameters | None] = sa_orm.mapped_column(
-        default=None
-    )
-
-    space_associations: sa_orm.Mapped[list[AgentSpaceAssociation]] = (
-        sa_orm.relationship(default_factory=list, init=False, viewonly=True)
-    )
-
-
-class AgentSpaceAssociation(BelongsToOrgMixin, BelongsToRoomMixin, Base, kw_only=True):
-    __tablename__ = "agent_space_association"
-
-    space_run_id: sa_orm.Mapped[SpaceRunID | None] = sa_orm.mapped_column(
-        ForeignKey(SpaceRun).make()
-    )
-    agent_id: sa_orm.Mapped[AgentID] = primary_key_foreign_column(
-        ForeignKey(Agent).make(ondelete="CASCADE")
-    )
-    space_id: sa_orm.Mapped[SpaceID] = primary_key_foreign_column(
-        ForeignKey(Space).make()
-    )
-
-
 class CompletionModel(SoftDeleteMixin, BelongsToOrgMixin, Base, kw_only=True):
     """A customer's custom completion model definition."""
 
@@ -412,7 +340,6 @@ ID = (
 
 
 __all__ = [
-    "Agent",
     "AgentID",
     "AgentMessageID",
     "Base",
@@ -446,7 +373,6 @@ __all__ = [
     "Space",
     "SpaceID",
     "SpaceParametersID",
-    "SpaceRun",
     "SpaceRunID",
     "UserMessageID",
     "primary_key_foreign_column",

{corvic_engine-0.3.0rc59 → corvic_engine-0.3.0rc60}/python/corvic/orm/base.py

@@ -167,7 +167,7 @@ class Base(sa_orm.MappedAsDataclass, sa_orm.DeclarativeBase):
     @updated_at.inplace.expression
     @classmethod
     def _updated_at_expression(cls):
-        return cls._created_at
+        return cls._updated_at
 
 
 class OrgBase(Base):

corvic_engine-0.3.0rc59/python/corvic/model/_agent.py

@@ -1,154 +0,0 @@
-"""Corvic Agents."""
-
-from __future__ import annotations
-
-import copy
-import datetime
-from collections.abc import Iterable, Sequence
-from typing import TypeAlias
-
-from sqlalchemy import orm as sa_orm
-
-from corvic import orm, system
-from corvic.model._base_model import BelongsToRoomModel
-from corvic.model._defaults import Defaults
-from corvic.model._proto_orm_convert import (
-    agent_delete_orms,
-    agent_orm_to_proto,
-    agent_proto_to_orm,
-)
-from corvic.result import InvalidArgumentError, NotFoundError, Ok
-from corvic_generated.model.v1alpha import models_pb2
-from corvic_generated.orm.v1.agent_pb2 import AgentParameters
-
-OrgID: TypeAlias = orm.OrgID
-RoomID: TypeAlias = orm.RoomID
-FeatureViewID: TypeAlias = orm.FeatureViewID
-AgentID: TypeAlias = orm.AgentID
-
-
-class Agent(BelongsToRoomModel[AgentID, models_pb2.Agent, orm.Agent]):
-    """A corvic agent represents a named agent that can produce embeddings."""
-
-    @classmethod
-    def orm_class(cls):
-        return orm.Agent
-
-    @classmethod
-    def id_class(cls):
-        return AgentID
-
-    @classmethod
-    def orm_to_proto(cls, orm_obj: orm.Agent) -> models_pb2.Agent:
-        return agent_orm_to_proto(orm_obj)
-
-    @classmethod
-    def proto_to_orm(
-        cls, proto_obj: models_pb2.Agent, session: orm.Session
-    ) -> Ok[orm.Agent] | InvalidArgumentError:
-        return agent_proto_to_orm(proto_obj, session)
-
-    @classmethod
-    def delete_by_ids(
-        cls, ids: Sequence[AgentID], session: orm.Session
-    ) -> Ok[None] | InvalidArgumentError:
-        return agent_delete_orms(ids, session)
-
-    @classmethod
-    def from_id(
-        cls,
-        agent_id: AgentID,
-        client: system.Client | None = None,
-        session: sa_orm.Session | None = None,
-    ) -> Ok[Agent] | NotFoundError:
-        client = client or Defaults.get_default_client()
-        return cls.load_proto_for(agent_id, client, existing_session=session).map(
-            lambda proto_self: cls(client, proto_self)
-        )
-
-    @classmethod
-    def from_orm(
-        cls,
-        agent: orm.Agent,
-        client: system.Client | None = None,
-    ):
-        client = client or Defaults.get_default_client()
-        return cls(
-            client,
-            cls.orm_to_proto(agent),
-        )
-
-    @classmethod
-    def create(
-        cls,
-        name: str,
-        parameters: AgentParameters,
-        room_id: RoomID | None = None,
-        client: system.Client | None = None,
-    ):
-        client = client or Defaults.get_default_client()
-        return cls(
-            client,
-            models_pb2.Agent(
-                name=name,
-                agent_parameters=parameters,
-                room_id=str(room_id or Defaults.get_default_room_id(client)),
-            ),
-        )
-
-    @classmethod
-    def from_proto(
-        cls, proto: models_pb2.Agent, client: system.Client | None = None
-    ) -> Agent:
-        client = client or Defaults.get_default_client()
-        return cls(client, proto)
-
-    @classmethod
-    def list(
-        cls,
-        *,
-        limit: int | None = None,
-        room_id: RoomID | None = None,
-        created_before: datetime.datetime | None = None,
-        client: system.Client | None = None,
-        ids: Iterable[AgentID] | None = None,
-        existing_session: sa_orm.Session | None = None,
-    ) -> Ok[list[Agent]] | NotFoundError | InvalidArgumentError:
-        """List agent models."""
-        client = client or Defaults.get_default_client()
-        match cls.list_as_proto(
-            client,
-            limit=limit,
-            room_id=room_id,
-            created_before=created_before,
-            ids=ids,
-            existing_session=existing_session,
-        ):
-            case NotFoundError() | InvalidArgumentError() as err:
-                return err
-            case Ok(protos):
-                return Ok([cls.from_proto(proto, client) for proto in protos])
-
-    @property
-    def name(self) -> str:
-        return self.proto_self.name
-
-    @property
-    def parameters(self) -> AgentParameters:
-        return self.proto_self.agent_parameters
-
-    def with_name(self, name: str) -> Agent:
-        proto_self = copy.deepcopy(self.proto_self)
-        proto_self.name = name
-        return self.__class__(
-            self.client,
-            proto_self=proto_self,
-        )
-
-    def with_parameters(self, parameters: AgentParameters) -> Agent:
-        proto_self = copy.deepcopy(self.proto_self)
-        proto_self.agent_parameters.CopyFrom(parameters)
-        return self.__class__(
-            self.client,
-            proto_self=proto_self,
-        )