trustgraph-flow 0.21.2__tar.gz → 0.21.3__tar.gz

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-flow
-Version: 0.21.2
+Version: 0.21.3
 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
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.21.2.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.21.3.tar.gz
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 Classifier: Programming Language :: Python :: 3

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/agent/react/service.py

@@ -156,14 +156,16 @@ class Processor(ConsumerProducer):
             subscriber=subscriber,
             input_queue=prompt_request_queue,
             output_queue=prompt_response_queue,
-            pulsar_host = self.pulsar_host
+            pulsar_host = self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
         )
 
         self.graph_rag = GraphRagClient(
             subscriber=subscriber,
             input_queue=graph_rag_request_queue,
             output_queue=graph_rag_response_queue,
-            pulsar_host = self.pulsar_host
+            pulsar_host = self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
         )
 
         # Need to be able to feed requests to myself
@@ -218,7 +220,7 @@ class Processor(ConsumerProducer):
 
             print(f"History: {history}", flush=True)
 
-            def think(x):
+            async def think(x):
 
                 print(f"Think: {x}", flush=True)
 
@@ -231,7 +233,7 @@ class Processor(ConsumerProducer):
 
                 await self.producer.send(r, properties={"id": id})
 
-            def observe(x):
+            async def observe(x):
 
                 print(f"Observe: {x}", flush=True)
 

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/document_rag.py

@@ -59,6 +59,7 @@ class DocumentRag:
     def __init__(
             self,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
             pr_request_queue=None,
             pr_response_queue=None,
             emb_request_queue=None,
@@ -100,6 +101,7 @@ class DocumentRag:
             subscriber=module + "-de",
             input_queue=de_request_queue,
             output_queue=de_response_queue,
+            pulsar_api_key=pulsar_api_key,
         )            
 
         self.embeddings = EmbeddingsClient(
@@ -107,6 +109,7 @@ class DocumentRag:
             input_queue=emb_request_queue,
             output_queue=emb_response_queue,
             subscriber=module + "-emb",
+            pulsar_api_key=pulsar_api_key,
         )
 
         self.lang = PromptClient(
@@ -114,6 +117,7 @@ class DocumentRag:
             input_queue=pr_request_queue,
             output_queue=pr_response_queue,
             subscriber=module + "-de-prompt",
+            pulsar_api_key=pulsar_api_key,
         )
 
         if self.verbose:

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/embeddings/document_embeddings/embeddings.py

@@ -47,6 +47,7 @@ class Processor(ConsumerProducer):
 
         self.embeddings = EmbeddingsClient(
             pulsar_host=self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
             input_queue=emb_request_queue,
             output_queue=emb_response_queue,
             subscriber=module + "-emb",

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/extract/kg/definitions/extract.py

@@ -79,6 +79,7 @@ class Processor(ConsumerProducer):
 
         self.prompt = PromptClient(
             pulsar_host=self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
             input_queue=pr_request_queue,
             output_queue=pr_response_queue,
             subscriber = module + "-prompt",

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/extract/kg/relationships/extract.py

@@ -54,6 +54,7 @@ class Processor(ConsumerProducer):
 
         self.prompt = PromptClient(
             pulsar_host=self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
             input_queue=pr_request_queue,
             output_queue=pr_response_queue,
             subscriber = module + "-prompt",

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/extract/kg/topics/extract.py

@@ -52,6 +52,7 @@ class Processor(ConsumerProducer):
 
         self.prompt = PromptClient(
             pulsar_host=self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
             input_queue=pr_request_queue,
             output_queue=pr_response_queue,
             subscriber = module + "-prompt",

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/extract/object/row/extract.py

@@ -112,6 +112,7 @@ class Processor(ConsumerProducer):
 
         self.prompt = PromptClient(
             pulsar_host=self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
             input_queue=pr_request_queue,
             output_queue=pr_response_queue,
             subscriber = module + "-prompt",

trustgraph-flow-0.21.3/trustgraph/flow_version.py

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

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/gateway/document_embeddings_stream.py

@@ -27,7 +27,7 @@ class DocumentEmbeddingsStreamEndpoint(SocketEndpoint):
         self.subscriber = Subscriber(
             self.pulsar_client, document_embeddings_store_queue,
             "api-gateway", "api-gateway",
-            schema=JsonSchema(DocumentEmbeddings)
+            schema=JsonSchema(DocumentEmbeddings),
         )
 
     async def listener(self, ws, running):

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/gateway/service.py

@@ -57,6 +57,7 @@ logger.setLevel(logging.INFO)
 
 default_pulsar_host = os.getenv("PULSAR_HOST", "pulsar://pulsar:6650")
 default_prometheus_url = os.getenv("PROMETHEUS_URL", "http://prometheus:9090")
+default_pulsar_api_key = os.getenv("PULSAR_API_KEY", None)
 default_timeout = 600
 default_port = 8088
 default_api_token = os.getenv("GATEWAY_SECRET", "")
@@ -73,11 +74,20 @@ class Api:
         self.port = int(config.get("port", default_port))
         self.timeout = int(config.get("timeout", default_timeout))
         self.pulsar_host = config.get("pulsar_host", default_pulsar_host)
+        self.pulsar_api_key = config.get(
+            "pulsar_api_key", default_pulsar_api_key
+        )
         self.pulsar_listener = config.get("pulsar_listener", None)
 
-        self.pulsar_client = pulsar.Client(
-            self.pulsar_host, listener_name=self.pulsar_listener
-        )
+        if self.pulsar_api_key:
+            self.pulsar_client = pulsar.Client(
+                self.pulsar_host, listener_name=self.pulsar_listener,
+                authentication=pulsar.AuthenticationToken(self.pulsar_api_key)
+            )
+        else:
+            self.pulsar_client = pulsar.Client(
+                self.pulsar_host, listener_name=self.pulsar_listener,
+            )
 
         self.prometheus_url = config.get(
             "prometheus_url", default_prometheus_url,
@@ -270,6 +280,12 @@ def run():
         default=default_pulsar_host,
         help=f'Pulsar host (default: {default_pulsar_host})',
     )
+    
+    parser.add_argument(
+        '--pulsar-api-key',
+        default=default_pulsar_api_key,
+        help=f'Pulsar API key',
+    )
 
     parser.add_argument(
         '--pulsar-listener',

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/graph_rag.py

@@ -161,6 +161,7 @@ class GraphRag:
     def __init__(
             self,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
             pr_request_queue=None,
             pr_response_queue=None,
             emb_request_queue=None,
@@ -207,6 +208,7 @@ class GraphRag:
 
         self.ge_client = GraphEmbeddingsClient(
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             subscriber=module + "-ge",
             input_queue=ge_request_queue,
             output_queue=ge_response_queue,
@@ -214,6 +216,7 @@ class GraphRag:
 
         self.triples_client = TriplesQueryClient(
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             subscriber=module + "-tpl",
             input_queue=tpl_request_queue,
             output_queue=tpl_response_queue
@@ -221,6 +224,7 @@ class GraphRag:
 
         self.embeddings = EmbeddingsClient(
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             input_queue=emb_request_queue,
             output_queue=emb_response_queue,
             subscriber=module + "-emb",
@@ -234,6 +238,7 @@ class GraphRag:
 
         self.prompt = PromptClient(
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             input_queue=pr_request_queue,
             output_queue=pr_response_queue,
             subscriber=module + "-prompt",

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/model/prompt/generic/service.py

@@ -63,7 +63,8 @@ class Processor(ConsumerProducer):
             subscriber=subscriber,
             input_queue=tc_request_queue,
             output_queue=tc_response_queue,
-            pulsar_host = self.pulsar_host
+            pulsar_host = self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
         )
 
     def parse_json(self, text):

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/model/prompt/template/service.py

@@ -136,7 +136,8 @@ class Processor(ConsumerProducer):
             subscriber=subscriber,
             input_queue=tc_request_queue,
             output_queue=tc_response_queue,
-            pulsar_host = self.pulsar_host
+            pulsar_host = self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
         )
 
         # System prompt hack

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/processing/processing.py

@@ -49,11 +49,12 @@ class Processing:
             pulsar_host,
             log_level,
             file,
+            pulsar_api_key=None,
     ):
         self.pulsar_host = pulsar_host
         self.log_level = log_level
         self.file = file
-
+        self.pulsar_api_key = pulsar_api_key
         self.defs = load(open(file, "r"), Loader=Loader)
 
     def run(self):
@@ -68,6 +69,7 @@ class Processing:
 
             params = {
                 "pulsar_host": self.pulsar_host,
+                "pulsar_api_key": self.pulsar_api_key,
                 "log_level": str(self.log_level),
             }
 
@@ -125,12 +127,19 @@ def run():
     )
 
     default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://pulsar:6650')
+    default_pulsar_api_key = os.getenv("PULSAR_API_KEY", None)
 
     parser.add_argument(
         '-p', '--pulsar-host',
         default=default_pulsar_host,
         help=f'Pulsar host (default: {default_pulsar_host})',
     )
+    
+    parser.add_argument(
+        '--pulsar-api-key',
+        default=default_pulsar_api_key,
+        help=f'Pulsar API key',
+    )
 
     parser.add_argument(
         '-l', '--log-level',
@@ -153,6 +162,7 @@ def run():
         try:
             p = Processing(
                 pulsar_host=args.pulsar_host,
+                pulsar_api_key=args.pulsar_api_key,
                 file=args.file,
                 log_level=args.log_level,
             )

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/retrieval/document_rag/rag.py

@@ -68,6 +68,7 @@ class Processor(ConsumerProducer):
 
         self.rag = DocumentRag(
             pulsar_host=self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
             pr_request_queue=pr_request_queue,
             pr_response_queue=pr_response_queue,
             emb_request_queue=emb_request_queue,

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph/retrieval/graph_rag/rag.py

@@ -82,6 +82,7 @@ class Processor(ConsumerProducer):
 
         self.rag = GraphRag(
             pulsar_host=self.pulsar_host,
+            pulsar_api_key=self.pulsar_api_key,
             pr_request_queue=pr_request_queue,
             pr_response_queue=pr_response_queue,
             emb_request_queue=emb_request_queue,

{trustgraph-flow-0.21.2 → trustgraph-flow-0.21.3}/trustgraph_flow.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-flow
-Version: 0.21.2
+Version: 0.21.3
 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
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.21.2.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.21.3.tar.gz
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 Classifier: Programming Language :: Python :: 3

trustgraph-flow-0.21.2/trustgraph/flow_version.py

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