trustgraph-flow 0.16.5__tar.gz → 0.16.7__tar.gz

{trustgraph-flow-0.16.5 → trustgraph-flow-0.16.7}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: trustgraph-flow
-Version: 0.16.5
+Version: 0.16.7
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Home-page: https://github.com/trustgraph-ai/trustgraph
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 License: UNKNOWN
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.16.5.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.16.7.tar.gz
 Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

{trustgraph-flow-0.16.5 → trustgraph-flow-0.16.7}/trustgraph/api/gateway/service.py

@@ -14,7 +14,7 @@ module = ".".join(__name__.split(".")[1:-1])
 
 import asyncio
 import argparse
-from aiohttp import web
+from aiohttp import web, WSMsgType
 import json
 import logging
 import uuid
@@ -47,9 +47,13 @@ from ... schema import GraphRagQuery, GraphRagResponse
 from ... schema import graph_rag_request_queue
 from ... schema import graph_rag_response_queue
 
-from ... schema import TriplesQueryRequest, TriplesQueryResponse
+from ... schema import TriplesQueryRequest, TriplesQueryResponse, Triples
 from ... schema import triples_request_queue
 from ... schema import triples_response_queue
+from ... schema import triples_store_queue
+
+from ... schema import GraphEmbeddings
+from ... schema import graph_embeddings_store_queue
 
 from ... schema import AgentRequest, AgentResponse
 from ... schema import agent_request_queue
@@ -69,10 +73,7 @@ default_timeout = 600
 default_port = 8088
 
 def to_value(x):
-    if x.startswith("http:") or x.startswith("https:"):
-        return Value(value=x, is_uri=True)
-    else:
-        return Value(value=x, is_uri=False)
+    return Value(value=x["v"], is_uri=x["e"])
 
 def to_subgraph(x):
     return [
@@ -84,6 +85,11 @@ def to_subgraph(x):
         for t in x
     ]
 
+class Running:
+    def __init__(self): self.running = True
+    def get(self): return self.running
+    def stop(self): self.running = False
+
 class Publisher:
 
     def __init__(self, pulsar_host, topic, schema=None, max_size=10,
@@ -132,6 +138,7 @@ class Subscriber:
         self.consumer_name = consumer_name
         self.schema = schema
         self.q = {}
+        self.full = {}
 
     async def run(self):
         while True:
@@ -145,10 +152,22 @@ class Subscriber:
                     ) as consumer:
                         while True:
                             msg = await consumer.receive()
-                            id = msg.properties()["id"]
+
+                            # Acknowledge successful reception of the message
+                            await consumer.acknowledge(msg)
+
+                            try:
+                                id = msg.properties()["id"]
+                            except:
+                                id = None
+
                             value = msg.value()
                             if id in self.q:
                                 await self.q[id].put(value)
+
+                            for q in self.full.values():
+                                await q.put(value)
+
             except Exception as e:
                 print("Exception:", e, flush=True)
          
@@ -164,6 +183,57 @@ class Subscriber:
         if id in self.q:
             del self.q[id]
     
+    async def subscribe_all(self, id):
+        q = asyncio.Queue()
+        self.full[id] = q
+        return q
+
+    async def unsubscribe_all(self, id):
+        if id in self.full:
+            del self.full[id]
+
+def serialize_value(v):
+    return {
+        "v": v.value,
+        "e": v.is_uri,
+    }
+
+def serialize_triple(t):
+    return {
+        "s": serialize_value(t.s),
+        "p": serialize_value(t.p),
+        "o": serialize_value(t.o)
+    }
+
+def serialize_subgraph(sg):
+    return [
+        serialize_triple(t)
+        for t in sg
+    ]
+
+def serialize_triples(message):
+    return {
+        "metadata": {
+            "id": message.metadata.id,
+            "metadata": serialize_subgraph(message.metadata.metadata),
+            "user": message.metadata.user,
+            "collection": message.metadata.collection,
+        },
+        "triples": serialize_subgraph(message.triples),
+    }
+    
+def serialize_graph_embeddings(message):
+    return {
+        "metadata": {
+            "id": message.metadata.id,
+            "metadata": serialize_subgraph(message.metadata.metadata),
+            "user": message.metadata.user,
+            "collection": message.metadata.collection,
+        },
+        "vectors": message.vectors,
+        "entity": message.entity.value,
+    }
+    
 class Api:
 
     def __init__(self, **config):
@@ -243,6 +313,28 @@ class Api:
             JsonSchema(EmbeddingsResponse)
         )
 
+        self.triples_tap = Subscriber(
+            self.pulsar_host, triples_store_queue,
+            "api-gateway", "api-gateway",
+            schema=JsonSchema(Triples)
+        )
+
+        self.triples_pub = Publisher(
+            self.pulsar_host, triples_store_queue,
+            schema=JsonSchema(Triples)
+        )
+
+        self.graph_embeddings_tap = Subscriber(
+            self.pulsar_host, graph_embeddings_store_queue,
+            "api-gateway", "api-gateway",
+            schema=JsonSchema(GraphEmbeddings)
+        )
+
+        self.graph_embeddings_pub = Publisher(
+            self.pulsar_host, graph_embeddings_store_queue,
+            schema=JsonSchema(GraphEmbeddings)
+        )
+
         self.document_out = Publisher(
             self.pulsar_host, document_ingest_queue,
             schema=JsonSchema(Document),
@@ -264,6 +356,20 @@ class Api:
             web.post("/api/v1/embeddings", self.embeddings),
             web.post("/api/v1/load/document", self.load_document),
             web.post("/api/v1/load/text", self.load_text),
+            web.get("/api/v1/ws", self.socket),
+
+            web.get("/api/v1/stream/triples", self.stream_triples),
+            web.get(
+                "/api/v1/stream/graph-embeddings",
+                self.stream_graph_embeddings
+            ),
+
+            web.get("/api/v1/load/triples", self.load_triples),
+            web.get(
+                "/api/v1/load/graph-embeddings",
+                self.load_graph_embeddings
+            ),
+
         ])
 
     async def llm(self, request):
@@ -452,23 +558,7 @@ class Api:
 
             return web.json_response(
                 {
-                    "response": [
-                        {
-                            "s": {
-                                "v": t.s.value,
-                                "e": t.s.is_uri,
-                            },
-                            "p": {
-                                "v": t.p.value,
-                                "e": t.p.is_uri,
-                            },
-                            "o": {
-                                "v": t.o.value,
-                                "e": t.o.is_uri,
-                            }
-                        }
-                        for t in resp.triples
-                    ]
+                    "response": serialize_subgraph(resp.triples),
                 }
             )
 
@@ -660,6 +750,169 @@ class Api:
                 { "error": str(e) }
             )
 
+    async def socket(self, request):
+
+        ws = web.WebSocketResponse()
+        await ws.prepare(request)
+
+        async for msg in ws:
+            if msg.type == WSMsgType.TEXT:
+                if msg.data == 'close':
+                    await ws.close()
+                else:
+                    await ws.send_str(msg.data + '/answer')
+            elif msg.type == WSMsgType.ERROR:
+                print('ws connection closed with exception %s' %
+                      ws.exception())
+
+        print('websocket connection closed')
+
+        return ws
+
+    async def stream(self, q, ws, running, fn):
+
+        while running.get():
+            try:
+                resp = await asyncio.wait_for(q.get(), 0.5)
+                await ws.send_json(fn(resp))
+
+            except TimeoutError:
+                continue
+
+            except Exception as e:
+                print(f"Exception: {str(e)}", flush=True)
+
+    async def stream_triples(self, request):
+
+        id = str(uuid.uuid4())
+
+        q = await self.triples_tap.subscribe_all(id)
+        running = Running()
+
+        ws = web.WebSocketResponse()
+        await ws.prepare(request)
+
+        tsk = asyncio.create_task(self.stream(
+            q,
+            ws,
+            running,
+            serialize_triples,
+        ))
+
+        async for msg in ws:
+            if msg.type == WSMsgType.ERROR:
+                break
+            else:
+                # Ignore incoming messages
+                pass
+
+        running.stop()
+
+        await self.triples_tap.unsubscribe_all(id)
+        await tsk
+
+        return ws
+
+    async def stream_graph_embeddings(self, request):
+
+        id = str(uuid.uuid4())
+
+        q = await self.graph_embeddings_tap.subscribe_all(id)
+        running = Running()
+
+        ws = web.WebSocketResponse()
+        await ws.prepare(request)
+
+        tsk = asyncio.create_task(self.stream(
+            q,
+            ws,
+            running,
+            serialize_graph_embeddings,
+        ))
+
+        async for msg in ws:
+            if msg.type == WSMsgType.ERROR:
+                break
+            else:
+                # Ignore incoming messages
+                pass
+
+        running.stop()
+
+        await self.graph_embeddings_tap.unsubscribe_all(id)
+        await tsk
+
+        return ws
+
+    async def load_triples(self, request):
+
+        ws = web.WebSocketResponse()
+        await ws.prepare(request)
+
+        async for msg in ws:
+
+            try:
+
+                if msg.type == WSMsgType.TEXT:
+
+                    data = msg.json()
+
+                    elt = Triples(
+                        metadata=Metadata(
+                            id=data["metadata"]["id"],
+                            metadata=to_subgraph(data["metadata"]["metadata"]),
+                            user=data["metadata"]["user"],
+                            collection=data["metadata"]["collection"],
+                        ),
+                        triples=to_subgraph(data["triples"]),
+                    )
+
+                    await self.triples_pub.send(None, elt)
+
+                elif msg.type == WSMsgType.ERROR:
+                    break
+
+            except Exception as e:
+
+                print("Exception:", e)
+
+        return ws
+
+    async def load_graph_embeddings(self, request):
+
+        ws = web.WebSocketResponse()
+        await ws.prepare(request)
+
+        async for msg in ws:
+
+            try:
+
+                if msg.type == WSMsgType.TEXT:
+
+                    data = msg.json()
+
+                    elt = GraphEmbeddings(
+                        metadata=Metadata(
+                            id=data["metadata"]["id"],
+                            metadata=to_subgraph(data["metadata"]["metadata"]),
+                            user=data["metadata"]["user"],
+                            collection=data["metadata"]["collection"],
+                        ),
+                        entity=to_value(data["entity"]),
+                        vectors=data["vectors"],
+                    )
+
+                    await self.graph_embeddings_pub.send(None, elt)
+
+                elif msg.type == WSMsgType.ERROR:
+                    break
+
+            except Exception as e:
+
+                print("Exception:", e)
+
+        return ws
+
     async def app_factory(self):
 
         self.llm_pub_task = asyncio.create_task(self.llm_in.run())
@@ -688,6 +941,22 @@ class Api:
             self.embeddings_out.run()
         )
 
+        self.triples_tap_task = asyncio.create_task(
+            self.triples_tap.run()
+        )
+
+        self.triples_pub_task = asyncio.create_task(
+            self.triples_pub.run()
+        )
+
+        self.graph_embeddings_tap_task = asyncio.create_task(
+            self.graph_embeddings_tap.run()
+        )
+
+        self.graph_embeddings_pub_task = asyncio.create_task(
+            self.graph_embeddings_pub.run()
+        )
+
         self.doc_ingest_pub_task = asyncio.create_task(self.document_out.run())
 
         self.text_ingest_pub_task = asyncio.create_task(self.text_out.run())
@@ -699,7 +968,6 @@ class Api:
 
 def run():
 
-
     parser = argparse.ArgumentParser(
         prog="api-gateway",
         description=__doc__

trustgraph-flow-0.16.7/trustgraph/flow_version.py

@@ -0,0 +1 @@
+__version__ = "0.16.7"

{trustgraph-flow-0.16.5 → trustgraph-flow-0.16.7}/trustgraph_flow.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: trustgraph-flow
-Version: 0.16.5
+Version: 0.16.7
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Home-page: https://github.com/trustgraph-ai/trustgraph
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 License: UNKNOWN
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.16.5.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.16.7.tar.gz
 Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

trustgraph-flow-0.16.5/trustgraph/flow_version.py

@@ -1 +0,0 @@
-__version__ = "0.16.5"