cocoindex 0.1.59__cp311-cp311-manylinux_2_28_aarch64.whl → 0.1.60__cp311-cp311-manylinux_2_28_aarch64.whl

cocoindex/__init__.py

@@ -17,7 +17,16 @@ from .llm import LlmSpec, LlmApiType
 from .index import VectorSimilarityMetric, VectorIndexDef, IndexOptions
 from .setting import DatabaseConnectionSpec, Settings, ServerSettings
 from .setting import get_app_namespace
-from .typing import Float32, Float64, LocalDateTime, OffsetDateTime, Range, Vector, Json
+from .typing import (
+    Int64,
+    Float32,
+    Float64,
+    LocalDateTime,
+    OffsetDateTime,
+    Range,
+    Vector,
+    Json,
+)
 
 __all__ = [
     # Submodules
@@ -64,6 +73,7 @@ __all__ = [
     "ServerSettings",
     "get_app_namespace",
     # Typing
+    "Int64",
     "Float32",
     "Float64",
     "LocalDateTime",

cocoindex/tests/test_convert.py

@@ -78,16 +78,15 @@ def build_engine_value_decoder(
     return make_engine_value_decoder([], engine_type, python_type or engine_type_in_py)
 
 
-def validate_full_roundtrip(
+def validate_full_roundtrip_to(
     value: Any,
-    value_type: Any = None,
-    *other_decoded_values: tuple[Any, Any],
+    value_type: Any,
+    *decoded_values: tuple[Any, Any],
 ) -> None:
     """
-    Validate the given value doesn't change after encoding, sending to engine (using output_type), receiving back and decoding (using input_type).
+    Validate the given value becomes specific values after encoding, sending to engine (using output_type), receiving back and decoding (using input_type).
 
-    `other_decoded_values` is a tuple of (value, type) pairs.
-    If provided, also validate the value can be decoded to the other types.
+    `decoded_values` is a tuple of (value, type) pairs.
     """
     from cocoindex import _engine  # type: ignore
 
@@ -102,15 +101,27 @@ def validate_full_roundtrip(
     value_from_engine = _engine.testutil.seder_roundtrip(
         encoded_value, encoded_output_type
     )
-    decoder = make_engine_value_decoder([], encoded_output_type, value_type)
-    decoded_value = decoder(value_from_engine)
-    assert eq(decoded_value, value), f"{decoded_value} != {value}"
 
-    if other_decoded_values is not None:
-        for other_value, other_type in other_decoded_values:
-            decoder = make_engine_value_decoder([], encoded_output_type, other_type)
-            other_decoded_value = decoder(value_from_engine)
-            assert eq(other_decoded_value, other_value)
+    for other_value, other_type in decoded_values:
+        decoder = make_engine_value_decoder([], encoded_output_type, other_type)
+        other_decoded_value = decoder(value_from_engine)
+        assert eq(other_decoded_value, other_value)
+
+
+def validate_full_roundtrip(
+    value: Any,
+    value_type: Any,
+    *other_decoded_values: tuple[Any, Any],
+) -> None:
+    """
+    Validate the given value doesn't change after encoding, sending to engine (using output_type), receiving back and decoding (using input_type).
+
+    `other_decoded_values` is a tuple of (value, type) pairs.
+    If provided, also validate the value can be decoded to the other types.
+    """
+    validate_full_roundtrip_to(
+        value, value_type, (value, value_type), *other_decoded_values
+    )
 
 
 def test_encode_engine_value_basic_types() -> None:
@@ -218,17 +229,33 @@ def test_encode_engine_value_none() -> None:
 
 
 def test_roundtrip_basic_types() -> None:
-    validate_full_roundtrip(42, int, (42, None))
-    validate_full_roundtrip(3.25, float, (3.25, Float64))
     validate_full_roundtrip(
-        3.25, Float64, (3.25, float), (np.float64(3.25), np.float64)
+        42, cocoindex.Int64, (42, int), (np.int64(42), np.int64), (42, None)
     )
+    validate_full_roundtrip(42, int, (42, cocoindex.Int64))
+    validate_full_roundtrip(np.int64(42), np.int64, (42, cocoindex.Int64))
+
     validate_full_roundtrip(
-        3.25, Float32, (3.25, float), (np.float32(3.25), np.float32)
+        3.25, Float64, (3.25, float), (np.float64(3.25), np.float64), (3.25, None)
     )
+    validate_full_roundtrip(3.25, float, (3.25, Float64))
+    validate_full_roundtrip(np.float64(3.25), np.float64, (3.25, Float64))
+
+    validate_full_roundtrip(
+        3.25,
+        Float32,
+        (3.25, float),
+        (np.float32(3.25), np.float32),
+        (np.float64(3.25), np.float64),
+        (3.25, Float64),
+        (3.25, None),
+    )
+    validate_full_roundtrip(np.float32(3.25), np.float32, (3.25, Float32))
+
     validate_full_roundtrip("hello", str, ("hello", None))
     validate_full_roundtrip(True, bool, (True, None))
     validate_full_roundtrip(False, bool, (False, None))
+    validate_full_roundtrip((1, 2), cocoindex.Range, ((1, 2), None))
     validate_full_roundtrip(
         datetime.date(2025, 1, 1), datetime.date, (datetime.date(2025, 1, 1), None)
     )
@@ -238,14 +265,37 @@ def test_roundtrip_basic_types() -> None:
         cocoindex.LocalDateTime,
         (datetime.datetime(2025, 1, 2, 3, 4, 5, 123456), datetime.datetime),
     )
+
+    tz = datetime.timezone(datetime.timedelta(hours=5))
     validate_full_roundtrip(
-        datetime.datetime(2025, 1, 2, 3, 4, 5, 123456, datetime.UTC),
+        datetime.datetime(2025, 1, 2, 3, 4, 5, 123456, tz),
+        cocoindex.OffsetDateTime,
+        (
+            datetime.datetime(2025, 1, 2, 3, 4, 5, 123456, tz),
+            datetime.datetime,
+        ),
+    )
+    validate_full_roundtrip(
+        datetime.datetime(2025, 1, 2, 3, 4, 5, 123456, tz),
+        datetime.datetime,
+        (datetime.datetime(2025, 1, 2, 3, 4, 5, 123456, tz), cocoindex.OffsetDateTime),
+    )
+    validate_full_roundtrip_to(
+        datetime.datetime(2025, 1, 2, 3, 4, 5, 123456),
         cocoindex.OffsetDateTime,
         (
             datetime.datetime(2025, 1, 2, 3, 4, 5, 123456, datetime.UTC),
             datetime.datetime,
         ),
     )
+    validate_full_roundtrip_to(
+        datetime.datetime(2025, 1, 2, 3, 4, 5, 123456),
+        datetime.datetime,
+        (
+            datetime.datetime(2025, 1, 2, 3, 4, 5, 123456, datetime.UTC),
+            cocoindex.OffsetDateTime,
+        ),
+    )
 
     uuid_value = uuid.uuid4()
     validate_full_roundtrip(uuid_value, uuid.UUID, (uuid_value, None))

cocoindex/typing.py

@@ -40,6 +40,7 @@ class TypeAttr:
 
 Annotation = TypeKind | TypeAttr | VectorInfo
 
+Int64 = Annotated[int, TypeKind("Int64")]
 Float32 = Annotated[float, TypeKind("Float32")]
 Float64 = Annotated[float, TypeKind("Float64")]
 Range = Annotated[tuple[int, int], TypeKind("Range")]

{cocoindex-0.1.59.dist-info → cocoindex-0.1.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cocoindex
-Version: 0.1.59
+Version: 0.1.60
 Requires-Dist: click>=8.1.8
 Requires-Dist: rich>=14.0.0
 Requires-Dist: python-dotenv>=1.1.0

{cocoindex-0.1.59.dist-info → cocoindex-0.1.60.dist-info}/RECORD

@@ -1,9 +1,9 @@
-cocoindex-0.1.59.dist-info/METADATA,sha256=XyuEgs1E6LhwzhvSwCwjcRmzFZkEHaw-GFEgpp5qVn8,10020
-cocoindex-0.1.59.dist-info/WHEEL,sha256=sV4rA9gfzC7j5ItBe_WAiMMgsSnxbuMxVbhOxuTV0TE,109
-cocoindex-0.1.59.dist-info/entry_points.txt,sha256=_NretjYVzBdNTn7dK-zgwr7YfG2afz1u1uSE-5bZXF8,46
-cocoindex-0.1.59.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cocoindex/__init__.py,sha256=MFm-QJzrr0ODJCsAAsPUzJXh8KH1WdZod8F60B1iUYw,1877
-cocoindex/_engine.cpython-311-aarch64-linux-gnu.so,sha256=DfjaVOU5-yQEqM4mlWNchUD4Sc2BxFrVA-h2aS67I6U,60988600
+cocoindex-0.1.60.dist-info/METADATA,sha256=TLP5AmkWol7oAVwBcHJfzpQNbilcmrczI6MJX_oVBD0,10020
+cocoindex-0.1.60.dist-info/WHEEL,sha256=sV4rA9gfzC7j5ItBe_WAiMMgsSnxbuMxVbhOxuTV0TE,109
+cocoindex-0.1.60.dist-info/entry_points.txt,sha256=_NretjYVzBdNTn7dK-zgwr7YfG2afz1u1uSE-5bZXF8,46
+cocoindex-0.1.60.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cocoindex/__init__.py,sha256=dSSqO5g2EPoPM3Yo7meIpIh8hWPDArsXFG8kXaQrCwk,1934
+cocoindex/_engine.cpython-311-aarch64-linux-gnu.so,sha256=wcbERulSGwUXnkJtCsxZ4UY0A7xAlBiV4jlHC8xo9ZY,60989352
 cocoindex/auth_registry.py,sha256=1XqO7ibjmBBd8i11XSJTvTgdz8p1ptW-ZpuSgo_5zzk,716
 cocoindex/cli.py,sha256=8bDL-Qmd9NYtn1DsDfvUMk45xfAqNf9YTyM7H9KRuNU,21345
 cocoindex/convert.py,sha256=FsKb2Pfbm7e1VQDOs_AsoiW9PbIUuyHQuqUlrENXmUY,11199
@@ -20,9 +20,9 @@ cocoindex/setup.py,sha256=7uIHKN4FOCuoidPXcKyGTrkqpkl9luL49-6UcnMxYzw,3068
 cocoindex/sources.py,sha256=JCnOhv1w4o28e03i7yvo4ESicWYAhckkBg5bQlxNH4U,1330
 cocoindex/targets.py,sha256=Nfh_tpFd1goTnS_cxBjIs4j9zl3Z4Z1JomAQ1dl3Sic,2796
 cocoindex/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cocoindex/tests/test_convert.py,sha256=fY3p1gRHZpuWUgk5v28UGPYzyaMI4Qakv4I4qHSNGu8,36528
+cocoindex/tests/test_convert.py,sha256=WmgbaQTYPDnjBfMlIrZWBHipPW7SlrvHYsLLqb--KH0,38025
 cocoindex/tests/test_optional_database.py,sha256=snAmkNa6wtOSaxoZE1HgjvL5v_ylitt3Jt_9df4Cgdc,8506
 cocoindex/tests/test_typing.py,sha256=t6UCYShcfonTfjBlGRWPiFGMZ8DGFfABXo6idekPoJE,14757
-cocoindex/typing.py,sha256=kPMFVKs2i4SCLzW1Tn5NP_Ev9DAc-2qW6eJ68gpLexU,12580
+cocoindex/typing.py,sha256=s_Hk4Npi8pxJUM2h_7Km0VFrojA8wJU9VDtRqVSL6C0,12622
 cocoindex/utils.py,sha256=hUhX-XV6XGCtJSEIpBOuDv6VvqImwPlgBxztBTw7u0U,598
-cocoindex-0.1.59.dist-info/RECORD,,
+cocoindex-0.1.60.dist-info/RECORD,,