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

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/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/orm/__init__.py

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

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/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))

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

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

@@ -11,17 +11,17 @@ 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=TpZtvtqt8GY1ZiKvwg1rEFYX85PRAhCbsV1DqVfvStE,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=JSFEPHeou1oUXlIrNhUVjjAHjwCjoFIWPpz2X9sUYmI,9527
+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
 corvic/model/_feature_type.py,sha256=Y-_-wa9fv7XaCAkxfjjoCLxxK2Ftfba-PMefD7bNXzs,917
 corvic/model/_feature_view.py,sha256=vRh9eVDlais8enZVymQtwPz8vd3QtwSRYR1CnlKtCnA,49698
-corvic/model/_pipeline.py,sha256=X9b34eCTD4zr6IF61EZRLC89n_Fi9HrsukoghDKwhI8,18685
+corvic/model/_pipeline.py,sha256=CIqp0gLkADw3gXkDW--NJwOBqt6N4Qj6XWyvGDXi8Hc,18785
 corvic/model/_proto_orm_convert.py,sha256=n27mPojg9ESt8ZO3puG9NfLFWNUAbUY6TuYqfCP5voQ,23900
 corvic/model/_resource.py,sha256=R973-POS5HDCo7hIoxsBNauH1YAPisZDFLrWIxjygbk,8495
 corvic/model/_room.py,sha256=36mXngZ38L4mr6_LgUm-QgsUUaoGMiYQRfvXLV_jd-4,2914
@@ -41,7 +41,7 @@ corvic/op_graph/row_filters/__init__.py,sha256=1sibH_kLw7t_9bpRccnEGWqdCiN0VaUh9
 corvic/op_graph/row_filters/_jsonlogic.py,sha256=0UdwOZmIGp4yuExHM3qqAnJYmcGv7iuc3vLub3GD-9Y,7685
 corvic/op_graph/row_filters/_row_filters.py,sha256=p3O7tJbLsy65Vs7shAiDjpdM4RzYA4-fyzwskt15pPk,9469
 corvic/op_graph/sample_strategy.py,sha256=DrbtJ3ORkIRfyIE_FdlOh_UMnCW_K9jL1LeonVYb3bU,3007
-corvic/orm/__init__.py,sha256=id3zLYtj3XjNZPOH2A8ULlRtT6h2TETaZwOiQ79huqI,12452
+corvic/orm/__init__.py,sha256=P5P-yDBHaPKDM5bH3MurOgXx8CgZk6oxwuW6ZxoTOCE,12431
 corvic/orm/_proto_columns.py,sha256=tcOu92UjFJFYZLasS6sWJQBDRK26yrnmpTii_LDY4iw,913
 corvic/orm/base.py,sha256=xASrtKQe9Zl0jfgteI4q8c77ju3cNQKPoQ47sXqXzGc,8820
 corvic/orm/errors.py,sha256=uFhFXpVG6pby1lndJZHGHxv3Y0Fbt0RiaZ-CqDfuY1o,545
@@ -50,7 +50,7 @@ corvic/orm/func/utc_func.py,sha256=-FC6w9wBWXejMv1AICT2Gg7tdkSo7gqL2dFT-YKPGQ4,4
 corvic/orm/func/uuid_func.py,sha256=oXPjDGAl3mvlNtvcvBrLmRRHPJgtKffShIPbHm-EswA,1152
 corvic/orm/ids.py,sha256=L9v7toMmRh7aM8ZtDGLyKoQaidG5jQDFC3WlwrmSu7g,6758
 corvic/orm/keys.py,sha256=Ag6Xbpvxev-VByT1KJ8ChUn9vKVEzkkMXxrjvtADCtY,2182
-corvic/orm/mixins.py,sha256=phSkm9Q5b6ikVprlIAM6oeASasWSkXHh63J-_2a9-vs,18016
+corvic/orm/mixins.py,sha256=tBsXLdP_7vuNmyVe70yCfIzrPz9oX7dM67IToChzPBs,17995
 corvic/orm/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/pa_scalar/__init__.py,sha256=1nfc0MFGpw78RQEI13VE5hpHuyw_DoE7sJbmzqx5pws,1063
 corvic/pa_scalar/_const.py,sha256=1nk6w3Y7crd3J5jSCq7DRVa1lcGk4H1RUr1l4NjnlzE,868
@@ -76,7 +76,7 @@ corvic/system/_image_embedder.py,sha256=i595n22L8rmiZQ0sT3JTu_RBJrcU_5Vl95K2HPJt
 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=VtZqIHyeHDpgV1Lh88v3YQFybsRz51uT-DeWwn5kgdM,66607
+corvic/system/in_memory_executor.py,sha256=Ds2A_RLoQeGVMpvKDz4IXTq0r5SgPcpMKHYm8vW6R7k,66622
 corvic/system/op_graph_executor.py,sha256=dFxbM_kk5ybPxs3NwyuW3Xg-xCB031toWCFv8eEW8qE,3639
 corvic/system/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/system/staging.py,sha256=K5P5moiuAMfPx7lxK4mArxeURBwKoyB6x9HGu9JJ16E,1846
@@ -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.0rc75.dist-info/METADATA,sha256=DAtmPlNxfrMZi0pV067JeT84Y8UzxdQkAjLk8_bmZeg,1814
-corvic_engine-0.3.0rc75.dist-info/WHEEL,sha256=qo08K5WTt1v9liGoFGXfI182ciKs5521XAErJtzFynQ,94
-corvic_engine-0.3.0rc75.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.0rc75.dist-info/RECORD,,
+corvic_engine-0.3.0rc77.dist-info/RECORD,,