trustgraph-cli 2.10.3__tar.gz → 2.10.4__tar.gz

{trustgraph_cli-2.10.3 → trustgraph_cli-2.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-cli
-Version: 2.10.3
+Version: 2.10.4
 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.10.3 → trustgraph_cli-2.10.4}/trustgraph/cli/load_knowledge.py

@@ -28,6 +28,7 @@ class KnowledgeLoader:
             url=default_url,
             token=None, workspace="default",
             graph="",
+            format="turtle",
     ):
         self.files = files
         self.flow = flow
@@ -37,42 +38,57 @@ class KnowledgeLoader:
         self.token = token
         self.workspace = workspace
         self.graph = graph
+        self.format = format
 
-    def load_triples_from_file(self, file) -> Iterator[Triple]:
-        """Generator that yields Triple objects from a Turtle file"""
-
-        g = rdflib.Graph()
-        g.parse(file, format="turtle")
+    def _make_triple(self, s, p, o, graph=""):
+        s_value = Uri(str(s))
+        p_value = Uri(str(p))
 
-        for e in g:
-            s_value = Uri(str(e[0]))
-            p_value = Uri(str(e[1]))
+        if isinstance(o, rdflib.term.Literal):
+            o_value = Literal(
+                str(o),
+                datatype=str(o.datatype) if o.datatype else None,
+                language=str(o.language) if o.language else None,
+            )
+        else:
+            o_value = Uri(str(o))
 
-            if isinstance(e[2], rdflib.term.Literal):
-                o_value = Literal(
-                    str(e[2]),
-                    datatype=str(e[2].datatype) if e[2].datatype else None,
-                    language=str(e[2].language) if e[2].language else None,
-                )
-            else:
-                o_value = Uri(str(e[2]))
+        return Triple(s=s_value, p=p_value, o=o_value, g=graph)
 
-            yield Triple(s=s_value, p=p_value, o=o_value, g=self.graph)
+    def load_triples_from_file(self, file) -> Iterator[Triple]:
+        """Generator that yields Triple objects from a data file."""
+
+        if self.format == "trig":
+            ds = rdflib.Dataset()
+            ds.parse(file, format="trig")
+            for s, p, o, g in ds.quads((None, None, None, None)):
+                graph = str(g.identifier) if g.identifier else ""
+                if graph == "urn:x-rdflib:default":
+                    graph = ""
+                yield self._make_triple(s, p, o, graph)
+        else:
+            g = rdflib.Graph()
+            g.parse(file, format="turtle")
+            for s, p, o in g:
+                yield self._make_triple(s, p, o, self.graph)
 
     def load_entity_contexts_from_file(self, file) -> Iterator[Tuple[str, str]]:
-        """Generator that yields (entity, context) tuples from a Turtle file"""
-
-        g = rdflib.Graph()
-        g.parse(file, format="turtle")
-
-        for s, p, o in g:
-            if isinstance(o, rdflib.term.URIRef):
-                continue
-
-            s_str = str(s)
-            o_str = str(o)
-
-            yield (s_str, o_str)
+        """Generator that yields (entity, context) tuples from a data file."""
+
+        if self.format == "trig":
+            ds = rdflib.Dataset()
+            ds.parse(file, format="trig")
+            for s, p, o, _g in ds.quads((None, None, None, None)):
+                if isinstance(o, rdflib.term.URIRef):
+                    continue
+                yield (str(s), str(o))
+        else:
+            g = rdflib.Graph()
+            g.parse(file, format="turtle")
+            for s, p, o in g:
+                if isinstance(o, rdflib.term.URIRef):
+                    continue
+                yield (str(s), str(o))
 
     def run(self):
         """Load triples and entity contexts using Python API"""
@@ -189,13 +205,24 @@ def main():
         help='Named graph URI (e.g. urn:graph:policy). Default: default graph'
     )
 
+    parser.add_argument(
+        '-F', '--format',
+        choices=["turtle", "trig"],
+        default="turtle",
+        help='Input format (default: turtle)'
+    )
+
     parser.add_argument(
         'files', nargs='+',
-        help=f'Turtle files to load'
+        help=f'Data files to load'
     )
 
     args = parser.parse_args()
 
+    if args.format == "trig" and args.graph:
+        parser.error("--format trig and --graph are incompatible: "
+                      "named graphs come from the TriG data")
+
     while True:
 
         try:
@@ -208,6 +235,7 @@ def main():
                 collection=args.collection,
                 workspace=args.workspace,
                 graph=args.graph,
+                format=args.format,
             )
 
             loader.run()

{trustgraph_cli-2.10.3 → trustgraph_cli-2.10.4}/trustgraph/cli/mint_token.py

@@ -7,7 +7,7 @@ import argparse
 import json
 import sys
 
-from ._iam import DEFAULT_URL, DEFAULT_TOKEN, call_auth, run_main
+from ._iam import DEFAULT_URL, DEFAULT_TOKEN, call_iam, run_main
 
 
 def do_mint_token(args):
@@ -21,15 +21,19 @@ def do_mint_token(args):
         print("--user-context must be a JSON object", file=sys.stderr)
         sys.exit(1)
 
-    body = {
-        "user_id": args.user_id,
+    req = {
+        "operation": "mint-token",
         "workspace": args.workspace,
-        "user_context": user_context,
+        "user_context_json": json.dumps(user_context),
     }
 
-    resp = call_auth(
-        args.api_url, "/api/v1/auth/mint-token", args.token, body,
-    )
+    if args.user_id:
+        req["user_id"] = args.user_id
+    elif args.username:
+        req["username"] = args.username
+    # --self: leave both empty; the gateway populates actor
+
+    resp = call_iam(args.api_url, args.token, req)
 
     jwt = resp.get("jwt", "")
     expires = resp.get("jwt_expires", "")
@@ -51,10 +55,6 @@ def main():
         "-t", "--token", default=DEFAULT_TOKEN,
         help="Admin auth token (JWT or API key)",
     )
-    parser.add_argument(
-        "--user-id", required=True,
-        help="User ID for the minted token's subject",
-    )
     parser.add_argument(
         "-w", "--workspace", required=True,
         help="Target workspace for the minted token",
@@ -63,6 +63,21 @@ def main():
         "--user-context", required=True,
         help="UserContext as a JSON string",
     )
+
+    target = parser.add_mutually_exclusive_group(required=True)
+    target.add_argument(
+        "--user-id",
+        help="User ID (UUID) for the minted token's subject",
+    )
+    target.add_argument(
+        "--username",
+        help="Username to resolve to a user ID",
+    )
+    target.add_argument(
+        "--self", dest="use_self", action="store_true",
+        help="Mint token for the caller's own user ID",
+    )
+
     run_main(do_mint_token, parser)
 
 

trustgraph_cli-2.10.4/trustgraph/cli_version.py

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

{trustgraph_cli-2.10.3 → trustgraph_cli-2.10.4}/trustgraph_cli.egg-info/PKG-INFO

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

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