trustgraph-cli 2.9.3__tar.gz → 2.9.5__tar.gz

{trustgraph_cli-2.9.3 → trustgraph_cli-2.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.9.3
+Version: 2.9.5
 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.9.3 → trustgraph_cli-2.9.5}/trustgraph/cli/load_doc_embeds.py

@@ -37,9 +37,7 @@ async def load_de(running, queue, url):
                     if msg is None:
                         break
 
-                except:
-                    # Hopefully it's TimeoutError.  Annoying to match since
-                    # it changed in 3.11.
+                except asyncio.TimeoutError:
                     continue
 
                 msg = {
@@ -92,7 +90,8 @@ async def loader(running, de_queue, path, format, collection):
 
                 try:
                     unpacked = unpacker.unpack()
-                except:
+                except msgpack.exceptions.OutOfData:
+                    # No more complete messages in the file.
                     break
 
                 if collection:
@@ -109,9 +108,7 @@ async def loader(running, de_queue, path, format, collection):
                         # Successful put message, move on
                         break
 
-                    except:
-                        # Hopefully it's TimeoutError.  Annoying to match since
-                        # it changed in 3.11.
+                    except asyncio.TimeoutError:
                         continue
 
                 if not running.get(): break
@@ -125,9 +122,7 @@ async def loader(running, de_queue, path, format, collection):
                 # Successful put message, move on
                 break
 
-            except:
-                # Hopefully it's TimeoutError.  Annoying to match since
-                # it changed in 3.11.
+            except asyncio.TimeoutError:
                 continue
 
 async def run(running, **args):

{trustgraph_cli-2.9.3 → trustgraph_cli-2.9.5}/trustgraph/cli/nquads.py

@@ -135,11 +135,20 @@ def serialize_nquads(batches, graph_iri, out):
     return written, skipped
 
 
+def _term_to_triple_field(term):
+    """Convert an rdflib term to (str_value, datatype, language)."""
+    if isinstance(term, rdflib.Literal):
+        dt = str(term.datatype) if term.datatype else ""
+        lang = str(term.language) if term.language else ""
+        return str(term), dt, lang
+    return str(term), "", ""
+
+
 def parse_nquads(data):
     """Parse N-Quads bytes back into api Triple values.
 
-    Terms are stringified with str(), the same convention tg-load-knowledge
-    uses, so values survive the store round trip unchanged. The whole
+    Preserves datatype, language tag and IRI-vs-literal distinctions
+    via the Triple.o_datatype and Triple.o_language fields. The whole
     member is materialized in memory (bundles are bounded by
     --triples-limit at export); line-streaming is a possible follow-up.
 
@@ -148,7 +157,11 @@ def parse_nquads(data):
     """
     ds = rdflib.Dataset()
     ds.parse(data=data.decode("utf-8"), format="nquads")
-    return [
-        Triple(s=str(s), p=str(p), o=str(o))
-        for s, p, o, _g in ds.quads((None, None, None, None))
-    ]
+    result = []
+    for s, p, o, _g in ds.quads((None, None, None, None)):
+        o_val, o_dt, o_lang = _term_to_triple_field(o)
+        result.append(Triple(
+            s=str(s), p=str(p), o=o_val,
+            o_datatype=o_dt, o_language=o_lang,
+        ))
+    return result

{trustgraph_cli-2.9.3 → trustgraph_cli-2.9.5}/trustgraph/cli/save_doc_embeds.py

@@ -31,7 +31,7 @@ async def fetch_de(running, queue, collection, url):
 
                 try:
                     msg = await asyncio.wait_for(ws.receive(), 1)
-                except:
+                except asyncio.TimeoutError:
                     continue
 
                 if msg.type == aiohttp.WSMsgType.TEXT:
@@ -89,9 +89,7 @@ async def output(running, queue, path, format):
 
             try:
                 msg = await asyncio.wait_for(queue.get(), 0.5)
-            except:
-                # Hopefully it's TimeoutError.  Annoying to match since
-                # it changed in 3.11.
+            except asyncio.TimeoutError:
                 continue
 
             if format == "msgpack":

trustgraph_cli-2.9.5/trustgraph/cli_version.py

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

{trustgraph_cli-2.9.3 → trustgraph_cli-2.9.5}/trustgraph_cli.egg-info/PKG-INFO

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

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