diff --git a/trustgraph-cli/scripts/tg-load-doc-embeds b/trustgraph-cli/scripts/tg-load-doc-embeds index 67e9bfa2..c242bb74 100755 --- a/trustgraph-cli/scripts/tg-load-doc-embeds +++ b/trustgraph-cli/scripts/tg-load-doc-embeds @@ -142,6 +142,7 @@ async def run(running, **args): de_q = asyncio.Queue(maxsize=10) url = args["url"] + flow_id = args["flow_id"] load_task = asyncio.create_task( loader( diff --git a/trustgraph-cli/scripts/tg-load-text b/trustgraph-cli/scripts/tg-load-text index 2d1c2a90..94cb5ade 100755 --- a/trustgraph-cli/scripts/tg-load-text +++ b/trustgraph-cli/scripts/tg-load-text @@ -195,12 +195,11 @@ def main(): p.load(args.files) print("All done.") - break except Exception as e: print("Exception:", e, flush=True) - main() + diff --git a/trustgraph-cli/scripts/tg-load-turtle b/trustgraph-cli/scripts/tg-load-turtle index c7cc9a24..12238c7b 100755 --- a/trustgraph-cli/scripts/tg-load-turtle +++ b/trustgraph-cli/scripts/tg-load-turtle @@ -7,7 +7,6 @@ Loads Graph embeddings into TrustGraph processing. import pulsar from pulsar.schema import JsonSchema from trustgraph.schema import Triples, Triple, Value, Metadata -from trustgraph.schema import triples_store_queue import argparse import os import time @@ -180,5 +179,6 @@ def main(): time.sleep(10) -main() +print("Not implemented.") +#main() diff --git a/trustgraph-cli/scripts/tg-processor-state b/trustgraph-cli/scripts/tg-processor-state index 4e838d0e..7f142174 100755 --- a/trustgraph-cli/scripts/tg-processor-state +++ b/trustgraph-cli/scripts/tg-processor-state @@ -6,34 +6,27 @@ Dump out TrustGraph processor states. import requests import argparse -import tabulate default_metrics_url = "http://localhost:8088/api/metrics" def dump_status(url): - url = f"{url}/query?query=processor_state%7Bprocessor_state%3D%22running%22%7D" + url = f"{url}/query?query=processor_info" resp = requests.get(url) obj = resp.json() - print(obj) - return - tbl = [ [ m["metric"]["job"], - "running" if int(m["value"][1]) > 0 else "down" + "\U0001f49a" ] for m in obj["data"]["result"] ] - print(tabulate.tabulate( - tbl, tablefmt="pretty", headers=["processor", "state"], - stralign="left" - )) - + for row in tbl: + print(f" {row[0]:30} {row[1]}") def main(): diff --git a/trustgraph-cli/scripts/tg-save-doc-embeds b/trustgraph-cli/scripts/tg-save-doc-embeds index abb8c6ba..ad6e92f7 100755 --- a/trustgraph-cli/scripts/tg-save-doc-embeds +++ b/trustgraph-cli/scripts/tg-save-doc-embeds @@ -27,9 +27,7 @@ async def fetch_de(running, queue, user, collection, url): async with aiohttp.ClientSession() as session: - de_url = f"{url}stream/document-embeddings" - - async with session.ws_connect(de_url) as ws: + async with session.ws_connect(url) as ws: while running.get(): @@ -117,11 +115,14 @@ async def run(running, **args): q = asyncio.Queue() + url = args["url"] + flow_id = args["flow_id"] + de_task = asyncio.create_task( fetch_de( running=running, queue=q, user=args["user"], collection=args["collection"], - url=args["url"] + "api/v1/" + url = f"{url}api/v1/flow/{flow_id}/export/document-embeddings" ) )