trustgraph-flow 0.23.2__tar.gz → 0.23.3__tar.gz

{trustgraph-flow-0.23.2 → trustgraph-flow-0.23.3}/PKG-INFO

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

{trustgraph-flow-0.23.2 → trustgraph-flow-0.23.3}/trustgraph/config/service/flow.py

@@ -27,6 +27,8 @@ class FlowConfig:
 
         self.config["flow-classes"][msg.class_name] = msg.class_definition
 
+        self.config.version += 1
+
         await self.config.push()
 
         return FlowResponse(
@@ -39,6 +41,8 @@ class FlowConfig:
 
         del self.config["flow-classes"][msg.class_name]
 
+        self.config.version += 1
+
         await self.config.push()
 
         return FlowResponse(
@@ -135,6 +139,8 @@ class FlowConfig:
             "interfaces": interfaces,
         })
 
+        self.config.version += 1
+
         await self.config.push()
 
         return FlowResponse(
@@ -186,6 +192,8 @@ class FlowConfig:
         if msg.flow_id in self.config["flows"]:
             del self.config["flows"][msg.flow_id]
 
+        self.config.version += 1
+
         await self.config.push()
 
         return FlowResponse(

{trustgraph-flow-0.23.2 → trustgraph-flow-0.23.3}/trustgraph/decoding/pdf/pdf_decoder.py

@@ -9,7 +9,6 @@ import base64
 from langchain_community.document_loaders import PyPDFLoader
 
 from ... schema import Document, TextDocument, Metadata
-from ... log_level import LogLevel
 from ... base import FlowProcessor, ConsumerSpec, ProducerSpec
 
 default_ident = "pdf-decoder"

{trustgraph-flow-0.23.2 → trustgraph-flow-0.23.3}/trustgraph/extract/kg/relationships/extract.py

@@ -173,7 +173,7 @@ class Processor(FlowProcessor):
                         o=Value(value=v.metadata.id, is_uri=True)
                     ))
 
-            await self.emit_edges(
+            await self.emit_triples(
                 flow("triples"),
                 Metadata(
                     id=v.metadata.id,

trustgraph-flow-0.23.3/trustgraph/flow_version.py

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

{trustgraph-flow-0.23.2 → trustgraph-flow-0.23.3}/trustgraph/metering/counter.py

@@ -3,22 +3,19 @@ Simple token counter for each LLM response.
 """
 
 from prometheus_client import Counter
-from . pricelist import price_list
+import json
 
 from .. schema import TextCompletionResponse, Error
-from .. schema import text_completion_response_queue
-from .. log_level import LogLevel
-from .. base import Consumer
+from .. base import FlowProcessor, ConsumerSpec
 
-module = "metering"
+default_ident = "metering"
 
-default_input_queue = text_completion_response_queue
-default_subscriber = module
-
-class Processor(Consumer):
+class Processor(FlowProcessor):
 
     def __init__(self, **params):
 
+        id = params.get("id", default_ident)
+
         if not hasattr(__class__, "input_token_metric"):
             __class__.input_token_metric = Counter(
                 'input_tokens', 'Input token count'
@@ -39,40 +36,61 @@ class Processor(Consumer):
                 'output_cost', 'Output cost'
             )
 
-        input_queue = params.get("input_queue", default_input_queue)
-        subscriber = params.get("subscriber", default_subscriber)
-
         super(Processor, self).__init__(
             **params | {
-                "input_queue": input_queue,
-                "subscriber": subscriber,
-                "input_schema": TextCompletionResponse,
+                "id": id,
             }
         )
 
-    def get_prices(self, prices, modelname):
-        for model in prices["price_list"]:
-            if model["model_name"] == modelname:
-                return model["input_price"], model["output_price"]
-        return None, None  # Return None if model is not found
+        self.register_config_handler(self.on_cost_config)
+
+        self.register_specification(
+            ConsumerSpec(
+                name = "input",
+                schema = TextCompletionResponse,
+                handler = self.on_message,
+            )
+        )
 
-    async def handle(self, msg):
+        self.prices = {}
 
-        v = msg.value()
-        modelname = v.model
+        self.config_key = "token-costs"
+
+    # Load token costs from the config service
+    async def on_cost_config(self, config, version):
 
-        # Sender-produced ID
-        id = msg.properties()["id"]
+        print("Loading configuration version", version)
 
-        print(f"Handling response {id}...", flush=True)
+        if self.config_key not in config:
+            print(f"No key {self.config_key} in config", flush=True)
+            return
 
+        config = config[self.config_key]
+
+        self.prices = {
+            k: json.loads(v)
+            for k, v in config.items()
+        }
+
+    def get_prices(self, modelname):
+
+        if modelname in self.prices:
+            model = self.prices[modelname]
+            return model["input_price"], model["output_price"]
+        return None, None  # Return None if model is not found
+
+    async def on_message(self, msg, consumer, flow):
+
+        v = msg.value()
+
+        modelname = v.model
         num_in = v.in_token
         num_out = v.out_token
 
         __class__.input_token_metric.inc(num_in)
         __class__.output_token_metric.inc(num_out)
 
-        model_input_price, model_output_price = self.get_prices(price_list, modelname)
+        model_input_price, model_output_price = self.get_prices(modelname)
 
         if model_input_price == None:
             cost_per_call = f"Model Not Found in Price list"
@@ -91,10 +109,8 @@ class Processor(Consumer):
     @staticmethod
     def add_args(parser):
 
-        Consumer.add_args(
-            parser, default_input_queue, default_subscriber,
-        )
+        FlowProcessor.add_args(parser)
 
 def run():
 
-    Processor.launch(module, __doc__)
+    Processor.launch(default_ident, __doc__)

{trustgraph-flow-0.23.2 → trustgraph-flow-0.23.3}/trustgraph_flow.egg-info/PKG-INFO

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

{trustgraph-flow-0.23.2 → trustgraph-flow-0.23.3}/trustgraph_flow.egg-info/SOURCES.txt

@@ -163,7 +163,6 @@ trustgraph/librarian/table_store.py
 trustgraph/metering/__init__.py
 trustgraph/metering/__main__.py
 trustgraph/metering/counter.py
-trustgraph/metering/pricelist.py
 trustgraph/model/__init__.py
 trustgraph/model/prompt/__init__.py
 trustgraph/model/prompt/generic/__init__.py

trustgraph-flow-0.23.2/trustgraph/flow_version.py

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

trustgraph-flow-0.23.2/trustgraph/metering/pricelist.py

@@ -1,104 +0,0 @@
-price_list = {
-  "price_list": [
-    {
-      "model_name": "mistral.mistral-large-2407-v1:0",
-      "input_price": 0.000004,
-      "output_price": 0.000012
-    },
-    {
-      "model_name": "meta.llama3-1-405b-instruct-v1:0",
-      "input_price": 0.00000532,
-      "output_price": 0.000016
-    },
-    {
-      "model_name": "mistral.mixtral-8x7b-instruct-v0:1",
-      "input_price": 0.00000045,
-      "output_price": 0.0000007
-    },
-    {
-      "model_name": "meta.llama3-1-70b-instruct-v1:0",
-      "input_price": 0.00000099,
-      "output_price": 0.00000099
-    },
-    {
-      "model_name": "meta.llama3-1-8b-instruct-v1:0",
-      "input_price": 0.00000022,
-      "output_price": 0.00000022
-    },
-    {
-      "model_name": "anthropic.claude-3-haiku-20240307-v1:0",
-      "input_price": 0.00000025,
-      "output_price": 0.00000125
-    },
-    {
-      "model_name": "anthropic.claude-3-5-sonnet-20240620-v1:0",
-      "input_price": 0.000003,
-      "output_price": 0.000015
-    },
-    {
-      "model_name": "cohere.command-r-plus-v1:0",
-      "input_price": 0.0000030,
-      "output_price": 0.0000150
-    },
-    {
-      "model_name": "ollama",
-      "input_price": 0,
-      "output_price": 0
-    },
-    {
-      "model_name": "claude-3-haiku-20240307",
-      "input_price": 0.00000025,
-      "output_price": 0.00000125
-    },
-    {
-      "model_name": "claude-3-5-sonnet-20240620",
-      "input_price": 0.000003,
-      "output_price": 0.000015
-    },
-    {
-      "model_name": "claude-3-opus-20240229",
-      "input_price": 0.000015,
-      "output_price": 0.000075
-    },
-    {
-      "model_name": "claude-3-sonnet-20240229",
-      "input_price": 0.000003,
-      "output_price": 0.000015
-    },
-    {
-      "model_name": "command-r-08-202",
-      "input_price": 0.0000025,
-      "output_price": 0.000010
-    },
-    {
-      "model_name": "c4ai-aya-23-8b",
-      "input_price": 0,
-      "output_price": 0
-    },
-    {
-      "model_name": "llama.cpp",
-      "input_price": 0,
-      "output_price": 0
-    },
-    {
-      "model_name": "gpt-4o",
-      "input_price": 0.000005,
-      "output_price": 0.000015
-    },
-    {
-      "model_name": "gpt-4o-2024-08-06",
-      "input_price": 0.0000025,
-      "output_price": 0.000010
-    },
-    {
-      "model_name": "gpt-4o-2024-05-13",
-      "input_price": 0.000005,
-      "output_price": 0.000015
-    },
-    {
-      "model_name": "gpt-4o-mini",
-      "input_price": 0.00000015,
-      "output_price": 0.0000006
-    },
-  ]
-}