trustgraph-flow 0.20.4__tar.gz → 0.20.5__tar.gz

{trustgraph-flow-0.20.4 → trustgraph-flow-0.20.5}/PKG-INFO

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

{trustgraph-flow-0.20.4 → trustgraph-flow-0.20.5}/setup.py

@@ -49,6 +49,7 @@ setuptools.setup(
         "langchain-core",
         "langchain-text-splitters",
         "neo4j",
+        "ollama",
         "openai",
         "pinecone[grpc]",
         "prometheus-client",

{trustgraph-flow-0.20.4 → trustgraph-flow-0.20.5}/trustgraph/embeddings/ollama/processor.py

@@ -3,12 +3,13 @@
 Embeddings service, applies an embeddings model selected from HuggingFace.
 Input is text, output is embeddings vector.
 """
-from langchain_community.embeddings import OllamaEmbeddings
 
 from ... schema import EmbeddingsRequest, EmbeddingsResponse
 from ... schema import embeddings_request_queue, embeddings_response_queue
 from ... log_level import LogLevel
 from ... base import ConsumerProducer
+from ollama import Client
+import os
 
 module = ".".join(__name__.split(".")[1:-1])
 
@@ -16,7 +17,7 @@ default_input_queue = embeddings_request_queue
 default_output_queue = embeddings_response_queue
 default_subscriber = module
 default_model="mxbai-embed-large"
-default_ollama = 'http://localhost:11434'
+default_ollama = os.getenv("OLLAMA_HOST", 'http://localhost:11434')
 
 class Processor(ConsumerProducer):
 
@@ -26,6 +27,9 @@ class Processor(ConsumerProducer):
         output_queue = params.get("output_queue", default_output_queue)
         subscriber = params.get("subscriber", default_subscriber)
 
+        ollama = params.get("ollama", default_ollama)
+        model = params.get("model", default_model)
+
         super(Processor, self).__init__(
             **params | {
                 "input_queue": input_queue,
@@ -33,10 +37,13 @@ class Processor(ConsumerProducer):
                 "subscriber": subscriber,
                 "input_schema": EmbeddingsRequest,
                 "output_schema": EmbeddingsResponse,
+                "ollama": ollama,
+                "model": model,
             }
         )
 
-        self.embeddings = OllamaEmbeddings(base_url=ollama, model=model)
+        self.client = Client(host=ollama)
+        self.model = model
 
     def handle(self, msg):
 
@@ -49,10 +56,16 @@ class Processor(ConsumerProducer):
         print(f"Handling input {id}...", flush=True)
 
         text = v.text
-        embeds = self.embeddings.embed_query([text])
+        embeds = self.client.embed(
+            model = self.model,
+            input = text
+        )
 
         print("Send response...", flush=True)
-        r = EmbeddingsResponse(vectors=[embeds])
+        r = EmbeddingsResponse(
+            vectors=embeds.embeddings,
+            error=None,
+        )
 
         self.producer.send(r, properties={"id": id})
 

trustgraph-flow-0.20.5/trustgraph/flow_version.py

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

{trustgraph-flow-0.20.4 → trustgraph-flow-0.20.5}/trustgraph_flow.egg-info/PKG-INFO

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

{trustgraph-flow-0.20.4 → trustgraph-flow-0.20.5}/trustgraph_flow.egg-info/requires.txt

@@ -12,6 +12,7 @@ langchain-community
 langchain-core
 langchain-text-splitters
 neo4j
+ollama
 openai
 pinecone[grpc]
 prometheus-client

trustgraph-flow-0.20.4/trustgraph/flow_version.py

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