trustgraph-base 0.23.3__tar.gz → 0.23.5__tar.gz

{trustgraph-base-0.23.3 → trustgraph-base-0.23.5}/PKG-INFO

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

{trustgraph-base-0.23.3 → trustgraph-base-0.23.5}/trustgraph/base/publisher.py

@@ -15,6 +15,7 @@ class Publisher:
         self.q = asyncio.Queue(maxsize=max_size)
         self.chunking_enabled = chunking_enabled
         self.running = True
+        self.task = None
 
     async def start(self):
         self.task = asyncio.create_task(self.run())
@@ -22,9 +23,14 @@ class Publisher:
     async def stop(self):
         self.running = False
 
+        if self.task:
+            await self.task
+
     async def join(self):
         await self.stop()
-        await self.task
+
+        if self.task:
+            await self.task
 
     async def run(self):
 
@@ -42,7 +48,7 @@ class Publisher:
                     try:
                         id, item = await asyncio.wait_for(
                             self.q.get(),
-                            timeout=0.5
+                            timeout=0.25
                         )
                     except asyncio.TimeoutError:
                         continue
@@ -57,8 +63,11 @@ class Publisher:
             except Exception as e:
                 print("Exception:", e, flush=True)
 
+            if not self.running:
+                return
+
             # If handler drops out, sleep a retry
-            time.sleep(2)
+            await asyncio.sleep(1)
 
     async def send(self, id, item):
         await self.q.put((id, item))

{trustgraph-base-0.23.3 → trustgraph-base-0.23.5}/trustgraph/base/subscriber.py

@@ -19,6 +19,7 @@ class Subscriber:
         self.lock = asyncio.Lock()
         self.running = True
         self.metrics = metrics
+        self.task = None
 
     def __del__(self):
         self.running = False
@@ -29,12 +30,19 @@ class Subscriber:
     async def stop(self):
         self.running = False
 
+        if self.task:
+            await self.task
+
     async def join(self):
         await self.stop()
-        await self.task
+
+        if self.task:
+            await self.task
 
     async def run(self):
 
+        consumer = None
+
         while self.running:
 
             if self.metrics:
@@ -42,6 +50,8 @@ class Subscriber:
 
             try:
 
+                # FIXME: Create consumer in start  method so we know
+                # it is definitely running when start completes
                 consumer = self.client.subscribe(
                     topic = self.topic,
                     subscription_name = self.subscription,
@@ -59,7 +69,7 @@ class Subscriber:
                     try:
                         msg = await asyncio.to_thread(
                             consumer.receive,
-                            timeout_millis=2000
+                            timeout_millis=250
                         )
                     except _pulsar.Timeout:
                         continue
@@ -91,7 +101,7 @@ class Subscriber:
                                 # FIXME: Timeout means data goes missing
                                 await asyncio.wait_for(
                                     self.q[id].put(value),
-                                    timeout=2
+                                    timeout=1
                                 )
 
                             except Exception as e:
@@ -103,7 +113,7 @@ class Subscriber:
                                 # FIXME: Timeout means data goes missing
                                 await asyncio.wait_for(
                                     q.put(value),
-                                    timeout=2
+                                    timeout=1
                                 )
                             except Exception as e:
                                 self.metrics.dropped()
@@ -112,13 +122,21 @@ class Subscriber:
             except Exception as e:
                 print("Subscriber exception:", e, flush=True)
 
-            consumer.close()
+            finally:
+
+                if consumer:
+                    consumer.close()
+                    consumer = None
+                
          
             if self.metrics:
                 self.metrics.state("stopped")
 
+            if not self.running:
+                return
+            
             # If handler drops out, sleep a retry
-            time.sleep(2)
+            await asyncio.sleep(1)
 
     async def subscribe(self, id):
 

trustgraph-base-0.23.5/trustgraph/base_version.py

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

{trustgraph-base-0.23.3 → trustgraph-base-0.23.5}/trustgraph/clients/embeddings_client.py

@@ -1,7 +1,6 @@
 
 from pulsar.schema import JsonSchema
 from .. schema import EmbeddingsRequest, EmbeddingsResponse
-from .. schema import embeddings_request_queue, embeddings_response_queue
 from . base import BaseClient
 
 import _pulsar
@@ -23,12 +22,6 @@ class EmbeddingsClient(BaseClient):
             pulsar_api_key=None,
     ):
 
-        if input_queue == None:
-            input_queue=embeddings_request_queue
-
-        if output_queue == None:
-            output_queue=embeddings_response_queue
-
         super(EmbeddingsClient, self).__init__(
             log_level=log_level,
             subscriber=subscriber,
@@ -43,4 +36,3 @@ class EmbeddingsClient(BaseClient):
     def request(self, text, timeout=300):
         return self.call(text=text, timeout=timeout).vectors
 
-

{trustgraph-base-0.23.3 → trustgraph-base-0.23.5}/trustgraph_base.egg-info/PKG-INFO

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

trustgraph-base-0.23.3/trustgraph/base_version.py

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