corvic-engine 0.3.0rc53__cp38-abi3-win_amd64.whl → 0.3.0rc54__cp38-abi3-win_amd64.whl

corvic/pa_scalar/_to_value.py

@@ -414,28 +414,23 @@ def _visit(
 
 
 def to_value(
-    scalar: Scalar | float | str | bool | None | struct_pb2.Value,
+    scalar: Scalar | _PyValue | struct_pb2.Value,
 ) -> struct_pb2.Value:
     """Convert Scalar (or convenient Scalar equivalents) to struct_pb2.Value."""
     match scalar:
-        # Order matters: bools are ints but ints are not bools
-        case bool():
-            return struct_pb2.Value(bool_value=scalar)
-        case int():
-            return struct_pb2.Value(string_value=str(scalar))
-        case float():
-            if _is_invalid_float(scalar):
-                return to_value(None)
-            return struct_pb2.Value(number_value=scalar)
-        case str():
-            return struct_pb2.Value(string_value=scalar)
-        case None:
-            return struct_pb2.Value(null_value=struct_pb2.NULL_VALUE)
         case struct_pb2.Value():
             return scalar
-        case _:
+        case pa.Scalar():
             value = cast(_PyValue, scalar.as_py())
-            return _visit(value, scalar.type)
+            return _visit(value, cast(Scalar, scalar).type)
+        case _:
+            try:
+                # Attempt to convert the python value into a pyarrow scalar and
+                # then go through our visitor
+                pa_value = cast(Scalar, pa.scalar(cast(Any, scalar)))
+                return to_value(pa_value)
+            except Exception:
+                return struct_pb2.Value(null_value=struct_pb2.NULL_VALUE)
 
 
 def _to_py(scalar: Scalar) -> Any:

corvic/table/table.py

@@ -62,9 +62,6 @@ _TM = TypeVar("_TM", bound=TypedMetadata)
 
 _logger = structlog.get_logger()
 
-CORVIC_RESERVED_PREFIX = "__corvic"
-CORVIC_SURROGATE_ID = f"{CORVIC_RESERVED_PREFIX}_surrogate_id"
-
 
 @dataclasses.dataclass
 class DataclassAsTypedMetadataMixin:
@@ -366,16 +363,6 @@ class Table:
                 case Ok(op):
                     pass
 
-        # For internally added columns we can set custom feature types
-        if CORVIC_SURROGATE_ID in schema:
-            match op.update_feature_types(
-                {CORVIC_SURROGATE_ID: op_graph.feature_type.identifier()}
-            ):
-                case InvalidArgumentError() as error:
-                    return error
-                case Ok(op):
-                    pass
-
         return Ok(cls.from_ops(client, op))
 
     def to_bytes(self):

{corvic_engine-0.3.0rc53.dist-info → corvic_engine-0.3.0rc54.dist-info}/METADATA

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

{corvic_engine-0.3.0rc53.dist-info → corvic_engine-0.3.0rc54.dist-info}/RECORD

@@ -1,6 +1,6 @@
-corvic_engine-0.3.0rc53.dist-info/METADATA,sha256=05SxfLAI-iBbGVEG_8enK3Ux-kx7hqfYaPNw7xv6FdI,1876
-corvic_engine-0.3.0rc53.dist-info/WHEEL,sha256=_g1M2QM3kt1Ssm_sHOg_3TUY7GxNE2Ueyslb9ZDtPwk,94
-corvic_engine-0.3.0rc53.dist-info/licenses/LICENSE,sha256=DSS1OD0oIgssKOmAzkMRBv5jvvVuZQbrIv8lpl9DXY8,1035
+corvic_engine-0.3.0rc54.dist-info/METADATA,sha256=dIswsV76aebo40RElZBVxIi8a_5eXaWzbfg1013YXEE,1876
+corvic_engine-0.3.0rc54.dist-info/WHEEL,sha256=_g1M2QM3kt1Ssm_sHOg_3TUY7GxNE2Ueyslb9ZDtPwk,94
+corvic_engine-0.3.0rc54.dist-info/licenses/LICENSE,sha256=DSS1OD0oIgssKOmAzkMRBv5jvvVuZQbrIv8lpl9DXY8,1035
 corvic/context/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/context/__init__.py,sha256=zBnPiP-tStGSVMG_0-G_0ay6-yIX2aerW_oYRzAex74,1702
 corvic/embed/node2vec.py,sha256=JnYb8f2g4XhF6LL2TjpMxLfKhn_Yp1AzptsWwrKQWgc,11146
@@ -55,7 +55,7 @@ corvic/pa_scalar/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/pa_scalar/_const.py,sha256=1nk6w3Y7crd3J5jSCq7DRVa1lcGk4H1RUr1l4NjnlzE,868
 corvic/pa_scalar/_from_value.py,sha256=fS3TNPcPI3jAKGmcUIhn8rdqdQEAwgTLEneVxFUeK6M,27531
 corvic/pa_scalar/_temporal.py,sha256=HPL1z5k4frIiGWM469YGj9j0hCPXNHtI_X1jk1y1c1Q,7842
-corvic/pa_scalar/_to_value.py,sha256=C1l-BVsS4Rs_KL8hVPllpzjP0NVVwfaOb0WM2pjZhoA,13476
+corvic/pa_scalar/_to_value.py,sha256=U8DoWDMSl58Yi35yd3JS5Gj773e5IOPa2UDfuZqTkjk,13307
 corvic/pa_scalar/_types.py,sha256=shbytO0ji-H2rBOX_1fooVOshb22wwkVU1W99VBKz1A,1131
 corvic/pa_scalar/__init__.py,sha256=1nfc0MFGpw78RQEI13VE5hpHuyw_DoE7sJbmzqx5pws,1063
 corvic/proto_wrapper/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -86,7 +86,7 @@ corvic/system_sqlite/rdbms_blob_store.py,sha256=gTP_tQfTVb3wzZkzo8ys1zaz0rSrERzb
 corvic/system_sqlite/staging.py,sha256=P6XdWhjpgcpOZkYxKEjpsTxaAdBKOeSVfARjqt4_xJA,16948
 corvic/system_sqlite/__init__.py,sha256=F4UN9vFsXiDY2AKk1jYZPuWWJpSugKHS7ghXeZYlbZs,390
 corvic/table/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-corvic/table/table.py,sha256=drWy8vMODWBUy86UcZP34yHPx2ewoAqvsnsAMJKegB8,25538
+corvic/table/table.py,sha256=wgA4d1QslrGu7rvzyiob21hLd7esyjgO_QntaSYl-4Q,25038
 corvic/table/__init__.py,sha256=Gj0IR8BQF5PZK92Us7PP0ZigMsVyrfWJupzH8TgzRQk,588
 corvic/version/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corvic/version/__init__.py,sha256=JlkRLvKXsu3zIxhdynO_0Ub5NfQOvGjfwCRkNnaOu9U,1125
@@ -244,5 +244,5 @@ corvic_generated/status/v1/event_pb2.pyi,sha256=eU-ibrYpvEAJSIDlSa62-bC96AQU1ykF
 corvic_generated/status/v1/event_pb2_grpc.pyi,sha256=H9-ADaiKR9iyVZvmnXutZqWwRRCDxjUIktkfJrJFIHg,417
 corvic_generated/status/v1/service_pb2.pyi,sha256=iXLR2FOKQJpBgvBzpD2kVwcYOCksP2aRwK4JYaI9CBw,558
 corvic_generated/status/v1/service_pb2_grpc.pyi,sha256=OoAnaZ64FD0UTzPoRhYvQU8ecoilhHj3ySjSfHbVDaU,1501
-corvic/engine/_native.pyd,sha256=qW1jOU_N4O6RXm94vu2WGXfdd6c-nc5gj-cN38RAysk,438272
-corvic_engine-0.3.0rc53.dist-info/RECORD,,
+corvic/engine/_native.pyd,sha256=I1MFZZQaMhCn6DLZyvp-gCPp22KegJanmob1Do2OH7Y,438272
+corvic_engine-0.3.0rc54.dist-info/RECORD,,