apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-07-16 16:51:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Working command service

Browse source
This commit is contained in:
Cyber MacGeddon 2024-12-06 23:49:09 +00:00
parent b15f956ac7
commit 4e4ca7e1aa
13 changed files with 29 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

18
trustgraph-flow/trustgraph/gateway/agent.py
View file

@ -3,10 +3,10 @@ from .. schema import AgentRequest, AgentResponse
from .. schema import agent_request_queue
from .. schema import agent_response_queue
from . endpoint import MultiResponseServiceEndpoint
from . requestor import MultiResponseServiceRequestor
from . endpoint import ServiceEndpoint
from . requestor import ServiceRequestor
class AgentRequestor(MultiResponseServiceRequestor):
class AgentRequestor(ServiceRequestor):
def __init__(self, pulsar_host, timeout, auth):
super(AgentRequestor, self).__init__(
@ -39,14 +39,4 @@ class AgentRequestor(MultiResponseServiceRequestor):
# The 2nd boolean expression indicates whether we're done responding
return resp, (message.answer is not None)
class AgentEndpoint(MultiResponseServiceEndpoint):
def __init__(self, pulsar_host, timeout, auth):
super(AgentEndpoint, self).__init__(
endpoint_path="/api/v1/agent",
auth=auth,
requestor = AgentRequestor(
pulsar_host=pulsar_host, timeout=timeout, auth=auth
)
)

9
trustgraph-flow/trustgraph/gateway/command.py
View file

@ -44,9 +44,14 @@ class CommandEndpoint(SocketEndpoint):
requestor = self.services[svc]
resp = await requestor.process(request)
async def responder(resp, fin):
await ws.send_json({
"id": id,
"response": resp,
"complete": fin,
})
await ws.send_json({"id": id, "response": resp })
resp = await requestor.process(request, responder)
except Exception as e:

13
trustgraph-flow/trustgraph/gateway/dbpedia.py
View file

@ -25,16 +25,5 @@ class DbpediaRequestor(ServiceRequestor):
)
def from_response(self, message):
return { "text": message.text }
class DbpediaEndpoint(ServiceEndpoint):
def __init__(self, pulsar_host, timeout, auth):
super(DbpediaEndpoint, self).__init__(
endpoint_path="/api/v1/dbpedia",
auth=auth,
requestor = DbpediaRequestor(
pulsar_host=pulsar_host, timeout=timeout, auth=auth
)
)
return { "text": message.text }, True

2
trustgraph-flow/trustgraph/gateway/embeddings.py
View file

@ -24,7 +24,7 @@ class EmbeddingsRequestor(ServiceRequestor):
)
def from_response(self, message):
return { "vectors": message.vectors }
return { "vectors": message.vectors }, True
class EmbeddingsEndpoint(ServiceEndpoint):
def __init__(self, pulsar_host, timeout, auth):

2
trustgraph-flow/trustgraph/gateway/encyclopedia.py
View file

@ -25,7 +25,7 @@ class EncyclopediaRequestor(ServiceRequestor):
)
def from_response(self, message):
return { "text": message.text }
return { "text": message.text }, True
class EncyclopediaEndpoint(ServiceEndpoint):

24
trustgraph-flow/trustgraph/gateway/endpoint.py
View file

@ -53,30 +53,10 @@ class ServiceEndpoint:
print(data)
resp = await self.requestor.process(data)
return web.json_response(resp)
except Exception as e:
logging.error(f"Exception: {e}")
return web.json_response(
{ "error": str(e) }
)
class MultiResponseServiceEndpoint(ServiceEndpoint):
async def handle(self, request):
try:
data = await request.json()
print(data)
def responder(x):
def responder(x, fin):
print(x)
resp = await self.requestor.process(data, responder)
resp, fin = await self.requestor.process(data, responder)
return web.json_response(resp)

2
trustgraph-flow/trustgraph/gateway/graph_rag.py
View file

@ -26,7 +26,7 @@ class GraphRagRequestor(ServiceRequestor):
)
def from_response(self, message):
return { "response": message.response }
return { "response": message.response }, True
class GraphRagEndpoint(ServiceEndpoint):
def __init__(self, pulsar_host, timeout, auth):

2
trustgraph-flow/trustgraph/gateway/internet_search.py
View file

@ -25,7 +25,7 @@ class InternetSearchRequestor(ServiceRequestor):
)
def from_response(self, message):
return { "text": message.text }
return { "text": message.text }, True
class InternetSearchEndpoint(ServiceEndpoint):
def __init__(self, pulsar_host, timeout, auth):

4
trustgraph-flow/trustgraph/gateway/prompt.py
View file

@ -33,11 +33,11 @@ class PromptRequestor(ServiceRequestor):
if message.object:
return {
"object": message.object
}
}, True
else:
return {
"text": message.text
}
}, True
class PromptEndpoint(ServiceEndpoint):
def __init__(self, pulsar_host, timeout, auth):

45
trustgraph-flow/trustgraph/gateway/requestor.py
View file

@ -45,7 +45,7 @@ class ServiceRequestor:
def from_response(self, response):
raise RuntimeError("Not defined")
async def process(self, request):
async def process(self, request, responder=None):
id = str(uuid.uuid4())
@ -57,41 +57,6 @@ class ServiceRequestor:
self.pub.send, id, self.to_request(request)
)
try:
resp = await asyncio.to_thread(q.get, timeout=self.timeout)
except Exception as e:
raise RuntimeError("Timeout")
if resp.error:
return { "error": resp.error.message }
return self.from_response(resp)
except Exception as e:
logging.error(f"Exception: {e}")
return { "error": str(e) }
finally:
self.sub.unsubscribe(id)
class MultiResponseServiceRequestor(ServiceRequestor):
async def process(self, request, responder):
id = str(uuid.uuid4())
try:
q = self.sub.subscribe(id)
await asyncio.to_thread(
self.pub.send, id, self.to_request(request)
)
# Keeps looking at responses...
while True:
try:
@ -102,16 +67,16 @@ class MultiResponseServiceRequestor(ServiceRequestor):
if resp.error:
return { "error": resp.error.message }
# Until from_response says we have a finished answer
resp, fin = self.from_response(resp)
responder(resp)
print(resp, fin)
if responder:
await responder(resp, fin)
if fin:
return resp
# Not finished, so loop round and continue
except Exception as e:
logging.error(f"Exception: {e}")

4
trustgraph-flow/trustgraph/gateway/service.py
View file

@ -46,7 +46,7 @@ from . triples_load import TriplesLoadEndpoint
from . graph_embeddings_load import GraphEmbeddingsLoadEndpoint
from . command import CommandEndpoint
from . endpoint import ServiceEndpoint, MultiResponseServiceEndpoint
from . endpoint import ServiceEndpoint
from . auth import Authenticator
logger = logging.getLogger("api")
@ -138,7 +138,7 @@ class Api:
endpoint_path = "/api/v1/embeddings", auth=self.auth,
requestor = self.services["embeddings"],
),
MultiResponseServiceEndpoint(
ServiceEndpoint(
endpoint_path = "/api/v1/agent", auth=self.auth,
requestor = self.services["agent"],
),

2
trustgraph-flow/trustgraph/gateway/text_completion.py
View file

@ -25,7 +25,7 @@ class TextCompletionRequestor(ServiceRequestor):
)
def from_response(self, message):
return { "response": message.response }
return { "response": message.response }, True
class TextCompletionEndpoint(ServiceEndpoint):
def __init__(self, pulsar_host, timeout, auth):

2
trustgraph-flow/trustgraph/gateway/triples_query.py
View file

@ -49,7 +49,7 @@ class TriplesQueryRequestor(ServiceRequestor):
print(message)
return {
"response": serialize_subgraph(message.triples)
}
}, True
class TriplesQueryEndpoint(ServiceEndpoint):
def __init__(self, pulsar_host, timeout, auth):