trustgraph-flow 1.0.1__tar.gz → 1.0.3__tar.gz

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/PKG-INFO

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

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/setup.py

@@ -42,7 +42,7 @@ setuptools.setup(
         "cryptography",
         "falkordb",
         "fastembed",
-        "google-generativeai",
+        "google-genai",
         "ibis",
         "jsonschema",
         "langchain",

trustgraph-flow-1.0.3/trustgraph/flow_version.py

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

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph/gateway/dispatch/librarian.py

@@ -65,8 +65,6 @@ class LibrarianRequestor(ServiceRequestor):
 
     def from_response(self, message):
 
-        print(message)
-
         response = {}
 
         if message.document_metadata:

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph/gateway/dispatch/mux.py

@@ -149,7 +149,6 @@ class Mux:
                 break
 
             try:
-                print(id, svc, request)
 
                 await self.start_request_task(
                     self.ws, id, flow, svc, request, workers

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph/gateway/dispatch/requestor.py

@@ -82,8 +82,6 @@ class ServiceRequestor:
 
                 resp, fin = self.from_response(resp)
 
-                print(resp, fin, flush=True)
-
                 if responder:
                     await responder(resp, fin)
 

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph/gateway/dispatch/streamer.py

@@ -76,8 +76,6 @@ class ServiceRequestor:
 
                     resp, fin = self.from_inbound(resp)
 
-                    print(resp, fin)
-
                     await self.receiver(resp, fin)
 
                 if fin: break

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph/gateway/dispatch/triples_query.py

@@ -48,7 +48,6 @@ class TriplesQueryRequestor(ServiceRequestor):
         )
 
     def from_response(self, message):
-        print(message)
         return {
             "response": serialize_subgraph(message.triples)
         }, True

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph/gateway/endpoint/constant_endpoint.py

@@ -47,10 +47,8 @@ class ConstantEndpoint:
 
             data = await request.json()
 
-            print(data)
-
             async def responder(x, fin):
-                print(x)
+                pass
 
             resp = await self.dispatcher.process(data, responder)
 

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph/gateway/endpoint/variable_endpoint.py

@@ -47,10 +47,8 @@ class VariableEndpoint:
 
             data = await request.json()
 
-            print(data)
-
             async def responder(x, fin):
-                print(x)
+                pass
 
             resp = await self.dispatcher.process(
                 data, responder, request.match_info

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph/model/text_completion/googleaistudio/llm.py

@@ -4,10 +4,18 @@ Simple LLM service, performs text prompt completion using GoogleAIStudio.
 Input is prompt, output is response.
 """
 
-import google.generativeai as genai
-from google.generativeai.types import HarmCategory, HarmBlockThreshold
+#
+# Using this SDK:
+#   https://googleapis.github.io/python-genai/genai.html#module-genai.client
+#
+# Seems to have simpler dependencies on the 'VertexAI' service, which
+# TrustGraph implements in the trustgraph-vertexai package.
+#
+
+from google import genai
+from google.genai import types
+from google.genai.types import HarmCategory, HarmBlockThreshold
 from google.api_core.exceptions import ResourceExhausted
-from prometheus_client import Histogram
 import os
 
 from .... exceptions import TooManyRequests
@@ -15,7 +23,7 @@ from .... base import LlmService, LlmResult
 
 default_ident = "text-completion"
 
-default_model = 'gemini-1.5-flash-002'
+default_model = 'gemini-2.0-flash-001'
 default_temperature = 0.0
 default_max_output = 8192
 default_api_key = os.getenv("GOOGLE_AI_STUDIO_KEY")
@@ -40,58 +48,56 @@ class Processor(LlmService):
             }
         )
 
-        genai.configure(api_key=api_key)
+        self.client = genai.Client(api_key=api_key)
         self.model = model
         self.temperature = temperature
         self.max_output = max_output
 
-        self.generation_config = {
-            "temperature": temperature,
-            "top_p": 1,
-            "top_k": 40,
-            "max_output_tokens": max_output,
-            "response_mime_type": "text/plain",
-        }
-
         block_level = HarmBlockThreshold.BLOCK_ONLY_HIGH
 
-        self.safety_settings={
-            HarmCategory.HARM_CATEGORY_HATE_SPEECH: block_level,
-            HarmCategory.HARM_CATEGORY_HARASSMENT: block_level,
-            HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: block_level,
-            HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: block_level,
+        self.safety_settings = [
+            types.SafetySetting(
+                category = HarmCategory.HARM_CATEGORY_HATE_SPEECH,
+                threshold = block_level,
+            ),
+            types.SafetySetting(
+                category = HarmCategory.HARM_CATEGORY_HARASSMENT,
+                threshold = block_level,
+            ),
+            types.SafetySetting(
+                category = HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
+                threshold = block_level,
+            ),
+            types.SafetySetting(
+                category = HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
+                threshold = block_level,
+            ),
             # There is a documentation conflict on whether or not
             # CIVIC_INTEGRITY is a valid category
             # HarmCategory.HARM_CATEGORY_CIVIC_INTEGRITY: block_level,
-        }
-
-        self.llm = genai.GenerativeModel(
-            model_name=model,
-            generation_config=self.generation_config,
-            safety_settings=self.safety_settings,
-            system_instruction="You are a helpful AI assistant.",
-        )
+        ]
 
         print("Initialised", flush=True)
 
     async def generate_content(self, system, prompt):
 
-        # FIXME: There's a system prompt above.  Maybe if system changes,
-        # then reset self.llm?  It shouldn't do, because system prompt
-        # is set system wide?
-
-        # Or... could keep different LLM structures for different system
-        # prompts?
-
-        prompt = system + "\n\n" + prompt
+        generation_config = types.GenerateContentConfig(
+            temperature = self.temperature,
+            top_p = 1,
+            top_k = 40,
+            max_output_tokens = self.max_output,
+            response_mime_type = "text/plain",
+            system_instruction = system,
+            safety_settings = self.safety_settings,
+        )
 
         try:
 
-            chat_session = self.llm.start_chat(
-                history=[
-                ]
+            response = self.client.models.generate_content(
+                model=self.model,
+                config=generation_config,
+                contents=prompt,
             )
-            response = chat_session.send_message(prompt)
 
             resp = response.text
             inputtokens = int(response.usage_metadata.prompt_token_count)
@@ -158,3 +164,4 @@ class Processor(LlmService):
 def run():
     
     Processor.launch(default_ident, __doc__)
+

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph/model/text_completion/openai/llm.py

@@ -16,7 +16,10 @@ 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)
+default_base_url = os.getenv("OPENAI_BASE_URL")
+
+if default_base_url is None or default_base_url == "":
+    default_base_url = "https://api.openai.com/v1"
 
 class Processor(LlmService):
 
@@ -24,7 +27,7 @@ class Processor(LlmService):
     
         model = params.get("model", default_model)
         api_key = params.get("api_key", default_api_key)
-        base_url = params.get("base_url", default_base_url)
+        base_url = params.get("url", default_base_url)
         temperature = params.get("temperature", default_temperature)
         max_output = params.get("max_output", default_max_output)
 
@@ -43,7 +46,11 @@ class Processor(LlmService):
         self.model = model
         self.temperature = temperature
         self.max_output = max_output
-        self.openai = OpenAI(base_url=base_url, api_key=api_key)
+
+        if base_url:
+            self.openai = OpenAI(base_url=base_url, api_key=api_key)
+        else:
+            self.openai = OpenAI(api_key=api_key)
 
         print("Initialised", flush=True)
 
@@ -102,7 +109,7 @@ class Processor(LlmService):
 
             # Apart from rate limits, treat all exceptions as unrecoverable
 
-            print(f"Exception: {e}")
+            print(f"Exception: {type(e)} {e}")
             raise e
 
     @staticmethod

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph_flow.egg-info/PKG-INFO

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

{trustgraph-flow-1.0.1 → trustgraph-flow-1.0.3}/trustgraph_flow.egg-info/requires.txt

@@ -5,7 +5,7 @@ cohere
 cryptography
 falkordb
 fastembed
-google-generativeai
+google-genai
 ibis
 jsonschema
 langchain

trustgraph-flow-1.0.1/trustgraph/flow_version.py

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