corvic-engine 0.3.0rc76__cp38-abi3-win_amd64.whl → 0.3.0rc77__cp38-abi3-win_amd64.whl

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:

{corvic_engine-0.3.0rc76.dist-info → corvic_engine-0.3.0rc77.dist-info}/METADATA

@@ -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.dist-info → corvic_engine-0.3.0rc77.dist-info}/RECORD

@@ -11,11 +11,11 @@ corvic/embedding_metric/__init__.py,sha256=8a-QKSQNbiksueHk5LdkugjZr6wasP4ff8A-J
 corvic/embedding_metric/embeddings.py,sha256=XCiMzoGdRSmCOJnBDnxm3xlU0L_vrXwUxEjwdMv1FMI,14036
 corvic/embedding_metric/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/engine/__init__.py,sha256=XL4Vg7rNcBi29ccVelpeFizR9oJtGYXDn84W9zok9d4,975
-corvic/engine/_native.pyd,sha256=vyCaz-8yzLSStZxu034YAc6k4miRwk24qlULQTnL9hM,438272
+corvic/engine/_native.pyd,sha256=oZ8tiGVOEcQUbgEFzM24eDwxgdUxcCCc87cR9f24ZuM,438272
 corvic/engine/_native.pyi,sha256=KYMPtvXqHZ-jMgZohLf4se3rr-rBpCihmjANcr6s8ag,1390
 corvic/engine/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/model/__init__.py,sha256=ZtMq8LTJE013v-OoVq0muo0aqomNGrjmXwKfS8wd4CU,3075
-corvic/model/_base_model.py,sha256=jwDm-5mnQRZIcTUYPaRxJcW56wtdLlR6wi_jJDuyPYY,10382
+corvic/model/_base_model.py,sha256=dgoCvxhroX0Bp21r7LhO69rZCBJyf8zio9UaLqpM1iQ,10263
 corvic/model/_completion_model.py,sha256=HMp3yCgRtPUUf0KMAw5GoVXAlrfPhQ9h6ytEIkY9yEs,7634
 corvic/model/_defaults.py,sha256=yoKPPSmYJCE5YAD5jLTEmT4XNf_zXoggNK-uyG8MfVs,1524
 corvic/model/_errors.py,sha256=Ctlq04SDwHzJPvLaL1rzqzwVqf2b50EILfW3cH4vnh8,261
@@ -94,9 +94,9 @@ corvic/version/__init__.py,sha256=JlkRLvKXsu3zIxhdynO_0Ub5NfQOvGjfwCRkNnaOu9U,11
 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.0rc76.dist-info/METADATA,sha256=QTWzeErHxDCCl0jVCeMl9i5mpiRpXIOT0LAh0PgEv7o,1814
-corvic_engine-0.3.0rc76.dist-info/WHEEL,sha256=qo08K5WTt1v9liGoFGXfI182ciKs5521XAErJtzFynQ,94
-corvic_engine-0.3.0rc76.dist-info/licenses/LICENSE,sha256=DSS1OD0oIgssKOmAzkMRBv5jvvVuZQbrIv8lpl9DXY8,1035
+corvic_engine-0.3.0rc77.dist-info/METADATA,sha256=-HhsUDmdXgIY4oR16Ib9bpTQEcLaIf_m-Bl-7vEa4x4,1814
+corvic_engine-0.3.0rc77.dist-info/WHEEL,sha256=qo08K5WTt1v9liGoFGXfI182ciKs5521XAErJtzFynQ,94
+corvic_engine-0.3.0rc77.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
@@ -207,4 +207,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.0rc76.dist-info/RECORD,,
+corvic_engine-0.3.0rc77.dist-info/RECORD,,