From d059139da7ca586b594d78c87f863241fa77a78e Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Tue, 29 Apr 2025 23:28:48 +0100 Subject: [PATCH] Exposing more APIs --- test-api/test-agent-api | 6 +++--- test-api/test-embeddings-api | 5 ++--- test-api/test-graph-rag-api | 4 ++-- test-api/test-llm-api | 4 ++-- test-api/test-prompt-api | 4 ++-- test-api/test-prompt2-api | 4 ++-- tests/test-load-pdf | 2 +- trustgraph-flow/trustgraph/gateway/service.py | 10 +++++----- 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/test-api/test-agent-api b/test-api/test-agent-api index f36ba196..bba0e70d 100755 --- a/test-api/test-agent-api +++ b/test-api/test-agent-api @@ -4,7 +4,7 @@ import requests import json import sys -url = "http://localhost:8088/api/v1/" +url = "http://localhost:8088/api/v1/flow/0000/agent" ############################################################################ @@ -13,10 +13,11 @@ input = { } resp = requests.post( - f"{url}agent", + url, json=input, ) +print(resp.text) resp = resp.json() if "error" in resp: @@ -25,4 +26,3 @@ if "error" in resp: print(resp["answer"]) - diff --git a/test-api/test-embeddings-api b/test-api/test-embeddings-api index b1defd01..dd15af31 100755 --- a/test-api/test-embeddings-api +++ b/test-api/test-embeddings-api @@ -4,7 +4,7 @@ import requests import json import sys -url = "http://localhost:8088/api/v1/" +url = "http://localhost:8088/api/v1/flow/0000/embeddings" ############################################################################ @@ -13,7 +13,7 @@ input = { } resp = requests.post( - f"{url}embeddings", + url, json=input, ) @@ -25,4 +25,3 @@ if "error" in resp: print(resp["vectors"]) - diff --git a/test-api/test-graph-rag-api b/test-api/test-graph-rag-api index c329934c..886d0c15 100755 --- a/test-api/test-graph-rag-api +++ b/test-api/test-graph-rag-api @@ -4,7 +4,7 @@ import requests import json import sys -url = "http://localhost:8088/api/v1/" +url = "http://localhost:8088/api/v1/flow/0000/graph-rag" ############################################################################ @@ -13,7 +13,7 @@ input = { } resp = requests.post( - f"{url}graph-rag", + url, json=input, ) diff --git a/test-api/test-llm-api b/test-api/test-llm-api index 6bee2048..fa100b15 100755 --- a/test-api/test-llm-api +++ b/test-api/test-llm-api @@ -4,7 +4,7 @@ import requests import json import sys -url = "http://localhost:8088/api/v1/" +url = "http://localhost:8088/api/v1/flow/0000/text-completion" ############################################################################ @@ -15,7 +15,7 @@ input = { } resp = requests.post( - f"{url}text-completion", + url, json=input, ) diff --git a/test-api/test-prompt-api b/test-api/test-prompt-api index 4f69f09a..8cd6615b 100755 --- a/test-api/test-prompt-api +++ b/test-api/test-prompt-api @@ -4,7 +4,7 @@ import requests import json import sys -url = "http://localhost:8088/api/v1/" +url = "http://localhost:8088/api/v1/flow/0000/prompt" ############################################################################ @@ -16,7 +16,7 @@ input = { } resp = requests.post( - f"{url}prompt", + url, json=input, ) diff --git a/test-api/test-prompt2-api b/test-api/test-prompt2-api index 1e641439..8b9c55c7 100755 --- a/test-api/test-prompt2-api +++ b/test-api/test-prompt2-api @@ -4,7 +4,7 @@ import requests import json import sys -url = "http://localhost:8088/api/v1/" +url = "http://localhost:8088/api/v1/flow/0000/prompt" ############################################################################ @@ -16,7 +16,7 @@ input = { } resp = requests.post( - f"{url}prompt", + url, json=input, ) diff --git a/tests/test-load-pdf b/tests/test-load-pdf index 838a57ce..c57ebcc1 100755 --- a/tests/test-load-pdf +++ b/tests/test-load-pdf @@ -9,7 +9,7 @@ from trustgraph.schema import Document, Metadata client = pulsar.Client("pulsar://localhost:6650", listener_name="localhost") prod = client.create_producer( - topic="persistent://tg/flow/document-load:0000", + topic="persistent://tg/flow/document-load:0002", schema=JsonSchema(Document), chunking_enabled=True, ) diff --git a/trustgraph-flow/trustgraph/gateway/service.py b/trustgraph-flow/trustgraph/gateway/service.py index 1b91523d..322d32d0 100755 --- a/trustgraph-flow/trustgraph/gateway/service.py +++ b/trustgraph-flow/trustgraph/gateway/service.py @@ -34,11 +34,11 @@ from . text_completion import TextCompletionRequestor from . prompt import PromptRequestor from . graph_rag import GraphRagRequestor #from . document_rag import DocumentRagRequestor -#from . triples_query import TriplesQueryRequestor -#from . graph_embeddings_query import GraphEmbeddingsQueryRequestor -#from . embeddings import EmbeddingsRequestor +from . triples_query import TriplesQueryRequestor +from . graph_embeddings_query import GraphEmbeddingsQueryRequestor +from . embeddings import EmbeddingsRequestor #from . encyclopedia import EncyclopediaRequestor -#from . agent import AgentRequestor +from . agent import AgentRequestor #from . dbpedia import DbpediaRequestor #from . internet_search import InternetSearchRequestor #from . librarian import LibrarianRequestor @@ -321,7 +321,7 @@ class Api: "prompt": PromptRequestor, "graph-rag": GraphRagRequestor, "embeddings": EmbeddingsRequestor, - "graph-embeddings": GraphEmbeddingsRequestor, + "graph-embeddings": GraphEmbeddingsQueryRequestor, "triples-query": TriplesQueryRequestor, }