corvic-engine 0.3.0rc75__tar.gz → 0.3.0rc77__tar.gz

{corvic_engine-0.3.0rc75 → corvic_engine-0.3.0rc77}/Cargo.lock

@@ -16,7 +16,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "corvic-engine"
-version = "0.3.0-rc.75"
+version = "0.3.0-rc.77"
 dependencies = [
  "numpy",
  "pyo3",
@@ -57,7 +57,7 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "engine-walk"
-version = "0.3.0-rc.75"
+version = "0.3.0-rc.77"
 dependencies = [
  "version_check",
 ]

{corvic_engine-0.3.0rc75 → corvic_engine-0.3.0rc77}/Cargo.toml

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

{corvic_engine-0.3.0rc75 → corvic_engine-0.3.0rc77}/PKG-INFO

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

{corvic_engine-0.3.0rc75 → corvic_engine-0.3.0rc77}/pyproject.toml

@@ -18,7 +18,7 @@ authors = [
 ]
 readme = "README.md"
 description = "Seamless embedding generation and retrieval."
-version = "0.3.0-rc.75" # sync this with tool.poetry.version below
+version = "0.3.0-rc.77" # 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.
@@ -72,7 +72,7 @@ packages = [
 ]
 description = ""
 authors = []
-version = "0.3.0-rc.75"
+version = "0.3.0-rc.77"
 
 [tool.poetry.scripts]
 check = "corvic_check.cli:main"
@@ -120,6 +120,7 @@ import-linter = "^2.0"
 maturin = "^1.4.0"
 pdoc = "^14.5.1"
 pre-commit = "^4.0.0"
+psycopg = { extras = ["binary"], version = "^3.2" }
 pyright = "^1.1.387"
 pytest = "^8.1.1"
 pytest-asyncio = "^0.26"

{corvic_engine-0.3.0rc75 → corvic_engine-0.3.0rc77}/python/corvic/model/_base_model.py

@@ -23,7 +23,12 @@ from corvic.model._proto_orm_convert import (
     ProtoBelongsToRoomObj,
     ProtoObj,
 )
-from corvic.result import InvalidArgumentError, NotFoundError, Ok
+from corvic.result import (
+    InvalidArgumentError,
+    NotFoundError,
+    Ok,
+    UnavailableError,
+)
 
 _logger = structlog.get_logger()
 
@@ -187,7 +192,7 @@ class BaseModel(Generic[ID, ProtoObj, OrmObj], UsesOrmID[ID, ProtoObj]):
                 ]
             )
 
-    def commit(self) -> Ok[Self] | InvalidArgumentError:
+    def commit(self) -> Ok[Self] | InvalidArgumentError | UnavailableError:
         """Store this object in the database at its id or a newly allocated id.
 
         This overwrites the entry at id in the database so that future readers will see
@@ -199,8 +204,8 @@ class BaseModel(Generic[ID, ProtoObj, OrmObj], UsesOrmID[ID, ProtoObj]):
                     self.proto_self, session
                 ).unwrap_or_raise()
                 session.commit()
-            except sa.exc.DatabaseError as err:
-                return InvalidArgumentError.from_(err)
+            except sa.exc.DBAPIError as err:
+                return self._dbapi_error_to_result(err)
             return Ok(
                 self.__class__(
                     client=self.client,
@@ -208,7 +213,25 @@ class BaseModel(Generic[ID, ProtoObj, OrmObj], UsesOrmID[ID, ProtoObj]):
                 )
             )
 
-    def add_to_session(self, session: orm.Session) -> Ok[None] | InvalidArgumentError:
+    @staticmethod
+    def _dbapi_error_to_result(err: sa.exc.DBAPIError):
+        try:
+            import psycopg.errors
+
+            if isinstance(err.orig, psycopg.errors.SerializationFailure):
+                return UnavailableError.from_(err)
+        except ModuleNotFoundError:
+            pass
+        if isinstance(err, sa.exc.ProgrammingError):
+            if "violates foreign key constraint" in str(err):
+                return InvalidArgumentError.from_(err)
+            if "could not serialize access due to concurrent update" in str(err):
+                return UnavailableError.from_(err)
+        return InvalidArgumentError.from_(err)
+
+    def add_to_session(
+        self, session: orm.Session
+    ) -> Ok[None] | InvalidArgumentError | UnavailableError:
         """Like commit, but just calls session.flush to check for database errors.
 
         This adds the updated object to a transaction in session. Unlike commit
@@ -219,8 +242,8 @@ class BaseModel(Generic[ID, ProtoObj, OrmObj], UsesOrmID[ID, ProtoObj]):
             _ = self.proto_to_orm(self.proto_self, session).unwrap_or_raise()
             session.flush()
         # TODO(thunt): Possibly separate out DatabaseError into a precondition error
-        except (sa.exc.DatabaseError, sa.exc.StatementError) as err:
-            return InvalidArgumentError.from_(err)
+        except sa.exc.DBAPIError as err:
+            return self._dbapi_error_to_result(err)
         return Ok(None)
 
     def delete(self) -> Ok[Self] | NotFoundError | InvalidArgumentError:

{corvic_engine-0.3.0rc75 → corvic_engine-0.3.0rc77}/python/corvic/model/_pipeline.py

@@ -22,7 +22,7 @@ from corvic.model._proto_orm_convert import (
     pipeline_proto_to_orm,
 )
 from corvic.model._source import Source
-from corvic.result import InvalidArgumentError, NotFoundError, Ok
+from corvic.result import InvalidArgumentError, NotFoundError, Ok, UnavailableError
 from corvic_generated.model.v1alpha import models_pb2
 from corvic_generated.orm.v1 import pipeline_pb2
 
@@ -268,7 +268,7 @@ class OcrPdfsPipeline(Pipeline):
         description: str = "",
         client: system.Client | None = None,
         room_id: RoomID | None = None,
-    ) -> Ok[Self] | InvalidArgumentError:
+    ) -> Ok[Self] | InvalidArgumentError | UnavailableError:
         """Create a pipeline for using OCR to process PDFs into structured sources."""
         client = client or Defaults.get_default_client()
         room_id = room_id or Defaults.get_default_room_id(client)
@@ -325,7 +325,7 @@ class OcrPdfsPipeline(Pipeline):
             )
             .and_then(lambda s: s.commit())
         ):
-            case InvalidArgumentError() as err:
+            case InvalidArgumentError() | UnavailableError() as err:
                 return err
             case Ok(text_source):
                 pass
@@ -356,7 +356,7 @@ class OcrPdfsPipeline(Pipeline):
             )
             .and_then(lambda s: s.commit())
         ):
-            case InvalidArgumentError() as err:
+            case InvalidArgumentError() | UnavailableError() as err:
                 return err
             case Ok(relationship_source):
                 pass
@@ -419,7 +419,7 @@ class OcrPdfsPipeline(Pipeline):
             )
             .and_then(lambda s: s.commit())
         ):
-            case InvalidArgumentError() as err:
+            case InvalidArgumentError() | UnavailableError() as err:
                 return err
             case Ok(image_source):
                 pass

{corvic_engine-0.3.0rc75 → corvic_engine-0.3.0rc77}/python/corvic/orm/__init__.py

@@ -89,7 +89,6 @@ class BelongsToRoomMixin(sa_orm.MappedAsDataclass):
         ForeignKey(Room).make(ondelete="CASCADE"),
         nullable=True,
         default=None,
-        index=True,
     )
 
 

{corvic_engine-0.3.0rc75 → corvic_engine-0.3.0rc77}/python/corvic/orm/mixins.py

@@ -229,7 +229,6 @@ class BelongsToOrgMixin(sa_orm.MappedAsDataclass):
         nullable=False,
         default_factory=_make_org_id_default,
         init=False,
-        index=True,
     )
 
     @sa_orm.validates("org_id")

{corvic_engine-0.3.0rc75 → corvic_engine-0.3.0rc77}/python/corvic/system/in_memory_executor.py

@@ -1132,7 +1132,7 @@ class InMemoryExecutor(OpGraphExecutor):
                 min_alpha=op.min_alpha,
                 negative=op.negative,
             )
-            n2v_runner.train(epochs=op.epochs)
+            n2v_runner.train(epochs=op.epochs, verbose=False)
             return n2v_runner.wv.to_polars().lazy()
 
         return Ok(_LazyFrameWithMetrics(await context.run_on_worker(run_n2v), metrics))