trustgraph-base 2.7.6__tar.gz → 2.7.8__tar.gz

{trustgraph_base-2.7.6 → trustgraph_base-2.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 2.7.6
+Version: 2.7.8
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Author-email: "trustgraph.ai" <security@trustgraph.ai>
 Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph

{trustgraph_base-2.7.6 → trustgraph_base-2.7.8}/trustgraph/api/async_bulk_client.py

@@ -4,6 +4,7 @@ import websockets
 from typing import Optional, AsyncIterator, Dict, Any, Iterator
 
 from . types import Triple
+from . bulk_client import _string_to_term
 
 
 class AsyncBulkClient:
@@ -45,9 +46,13 @@ class AsyncBulkClient:
         async with websockets.connect(ws_url, ping_interval=20, ping_timeout=self.timeout) as websocket:
             async for triple in triples:
                 message = {
-                    "s": triple.s,
-                    "p": triple.p,
-                    "o": triple.o
+                    "s": _string_to_term(triple.s),
+                    "p": _string_to_term(triple.p),
+                    "o": _string_to_term(
+                        triple.o,
+                        datatype=triple.o_datatype,
+                        language=triple.o_language,
+                    ),
                 }
                 await websocket.send(json.dumps(message))
 

{trustgraph_base-2.7.6 → trustgraph_base-2.7.8}/trustgraph/api/bulk_client.py

@@ -15,13 +15,19 @@ from . types import Triple
 from . exceptions import ProtocolException
 
 
-def _string_to_term(value: str) -> Dict[str, Any]:
+def _string_to_term(
+    value: str, datatype: str = "", language: str = ""
+) -> Dict[str, Any]:
     """Convert a string value to Term format for the gateway."""
-    # Treat URIs as IRI type, otherwise as literal
     if value.startswith("http://") or value.startswith("https://") or "://" in value:
         return {"t": "i", "i": value}
     else:
-        return {"t": "l", "v": value}
+        result: Dict[str, Any] = {"t": "l", "v": value}
+        if datatype:
+            result["dt"] = datatype
+        if language:
+            result["ln"] = language
+        return result
 
 
 class BulkClient:
@@ -141,7 +147,11 @@ class BulkClient:
                 batch.append({
                     "s": _string_to_term(triple.s),
                     "p": _string_to_term(triple.p),
-                    "o": _string_to_term(triple.o)
+                    "o": _string_to_term(
+                        triple.o,
+                        datatype=triple.o_datatype,
+                        language=triple.o_language,
+                    ),
                 })
                 if len(batch) >= batch_size:
                     message = {

{trustgraph_base-2.7.6 → trustgraph_base-2.7.8}/trustgraph/api/types.py

@@ -19,10 +19,14 @@ class Triple:
         s: Subject (entity URI or value)
         p: Predicate (relationship URI)
         o: Object (entity URI, literal value, or typed value)
+        o_datatype: XSD datatype URI for literal objects (e.g. "xsd:string")
+        o_language: Language tag for literal objects (e.g. "en", "lt")
     """
     s : str
     p : str
     o : str
+    o_datatype : str = ""
+    o_language : str = ""
 
 @dataclasses.dataclass
 class ConfigKey:

{trustgraph_base-2.7.6 → trustgraph_base-2.7.8}/trustgraph/base/triples_client.py

@@ -58,7 +58,7 @@ class TriplesClient(RequestResponse):
                 raise RuntimeError(resp.error.message)
 
             batch = [
-                Triple(to_value(v.s), to_value(v.p), to_value(v.o))
+                Triple(v.s, v.p, v.o)
                 for v in resp.triples
             ]
             await queue.put(batch)

trustgraph_base-2.7.8/trustgraph/base_version.py

@@ -0,0 +1 @@
+__version__ = "2.7.8"

{trustgraph_base-2.7.6 → trustgraph_base-2.7.8}/trustgraph/messaging/translators/knowledge.py

@@ -1,3 +1,4 @@
+import logging
 from typing import Dict, Any, Tuple, Optional
 from ...schema import (
     KnowledgeRequest, KnowledgeResponse, Triples, GraphEmbeddings,
@@ -8,6 +9,8 @@ from ...schema import (
 from .base import MessageTranslator
 from .primitives import ValueTranslator, SubgraphTranslator
 
+logger = logging.getLogger(__name__)
+
 
 class KnowledgeRequestTranslator(MessageTranslator):
     """Translator for KnowledgeRequest schema objects"""
@@ -264,6 +267,15 @@ class KnowledgeResponseTranslator(MessageTranslator):
                 }
             }
 
+        # Error response
+        if obj.error:
+            return {
+                "error": {
+                    "type": obj.error.type,
+                    "message": obj.error.message,
+                }
+            }
+
         # End of stream marker
         if obj.eos is True:
             return {"eos": True}
@@ -274,14 +286,13 @@ class KnowledgeResponseTranslator(MessageTranslator):
     def encode_with_completion(self, obj: KnowledgeResponse) -> Tuple[Dict[str, Any], bool]:
         """Returns (response_dict, is_final)"""
         response = self.encode(obj)
-        
-        # Check if this is a final response
+
         is_final = (
-            obj.ids is not None or  # List response
-            obj.eos is True or      # End of stream
-            (not obj.triples and not obj.graph_embeddings
+            obj.ids is not None or
+            obj.eos is True or
+            (not obj.error and not obj.triples and not obj.graph_embeddings
              and not obj.document_embeddings
-             and not obj.library_metadata and not obj.library_blob)  # Empty response
+             and not obj.library_metadata and not obj.library_blob)
         )
-        
+
         return response, is_final

{trustgraph_base-2.7.6 → trustgraph_base-2.7.8}/trustgraph/schema/knowledge/knowledge.py

@@ -66,7 +66,7 @@ class KnowledgeRequest:
 @dataclass
 class KnowledgeResponse:
     error: Error | None = None
-    ids: list[str] = field(default_factory=list)
+    ids: list[str] | None = None
     eos: bool = False     # Indicates end of knowledge core stream
     triples: Triples | None = None
     graph_embeddings: GraphEmbeddings | None = None

{trustgraph_base-2.7.6 → trustgraph_base-2.7.8}/trustgraph_base.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 2.7.6
+Version: 2.7.8
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Author-email: "trustgraph.ai" <security@trustgraph.ai>
 Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph

trustgraph_base-2.7.6/trustgraph/base_version.py

@@ -1 +0,0 @@
-__version__ = "2.7.6"