corvic-engine 0.3.0rc53__tar.gz → 0.3.0rc54__tar.gz

{corvic_engine-0.3.0rc53 → corvic_engine-0.3.0rc54}/Cargo.lock

@@ -22,7 +22,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "corvic-engine"
-version = "0.3.0-rc.53"
+version = "0.3.0-rc.54"
 dependencies = [
  "numpy",
  "pyo3",
@@ -63,7 +63,7 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "engine-walk"
-version = "0.3.0-rc.53"
+version = "0.3.0-rc.54"
 dependencies = [
  "version_check",
 ]

{corvic_engine-0.3.0rc53 → corvic_engine-0.3.0rc54}/Cargo.toml

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

{corvic_engine-0.3.0rc53 → corvic_engine-0.3.0rc54}/PKG-INFO

@@ -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 → corvic_engine-0.3.0rc54}/pyproject.toml

@@ -20,7 +20,7 @@ authors = [
 ]
 readme = "README.md"
 description = "Seamless embedding generation and retrieval."
-version = "0.3.0-rc.53" # sync this with tool.poetry.version below
+version = "0.3.0-rc.54" # 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.
@@ -74,7 +74,7 @@ packages = [
 ]
 description = ""
 authors = []
-version = "0.3.0-rc.53"
+version = "0.3.0-rc.54"
 
 [tool.poetry.scripts]
 check = "corvic_check.cli:main"

{corvic_engine-0.3.0rc53 → corvic_engine-0.3.0rc54}/python/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_engine-0.3.0rc53 → corvic_engine-0.3.0rc54}/python/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):