trustgraph-base 0.14.15__tar.gz → 0.15.0__tar.gz

{trustgraph-base-0.14.15 → trustgraph-base-0.15.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: trustgraph-base
-Version: 0.14.15
+Version: 0.15.0
 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
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 License: UNKNOWN
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.14.15.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.15.0.tar.gz
 Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

{trustgraph-base-0.14.15 → trustgraph-base-0.15.0}/trustgraph/base/base_processor.py

@@ -39,8 +39,9 @@ class BaseProcessor:
 
     def __del__(self):
 
-        if self.client:
-            self.client.close()
+        if hasattr(self, "client"):
+            if self.client:
+                self.client.close()
 
     @staticmethod
     def add_args(parser):

trustgraph-base-0.15.0/trustgraph/base_version.py

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

trustgraph-base-0.15.0/trustgraph/clients/agent_client.py

@@ -0,0 +1,64 @@
+
+import _pulsar
+
+from .. schema import AgentRequest, AgentResponse
+from .. schema import agent_request_queue
+from .. schema import agent_response_queue
+from . base import BaseClient
+
+# Ugly
+ERROR=_pulsar.LoggerLevel.Error
+WARN=_pulsar.LoggerLevel.Warn
+INFO=_pulsar.LoggerLevel.Info
+DEBUG=_pulsar.LoggerLevel.Debug
+
+class AgentClient(BaseClient):
+
+    def __init__(
+            self, log_level=ERROR,
+            subscriber=None,
+            input_queue=None,
+            output_queue=None,
+            pulsar_host="pulsar://pulsar:6650",
+    ):
+
+        if input_queue is None: input_queue = agent_request_queue
+        if output_queue is None: output_queue = agent_response_queue
+
+        super(AgentClient, self).__init__(
+            log_level=log_level,
+            subscriber=subscriber,
+            input_queue=input_queue,
+            output_queue=output_queue,
+            pulsar_host=pulsar_host,
+            input_schema=AgentRequest,
+            output_schema=AgentResponse,
+        )
+
+    def request(
+            self,
+            question,
+            think=None,
+            observe=None,
+            timeout=300
+    ):
+
+        def inspect(x):
+
+            if x.thought and think:
+                think(x.thought)
+                return
+
+            if x.observation and observe:
+                observe(x.observation)
+                return
+
+            if x.answer:
+                return True
+
+            return False
+
+        return self.call(
+            question=question, inspect=inspect, timeout=timeout
+        ).answer
+

{trustgraph-base-0.14.15 → trustgraph-base-0.15.0}/trustgraph/clients/base.py

@@ -59,10 +59,14 @@ class BaseClient:
     def call(self, **args):
 
         timeout = args.get("timeout", DEFAULT_TIMEOUT)
+        inspect = args.get("inspect", lambda x: True)
 
         if "timeout" in args:
             del args["timeout"]
 
+        if "inspect" in args:
+            del args["inspect"]
+
         id = str(uuid.uuid4())
 
         r = self.input_schema(**args)
@@ -103,6 +107,10 @@ class BaseClient:
                             f"{value.error.type}: {value.error.message}"
                         )
 
+                complete = inspect(value)
+
+                if not complete: continue
+
                 resp = msg.value()
                 self.consumer.acknowledge(msg)
                 return resp

{trustgraph-base-0.14.15 → trustgraph-base-0.15.0}/trustgraph/clients/prompt_client.py

@@ -57,13 +57,13 @@ class PromptClient(BaseClient):
             output_schema=PromptResponse,
         )
 
-    def request(self, id, terms, timeout=300):
+    def request(self, id, variables, timeout=300):
 
         resp = self.call(
             id=id,
             terms={
                 k: json.dumps(v)
-                for k, v in terms.items()
+                for k, v in variables.items()
             },
             timeout=timeout
         )
@@ -76,7 +76,7 @@ class PromptClient(BaseClient):
 
         defs = self.request(
             id="extract-definitions",
-            terms={
+            variables={
                 "text": chunk
             },
             timeout=timeout
@@ -91,7 +91,7 @@ class PromptClient(BaseClient):
 
         rels = self.request(
             id="extract-relationships",
-            terms={
+            variables={
                 "text": chunk
             },
             timeout=timeout
@@ -111,7 +111,7 @@ class PromptClient(BaseClient):
 
         topics = self.request(
             id="extract-topics",
-            terms={
+            variables={
                 "text": chunk
             },
             timeout=timeout
@@ -126,7 +126,7 @@ class PromptClient(BaseClient):
 
         return self.request(
             id="extract-rows",
-            terms={
+            variables={
                 "chunk": chunk,
                 "row-schema": {
                     "name": schema.name,
@@ -148,7 +148,7 @@ class PromptClient(BaseClient):
 
         return self.request(
             id="kg-prompt",
-            terms={
+            variables={
                 "query": query,
                 "knowledge": [
                     { "s": v[0], "p": v[1], "o": v[2] }
@@ -162,7 +162,7 @@ class PromptClient(BaseClient):
 
         return self.request(
             id="document-prompt",
-            terms={
+            variables={
                 "query": query,
                 "documents": documents,
             },

{trustgraph-base-0.14.15 → trustgraph-base-0.15.0}/trustgraph/schema/__init__.py

@@ -8,4 +8,5 @@ from . topic import *
 from . graph import *
 from . retrieval import *
 from . metadata import *
+from . agent import *
 

trustgraph-base-0.15.0/trustgraph/schema/agent.py

@@ -0,0 +1,37 @@
+
+from pulsar.schema import Record, String, Array, Map
+
+from . topic import topic
+from . types import Error
+
+############################################################################
+
+# Prompt services, abstract the prompt generation
+
+class AgentStep(Record):
+    thought = String()
+    action = String()
+    arguments = Map(String())
+    observation = String()
+
+class AgentRequest(Record):
+    question = String()
+    plan = String()
+    state = String()
+    history = Array(AgentStep())
+
+class AgentResponse(Record):
+    answer = String()
+    error = Error()
+    thought = String()
+    observation = String()
+
+agent_request_queue = topic(
+    'agent', kind='non-persistent', namespace='request'
+)
+agent_response_queue = topic(
+    'agent', kind='non-persistent', namespace='response'
+)
+
+############################################################################
+

{trustgraph-base-0.14.15 → trustgraph-base-0.15.0}/trustgraph_base.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: trustgraph-base
-Version: 0.14.15
+Version: 0.15.0
 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
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 License: UNKNOWN
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.14.15.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.15.0.tar.gz
 Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

{trustgraph-base-0.14.15 → trustgraph-base-0.15.0}/trustgraph_base.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ trustgraph/base/consumer.py
 trustgraph/base/consumer_producer.py
 trustgraph/base/producer.py
 trustgraph/clients/__init__.py
+trustgraph/clients/agent_client.py
 trustgraph/clients/base.py
 trustgraph/clients/document_embeddings_client.py
 trustgraph/clients/document_rag_client.py
@@ -29,6 +30,7 @@ trustgraph/objects/__init__.py
 trustgraph/objects/field.py
 trustgraph/objects/object.py
 trustgraph/schema/__init__.py
+trustgraph/schema/agent.py
 trustgraph/schema/documents.py
 trustgraph/schema/graph.py
 trustgraph/schema/metadata.py

trustgraph-base-0.14.15/trustgraph/base_version.py

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