From 031da4842d6eb6d5a920f6d718ab834efcae0226 Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Sat, 3 May 2025 00:17:07 +0100 Subject: [PATCH] Add Flow ID to all relevant CLIs, not completely implemented --- trustgraph-cli/scripts/tg-graph-show | 6 ++++++ trustgraph-cli/scripts/tg-graph-to-turtle | 6 ++++++ trustgraph-cli/scripts/tg-invoke-agent | 6 ++++++ trustgraph-cli/scripts/tg-invoke-document-rag | 6 ++++++ trustgraph-cli/scripts/tg-invoke-graph-rag | 6 ++++++ trustgraph-cli/scripts/tg-invoke-llm | 17 +++++++++-------- trustgraph-cli/scripts/tg-invoke-prompt | 6 ++++++ trustgraph-cli/scripts/tg-load-doc-embeds | 6 ++++++ trustgraph-cli/scripts/tg-load-pdf | 6 ++++++ trustgraph-cli/scripts/tg-load-text | 12 ++++++------ trustgraph-cli/scripts/tg-load-turtle | 6 ++++++ trustgraph-cli/scripts/tg-save-doc-embeds | 6 ++++++ 12 files changed, 75 insertions(+), 14 deletions(-) diff --git a/trustgraph-cli/scripts/tg-graph-show b/trustgraph-cli/scripts/tg-graph-show index a3d10283..0ee09c00 100755 --- a/trustgraph-cli/scripts/tg-graph-show +++ b/trustgraph-cli/scripts/tg-graph-show @@ -37,6 +37,12 @@ def main(): help=f'API URL (default: {default_url})', ) + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) + parser.add_argument( '-U', '--user', default=default_user, diff --git a/trustgraph-cli/scripts/tg-graph-to-turtle b/trustgraph-cli/scripts/tg-graph-to-turtle index fc17ddd0..85e8abf9 100755 --- a/trustgraph-cli/scripts/tg-graph-to-turtle +++ b/trustgraph-cli/scripts/tg-graph-to-turtle @@ -69,6 +69,12 @@ def main(): help=f'API URL (default: {default_url})', ) + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) + parser.add_argument( '-U', '--user', default=default_user, diff --git a/trustgraph-cli/scripts/tg-invoke-agent b/trustgraph-cli/scripts/tg-invoke-agent index 5e213447..4019b2d0 100755 --- a/trustgraph-cli/scripts/tg-invoke-agent +++ b/trustgraph-cli/scripts/tg-invoke-agent @@ -104,6 +104,12 @@ def main(): help=f'API URL (default: {default_url})', ) + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) + parser.add_argument( '-q', '--question', required=True, diff --git a/trustgraph-cli/scripts/tg-invoke-document-rag b/trustgraph-cli/scripts/tg-invoke-document-rag index 759d4200..e900156c 100755 --- a/trustgraph-cli/scripts/tg-invoke-document-rag +++ b/trustgraph-cli/scripts/tg-invoke-document-rag @@ -37,6 +37,12 @@ def main(): help=f'API URL (default: {default_url})', ) + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) + # parser.add_argument( # '--pulsar-api-key', # default=default_pulsar_api_key, diff --git a/trustgraph-cli/scripts/tg-invoke-graph-rag b/trustgraph-cli/scripts/tg-invoke-graph-rag index 5bbe5f59..05d97fc0 100755 --- a/trustgraph-cli/scripts/tg-invoke-graph-rag +++ b/trustgraph-cli/scripts/tg-invoke-graph-rag @@ -45,6 +45,12 @@ def main(): help=f'API URL (default: {default_url})', ) + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) + parser.add_argument( '-q', '--question', required=True, diff --git a/trustgraph-cli/scripts/tg-invoke-llm b/trustgraph-cli/scripts/tg-invoke-llm index eb469b6e..7e3952cd 100755 --- a/trustgraph-cli/scripts/tg-invoke-llm +++ b/trustgraph-cli/scripts/tg-invoke-llm @@ -12,11 +12,11 @@ from trustgraph.api import Api default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/') -def query(url, system, prompt): +def query(url, flow, system, prompt): api = Api(url) - resp = api.text_completion(system=system, prompt=prompt) + resp = api.flow(flow).text_completion(system=system, prompt=prompt) print(resp) @@ -44,12 +44,12 @@ def main(): nargs=1, help='LLM prompt e.g. What is 2 + 2?', ) - - # parser.add_argument( - # '--pulsar-api-key', - # default=default_pulsar_api_key, - # help=f'Pulsar API key', - # ) + + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) args = parser.parse_args() @@ -57,6 +57,7 @@ def main(): query( url=args.url, + flow = args.flow_id, system=args.system[0], prompt=args.prompt[0], ) diff --git a/trustgraph-cli/scripts/tg-invoke-prompt b/trustgraph-cli/scripts/tg-invoke-prompt index 426fe1ee..a4fe6fbd 100755 --- a/trustgraph-cli/scripts/tg-invoke-prompt +++ b/trustgraph-cli/scripts/tg-invoke-prompt @@ -40,6 +40,12 @@ def main(): help=f'API URL (default: {default_url})', ) + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) + parser.add_argument( 'id', metavar='template-id', diff --git a/trustgraph-cli/scripts/tg-load-doc-embeds b/trustgraph-cli/scripts/tg-load-doc-embeds index d445ec5a..25769864 100755 --- a/trustgraph-cli/scripts/tg-load-doc-embeds +++ b/trustgraph-cli/scripts/tg-load-doc-embeds @@ -184,6 +184,12 @@ async def main(running): help=f'TrustGraph API URL (default: {default_url})', ) + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) + parser.add_argument( '-i', '--input-file', # Make it mandatory, difficult to over-write an existing file diff --git a/trustgraph-cli/scripts/tg-load-pdf b/trustgraph-cli/scripts/tg-load-pdf index 3e960c67..c8da2caf 100755 --- a/trustgraph-cli/scripts/tg-load-pdf +++ b/trustgraph-cli/scripts/tg-load-pdf @@ -82,6 +82,12 @@ def main(): help=f'API URL (default: {default_url})', ) + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) + parser.add_argument( '-U', '--user', default=default_user, diff --git a/trustgraph-cli/scripts/tg-load-text b/trustgraph-cli/scripts/tg-load-text index 0cc221a5..9aa98126 100755 --- a/trustgraph-cli/scripts/tg-load-text +++ b/trustgraph-cli/scripts/tg-load-text @@ -80,12 +80,12 @@ def main(): default=default_url, help=f'API URL (default: {default_url})', ) - - # parser.add_argument( - # '--pulsar-api-key', - # default=default_pulsar_api_key, - # help=f'Pulsar API key', - # ) + + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) parser.add_argument( '-U', '--user', diff --git a/trustgraph-cli/scripts/tg-load-turtle b/trustgraph-cli/scripts/tg-load-turtle index 3417a87d..c7cc9a24 100755 --- a/trustgraph-cli/scripts/tg-load-turtle +++ b/trustgraph-cli/scripts/tg-load-turtle @@ -109,6 +109,12 @@ def main(): default=default_pulsar_host, help=f'Pulsar host (default: {default_pulsar_host})', ) + + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) parser.add_argument( '--pulsar-api-key', diff --git a/trustgraph-cli/scripts/tg-save-doc-embeds b/trustgraph-cli/scripts/tg-save-doc-embeds index 95f8b748..abb8c6ba 100755 --- a/trustgraph-cli/scripts/tg-save-doc-embeds +++ b/trustgraph-cli/scripts/tg-save-doc-embeds @@ -158,6 +158,12 @@ async def main(running): help=f'TrustGraph API URL (default: {default_url})', ) + parser.add_argument( + '-f', '--flow-id', + default="0000", + help=f'Flow ID (default: 0000)' + ) + parser.add_argument( '-o', '--output-file', # Make it mandatory, difficult to over-write an existing file