cocoindex 0.1.21__cp311-cp311-macosx_11_0_arm64.whl → 0.1.23__cp311-cp311-macosx_11_0_arm64.whl

cocoindex/convert.py

@@ -117,7 +117,10 @@ def dump_engine_object(v: Any) -> Any:
         nanos = int((total_secs - secs) * 1e9)
         return {'secs': secs, 'nanos': nanos}
     elif hasattr(v, '__dict__'):
-        return {k: dump_engine_object(v) for k, v in v.__dict__.items()}
+        s = {k: dump_engine_object(v) for k, v in v.__dict__.items()}
+        if hasattr(v, 'kind') and 'kind' not in s:
+            s['kind'] = v.kind
+        return s
     elif isinstance(v, (list, tuple)):
         return [dump_engine_object(item) for item in v]
     elif isinstance(v, dict):

cocoindex/functions.py

@@ -5,6 +5,9 @@ import sentence_transformers
 from .typing import Float32, Vector, TypeAttr
 from . import op, llm
 
+class ParseJson(op.FunctionSpec):
+    """Parse a text into a JSON object."""
+
 class SplitRecursively(op.FunctionSpec):
     """Split a document (in string) recursively."""
 

cocoindex/storages.py

@@ -21,7 +21,7 @@ class Qdrant(op.StorageSpec):
     api_key: str | None = None
 
 @dataclass
-class Neo4jConnectionSpec:
+class Neo4jConnection:
     """Connection spec for Neo4j."""
     uri: str
     user: str
@@ -29,7 +29,7 @@ class Neo4jConnectionSpec:
     db: str | None = None
 
 @dataclass
-class Neo4jFieldMapping:
+class GraphFieldMapping:
     """Mapping for a Neo4j field."""
     field_name: str
     # Field name for the node in the Knowledge Graph.
@@ -37,22 +37,36 @@ class Neo4jFieldMapping:
     node_field_name: str | None = None
 
 @dataclass
-class Neo4jRelationshipEndSpec:
+class GraphRelationshipEnd:
     """Spec for a Neo4j node type."""
     label: str
-    fields: list[Neo4jFieldMapping]
+    fields: list[GraphFieldMapping]
 
 @dataclass
-class Neo4jRelationshipNodeSpec:
+class GraphRelationshipNode:
     """Spec for a Neo4j node type."""
     primary_key_fields: Sequence[str]
     vector_indexes: Sequence[index.VectorIndexDef] = ()
 
-class Neo4jRelationship(op.StorageSpec):
+@dataclass
+class GraphNode:
+    """Spec for a Neo4j node type."""
+    kind = "Node"
+
+    label: str
+
+@dataclass
+class GraphRelationship:
+    """Spec for a Neo4j relationship."""
+    kind = "Relationship"
+
+    rel_type: str
+    source: GraphRelationshipEnd
+    target: GraphRelationshipEnd
+    nodes: dict[str, GraphRelationshipNode] | None = None
+
+class Neo4j(op.StorageSpec):
     """Graph storage powered by Neo4j."""
 
     connection: AuthEntryReference
-    rel_type: str
-    source: Neo4jRelationshipEndSpec
-    target: Neo4jRelationshipEndSpec
-    nodes: dict[str, Neo4jRelationshipNodeSpec]
+    mapping: GraphNode | GraphRelationship

cocoindex/tests/__init__.py

@@ -0,0 +1 @@
+

cocoindex/tests/test_convert.py

@@ -0,0 +1,69 @@
+import dataclasses
+import uuid
+import datetime
+from dataclasses import dataclass
+import pytest
+from cocoindex.convert import to_engine_value
+
+@dataclass
+class Order:
+    order_id: str
+    name: str
+    price: float
+
+@dataclass
+class Basket:
+    items: list
+
+@dataclass
+class Customer:
+    name: str
+    order: Order
+
+def test_to_engine_value_basic_types():
+    assert to_engine_value(123) == 123
+    assert to_engine_value(3.14) == 3.14
+    assert to_engine_value("hello") == "hello"
+    assert to_engine_value(True) is True
+
+def test_to_engine_value_uuid():
+    u = uuid.uuid4()
+    assert to_engine_value(u) == u.bytes
+
+def test_to_engine_value_date_time_types():
+    d = datetime.date(2024, 1, 1)
+    assert to_engine_value(d) == d
+    t = datetime.time(12, 30)
+    assert to_engine_value(t) == t
+    dt = datetime.datetime(2024, 1, 1, 12, 30)
+    assert to_engine_value(dt) == dt
+
+def test_to_engine_value_struct():
+    order = Order(order_id="O123", name="mixed nuts", price=25.0)
+    assert to_engine_value(order) == ["O123", "mixed nuts", 25.0]
+
+def test_to_engine_value_list_of_structs():
+    orders = [Order("O1", "item1", 10.0), Order("O2", "item2", 20.0)]
+    assert to_engine_value(orders) == [["O1", "item1", 10.0], ["O2", "item2", 20.0]]
+
+def test_to_engine_value_struct_with_list():
+    basket = Basket(items=["apple", "banana"])
+    assert to_engine_value(basket) == [["apple", "banana"]]
+
+def test_to_engine_value_nested_struct():
+    customer = Customer(name="Alice", order=Order("O1", "item1", 10.0))
+    assert to_engine_value(customer) == ["Alice", ["O1", "item1", 10.0]]
+
+def test_to_engine_value_empty_list():
+    assert to_engine_value([]) == []
+    assert to_engine_value([[]]) == [[]]
+
+def test_to_engine_value_tuple():
+    assert to_engine_value(()) == []
+    assert to_engine_value((1, 2, 3)) == [1, 2, 3]
+    assert to_engine_value(((1, 2), (3, 4))) == [[1, 2], [3, 4]]
+    assert to_engine_value(([],)) == [[]]
+    assert to_engine_value(((),)) == [[]]
+
+def test_to_engine_value_none():
+    assert to_engine_value(None) is None

cocoindex/typing.py

@@ -183,11 +183,7 @@ def _encode_type(type_info: AnalyzedTypeInfo) -> dict[str, Any]:
         if type_info.elem_type is None:
             raise ValueError(f"{type_info.kind} type must have an element type")
         row_type_info = analyze_type_info(type_info.elem_type)
-        if row_type_info.dataclass_type is None:
-            raise ValueError(f"{type_info.kind} type must have a dataclass type")
-        encoded_type['row'] = {
-            'fields': _encode_fields_schema(row_type_info.dataclass_type),
-        }
+        encoded_type['row'] = _encode_type(row_type_info)
 
     return encoded_type
 

{cocoindex-0.1.21.dist-info → cocoindex-0.1.23.dist-info}/METADATA

@@ -1,8 +1,10 @@
 Metadata-Version: 2.4
 Name: cocoindex
-Version: 0.1.21
+Version: 0.1.23
 Requires-Dist: sentence-transformers>=3.3.1
 Requires-Dist: click>=8.1.8
+Requires-Dist: pytest ; extra == 'test'
+Provides-Extra: test
 License-File: LICENSE
 Summary: With CocoIndex, users declare the transformation, CocoIndex creates & maintains an index, and keeps the derived index up to date based on source update, with minimal computation and changes.
 Author-email: CocoIndex <cocoindex.io@gmail.com>

{cocoindex-0.1.21.dist-info → cocoindex-0.1.23.dist-info}/RECORD

@@ -1,12 +1,14 @@
-cocoindex-0.1.21.dist-info/METADATA,sha256=6e2Mq54aZuC_yMX2fWkvSjmp_XfmbuRc_Oe0m3XnORc,8005
-cocoindex-0.1.21.dist-info/WHEEL,sha256=wsVBlw9xyAuHecZeOYqJ_tA7emUKfXYOn-_180uZRi4,104
-cocoindex-0.1.21.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cocoindex/functions.py,sha256=uukmig7qtOIda3lrM7tNSfGqx22e0EANfWWZjuhE_5E,1579
+cocoindex-0.1.23.dist-info/METADATA,sha256=IcyNWcJi0ycAqXknL1KbV-tsNRQqNf3a097Xrpbe4g8,8066
+cocoindex-0.1.23.dist-info/WHEEL,sha256=wsVBlw9xyAuHecZeOYqJ_tA7emUKfXYOn-_180uZRi4,104
+cocoindex-0.1.23.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cocoindex/functions.py,sha256=xcAeRQTy9JObfxpjyMn-dPY2y7XhVWjB7759xVyup6o,1657
 cocoindex/query.py,sha256=XsVY5cBJJ3a70qazkcCHjWZLE1zBqzMQ4HVSulicGMA,3273
 cocoindex/index.py,sha256=LssEOuZi6AqhwKtZM3QFeQpa9T-0ELi8G5DsrYKECvc,534
 cocoindex/lib.py,sha256=kyfzkaanrMHVwWjd2UWgLr8ArS_vjlK64qb4TbNTbbs,3464
 cocoindex/auth_registry.py,sha256=lZ2rD5_9aC_UpGk7t4TmSYal_rjN7eHgO4_sU7FR0Zw,620
-cocoindex/convert.py,sha256=Nc_gFC64MkpGxkJHy9sSr9d-R916uqYyvUW7qwxS0-0,4921
+cocoindex/convert.py,sha256=tzlHadc-SaZCRBWxZEp08T4clJQPab_eXt6mUub0iQQ,5017
+cocoindex/tests/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+cocoindex/tests/test_convert.py,sha256=wSAiskmBgBM5UZussbNXmCxt47hHGlSEEQVgDZaY4TE,2058
 cocoindex/__init__.py,sha256=f4LTPg4db7Wm3QO9HirvhsT11OVykiFxGbt1JK6taFA,572
 cocoindex/flow.py,sha256=HwngOKZyF60pUE_LGjt02yVNWh-haoMWH1Si0w5rYqY,19856
 cocoindex/llm.py,sha256=uHXub9AWTOtxNyTaefHY-VuY_yzo6ikM1kUxHsQn-zw,298
@@ -15,7 +17,7 @@ cocoindex/sources.py,sha256=wZFU8lwSXjyofJR-syySH9fTyPnBlAPJ6-1hQNX8fGA,936
 cocoindex/setup.py,sha256=W1HshwYk_K2aeLOVn_e62ZOXBO9yWsoUboRiH4SjF48,496
 cocoindex/cli.py,sha256=jRwGCPuqkBz_cIp7LKARCRAiDsPm91bsduKzfYJohJ4,6931
 cocoindex/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cocoindex/typing.py,sha256=EZstkCKOFTRST23ia8R8PV7rZbQiNWFblzzRIQ3vVcQ,7472
-cocoindex/storages.py,sha256=Tqrk9ROgHTjtfjgxYZqLwNU_2bQmYjbST6zOqq0ksS4,1491
-cocoindex/_engine.cpython-311-darwin.so,sha256=ApNX71rwoprnd9MqjFQ4MRyJXAvrBW-nqyH5mR6to5A,58940816
-cocoindex-0.1.21.dist-info/RECORD,,
+cocoindex/typing.py,sha256=4mP9VXS75s3VMfF1LDc1LXsBng7uGdR5aD73N8iaeSM,7282
+cocoindex/storages.py,sha256=ZWpQABuUWTs6BdPcTBWDOiRXVGxS87Uh2i_C1wtkXYQ,1718
+cocoindex/_engine.cpython-311-darwin.so,sha256=-77UYSsQnHih4BKXk7xE4vaSgd8yOejNQXY1GMI69FU,59047776
+cocoindex-0.1.23.dist-info/RECORD,,