trustgraph-base 0.22.1__tar.gz → 0.22.3__tar.gz

{trustgraph-base-0.22.1 → trustgraph-base-0.22.3}/PKG-INFO

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

{trustgraph-base-0.22.1 → trustgraph-base-0.22.3}/trustgraph/api/api.py

@@ -18,6 +18,17 @@ class Triple:
     p : str
     o : str
 
+@dataclasses.dataclass
+class ConfigKey:
+    type : str
+    key : str
+
+@dataclasses.dataclass
+class ConfigValue:
+    type : str
+    key : str
+    value : str
+
 class Api:
 
     def __init__(self, url="http://localhost:8088/"):
@@ -35,7 +46,7 @@ class Api:
 
             try:
                 msg = response["error"]["message"]
-                tp = response["error"]["message"]
+                tp = response["error"]["type"]
             except:
                 raise ApplicationException(
                     "Error, but the error object is broken"
@@ -66,7 +77,7 @@ class Api:
         except:
             raise ProtocolException(f"Expected JSON response")
 
-        self.check_error(resp)
+        self.check_error(object)
 
         try:
             return object["response"]
@@ -95,7 +106,7 @@ class Api:
         except:
             raise ProtocolException(f"Expected JSON response")
 
-        self.check_error(resp)
+        self.check_error(object)
 
         try:
             return object["answer"]
@@ -134,7 +145,7 @@ class Api:
         except:
             raise ProtocolException(f"Expected JSON response")
 
-        self.check_error(resp)
+        self.check_error(object)
 
         try:
             return object["response"]
@@ -169,7 +180,7 @@ class Api:
         except:
             raise ProtocolException(f"Expected JSON response")
 
-        self.check_error(resp)
+        self.check_error(object)
 
         try:
             return object["response"]
@@ -198,7 +209,7 @@ class Api:
         except:
             raise ProtocolException(f"Expected JSON response")
 
-        self.check_error(resp)
+        self.check_error(object)
 
         try:
             return object["vectors"]
@@ -228,7 +239,7 @@ class Api:
         except:
             raise ProtocolException("Expected JSON response")
 
-        self.check_error(resp)
+        self.check_error(object)
 
         if "text" in object:
             return object["text"]
@@ -280,7 +291,7 @@ class Api:
         except:
             raise ProtocolException("Expected JSON response")
 
-        self.check_error(resp)
+        self.check_error(object)
 
         if "response" not in object:
             raise ProtocolException("Response not formatted correctly")
@@ -382,7 +393,7 @@ class Api:
         if resp.status_code != 200:
             raise ProtocolException(f"Status code {resp.status_code}")
 
-    def get_config(self):
+    def config_all(self):
 
         # The input consists of system and prompt strings
         input = {
@@ -404,10 +415,150 @@ class Api:
         except:
             raise ProtocolException(f"Expected JSON response")
 
-        self.check_error(resp)
+        self.check_error(object)
 
         try:
             return object["config"], object["version"]
         except:
             raise ProtocolException(f"Response not formatted correctly")
 
+    def config_get(self, keys):
+
+        # The input consists of system and prompt strings
+        input = {
+            "operation": "get",
+            "keys": [
+                { "type": k.type, "key": k.key }
+                for k in keys
+            ]
+        }
+
+        url = f"{self.url}config"
+
+        # Invoke the API, input is passed as JSON
+        resp = requests.post(url, json=input)
+
+        # Should be a 200 status code
+        if resp.status_code != 200:
+            raise ProtocolException(f"Status code {resp.status_code}")
+
+        try:
+            # Parse the response as JSON
+            object = resp.json()
+        except:
+            raise ProtocolException(f"Expected JSON response")
+
+        self.check_error(object)
+
+        try:
+            return [
+                ConfigValue(
+                    type = v["type"],
+                    key = v["key"],
+                    value = v["value"]
+                )
+                for v in object["values"]
+            ]
+        except:
+            raise ProtocolException(f"Response not formatted correctly")
+
+    def config_put(self, values):
+
+        # The input consists of system and prompt strings
+        input = {
+            "operation": "put",
+            "values": [
+                { "type": v.type, "key": v.key, "value": v.value }
+                for v in values
+            ]
+        }
+
+        url = f"{self.url}config"
+
+        # Invoke the API, input is passed as JSON
+        resp = requests.post(url, json=input)
+
+        # Should be a 200 status code
+        if resp.status_code != 200:
+            raise ProtocolException(f"Status code {resp.status_code}")
+
+        try:
+            # Parse the response as JSON
+            object = resp.json()
+        except:
+            raise ProtocolException(f"Expected JSON response")
+
+        self.check_error(object)
+
+        try:
+            return None
+        except:
+            raise ProtocolException(f"Response not formatted correctly")
+
+    def config_list(self, type):
+
+        # The input consists of system and prompt strings
+        input = {
+            "operation": "list",
+            "type": type,
+        }
+
+        url = f"{self.url}config"
+
+        # Invoke the API, input is passed as JSON
+        resp = requests.post(url, json=input)
+
+        # Should be a 200 status code
+        if resp.status_code != 200:
+            raise ProtocolException(f"Status code {resp.status_code}")
+
+        try:
+            # Parse the response as JSON
+            object = resp.json()
+        except:
+            raise ProtocolException(f"Expected JSON response")
+
+        self.check_error(object)
+
+        try:
+            return object["directory"]
+        except:
+            raise ProtocolException(f"Response not formatted correctly")
+
+    def config_getvalues(self, type):
+
+        # The input consists of system and prompt strings
+        input = {
+            "operation": "getvalues",
+            "type": type,
+        }
+
+        url = f"{self.url}config"
+
+        # Invoke the API, input is passed as JSON
+        resp = requests.post(url, json=input)
+
+        # Should be a 200 status code
+        if resp.status_code != 200:
+            raise ProtocolException(f"Status code {resp.status_code}")
+
+        try:
+            # Parse the response as JSON
+            object = resp.json()
+        except:
+            raise ProtocolException(f"Expected JSON response")
+
+        self.check_error(object)
+
+        try:
+            return [
+                ConfigValue(
+                    type = v["type"],
+                    key = v["key"],
+                    value = v["value"]
+                )
+                for v in object["values"]
+            ]
+        except:
+            raise ProtocolException(f"Response not formatted correctly")
+

{trustgraph-base-0.22.1 → trustgraph-base-0.22.3}/trustgraph/base/base_processor.py

@@ -67,6 +67,7 @@ class BaseProcessor:
         self.config_subscriber = self.client.subscribe(
             self.config_push_queue, config_subscriber_id,
             consumer_type=pulsar.ConsumerType.Shared,
+            initial_position=pulsar.InitialPosition.Earliest,
             schema=JsonSchema(ConfigPush),         
         )
 

trustgraph-base-0.22.3/trustgraph/base_version.py

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

{trustgraph-base-0.22.1 → trustgraph-base-0.22.3}/trustgraph/clients/config_client.py

@@ -61,7 +61,7 @@ class ConfigClient(BaseClient):
             listener=listener,
         )
 
-    def request_get(self, keys, timeout=300):
+    def get(self, keys, timeout=300):
 
         resp = self.call(
             id=id,
@@ -85,7 +85,7 @@ class ConfigClient(BaseClient):
             for v in resp.values
         ]
 
-    def request_list(self, type, timeout=300):
+    def list(self, type, timeout=300):
 
         resp = self.call(
             id=id,
@@ -96,7 +96,7 @@ class ConfigClient(BaseClient):
 
         return resp.directory
 
-    def request_getvalues(self, type, timeout=300):
+    def getvalues(self, type, timeout=300):
 
         resp = self.call(
             id=id,
@@ -114,7 +114,7 @@ class ConfigClient(BaseClient):
             for v in resp.values
         ]
 
-    def request_delete(self, keys, timeout=300):
+    def delete(self, keys, timeout=300):
 
         resp = self.call(
             id=id,
@@ -131,25 +131,25 @@ class ConfigClient(BaseClient):
 
         return None
 
-    def request_put(self, value, timeout=300):
+    def put(self, values, timeout=300):
 
         resp = self.call(
             id=id,
             operation="put",
             values=[
                 ConfigValue(
-                    type = k["type"],
-                    key = k["key"],
-                    value = k["value"]
+                    type = v["type"],
+                    key = v["key"],
+                    value = v["value"]
                 )
-                for k in keys
+                for v in values
             ],
             timeout=timeout
         )
 
         return None
 
-    def request_config(self, timeout=300):
+    def config(self, timeout=300):
 
         resp = self.call(
             id=id,
@@ -157,5 +157,5 @@ class ConfigClient(BaseClient):
             timeout=timeout
         )
 
-        return resp.config
+        return resp.config, resp.version
 

{trustgraph-base-0.22.1 → trustgraph-base-0.22.3}/trustgraph_base.egg-info/PKG-INFO

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

trustgraph-base-0.22.1/trustgraph/base_version.py

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