trustgraph-flow 0.21.19__tar.gz → 0.22.0__tar.gz

{trustgraph-flow-0.21.19 → trustgraph-flow-0.22.0}/PKG-INFO

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

trustgraph-flow-0.22.0/scripts/config-svc

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

{trustgraph-flow-0.21.19 → trustgraph-flow-0.22.0}/setup.py

@@ -34,7 +34,7 @@ setuptools.setup(
     python_requires='>=3.8',
     download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz",
     install_requires=[
-        "trustgraph-base>=0.21,<0.22",
+        "trustgraph-base>=0.22,<0.23",
         "aiohttp",
         "anthropic",
         "cassandra-driver",
@@ -73,6 +73,7 @@ setuptools.setup(
         "scripts/api-gateway",
         "scripts/chunker-recursive",
         "scripts/chunker-token",
+        "scripts/config-svc",
         "scripts/de-query-milvus",
         "scripts/de-query-pinecone",
         "scripts/de-query-qdrant",

trustgraph-flow-0.22.0/trustgraph/config/service/service.py

@@ -0,0 +1,312 @@
+
+"""
+Config service.  Fetchs an extract from the Wikipedia page
+using the API.
+"""
+
+from pulsar.schema import JsonSchema
+
+from trustgraph.schema import ConfigRequest, ConfigResponse, ConfigPush
+from trustgraph.schema import ConfigValue, Error
+from trustgraph.schema import config_request_queue, config_response_queue
+from trustgraph.schema import config_push_queue
+from trustgraph.log_level import LogLevel
+from trustgraph.base import ConsumerProducer
+
+module = ".".join(__name__.split(".")[1:-1])
+
+default_input_queue = config_request_queue
+default_output_queue = config_response_queue
+default_push_queue = config_push_queue
+default_subscriber = module
+
+# This behaves just like a dict, should be easier to add persistent storage
+# later
+
+class ConfigurationItems(dict):
+    pass
+
+class Configuration(dict):
+
+    def __getitem__(self, key):
+        if key not in self:
+            self[key] = ConfigurationItems()
+        return dict.__getitem__(self, key)
+        
+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)
+        push_queue = params.get("push_queue", default_push_queue)
+        subscriber = params.get("subscriber", default_subscriber)
+
+        super(Processor, self).__init__(
+            **params | {
+                "input_queue": input_queue,
+                "output_queue": output_queue,
+                "push_queue": output_queue,
+                "subscriber": subscriber,
+                "input_schema": ConfigRequest,
+                "output_schema": ConfigResponse,
+                "push_schema": ConfigPush,
+            }
+        )
+
+        self.push_prod = self.client.create_producer(
+            topic=push_queue,
+            schema=JsonSchema(ConfigPush),
+        )
+
+        # FIXME: The state is held internally. This only works if there's
+        # one config service.  Should be more than one, and use a
+        # back-end state store.
+        self.config = Configuration()
+
+        # Version counter
+        self.version = 0
+
+    async def start(self):
+        await self.push()
+        
+    async def handle_get(self, v, id):
+
+        for k in v.keys:
+            if k.type not in self.config or k.key not in self.config[k.type]:
+                return ConfigResponse(
+                    version = None,
+                    values = None,
+                    directory = None,
+                    config = None,
+                    error = Error(
+                        code = "key-error",
+                        message = f"Key error"
+                    )
+                )
+
+        values = [
+            ConfigValue(
+                type = k.type,
+                key = k.key,
+                value = self.config[k.type][k.key]
+            )
+            for k in v.keys
+        ]
+
+        return ConfigResponse(
+            version = self.version,
+            values = values,
+            directory = None,
+            config = None,
+            error = None,
+        )
+
+    async def handle_list(self, v, id):
+
+        if v.type not in self.config:
+
+            return ConfigResponse(
+                version = None,
+                values = None,
+                directory = None,
+                config = None,
+                error = Error(
+                    code="key-error",
+                    message="No such type",
+                ),
+            )
+
+        return ConfigResponse(
+            version = self.version,
+            values = None,
+            directory = list(self.config[v.type].keys()),
+            config = None,
+            error = None,
+        )
+
+    async def handle_getvalues(self, v, id):
+
+        if v.type not in self.config:
+
+            return ConfigResponse(
+                version = None,
+                values = None,
+                directory = None,
+                config = None,
+                error = Error(
+                    code = "key-error",
+                    message = f"Key error"
+                )
+            )
+
+        values = [
+            ConfigValue(
+                type = v.type,
+                key = k,
+                value = self.config[v.type][k],
+            )
+            for k in self.config[v.type]
+        ]
+
+        return ConfigResponse(
+            version = self.version,
+            values = values,
+            directory = None,
+            config = None,
+            error = None,
+        )
+
+    async def handle_delete(self, v, id):
+
+        for k in v.keys:
+            if k.type not in self.config or k.key not in self.config[k.type]:
+                return ConfigResponse(
+                    version = None,
+                    values = None,
+                    directory = None,
+                    config = None,
+                    error = Error(
+                        code = "key-error",
+                        message = f"Key error"
+                    )
+                )
+
+        for k in v.keys:
+            del self.config[k.type][k.key]
+
+        self.version += 1
+
+        await self.push()
+
+        return ConfigResponse(
+            version = None,
+            value = None,
+            directory = None,
+            values = None,
+            config = None,
+            error = None,
+        )
+
+    async def handle_put(self, v, id):
+
+        for k in v.values:
+            self.config[k.type][k.key] = k.value
+
+        self.version += 1
+
+        await self.push()
+
+        return ConfigResponse(
+            version = None,
+            value = None,
+            directory = None,
+            values = None,
+            error = None,
+        )
+
+    async def handle_config(self, v, id):
+
+        return ConfigResponse(
+            version = self.version,
+            value = None,
+            directory = None,
+            values = None,
+            config = self.config,
+            error = None,
+        )
+
+    async def push(self):
+
+        resp = ConfigPush(
+            version = self.version,
+            value = None,
+            directory = None,
+            values = None,
+            config = self.config,
+            error = None,
+        )
+        self.push_prod.send(resp)
+        print("Pushed.")
+        
+    async def handle(self, msg):
+
+        v = msg.value()
+
+        # Sender-produced ID
+        id = msg.properties()["id"]
+
+        print(f"Handling {id}...", flush=True)
+
+        try:
+
+            if v.operation == "get":
+
+                resp = await self.handle_get(v, id)
+
+            elif v.operation == "list":
+
+                resp = await self.handle_list(v, id)
+
+            elif v.operation == "getvalues":
+
+                resp = await self.handle_getvalues(v, id)
+
+            elif v.operation == "delete":
+
+                resp = await self.handle_delete(v, id)
+
+            elif v.operation == "put":
+
+                resp = await self.handle_put(v, id)
+
+            elif v.operation == "config":
+
+                resp = await self.handle_config(v, id)
+
+            else:
+
+                resp = ConfigResponse(
+                    value=None,
+                    directory=None,
+                    values=None,
+                    error=Error(
+                        code="bad-operation",
+                        message="Bad operation"
+                    )
+                )
+
+            await self.send(resp, properties={"id": id})
+
+            self.consumer.acknowledge(msg)
+
+        except Exception as e:
+                
+            resp = ConfigResponse(
+                error=Error(
+                    type = "unexpected-error",
+                    message = str(e),
+                ),
+                text=None,
+            )
+            await self.send(resp, 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(
+            '-q', '--push-queue',
+            default=default_push_queue,
+            help=f'Config push queue (default: {default_push_queue})'
+        )
+
+def run():
+
+    Processor.launch(module, __doc__)
+

trustgraph-flow-0.22.0/trustgraph/flow_version.py

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

trustgraph-flow-0.22.0/trustgraph/gateway/config.py

@@ -0,0 +1,77 @@
+
+from .. schema import ConfigRequest, ConfigResponse, ConfigKey, ConfigValue
+from .. schema import config_request_queue
+from .. schema import config_response_queue
+
+from . endpoint import ServiceEndpoint
+from . requestor import ServiceRequestor
+
+class ConfigRequestor(ServiceRequestor):
+    def __init__(self, pulsar_client, timeout, auth):
+
+        super(ConfigRequestor, self).__init__(
+            pulsar_client=pulsar_client,
+            request_queue=config_request_queue,
+            response_queue=config_response_queue,
+            request_schema=ConfigRequest,
+            response_schema=ConfigResponse,
+            timeout=timeout,
+        )
+
+    def to_request(self, body):
+
+        if "keys" in body:
+            keys = [
+                ConfigKey(
+                    type = k["type"],
+                    key = k["key"],
+                )
+                for k in body["keys"]
+            ]
+        else:
+            keys = None
+
+        if "values" in body:
+            values = [
+                ConfigValue(
+                    type = v["type"],
+                    key = v["key"],
+                    value = v["value"],
+                )
+                for v in body["values"]
+            ]
+        else:
+            values = None
+
+        return ConfigRequest(
+            operation = body.get("operation", None),
+            keys = keys,
+            type = body.get("type", None),
+            values = values
+        )
+
+    def from_response(self, message):
+
+        response = { }
+
+        if message.version:
+            response["version"] = message.version
+
+        if message.values:
+            response["values"] = [
+                {
+                    "type": v.type,
+                    "key": v.key,
+                    "value": v.value,
+                }
+                for v in message.values
+            ]
+
+        if message.directory:
+            response["directory"] = message.directory
+
+        if message.config:
+            response["config"] = message.config
+
+        return response, True
+

{trustgraph-flow-0.21.19 → trustgraph-flow-0.22.0}/trustgraph/gateway/service.py

@@ -38,6 +38,7 @@ from . agent import AgentRequestor
 from . dbpedia import DbpediaRequestor
 from . internet_search import InternetSearchRequestor
 from . librarian import LibrarianRequestor
+from . config import ConfigRequestor
 from . triples_stream import TriplesStreamEndpoint
 from . graph_embeddings_stream import GraphEmbeddingsStreamEndpoint
 from . document_embeddings_stream import DocumentEmbeddingsStreamEndpoint
@@ -141,6 +142,10 @@ class Api:
                 pulsar_client=self.pulsar_client, timeout=self.timeout,
                 auth = self.auth,
             ),
+            "config": ConfigRequestor(
+                pulsar_client=self.pulsar_client, timeout=self.timeout,
+                auth = self.auth,
+            ),
             "encyclopedia": EncyclopediaRequestor(
                 pulsar_client=self.pulsar_client, timeout=self.timeout,
                 auth = self.auth,
@@ -199,6 +204,10 @@ class Api:
                 endpoint_path = "/api/v1/librarian", auth=self.auth,
                 requestor = self.services["librarian"],
             ),
+            ServiceEndpoint(
+                endpoint_path = "/api/v1/config", auth=self.auth,
+                requestor = self.services["config"],
+            ),
             ServiceEndpoint(
                 endpoint_path = "/api/v1/encyclopedia", auth=self.auth,
                 requestor = self.services["encyclopedia"],

trustgraph-flow-0.22.0/trustgraph/model/prompt/template/__main__.py

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

trustgraph-flow-0.22.0/trustgraph/query/triples/neo4j/__init__.py

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

{trustgraph-flow-0.21.19 → trustgraph-flow-0.22.0}/trustgraph_flow.egg-info/PKG-INFO

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

{trustgraph-flow-0.21.19 → trustgraph-flow-0.22.0}/trustgraph_flow.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ scripts/agent-manager-react
 scripts/api-gateway
 scripts/chunker-recursive
 scripts/chunker-token
+scripts/config-svc
 scripts/de-query-milvus
 scripts/de-query-pinecone
 scripts/de-query-qdrant
@@ -72,6 +73,9 @@ trustgraph/chunking/recursive/chunker.py
 trustgraph/chunking/token/__init__.py
 trustgraph/chunking/token/__main__.py
 trustgraph/chunking/token/chunker.py
+trustgraph/config/service/__init__.py
+trustgraph/config/service/__main__.py
+trustgraph/config/service/service.py
 trustgraph/decoding/__init__.py
 trustgraph/decoding/mistral_ocr/__init__.py
 trustgraph/decoding/mistral_ocr/__main__.py
@@ -120,6 +124,7 @@ trustgraph/gateway/__init__.py
 trustgraph/gateway/__main__.py
 trustgraph/gateway/agent.py
 trustgraph/gateway/auth.py
+trustgraph/gateway/config.py
 trustgraph/gateway/dbpedia.py
 trustgraph/gateway/document_embeddings_load.py
 trustgraph/gateway/document_embeddings_stream.py

{trustgraph-flow-0.21.19 → trustgraph-flow-0.22.0}/trustgraph_flow.egg-info/requires.txt

@@ -29,5 +29,5 @@ rdflib
 requests
 tabulate
 tiktoken
-trustgraph-base<0.22,>=0.21
+trustgraph-base<0.23,>=0.22
 urllib3

trustgraph-flow-0.21.19/trustgraph/flow_version.py

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