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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-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_cli-2.7.6 → trustgraph_cli-2.7.8}/trustgraph/cli/get_kg_core.py

@@ -87,6 +87,13 @@ def fetch(url, workspace, id, output, token=None):
 
             for response in socket.get_kg_core(id):
 
+                if response.get("error"):
+                    err = response["error"]
+                    print(
+                        f"Error: {err.get('type', 'unknown')}: "
+                        f"{err.get('message', 'Unknown error')}"
+                    )
+
                 if "triples" in response:
                     t += 1
                     write_triple(f, response["triples"])

{trustgraph_cli-2.7.6 → trustgraph_cli-2.7.8}/trustgraph/cli/load_knowledge.py

@@ -44,15 +44,21 @@ class KnowledgeLoader:
         for e in g:
             s_value = str(e[0])
             p_value = str(e[1])
+            o_value = str(e[2])
 
-            if isinstance(e[2], rdflib.term.URIRef):
-                o_value = str(e[2])
-                o_is_uri = True
-            else:
-                o_value = str(e[2])
-                o_is_uri = False
+            o_datatype = ""
+            o_language = ""
 
-            yield Triple(s=s_value, p=p_value, o=o_value)
+            if isinstance(e[2], rdflib.term.Literal):
+                if e[2].language:
+                    o_language = str(e[2].language)
+                if e[2].datatype:
+                    o_datatype = str(e[2].datatype)
+
+            yield Triple(
+                s=s_value, p=p_value, o=o_value,
+                o_datatype=o_datatype, o_language=o_language,
+            )
 
     def load_entity_contexts_from_file(self, file) -> Iterator[Tuple[str, str]]:
         """Generator that yields (entity, context) tuples from a Turtle file"""

{trustgraph_cli-2.7.6 → trustgraph_cli-2.7.8}/trustgraph/cli/load_turtle.py

@@ -44,13 +44,21 @@ class Loader:
         for e in g:
             s_value = str(e[0])
             p_value = str(e[1])
+            o_value = str(e[2])
 
-            if isinstance(e[2], rdflib.term.URIRef):
-                o_value = str(e[2])
-            else:
-                o_value = str(e[2])
+            o_datatype = ""
+            o_language = ""
 
-            yield Triple(s=s_value, p=p_value, o=o_value)
+            if isinstance(e[2], rdflib.term.Literal):
+                if e[2].language:
+                    o_language = str(e[2].language)
+                if e[2].datatype:
+                    o_datatype = str(e[2].datatype)
+
+            yield Triple(
+                s=s_value, p=p_value, o=o_value,
+                o_datatype=o_datatype, o_language=o_language,
+            )
 
     def run(self):
         """Load triples using Python API"""

trustgraph_cli-2.7.8/trustgraph/cli_version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-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_cli-2.7.6/trustgraph/cli_version.py

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