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

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

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

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

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

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

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

{corvic_engine-0.3.0rc76 → 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.76" # 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.76"
+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.0rc76 → corvic_engine-0.3.0rc77}/python/corvic/model/_base_model.py

@@ -204,14 +204,8 @@ class BaseModel(Generic[ID, ProtoObj, OrmObj], UsesOrmID[ID, ProtoObj]):
                     self.proto_self, session
                 ).unwrap_or_raise()
                 session.commit()
-            except sa.exc.ProgrammingError as err:
-                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)
-            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(
                 self.__class__(
                     client=self.client,
@@ -219,6 +213,22 @@ class BaseModel(Generic[ID, ProtoObj, OrmObj], UsesOrmID[ID, ProtoObj]):
                 )
             )
 
+    @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:
@@ -232,14 +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.ProgrammingError as err:
-            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)
-        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: