From e3a816f851172d8c1167fa76815d16393deab6b5 Mon Sep 17 00:00:00 2001 From: Tyler O <4535788+toliver38@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:44:34 +0000 Subject: [PATCH] Resolve Conflicts --- trustgraph-cli/scripts/tg-graph-show | 3 +-- trustgraph-cli/scripts/tg-graph-to-turtle | 2 +- trustgraph-cli/scripts/tg-invoke-graph-rag | 2 +- trustgraph-cli/scripts/tg-invoke-llm | 2 +- trustgraph-cli/scripts/tg-load-pdf | 2 +- trustgraph-cli/scripts/tg-load-text | 1 - 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/trustgraph-cli/scripts/tg-graph-show b/trustgraph-cli/scripts/tg-graph-show index fcba6c23..a3d10283 100755 --- a/trustgraph-cli/scripts/tg-graph-show +++ b/trustgraph-cli/scripts/tg-graph-show @@ -48,7 +48,7 @@ def main(): default=default_collection, help=f'Collection ID (default: {default_collection})' ) - + args = parser.parse_args() try: @@ -57,7 +57,6 @@ def main(): url=args.api_url, user=args.user, collection=args.collection, - pulsar_api_key=args.pulsar_api_key, ) except Exception as e: diff --git a/trustgraph-cli/scripts/tg-graph-to-turtle b/trustgraph-cli/scripts/tg-graph-to-turtle index 900af370..fc17ddd0 100755 --- a/trustgraph-cli/scripts/tg-graph-to-turtle +++ b/trustgraph-cli/scripts/tg-graph-to-turtle @@ -80,7 +80,7 @@ def main(): default=default_collection, help=f'Collection ID (default: {default_collection})' ) - + args = parser.parse_args() try: diff --git a/trustgraph-cli/scripts/tg-invoke-graph-rag b/trustgraph-cli/scripts/tg-invoke-graph-rag index 44c04041..50de5b74 100755 --- a/trustgraph-cli/scripts/tg-invoke-graph-rag +++ b/trustgraph-cli/scripts/tg-invoke-graph-rag @@ -33,7 +33,7 @@ def main(): default=default_url, help=f'API URL (default: {default_url})', ) - + parser.add_argument( '-q', '--question', required=True, diff --git a/trustgraph-cli/scripts/tg-invoke-llm b/trustgraph-cli/scripts/tg-invoke-llm index b9bd73e4..d1a49e87 100755 --- a/trustgraph-cli/scripts/tg-invoke-llm +++ b/trustgraph-cli/scripts/tg-invoke-llm @@ -32,7 +32,7 @@ def main(): default=default_url, help=f'API URL (default: {default_url})', ) - + parser.add_argument( 'system', nargs=1, diff --git a/trustgraph-cli/scripts/tg-load-pdf b/trustgraph-cli/scripts/tg-load-pdf index 92140906..f27aaf5a 100755 --- a/trustgraph-cli/scripts/tg-load-pdf +++ b/trustgraph-cli/scripts/tg-load-pdf @@ -80,7 +80,7 @@ def main(): default=default_url, help=f'API URL (default: {default_url})', ) - + 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 a2210dbb..634ac3d7 100755 --- a/trustgraph-cli/scripts/tg-load-text +++ b/trustgraph-cli/scripts/tg-load-text @@ -30,7 +30,6 @@ class Loader: user, collection, metadata, - pulsar_api_key=None, ): self.api = Api(url)