trustgraph-flow 0.21.4__tar.gz → 0.21.6__tar.gz

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/PKG-INFO

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

trustgraph-flow-0.21.6/scripts/text-completion-mistral

@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+
+from trustgraph.model.text_completion.mistral import run
+
+run()
+

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/setup.py

@@ -50,6 +50,7 @@ setuptools.setup(
         "langchain-core",
         "langchain-text-splitters",
         "minio",
+        "mistralai"
         "neo4j",
         "ollama",
         "openai",
@@ -107,6 +108,7 @@ setuptools.setup(
         "scripts/text-completion-cohere",
         "scripts/text-completion-googleaistudio",
         "scripts/text-completion-llamafile",
+        "scripts/text-completion-mistral",
         "scripts/text-completion-ollama",
         "scripts/text-completion-openai",
         "scripts/triples-query-cassandra",

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/document_rag.py

@@ -18,11 +18,15 @@ DEFINITION="http://www.w3.org/2004/02/skos/core#definition"
 
 class Query:
 
-    def __init__(self, rag, user, collection, verbose):
+    def __init__(
+            self, rag, user, collection, verbose,
+            doc_limit=20
+    ):
         self.rag = rag
         self.user = user
         self.collection = collection
         self.verbose = verbose
+        self.doc_limit = doc_limit
 
     def get_vector(self, query):
 
@@ -44,7 +48,7 @@ class Query:
             print("Get entities...", flush=True)
 
         docs = self.rag.de_client.request(
-            vectors, limit=self.rag.doc_limit
+            vectors, limit=self.doc_limit
         )
 
         if self.verbose:
@@ -93,9 +97,6 @@ class DocumentRag:
         if self.verbose:
             print("Initialising...", flush=True)
 
-        # FIXME: Configurable
-        self.doc_limit = 20
-
         self.de_client = DocumentEmbeddingsClient(
             pulsar_host=pulsar_host,
             subscriber=module + "-de",
@@ -123,13 +124,17 @@ class DocumentRag:
         if self.verbose:
             print("Initialised", flush=True)
 
-    def query(self, query, user="trustgraph", collection="default"):
+    def query(
+            self, query, user="trustgraph", collection="default",
+            doc_limit=20,
+    ):
 
         if self.verbose:
             print("Construct prompt...", flush=True)
 
         q = Query(
-            rag=self, user=user, collection=collection, verbose=self.verbose
+            rag=self, user=user, collection=collection, verbose=self.verbose,
+            doc_limit=doc_limit
         )
 
         docs = q.get_docs(query)

trustgraph-flow-0.21.6/trustgraph/flow_version.py

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

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/gateway/document_embeddings_load.py

@@ -59,6 +59,6 @@ class DocumentEmbeddingsLoadEndpoint(SocketEndpoint):
                     ],
                 )
 
-                await self.publisher.send(None, elt)
+                self.publisher.send(None, elt)
 
         running.stop()

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/gateway/document_rag.py

@@ -23,6 +23,7 @@ class DocumentRagRequestor(ServiceRequestor):
             query=body["query"],
             user=body.get("user", "trustgraph"),
             collection=body.get("collection", "default"),
+            doc_limit=int(body.get("doc-limit", 20)),
         )
 
     def from_response(self, message):

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/gateway/graph_embeddings_load.py

@@ -36,6 +36,7 @@ class GraphEmbeddingsLoadEndpoint(SocketEndpoint):
     async def listener(self, ws, running):
         
         async for msg in ws:
+
             # On error, finish
             if msg.type == WSMsgType.ERROR:
                 break
@@ -59,7 +60,6 @@ class GraphEmbeddingsLoadEndpoint(SocketEndpoint):
                     ]
                 )
 
-                await self.publisher.send(None, elt)
-
+                self.publisher.send(None, elt)
 
         running.stop()

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/gateway/graph_rag.py

@@ -23,6 +23,10 @@ class GraphRagRequestor(ServiceRequestor):
             query=body["query"],
             user=body.get("user", "trustgraph"),
             collection=body.get("collection", "default"),
+            entity_limit=int(body.get("entity-limit", 50)),
+            triple_limit=int(body.get("triple-limit", 30)),
+            max_subgraph_size=int(body.get("max-subgraph-size", 1000)),
+            max_path_length=int(body.get("max-path-length", 2)),
         )
 
     def from_response(self, message):

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/gateway/requestor.py

@@ -53,11 +53,9 @@ class ServiceRequestor:
 
             q = self.sub.subscribe(id)
 
-            print("BOUT TO SEDN")
             await asyncio.to_thread(
                 self.pub.send, id, self.to_request(request)
             )
-            print("SENT")
 
             while True:
 

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/gateway/socket.py

@@ -19,7 +19,7 @@ class SocketEndpoint:
         self.operation = "socket"
 
     async def listener(self, ws, running):
-        
+
         async for msg in ws:
             # On error, finish
             if msg.type == WSMsgType.TEXT:
@@ -53,7 +53,7 @@ class SocketEndpoint:
         try:
             await self.listener(ws, running)
         except Exception as e:
-            print(e, flush=True)
+            print("Socket exception:", e, flush=True)
 
         running.stop()
 

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/gateway/triples_load.py

@@ -51,7 +51,7 @@ class TriplesLoadEndpoint(SocketEndpoint):
                     triples=to_subgraph(data["triples"]),
                 )
 
-                await self.publisher.send(None, elt)
+                self.publisher.send(None, elt)
 
 
         running.stop()

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/graph_rag.py

@@ -20,11 +20,19 @@ DEFINITION="http://www.w3.org/2004/02/skos/core#definition"
 
 class Query:
 
-    def __init__(self, rag, user, collection, verbose):
+    def __init__(
+            self, rag, user, collection, verbose,
+            entity_limit=50, triple_limit=30, max_subgraph_size=1000,
+            max_path_length=2,
+    ):
         self.rag = rag
         self.user = user
         self.collection = collection
         self.verbose = verbose
+        self.entity_limit = entity_limit
+        self.triple_limit = triple_limit
+        self.max_subgraph_size = max_subgraph_size
+        self.max_path_length = max_path_length
 
     def get_vector(self, query):
 
@@ -47,7 +55,7 @@ class Query:
 
         entities = self.rag.ge_client.request(
             user=self.user, collection=self.collection,
-            vectors=vectors, limit=self.rag.entity_limit,
+            vectors=vectors, limit=self.entity_limit,
         )
 
         entities = [
@@ -79,61 +87,66 @@ class Query:
         self.rag.label_cache[e] = res[0].o.value
         return self.rag.label_cache[e]
 
-    def get_subgraph(self, query):
-
-        entities = self.get_entities(query)
+    def follow_edges(self, ent, subgraph, path_length):
 
-        subgraph = set()
+        # Not needed?
+        if path_length <= 0:
+            return
 
-        if self.verbose:
-            print("Get subgraph...", flush=True)
+        # Stop spanning around if the subgraph is already maxed out
+        if len(subgraph) >= self.max_subgraph_size:
+            return
 
-        for e in entities:
+        res = self.rag.triples_client.request(
+            user=self.user, collection=self.collection,
+            s=ent, p=None, o=None,
+            limit=self.triple_limit
+        )
 
-            res = self.rag.triples_client.request(
-                user=self.user, collection=self.collection,
-                s=e, p=None, o=None,
-                limit=self.rag.query_limit
+        for triple in res:
+            subgraph.add(
+                (triple.s.value, triple.p.value, triple.o.value)
             )
+            if path_length > 1:
+                self.follow_edges(triple.o.value, subgraph, path_length-1)
 
-            for triple in res:
-                subgraph.add(
-                    (triple.s.value, triple.p.value, triple.o.value)
-                )
+        res = self.rag.triples_client.request(
+            user=self.user, collection=self.collection,
+            s=None, p=ent, o=None,
+            limit=self.triple_limit
+        )
 
-            res = self.rag.triples_client.request(
-                user=self.user, collection=self.collection,
-                s=None, p=e, o=None,
-                limit=self.rag.query_limit
+        for triple in res:
+            subgraph.add(
+                (triple.s.value, triple.p.value, triple.o.value)
             )
 
-            for triple in res:
-                subgraph.add(
-                    (triple.s.value, triple.p.value, triple.o.value)
-                )
+        res = self.rag.triples_client.request(
+            user=self.user, collection=self.collection,
+            s=None, p=None, o=ent,
+            limit=self.triple_limit,
+        )
 
-            res = self.rag.triples_client.request(
-                user=self.user, collection=self.collection,
-                s=None, p=None, o=e,
-                limit=self.rag.query_limit,
+        for triple in res:
+            subgraph.add(
+                (triple.s.value, triple.p.value, triple.o.value)
             )
+            if path_length > 1:
+                self.follow_edges(triple.s.value, subgraph, path_length-1)
 
-            for triple in res:
-                subgraph.add(
-                    (triple.s.value, triple.p.value, triple.o.value)
-                )
-
-        subgraph = list(subgraph)
+    def get_subgraph(self, query):
 
-        subgraph = subgraph[0:self.rag.max_subgraph_size]
+        entities = self.get_entities(query)
 
         if self.verbose:
-            print("Subgraph:", flush=True)
-            for edge in subgraph:
-                print(" ", str(edge), flush=True)
+            print("Get subgraph...", flush=True)
 
-        if self.verbose:
-            print("Done.", flush=True)
+        subgraph = set()
+
+        for ent in entities:
+            self.follow_edges(ent, subgraph, self.max_path_length)
+
+        subgraph = list(subgraph)
 
         return subgraph
 
@@ -154,6 +167,16 @@ class Query:
 
             sg2.append((s, p, o))
 
+        sg2 = sg2[0:self.max_subgraph_size]
+
+        if self.verbose:
+            print("Subgraph:", flush=True)
+            for edge in sg2:
+                print(" ", str(edge), flush=True)
+
+        if self.verbose:
+            print("Done.", flush=True)
+
         return sg2
     
 class GraphRag:
@@ -171,9 +194,6 @@ class GraphRag:
             tpl_request_queue=None,
             tpl_response_queue=None,
             verbose=False,
-            entity_limit=50,
-            triple_limit=30,
-            max_subgraph_size=3000,
             module="test",
     ):
 
@@ -230,10 +250,6 @@ class GraphRag:
             subscriber=module + "-emb",
         )
 
-        self.entity_limit=entity_limit
-        self.query_limit=triple_limit
-        self.max_subgraph_size=max_subgraph_size
-
         self.label_cache = {}
 
         self.prompt = PromptClient(
@@ -247,13 +263,20 @@ class GraphRag:
         if self.verbose:
             print("Initialised", flush=True)
 
-    def query(self, query, user="trustgraph", collection="default"):
+    def query(
+            self, query, user="trustgraph", collection="default",
+            entity_limit=50, triple_limit=30, max_subgraph_size=1000,
+            max_path_length=2,
+    ):
 
         if self.verbose:
             print("Construct prompt...", flush=True)
 
         q = Query(
-            rag=self, user=user, collection=collection, verbose=self.verbose
+            rag=self, user=user, collection=collection, verbose=self.verbose,
+            entity_limit=entity_limit, triple_limit=triple_limit,
+            max_subgraph_size=max_subgraph_size,
+            max_path_length=max_path_length,
         )
 
         kg = q.get_labelgraph(query)

{trustgraph-flow-0.21.4 → trustgraph-flow-0.21.6}/trustgraph/model/text_completion/azure_openai/llm.py

@@ -23,9 +23,10 @@ default_output_queue = text_completion_response_queue
 default_subscriber = module
 default_temperature = 0.0
 default_max_output = 4192
-default_api = "2024-02-15-preview"
-default_endpoint = os.getenv("AZURE_ENDPOINT")
-default_token = os.getenv("AZURE_TOKEN")
+default_api = "2024-12-01-preview"
+default_endpoint = os.getenv("AZURE_ENDPOINT", None)
+default_token = os.getenv("AZURE_TOKEN", None)
+default_modeel = os.getenv("AZURE_MODEL", None)
 
 class Processor(ConsumerProducer):
 
@@ -34,12 +35,13 @@ class Processor(ConsumerProducer):
         input_queue = params.get("input_queue", default_input_queue)
         output_queue = params.get("output_queue", default_output_queue)
         subscriber = params.get("subscriber", default_subscriber)
-        endpoint = params.get("endpoint", default_endpoint)
-        token = params.get("token", default_token)
         temperature = params.get("temperature", default_temperature)
         max_output = params.get("max_output", default_max_output)
-        model = params.get("model")
+
         api = params.get("api_version", default_api)
+        endpoint = params.get("endpoint", default_endpoint)
+        token = params.get("token", default_token)
+        model = params.get("model", default_model)
 
         if endpoint is None:
             raise RuntimeError("Azure endpoint not specified")
@@ -177,6 +179,7 @@ class Processor(ConsumerProducer):
 
         parser.add_argument(
             '-e', '--endpoint',
+            default=default_endpoint,
             help=f'LLM model endpoint'
         )
 
@@ -188,11 +191,13 @@ class Processor(ConsumerProducer):
 
         parser.add_argument(
             '-k', '--token',
+            default=default_token,
             help=f'LLM model token'
         )
 
         parser.add_argument(
             '-m', '--model',
+            default=default_model,
             help=f'LLM model'
         )
 

trustgraph-flow-0.21.6/trustgraph/model/text_completion/mistral/llm.py

@@ -0,0 +1,201 @@
+
+"""
+Simple LLM service, performs text prompt completion using Mistral.
+Input is prompt, output is response.
+"""
+
+from mistralai import Mistral, RateLimitError
+from prometheus_client import Histogram
+import os
+
+from .... schema import TextCompletionRequest, TextCompletionResponse, Error
+from .... schema import text_completion_request_queue
+from .... schema import text_completion_response_queue
+from .... log_level import LogLevel
+from .... base import ConsumerProducer
+from .... exceptions import TooManyRequests
+
+module = ".".join(__name__.split(".")[1:-1])
+
+default_input_queue = text_completion_request_queue
+default_output_queue = text_completion_response_queue
+default_subscriber = module
+default_model = 'ministral-8b-latest'
+default_temperature = 0.0
+default_max_output = 4096
+default_api_key = os.getenv("MISTRAL_TOKEN")
+
+class Processor(ConsumerProducer):
+
+    def __init__(self, **params):
+    
+        input_queue = params.get("input_queue", default_input_queue)
+        output_queue = params.get("output_queue", default_output_queue)
+        subscriber = params.get("subscriber", default_subscriber)
+        model = params.get("model", default_model)
+        api_key = params.get("api_key", default_api_key)
+        temperature = params.get("temperature", default_temperature)
+        max_output = params.get("max_output", default_max_output)
+
+        if api_key is None:
+            raise RuntimeError("Mistral API key not specified")
+
+        super(Processor, self).__init__(
+            **params | {
+                "input_queue": input_queue,
+                "output_queue": output_queue,
+                "subscriber": subscriber,
+                "input_schema": TextCompletionRequest,
+                "output_schema": TextCompletionResponse,
+                "model": model,
+                "temperature": temperature,
+                "max_output": max_output,
+            }
+        )
+
+        if not hasattr(__class__, "text_completion_metric"):
+            __class__.text_completion_metric = Histogram(
+                'text_completion_duration',
+                'Text completion duration (seconds)',
+                buckets=[
+                    0.25, 0.5, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0,
+                    8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0,
+                    17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0,
+                    30.0, 35.0, 40.0, 45.0, 50.0, 60.0, 80.0, 100.0,
+                    120.0
+                ]
+            )
+
+        self.model = model
+        self.temperature = temperature
+        self.max_output = max_output
+        self.mistral = Mistral(api_key=api_key)
+
+        print("Initialised", flush=True)
+
+    async def handle(self, msg):
+
+        v = msg.value()
+
+        # Sender-produced ID
+
+        id = msg.properties()["id"]
+
+        print(f"Handling prompt {id}...", flush=True)
+
+        prompt = v.system + "\n\n" + v.prompt
+
+        try:
+
+            with __class__.text_completion_metric.time():
+
+                resp = self.mistral.chat.complete(
+                    model=self.model,
+                    messages=[
+                        {
+                            "role": "user",
+                            "content": [
+                                {
+                                    "type": "text",
+                                    "text": prompt
+                                }
+                            ]
+                        }
+                    ],
+                    temperature=self.temperature,
+                    max_tokens=self.max_output,
+                    top_p=1,
+                    frequency_penalty=0,
+                    presence_penalty=0,
+                    response_format={
+                        "type": "text"
+                    }
+                )
+            
+            inputtokens = resp.usage.prompt_tokens
+            outputtokens = resp.usage.completion_tokens
+            print(resp.choices[0].message.content, flush=True)
+            print(f"Input Tokens: {inputtokens}", flush=True)
+            print(f"Output Tokens: {outputtokens}", flush=True)
+
+            print("Send response...", flush=True)
+            r = TextCompletionResponse(
+                response=resp.choices[0].message.content,
+                error=None,
+                in_token=inputtokens,
+                out_token=outputtokens,
+                model=self.model
+            )
+            await self.send(r, properties={"id": id})
+
+            print("Done.", flush=True)
+
+        # FIXME: Wrong exception, don't know what this LLM throws
+        # for a rate limit
+        except Mistral.RateLimitError:
+
+            # Leave rate limit retries to the base handler
+            raise TooManyRequests()
+
+        except Exception as e:
+
+            # Apart from rate limits, treat all exceptions as unrecoverable
+
+            print(f"Exception: {e}")
+
+            print("Send error response...", flush=True)
+
+            r = TextCompletionResponse(
+                error=Error(
+                    type = "llm-error",
+                    message = str(e),
+                ),
+                response=None,
+                in_token=None,
+                out_token=None,
+                model=None,
+            )
+
+            await self.send(r, properties={"id": id})
+
+            self.consumer.acknowledge(msg)
+
+    @staticmethod
+    def add_args(parser):
+
+        ConsumerProducer.add_args(
+            parser, default_input_queue, default_subscriber,
+            default_output_queue,
+        )
+
+        parser.add_argument(
+            '-m', '--model',
+            default=default_model,
+            help=f'LLM model (default: ministral-8b-latest)'
+        )
+
+        parser.add_argument(
+            '-k', '--api-key',
+            default=default_api_key,
+            help=f'Mistral API Key'
+        )
+
+        parser.add_argument(
+            '-t', '--temperature',
+            type=float,
+            default=default_temperature,
+            help=f'LLM temperature parameter (default: {default_temperature})'
+        )
+
+        parser.add_argument(
+            '-x', '--max-output',
+            type=int,
+            default=default_max_output,
+            help=f'LLM max output tokens (default: {default_max_output})'
+        )
+
+def run():
+
+    Processor.launch(module, __doc__)
+
+    

trustgraph-flow-0.21.6/trustgraph/model/text_completion/openai/__init__.py

@@ -0,0 +1,3 @@
+
+from . llm import *
+

trustgraph-flow-0.21.6/trustgraph/model/text_completion/openai/__main__.py

@@ -0,0 +1,7 @@
+#!/usr/bin/env python3
+
+from . llm import run
+
+if __name__ == '__main__':
+    run()
+