trustgraph-flow 0.21.16__tar.gz → 0.21.18__tar.gz

{trustgraph-flow-0.21.16 → trustgraph-flow-0.21.18}/PKG-INFO

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

trustgraph-flow-0.21.18/trustgraph/flow_version.py

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

{trustgraph-flow-0.21.16 → trustgraph-flow-0.21.18}/trustgraph/model/text_completion/mistral/llm.py

@@ -4,7 +4,7 @@ Simple LLM service, performs text prompt completion using Mistral.
 Input is prompt, output is response.
 """
 
-from mistralai import Mistral, RateLimitError
+from mistralai import Mistral
 from prometheus_client import Histogram
 import os
 
@@ -130,12 +130,18 @@ class Processor(ConsumerProducer):
 
             print("Done.", flush=True)
 
-        # FIXME: Wrong exception, don't know what this LLM throws
-        # for a rate limit
-        except Mistral.RateLimitError:
+        # FIXME: Wrong exception.  The MistralAI library has retry logic
+        # so retry-able errors are retried transparently.  It means we
+        # don't get rate limit events.
 
-            # Leave rate limit retries to the base handler
-            raise TooManyRequests()
+        # We could choose to turn off retry and handle all that here
+        # or subclass BackoffStrategy to keep the retry logic, but
+        # get the events out.
+
+#        except Mistral.RateLimitError:
+
+#            # Leave rate limit retries to the base handler
+#            raise TooManyRequests()
 
         except Exception as e:
 

{trustgraph-flow-0.21.16 → trustgraph-flow-0.21.18}/trustgraph/model/text_completion/openai/llm.py

@@ -24,6 +24,7 @@ default_model = 'gpt-3.5-turbo'
 default_temperature = 0.0
 default_max_output = 4096
 default_api_key = os.getenv("OPENAI_TOKEN")
+default_base_url = os.getenv("OPENAI_BASE_URL", None)
 
 class Processor(ConsumerProducer):
 
@@ -34,6 +35,7 @@ class Processor(ConsumerProducer):
         subscriber = params.get("subscriber", default_subscriber)
         model = params.get("model", default_model)
         api_key = params.get("api_key", default_api_key)
+        base_url = params.get("base_url", default_base_url)
         temperature = params.get("temperature", default_temperature)
         max_output = params.get("max_output", default_max_output)
 
@@ -50,6 +52,7 @@ class Processor(ConsumerProducer):
                 "model": model,
                 "temperature": temperature,
                 "max_output": max_output,
+                "base_url": base_url,
             }
         )
 
@@ -69,7 +72,7 @@ class Processor(ConsumerProducer):
         self.model = model
         self.temperature = temperature
         self.max_output = max_output
-        self.openai = OpenAI(api_key=api_key)
+        self.openai = OpenAI(base_url=base_url, api_key=api_key)
 
         print("Initialised", flush=True)
 
@@ -132,7 +135,7 @@ class Processor(ConsumerProducer):
 
         # FIXME: Wrong exception, don't know what this LLM throws
         # for a rate limit
-        except openai.RateLimitError:
+        except RateLimitError:
 
             # Leave rate limit retries to the base handler
             raise TooManyRequests()
@@ -180,6 +183,12 @@ class Processor(ConsumerProducer):
             help=f'OpenAI API key'
         )
 
+        parser.add_argument(
+            '-u', '--url',
+            default=default_base_url,
+            help=f'OpenAI service base URL'
+        )
+
         parser.add_argument(
             '-t', '--temperature',
             type=float,

{trustgraph-flow-0.21.16 → trustgraph-flow-0.21.18}/trustgraph_flow.egg-info/PKG-INFO

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

trustgraph-flow-0.21.16/trustgraph/flow_version.py

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