diff --git a/trustgraph-cli/scripts/tg-load-pdf b/trustgraph-cli/scripts/tg-load-pdf index 0dc8ced6..08ce6f91 100755 --- a/trustgraph-cli/scripts/tg-load-pdf +++ b/trustgraph-cli/scripts/tg-load-pdf @@ -81,9 +81,18 @@ class Loader: id=id, 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"]) + s=Value( + value=t["s"], + is_uri=isinstance(t["s"], Uri) + ), + p=Value( + value=t["p"], + is_uri=isinstance(t["p"], Uri) + ), + o=Value( + value=t["o"], + is_uri=isinstance(t["o"], Uri) + ), ) for t in triples ], diff --git a/trustgraph-cli/scripts/tg-load-text b/trustgraph-cli/scripts/tg-load-text index 6ff8d09a..51664a1b 100755 --- a/trustgraph-cli/scripts/tg-load-text +++ b/trustgraph-cli/scripts/tg-load-text @@ -15,7 +15,7 @@ import uuid from trustgraph.schema import TextDocument, text_ingest_queue from trustgraph.schema import Metadata, Triple, Value from trustgraph.log_level import LogLevel -from trustgraph.knowledge import hash, to_uri +from trustgraph.knowledge import hash, to_uri, Literal, Uri from trustgraph.knowledge import PREF_PUBEV, PREF_DOC, PREF_ORG from trustgraph.knowledge import Organization, PublicationEvent from trustgraph.knowledge import DigitalDocument @@ -80,9 +80,18 @@ class Loader: id=id, 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"]) + s=Value( + value=t["s"], + is_uri=isinstance(t["s"], Uri) + ), + p=Value( + value=t["p"], + is_uri=isinstance(t["p"], Uri) + ), + o=Value( + value=t["o"], + is_uri=isinstance(t["o"], Uri) + ), ) for t in triples ],