trustgraph 0.5.3__tar.gz → 0.5.5__tar.gz

{trustgraph-0.5.3/trustgraph.egg-info → trustgraph-0.5.5}/PKG-INFO

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

{trustgraph-0.5.3 → trustgraph-0.5.5}/setup.py

@@ -4,7 +4,7 @@ import os
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
-version = "0.5.3"
+version = "0.5.5"
 
 setuptools.setup(
     name="trustgraph",

{trustgraph-0.5.3 → trustgraph-0.5.5}/trustgraph/base/base_processor.py

@@ -60,10 +60,10 @@ class BaseProcessor:
         )
 
         parser.add_argument(
-            '-M', '--metrics-enabled',
-            type=bool,
+            '--metrics',
+            action=argparse.BooleanOptionalAction,
             default=True,
-            help=f'Pulsar host (default: true)',
+            help=f'Metrics enabled (default: true)',
         )
 
         parser.add_argument(
@@ -89,7 +89,9 @@ class BaseProcessor:
         args = parser.parse_args()
         args = vars(args)
 
-        if args["metrics_enabled"]:
+        print(args)
+
+        if args["metrics"]:
             start_http_server(args["metrics_port"])
 
         while True:

{trustgraph-0.5.3 → trustgraph-0.5.5}/trustgraph/embeddings/vectorize/vectorize.py

@@ -36,7 +36,7 @@ class Processor(ConsumerProducer):
 
         self.embeddings = EmbeddingsClient(
             pulsar_host=self.pulsar_host,
-            subscriber=module + "emb",
+            subscriber=module + "-emb",
         )
 
     def emit(self, source, chunk, vectors):

{trustgraph-0.5.3 → trustgraph-0.5.5}/trustgraph/retrieval/graph_rag/rag.py

@@ -52,6 +52,7 @@ class Processor(ConsumerProducer):
             entity_limit=entity_limit,
             triple_limit=triple_limit,
             max_subgraph_size=max_subgraph_size,
+            module=module,
         )
 
     def handle(self, msg):

{trustgraph-0.5.3 → trustgraph-0.5.5}/trustgraph/schema.py

@@ -3,6 +3,9 @@ from pulsar.schema import Record, Bytes, String, Boolean, Integer, Array, Double
 
 from enum import Enum
 
+def topic(topic, kind='persistent', tenant='tg', namespace='flow'):
+    return f"{kind}://{tenant}/{namespace}/{topic}"
+
 ############################################################################
 
 class Value(Record):
@@ -22,7 +25,7 @@ class Document(Record):
     source = Source()
     data = Bytes()
 
-document_ingest_queue = 'document-load'
+document_ingest_queue = topic('document-load')
 
 ############################################################################
 
@@ -32,7 +35,7 @@ class TextDocument(Record):
     source = Source()
     text = Bytes()
 
-text_ingest_queue = 'text-document-load'
+text_ingest_queue = topic('text-document-load')
 
 ############################################################################
 
@@ -42,7 +45,7 @@ class Chunk(Record):
     source = Source()
     chunk = Bytes()
 
-chunk_ingest_queue = 'chunk-load'
+chunk_ingest_queue = topic('chunk-load')
 
 ############################################################################
 
@@ -53,7 +56,7 @@ class ChunkEmbeddings(Record):
     vectors = Array(Array(Double()))
     chunk = Bytes()
 
-chunk_embeddings_ingest_queue = 'chunk-embeddings-load'
+chunk_embeddings_ingest_queue = topic('chunk-embeddings-load')
 
 ############################################################################
 
@@ -64,7 +67,7 @@ class GraphEmbeddings(Record):
     vectors = Array(Array(Double()))
     entity = Value()
 
-graph_embeddings_store_queue = 'graph-embeddings-store'
+graph_embeddings_store_queue = topic('graph-embeddings-store')
 
 ############################################################################
 
@@ -76,11 +79,11 @@ class Triple(Record):
     p = Value()
     o = Value()
 
-triples_store_queue = 'triples-store'
+triples_store_queue = topic('triples-store')
 
 ############################################################################
 
-# chunk_embeddings_store_queue = 'chunk-embeddings-store'
+# chunk_embeddings_store_queue = topic('chunk-embeddings-store')
 
 ############################################################################
 
@@ -92,8 +95,12 @@ class TextCompletionRequest(Record):
 class TextCompletionResponse(Record):
     response = String()
 
-text_completion_request_queue = 'text-completion'
-text_completion_response_queue = 'text-completion-response'
+text_completion_request_queue = topic(
+    'text-completion', kind='non-persistent', namespace='request'
+)
+text_completion_response_queue = topic(
+    'text-completion-response', kind='non-persistent', namespace='response', 
+)
 
 ############################################################################
 
@@ -105,8 +112,12 @@ class EmbeddingsRequest(Record):
 class EmbeddingsResponse(Record):
     vectors = Array(Array(Double()))
 
-embeddings_request_queue = 'embeddings'
-embeddings_response_queue = 'embeddings-response'
+embeddings_request_queue = topic(
+    'embeddings', kind='non-persistent', namespace='request'
+)
+embeddings_response_queue = topic(
+    'embeddings-response', kind='non-persistent', namespace='response'
+)
 
 ############################################################################
 
@@ -118,8 +129,12 @@ class GraphRagQuery(Record):
 class GraphRagResponse(Record):
     response = String()
 
-graph_rag_request_queue = 'graph-rag'
-graph_rag_response_queue = 'graph-rag-response'
+graph_rag_request_queue = topic(
+    'graph-rag', kind='non-persistent', namespace='request'
+)
+graph_rag_response_queue = topic(
+    'graph-rag-response', kind='non-persistent', namespace='response'
+)
 
 ############################################################################
 

{trustgraph-0.5.3 → trustgraph-0.5.5/trustgraph.egg-info}/PKG-INFO

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