From 6b478e9cc956422b231e229d2cf15ce4ea5db3fc Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Tue, 26 Nov 2024 13:49:27 +0000 Subject: [PATCH] Change loaders to use new API --- trustgraph-cli/scripts/tg-load-pdf | 11 +++++++++-- trustgraph-cli/scripts/tg-load-text | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/trustgraph-cli/scripts/tg-load-pdf b/trustgraph-cli/scripts/tg-load-pdf index 18ac57cb..0dc8ced6 100755 --- a/trustgraph-cli/scripts/tg-load-pdf +++ b/trustgraph-cli/scripts/tg-load-pdf @@ -14,7 +14,7 @@ import time import uuid from trustgraph.schema import Document, document_ingest_queue -from trustgraph.schema import Metadata +from trustgraph.schema import Metadata, Triple, Value from trustgraph.log_level import LogLevel from trustgraph.knowledge import hash, to_uri from trustgraph.knowledge import PREF_PUBEV, PREF_DOC, PREF_ORG @@ -79,7 +79,14 @@ class Loader: r = Document( metadata=Metadata( id=id, - metadata=triples, + metadata=[ + Triple( + s=Value(value=t["s"]["v"], is_uri=t["s"]["e"]), + p=Value(value=t["p"]["v"], is_uri=t["p"]["e"]), + o=Value(value=t["o"]["v"], is_uri=t["o"]["e"]) + ) + for t in triples + ], user=self.user, collection=self.collection, ), diff --git a/trustgraph-cli/scripts/tg-load-text b/trustgraph-cli/scripts/tg-load-text index e49ee7a9..6ff8d09a 100755 --- a/trustgraph-cli/scripts/tg-load-text +++ b/trustgraph-cli/scripts/tg-load-text @@ -13,7 +13,7 @@ import time import uuid from trustgraph.schema import TextDocument, text_ingest_queue -from trustgraph.schema import Metadata +from trustgraph.schema import Metadata, Triple, Value from trustgraph.log_level import LogLevel from trustgraph.knowledge import hash, to_uri from trustgraph.knowledge import PREF_PUBEV, PREF_DOC, PREF_ORG @@ -78,7 +78,14 @@ class Loader: r = TextDocument( metadata=Metadata( id=id, - metadata=triples, + metadata=[ + Triple( + s=Value(value=t["s"]["v"], is_uri=t["s"]["e"]), + p=Value(value=t["p"]["v"], is_uri=t["p"]["e"]), + o=Value(value=t["o"]["v"], is_uri=t["o"]["e"]) + ) + for t in triples + ], user=self.user, collection=self.collection, ),