trustgraph-base 0.21.1__tar.gz → 0.21.3__tar.gz

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-base
-Version: 0.21.1
+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.1.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-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/base/base_processor.py

@@ -12,6 +12,7 @@ from .. log_level import LogLevel
 class BaseProcessor:
 
     default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://pulsar:6650')
+    default_pulsar_api_key = os.getenv("PULSAR_API_KEY", None)
 
     def __init__(self, **params):
 
@@ -30,15 +31,25 @@ class BaseProcessor:
 
         pulsar_host = params.get("pulsar_host", self.default_pulsar_host)
         pulsar_listener = params.get("pulsar_listener", None)
+        pulsar_api_key = params.get("pulsar_api_key", None)
         log_level = params.get("log_level", LogLevel.INFO)
 
         self.pulsar_host = pulsar_host
+        self.pulsar_api_key = pulsar_api_key
 
-        self.client = pulsar.Client(
+        if pulsar_api_key:
+            auth = pulsar.AuthenticationToken(pulsar_api_key)
+            self.client = pulsar.Client(
+            pulsar_host,
+            authentication=auth,
+            logger=pulsar.ConsoleLogger(log_level.to_pulsar())
+            )
+        else:
+            self.client = pulsar.Client(
             pulsar_host,
             listener_name=pulsar_listener,
             logger=pulsar.ConsoleLogger(log_level.to_pulsar())
-        )
+            )
 
         self.pulsar_listener = pulsar_listener
 
@@ -56,6 +67,12 @@ class BaseProcessor:
             default=__class__.default_pulsar_host,
             help=f'Pulsar host (default: {__class__.default_pulsar_host})',
         )
+        
+        parser.add_argument(
+            '--pulsar-api-key',
+            default=__class__.default_pulsar_api_key,
+            help=f'Pulsar API key',
+        )
 
         parser.add_argument(
             '--pulsar-listener',

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/base/publisher.py

@@ -6,14 +6,13 @@ import threading
 
 class Publisher:
 
-    def __init__(self, pulsar_host, topic, schema=None, max_size=10,
-                 chunking_enabled=True, listener=None):
-        self.pulsar_host = pulsar_host
+    def __init__(self, pulsar_client, topic, schema=None, max_size=10,
+                 chunking_enabled=True):
+        self.client = pulsar_client
         self.topic = topic
         self.schema = schema
         self.q = queue.Queue(maxsize=max_size)
         self.chunking_enabled = chunking_enabled
-        self.listener_name = listener
         self.running = True
 
     def start(self):
@@ -32,12 +31,7 @@ class Publisher:
         while self.running:
 
             try:
-
-                client = pulsar.Client(
-                    self.pulsar_host, listener_name=self.listener_name
-                )
-
-                producer = client.create_producer(
+                producer = self.client.create_producer(
                     topic=self.topic,
                     schema=self.schema,
                     chunking_enabled=self.chunking_enabled,

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/base/subscriber.py

@@ -6,9 +6,9 @@ import time
 
 class Subscriber:
 
-    def __init__(self, pulsar_host, topic, subscription, consumer_name,
-                 schema=None, max_size=100, listener=None):
-        self.pulsar_host = pulsar_host
+    def __init__(self, pulsar_client, topic, subscription, consumer_name,
+                 schema=None, max_size=100):
+        self.client = pulsar_client
         self.topic = topic
         self.subscription = subscription
         self.consumer_name = consumer_name
@@ -17,7 +17,6 @@ class Subscriber:
         self.full = {}
         self.max_size = max_size
         self.lock = threading.Lock()
-        self.listener_name = listener
         self.running = True
 
     def start(self):
@@ -36,12 +35,7 @@ class Subscriber:
 
             try:
 
-                client = pulsar.Client(
-                    self.pulsar_host,
-                    listener_name=self.listener_name,
-                )
-
-                consumer = client.subscribe(
+                consumer = self.client.subscribe(
                     topic=self.topic,
                     subscription_name=self.subscription,
                     consumer_name=self.consumer_name,

trustgraph-base-0.21.3/trustgraph/base_version.py

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

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/agent_client.py

@@ -20,6 +20,7 @@ class AgentClient(BaseClient):
             input_queue=None,
             output_queue=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue is None: input_queue = agent_request_queue
@@ -33,6 +34,7 @@ class AgentClient(BaseClient):
             pulsar_host=pulsar_host,
             input_schema=AgentRequest,
             output_schema=AgentResponse,
+            pulsar_api_key=pulsar_api_key
         )
 
     def request(

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/base.py

@@ -27,6 +27,7 @@ class BaseClient:
             input_schema=None,
             output_schema=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue == None: raise RuntimeError("Need input_queue")
@@ -37,10 +38,18 @@ class BaseClient:
         if subscriber == None:
             subscriber = str(uuid.uuid4())
 
-        self.client = pulsar.Client(
+        if pulsar_api_key:
+            auth = pulsar.AuthenticationToken(pulsar_api_key)
+            self.client = pulsar.Client(
             pulsar_host,
             logger=pulsar.ConsoleLogger(log_level),
-        )
+            authentication=auth,
+            )
+        else:
+            self.client = pulsar.Client(
+            pulsar_host,
+            logger=pulsar.ConsoleLogger(log_level)
+            )
 
         self.producer = self.client.create_producer(
             topic=input_queue,

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/document_embeddings_client.py

@@ -20,6 +20,7 @@ class DocumentEmbeddingsClient(BaseClient):
             input_queue=None,
             output_queue=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue == None:
@@ -34,6 +35,7 @@ class DocumentEmbeddingsClient(BaseClient):
             input_queue=input_queue,
             output_queue=output_queue,
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             input_schema=DocumentEmbeddingsRequest,
             output_schema=DocumentEmbeddingsResponse,
         )

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/document_rag_client.py

@@ -20,6 +20,7 @@ class DocumentRagClient(BaseClient):
             input_queue=None,
             output_queue=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue == None:
@@ -34,6 +35,7 @@ class DocumentRagClient(BaseClient):
             input_queue=input_queue,
             output_queue=output_queue,
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             input_schema=DocumentRagQuery,
             output_schema=DocumentRagResponse,
         )

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/embeddings_client.py

@@ -20,6 +20,7 @@ class EmbeddingsClient(BaseClient):
             output_queue=None,
             subscriber=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue == None:
@@ -34,6 +35,7 @@ class EmbeddingsClient(BaseClient):
             input_queue=input_queue,
             output_queue=output_queue,
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             input_schema=EmbeddingsRequest,
             output_schema=EmbeddingsResponse,
         )

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/graph_embeddings_client.py

@@ -20,6 +20,7 @@ class GraphEmbeddingsClient(BaseClient):
             input_queue=None,
             output_queue=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue == None:
@@ -34,6 +35,7 @@ class GraphEmbeddingsClient(BaseClient):
             input_queue=input_queue,
             output_queue=output_queue,
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             input_schema=GraphEmbeddingsRequest,
             output_schema=GraphEmbeddingsResponse,
         )

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/graph_rag_client.py

@@ -20,6 +20,7 @@ class GraphRagClient(BaseClient):
             input_queue=None,
             output_queue=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue == None:
@@ -34,6 +35,7 @@ class GraphRagClient(BaseClient):
             input_queue=input_queue,
             output_queue=output_queue,
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             input_schema=GraphRagQuery,
             output_schema=GraphRagResponse,
         )

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/llm_client.py

@@ -20,6 +20,7 @@ class LlmClient(BaseClient):
             input_queue=None,
             output_queue=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue is None: input_queue = text_completion_request_queue
@@ -31,6 +32,7 @@ class LlmClient(BaseClient):
             input_queue=input_queue,
             output_queue=output_queue,
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             input_schema=TextCompletionRequest,
             output_schema=TextCompletionResponse,
         )

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/prompt_client.py

@@ -39,6 +39,7 @@ class PromptClient(BaseClient):
             input_queue=None,
             output_queue=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue == None:
@@ -53,6 +54,7 @@ class PromptClient(BaseClient):
             input_queue=input_queue,
             output_queue=output_queue,
             pulsar_host=pulsar_host,
+            pulsar_api_key=pulsar_api_key,
             input_schema=PromptRequest,
             output_schema=PromptResponse,
         )

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/clients/triples_query_client.py

@@ -21,6 +21,7 @@ class TriplesQueryClient(BaseClient):
             input_queue=None,
             output_queue=None,
             pulsar_host="pulsar://pulsar:6650",
+            pulsar_api_key=None,
     ):
 
         if input_queue == None:
@@ -34,6 +35,7 @@ class TriplesQueryClient(BaseClient):
             subscriber=subscriber,
             input_queue=input_queue,
             output_queue=output_queue,
+            pulsar_api_key=pulsar_api_key,
             pulsar_host=pulsar_host,
             input_schema=TriplesQueryRequest,
             output_schema=TriplesQueryResponse,

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph/schema/library.py

@@ -22,6 +22,8 @@ class DocumentPackage(Record):
     kind = String()
     user = String()
     collection = String()
+    title = String()
+    comments = String()
 
 class DocumentInfo(Record):
     metadata = Array(Triple())

{trustgraph-base-0.21.1 → trustgraph-base-0.21.3}/trustgraph_base.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-base
-Version: 0.21.1
+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.1.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-base-0.21.1/trustgraph/base_version.py

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