diff --git a/trustgraph-base/trustgraph/base/base_processor.py b/trustgraph-base/trustgraph/base/base_processor.py index 05cdb940..faf761bf 100644 --- a/trustgraph-base/trustgraph/base/base_processor.py +++ b/trustgraph-base/trustgraph/base/base_processor.py @@ -71,6 +71,8 @@ class BaseProcessor: schema=JsonSchema(ConfigPush), ) + self.config_handlers = [] + def __del__(self): if hasattr(self, "client"): @@ -148,18 +150,20 @@ class BaseProcessor: v = msg.value() print("Got config version", v.version, flush=True) - await self.on_config(v.version, v.config) - - async def on_config(self, version, config): - pass + for h in self.config_handlers: + await h(v.version, v.config) async def run(self): raise RuntimeError("Something should have implemented the run method") @classmethod - async def launch_async(cls, args, prog): + async def launch_async(cls, args, ident): p = cls(**args) - p.module = prog + + # FIXME: Two sort of 'ident' things going on here? + p.module = ident + p.config_ident = args.ident + await p.start() task1 = asyncio.create_task(p.run_config_queue()) @@ -168,12 +172,18 @@ class BaseProcessor: await asyncio.gather(task1, task2) @classmethod - def launch(cls, prog, doc): + def launch(cls, ident, doc): parser = argparse.ArgumentParser( - prog=prog, + prog=ident, description=doc ) + + parser.add_argument( + '--id', + default=ident, + help=f'Configuration identity (default: {ident})', + ) cls.add_args(parser) @@ -189,7 +199,9 @@ class BaseProcessor: try: - asyncio.run(cls.launch_async(args, prog)) + asyncio.run(cls.launch_async( + args, ident + )) except KeyboardInterrupt: print("Keyboard interrupt.") diff --git a/trustgraph-bedrock/trustgraph/model/text_completion/bedrock/llm.py b/trustgraph-bedrock/trustgraph/model/text_completion/bedrock/llm.py index 9b8818a2..572e01b7 100755 --- a/trustgraph-bedrock/trustgraph/model/text_completion/bedrock/llm.py +++ b/trustgraph-bedrock/trustgraph/model/text_completion/bedrock/llm.py @@ -17,7 +17,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-embeddings-hf/trustgraph/embeddings/hf/hf.py b/trustgraph-embeddings-hf/trustgraph/embeddings/hf/hf.py index 2e44821e..b23f7130 100755 --- a/trustgraph-embeddings-hf/trustgraph/embeddings/hf/hf.py +++ b/trustgraph-embeddings-hf/trustgraph/embeddings/hf/hf.py @@ -12,7 +12,7 @@ from trustgraph.schema import embeddings_response_queue from trustgraph.log_level import LogLevel from trustgraph.base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "embeddings" default_input_queue = embeddings_request_queue default_output_queue = embeddings_response_queue diff --git a/trustgraph-flow/trustgraph/agent/react/service.py b/trustgraph-flow/trustgraph/agent/react/service.py index 224efe3c..5b5e97b5 100755 --- a/trustgraph-flow/trustgraph/agent/react/service.py +++ b/trustgraph-flow/trustgraph/agent/react/service.py @@ -25,7 +25,7 @@ from . agent_manager import AgentManager from . types import Final, Action, Tool, Argument -module = ".".join(__name__.split(".")[1:-1]) +module = "agent" default_input_queue = agent_request_queue default_output_queue = agent_response_queue @@ -102,6 +102,8 @@ class Processor(ConsumerProducer): additional_context="", ) + self.config_handlers.append(self.on_config) + async def on_config(self, version, config): print("Loading configuration version", version) diff --git a/trustgraph-flow/trustgraph/chunking/recursive/chunker.py b/trustgraph-flow/trustgraph/chunking/recursive/chunker.py index 82f333b5..364fc72c 100755 --- a/trustgraph-flow/trustgraph/chunking/recursive/chunker.py +++ b/trustgraph-flow/trustgraph/chunking/recursive/chunker.py @@ -12,7 +12,7 @@ from ... schema import text_ingest_queue, chunk_ingest_queue from ... log_level import LogLevel from ... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "chunker" default_input_queue = text_ingest_queue default_output_queue = chunk_ingest_queue diff --git a/trustgraph-flow/trustgraph/chunking/token/chunker.py b/trustgraph-flow/trustgraph/chunking/token/chunker.py index c625b48c..4ca1da7e 100755 --- a/trustgraph-flow/trustgraph/chunking/token/chunker.py +++ b/trustgraph-flow/trustgraph/chunking/token/chunker.py @@ -12,7 +12,7 @@ from ... schema import text_ingest_queue, chunk_ingest_queue from ... log_level import LogLevel from ... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "chunker" default_input_queue = text_ingest_queue default_output_queue = chunk_ingest_queue diff --git a/trustgraph-flow/trustgraph/config/service/service.py b/trustgraph-flow/trustgraph/config/service/service.py index ee0c960e..c17ad2ec 100644 --- a/trustgraph-flow/trustgraph/config/service/service.py +++ b/trustgraph-flow/trustgraph/config/service/service.py @@ -13,7 +13,7 @@ from trustgraph.schema import config_push_queue from trustgraph.log_level import LogLevel from trustgraph.base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "config-svc" default_input_queue = config_request_queue default_output_queue = config_response_queue diff --git a/trustgraph-flow/trustgraph/decoding/mistral_ocr/processor.py b/trustgraph-flow/trustgraph/decoding/mistral_ocr/processor.py index f5100244..669ec1b5 100755 --- a/trustgraph-flow/trustgraph/decoding/mistral_ocr/processor.py +++ b/trustgraph-flow/trustgraph/decoding/mistral_ocr/processor.py @@ -19,7 +19,7 @@ from ... schema import document_ingest_queue, text_ingest_queue from ... log_level import LogLevel from ... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "ocr" default_input_queue = document_ingest_queue default_output_queue = text_ingest_queue diff --git a/trustgraph-flow/trustgraph/decoding/pdf/pdf_decoder.py b/trustgraph-flow/trustgraph/decoding/pdf/pdf_decoder.py index 5e5e3612..a2cc2adb 100755 --- a/trustgraph-flow/trustgraph/decoding/pdf/pdf_decoder.py +++ b/trustgraph-flow/trustgraph/decoding/pdf/pdf_decoder.py @@ -13,7 +13,7 @@ from ... schema import document_ingest_queue, text_ingest_queue from ... log_level import LogLevel from ... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "pdf-decoder" default_input_queue = document_ingest_queue default_output_queue = text_ingest_queue diff --git a/trustgraph-flow/trustgraph/embeddings/document_embeddings/embeddings.py b/trustgraph-flow/trustgraph/embeddings/document_embeddings/embeddings.py index 70f53e07..1a51d559 100755 --- a/trustgraph-flow/trustgraph/embeddings/document_embeddings/embeddings.py +++ b/trustgraph-flow/trustgraph/embeddings/document_embeddings/embeddings.py @@ -13,7 +13,7 @@ from ... clients.embeddings_client import EmbeddingsClient from ... log_level import LogLevel from ... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "document-embeddings" default_input_queue = chunk_ingest_queue default_output_queue = document_embeddings_store_queue diff --git a/trustgraph-flow/trustgraph/embeddings/fastembed/processor.py b/trustgraph-flow/trustgraph/embeddings/fastembed/processor.py index bc164fa0..f90771d4 100755 --- a/trustgraph-flow/trustgraph/embeddings/fastembed/processor.py +++ b/trustgraph-flow/trustgraph/embeddings/fastembed/processor.py @@ -11,7 +11,7 @@ from ... base import ConsumerProducer from fastembed import TextEmbedding import os -module = ".".join(__name__.split(".")[1:-1]) +module = "embeddings" default_input_queue = embeddings_request_queue default_output_queue = embeddings_response_queue diff --git a/trustgraph-flow/trustgraph/embeddings/graph_embeddings/embeddings.py b/trustgraph-flow/trustgraph/embeddings/graph_embeddings/embeddings.py index 2cbe9907..a61bc9c1 100755 --- a/trustgraph-flow/trustgraph/embeddings/graph_embeddings/embeddings.py +++ b/trustgraph-flow/trustgraph/embeddings/graph_embeddings/embeddings.py @@ -13,7 +13,7 @@ from ... clients.embeddings_client import EmbeddingsClient from ... log_level import LogLevel from ... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "graph-embeddings" default_input_queue = entity_contexts_ingest_queue default_output_queue = graph_embeddings_store_queue diff --git a/trustgraph-flow/trustgraph/embeddings/ollama/processor.py b/trustgraph-flow/trustgraph/embeddings/ollama/processor.py index c441b9c6..86787316 100755 --- a/trustgraph-flow/trustgraph/embeddings/ollama/processor.py +++ b/trustgraph-flow/trustgraph/embeddings/ollama/processor.py @@ -11,7 +11,7 @@ from ... base import ConsumerProducer from ollama import Client import os -module = ".".join(__name__.split(".")[1:-1]) +module = "embeddings" default_input_queue = embeddings_request_queue default_output_queue = embeddings_response_queue diff --git a/trustgraph-flow/trustgraph/external/wikipedia/service.py b/trustgraph-flow/trustgraph/external/wikipedia/service.py index cc002765..f7de78da 100644 --- a/trustgraph-flow/trustgraph/external/wikipedia/service.py +++ b/trustgraph-flow/trustgraph/external/wikipedia/service.py @@ -11,7 +11,7 @@ from trustgraph.log_level import LogLevel from trustgraph.base import ConsumerProducer import requests -module = ".".join(__name__.split(".")[1:-1]) +module = "wikipedia" default_input_queue = encyclopedia_lookup_request_queue default_output_queue = encyclopedia_lookup_response_queue diff --git a/trustgraph-flow/trustgraph/extract/kg/definitions/extract.py b/trustgraph-flow/trustgraph/extract/kg/definitions/extract.py index 47c99802..fe4c58c6 100755 --- a/trustgraph-flow/trustgraph/extract/kg/definitions/extract.py +++ b/trustgraph-flow/trustgraph/extract/kg/definitions/extract.py @@ -23,7 +23,7 @@ DEFINITION_VALUE = Value(value=DEFINITION, is_uri=True) RDF_LABEL_VALUE = Value(value=RDF_LABEL, is_uri=True) SUBJECT_OF_VALUE = Value(value=SUBJECT_OF, is_uri=True) -module = ".".join(__name__.split(".")[1:-1]) +module = "kg-extract-definitions" default_input_queue = chunk_ingest_queue default_output_queue = triples_store_queue diff --git a/trustgraph-flow/trustgraph/extract/kg/relationships/extract.py b/trustgraph-flow/trustgraph/extract/kg/relationships/extract.py index 2f293527..5d6e093a 100755 --- a/trustgraph-flow/trustgraph/extract/kg/relationships/extract.py +++ b/trustgraph-flow/trustgraph/extract/kg/relationships/extract.py @@ -20,7 +20,7 @@ from .... base import ConsumerProducer RDF_LABEL_VALUE = Value(value=RDF_LABEL, is_uri=True) SUBJECT_OF_VALUE = Value(value=SUBJECT_OF, is_uri=True) -module = ".".join(__name__.split(".")[1:-1]) +module = "kg-extract-relationships" default_input_queue = chunk_ingest_queue default_output_queue = triples_store_queue diff --git a/trustgraph-flow/trustgraph/extract/kg/topics/extract.py b/trustgraph-flow/trustgraph/extract/kg/topics/extract.py index 7424abe2..84ab6681 100755 --- a/trustgraph-flow/trustgraph/extract/kg/topics/extract.py +++ b/trustgraph-flow/trustgraph/extract/kg/topics/extract.py @@ -18,7 +18,7 @@ from .... base import ConsumerProducer DEFINITION_VALUE = Value(value=DEFINITION, is_uri=True) -module = ".".join(__name__.split(".")[1:-1]) +module = "kg-extract-topics" default_input_queue = chunk_ingest_queue default_output_queue = triples_store_queue diff --git a/trustgraph-flow/trustgraph/gateway/service.py b/trustgraph-flow/trustgraph/gateway/service.py index e997f83e..3f9fac25 100755 --- a/trustgraph-flow/trustgraph/gateway/service.py +++ b/trustgraph-flow/trustgraph/gateway/service.py @@ -3,7 +3,7 @@ API gateway. Offers HTTP services which are translated to interaction on the Pulsar bus. """ -module = ".".join(__name__.split(".")[1:-1]) +module = "api-gateway" # FIXME: Subscribes to Pulsar unnecessarily, should only do it when there # are active listeners diff --git a/trustgraph-flow/trustgraph/librarian/service.py b/trustgraph-flow/trustgraph/librarian/service.py index b42123a5..587dcbf3 100755 --- a/trustgraph-flow/trustgraph/librarian/service.py +++ b/trustgraph-flow/trustgraph/librarian/service.py @@ -35,7 +35,7 @@ from .. exceptions import RequestError from . librarian import Librarian -module = ".".join(__name__.split(".")[1:-1]) +module = "librarian" default_input_queue = librarian_request_queue default_output_queue = librarian_response_queue diff --git a/trustgraph-flow/trustgraph/metering/counter.py b/trustgraph-flow/trustgraph/metering/counter.py index 68ddf441..c721c065 100644 --- a/trustgraph-flow/trustgraph/metering/counter.py +++ b/trustgraph-flow/trustgraph/metering/counter.py @@ -10,12 +10,11 @@ from .. schema import text_completion_response_queue from .. log_level import LogLevel from .. base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "metering" default_input_queue = text_completion_response_queue default_subscriber = module - class Processor(Consumer): def __init__(self, **params): diff --git a/trustgraph-flow/trustgraph/model/prompt/generic/service.py b/trustgraph-flow/trustgraph/model/prompt/generic/service.py index b143b759..b10da491 100755 --- a/trustgraph-flow/trustgraph/model/prompt/generic/service.py +++ b/trustgraph-flow/trustgraph/model/prompt/generic/service.py @@ -27,7 +27,7 @@ from .... clients.llm_client import LlmClient from . prompts import to_definitions, to_relationships, to_topics from . prompts import to_kg_query, to_document_query, to_rows -module = ".".join(__name__.split(".")[1:-1]) +module = "prompt" default_input_queue = prompt_request_queue default_output_queue = prompt_response_queue diff --git a/trustgraph-flow/trustgraph/model/prompt/template/service.py b/trustgraph-flow/trustgraph/model/prompt/template/service.py index a1267114..24ed21a9 100755 --- a/trustgraph-flow/trustgraph/model/prompt/template/service.py +++ b/trustgraph-flow/trustgraph/model/prompt/template/service.py @@ -18,7 +18,7 @@ from .... clients.llm_client import LlmClient from . prompt_manager import PromptConfiguration, Prompt, PromptManager -module = ".".join(__name__.split(".")[1:-1]) +module = "prompt" default_input_queue = prompt_request_queue default_output_queue = prompt_response_queue @@ -71,6 +71,8 @@ class Processor(ConsumerProducer): self.llm = Llm(self.llm) + self.config_handlers.append(self.on_config) + # Null configuration, should reload quickly self.manager = PromptManager( llm = self.llm, diff --git a/trustgraph-flow/trustgraph/model/text_completion/azure/llm.py b/trustgraph-flow/trustgraph/model/text_completion/azure/llm.py index 33840378..79118cc8 100755 --- a/trustgraph-flow/trustgraph/model/text_completion/azure/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/azure/llm.py @@ -16,7 +16,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/model/text_completion/azure_openai/llm.py b/trustgraph-flow/trustgraph/model/text_completion/azure_openai/llm.py index 252d58ad..734b20c5 100755 --- a/trustgraph-flow/trustgraph/model/text_completion/azure_openai/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/azure_openai/llm.py @@ -16,7 +16,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/model/text_completion/claude/llm.py b/trustgraph-flow/trustgraph/model/text_completion/claude/llm.py index 195a39e4..f60b70d7 100755 --- a/trustgraph-flow/trustgraph/model/text_completion/claude/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/claude/llm.py @@ -15,7 +15,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/model/text_completion/cohere/llm.py b/trustgraph-flow/trustgraph/model/text_completion/cohere/llm.py index d5dab142..df104ada 100755 --- a/trustgraph-flow/trustgraph/model/text_completion/cohere/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/cohere/llm.py @@ -15,7 +15,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/model/text_completion/googleaistudio/llm.py b/trustgraph-flow/trustgraph/model/text_completion/googleaistudio/llm.py index 98ecaf0e..9f382572 100644 --- a/trustgraph-flow/trustgraph/model/text_completion/googleaistudio/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/googleaistudio/llm.py @@ -17,7 +17,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/model/text_completion/llamafile/llm.py b/trustgraph-flow/trustgraph/model/text_completion/llamafile/llm.py index 483412a2..fd473564 100755 --- a/trustgraph-flow/trustgraph/model/text_completion/llamafile/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/llamafile/llm.py @@ -14,7 +14,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/model/text_completion/lmstudio/llm.py b/trustgraph-flow/trustgraph/model/text_completion/lmstudio/llm.py index 16ff2df4..05ff18a6 100755 --- a/trustgraph-flow/trustgraph/model/text_completion/lmstudio/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/lmstudio/llm.py @@ -15,7 +15,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/model/text_completion/mistral/llm.py b/trustgraph-flow/trustgraph/model/text_completion/mistral/llm.py index 45f1311c..10257cdf 100755 --- a/trustgraph-flow/trustgraph/model/text_completion/mistral/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/mistral/llm.py @@ -15,7 +15,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/model/text_completion/ollama/llm.py b/trustgraph-flow/trustgraph/model/text_completion/ollama/llm.py index 6d825bac..91e627e3 100755 --- a/trustgraph-flow/trustgraph/model/text_completion/ollama/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/ollama/llm.py @@ -15,7 +15,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/model/text_completion/openai/llm.py b/trustgraph-flow/trustgraph/model/text_completion/openai/llm.py index 590c2e3f..2479034d 100755 --- a/trustgraph-flow/trustgraph/model/text_completion/openai/llm.py +++ b/trustgraph-flow/trustgraph/model/text_completion/openai/llm.py @@ -15,7 +15,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue diff --git a/trustgraph-flow/trustgraph/query/doc_embeddings/milvus/service.py b/trustgraph-flow/trustgraph/query/doc_embeddings/milvus/service.py index b16399e9..2fb416dd 100755 --- a/trustgraph-flow/trustgraph/query/doc_embeddings/milvus/service.py +++ b/trustgraph-flow/trustgraph/query/doc_embeddings/milvus/service.py @@ -11,7 +11,7 @@ from .... schema import document_embeddings_request_queue from .... schema import document_embeddings_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "de-query" default_input_queue = document_embeddings_request_queue default_output_queue = document_embeddings_response_queue diff --git a/trustgraph-flow/trustgraph/query/doc_embeddings/pinecone/service.py b/trustgraph-flow/trustgraph/query/doc_embeddings/pinecone/service.py index 6a88671c..74c52055 100755 --- a/trustgraph-flow/trustgraph/query/doc_embeddings/pinecone/service.py +++ b/trustgraph-flow/trustgraph/query/doc_embeddings/pinecone/service.py @@ -16,7 +16,7 @@ from .... schema import document_embeddings_request_queue from .... schema import document_embeddings_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "de-query" default_input_queue = document_embeddings_request_queue default_output_queue = document_embeddings_response_queue diff --git a/trustgraph-flow/trustgraph/query/doc_embeddings/qdrant/service.py b/trustgraph-flow/trustgraph/query/doc_embeddings/qdrant/service.py index 128203ad..b2d4cdb3 100755 --- a/trustgraph-flow/trustgraph/query/doc_embeddings/qdrant/service.py +++ b/trustgraph-flow/trustgraph/query/doc_embeddings/qdrant/service.py @@ -15,7 +15,7 @@ from .... schema import document_embeddings_request_queue from .... schema import document_embeddings_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "de-query" default_input_queue = document_embeddings_request_queue default_output_queue = document_embeddings_response_queue diff --git a/trustgraph-flow/trustgraph/query/graph_embeddings/milvus/service.py b/trustgraph-flow/trustgraph/query/graph_embeddings/milvus/service.py index 8dd8d04d..d2cec084 100755 --- a/trustgraph-flow/trustgraph/query/graph_embeddings/milvus/service.py +++ b/trustgraph-flow/trustgraph/query/graph_embeddings/milvus/service.py @@ -11,7 +11,7 @@ from .... schema import graph_embeddings_request_queue from .... schema import graph_embeddings_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "ge-query" default_input_queue = graph_embeddings_request_queue default_output_queue = graph_embeddings_response_queue diff --git a/trustgraph-flow/trustgraph/query/graph_embeddings/pinecone/service.py b/trustgraph-flow/trustgraph/query/graph_embeddings/pinecone/service.py index 90cfc6de..942a1e69 100755 --- a/trustgraph-flow/trustgraph/query/graph_embeddings/pinecone/service.py +++ b/trustgraph-flow/trustgraph/query/graph_embeddings/pinecone/service.py @@ -16,7 +16,7 @@ from .... schema import graph_embeddings_request_queue from .... schema import graph_embeddings_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "ge-query" default_input_queue = graph_embeddings_request_queue default_output_queue = graph_embeddings_response_queue diff --git a/trustgraph-flow/trustgraph/query/graph_embeddings/qdrant/service.py b/trustgraph-flow/trustgraph/query/graph_embeddings/qdrant/service.py index dc3e28f3..28a1637c 100755 --- a/trustgraph-flow/trustgraph/query/graph_embeddings/qdrant/service.py +++ b/trustgraph-flow/trustgraph/query/graph_embeddings/qdrant/service.py @@ -15,7 +15,7 @@ from .... schema import graph_embeddings_request_queue from .... schema import graph_embeddings_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "ge-query" default_input_queue = graph_embeddings_request_queue default_output_queue = graph_embeddings_response_queue diff --git a/trustgraph-flow/trustgraph/query/triples/cassandra/service.py b/trustgraph-flow/trustgraph/query/triples/cassandra/service.py index e3687756..b06765e2 100755 --- a/trustgraph-flow/trustgraph/query/triples/cassandra/service.py +++ b/trustgraph-flow/trustgraph/query/triples/cassandra/service.py @@ -11,7 +11,7 @@ from .... schema import triples_request_queue from .... schema import triples_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "triples-query" default_input_queue = triples_request_queue default_output_queue = triples_response_queue diff --git a/trustgraph-flow/trustgraph/query/triples/falkordb/service.py b/trustgraph-flow/trustgraph/query/triples/falkordb/service.py index 56fed6d3..c62c28c1 100755 --- a/trustgraph-flow/trustgraph/query/triples/falkordb/service.py +++ b/trustgraph-flow/trustgraph/query/triples/falkordb/service.py @@ -13,7 +13,7 @@ from .... schema import triples_request_queue from .... schema import triples_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "triples-query" default_input_queue = triples_request_queue default_output_queue = triples_response_queue diff --git a/trustgraph-flow/trustgraph/query/triples/memgraph/service.py b/trustgraph-flow/trustgraph/query/triples/memgraph/service.py index f442c4ef..594c9130 100755 --- a/trustgraph-flow/trustgraph/query/triples/memgraph/service.py +++ b/trustgraph-flow/trustgraph/query/triples/memgraph/service.py @@ -13,7 +13,7 @@ from .... schema import triples_request_queue from .... schema import triples_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "triples-query" default_input_queue = triples_request_queue default_output_queue = triples_response_queue diff --git a/trustgraph-flow/trustgraph/query/triples/neo4j/service.py b/trustgraph-flow/trustgraph/query/triples/neo4j/service.py index 49ba0345..591361ce 100755 --- a/trustgraph-flow/trustgraph/query/triples/neo4j/service.py +++ b/trustgraph-flow/trustgraph/query/triples/neo4j/service.py @@ -13,7 +13,7 @@ from .... schema import triples_request_queue from .... schema import triples_response_queue from .... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "triples-query" default_input_queue = triples_request_queue default_output_queue = triples_response_queue diff --git a/trustgraph-flow/trustgraph/retrieval/document_rag/rag.py b/trustgraph-flow/trustgraph/retrieval/document_rag/rag.py index bb8b008e..fd36c7df 100755 --- a/trustgraph-flow/trustgraph/retrieval/document_rag/rag.py +++ b/trustgraph-flow/trustgraph/retrieval/document_rag/rag.py @@ -16,7 +16,7 @@ from ... log_level import LogLevel from ... document_rag import DocumentRag from ... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "document-rag" default_input_queue = document_rag_request_queue default_output_queue = document_rag_response_queue diff --git a/trustgraph-flow/trustgraph/retrieval/graph_rag/rag.py b/trustgraph-flow/trustgraph/retrieval/graph_rag/rag.py index 2c45ecd4..6c965695 100755 --- a/trustgraph-flow/trustgraph/retrieval/graph_rag/rag.py +++ b/trustgraph-flow/trustgraph/retrieval/graph_rag/rag.py @@ -18,7 +18,7 @@ from ... log_level import LogLevel from ... graph_rag import GraphRag from ... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "graph-rag" default_input_queue = graph_rag_request_queue default_output_queue = graph_rag_response_queue diff --git a/trustgraph-flow/trustgraph/storage/doc_embeddings/milvus/write.py b/trustgraph-flow/trustgraph/storage/doc_embeddings/milvus/write.py index b4dbc486..2949263a 100755 --- a/trustgraph-flow/trustgraph/storage/doc_embeddings/milvus/write.py +++ b/trustgraph-flow/trustgraph/storage/doc_embeddings/milvus/write.py @@ -10,7 +10,7 @@ from .... schema import document_embeddings_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "de-write" default_input_queue = document_embeddings_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/doc_embeddings/pinecone/write.py b/trustgraph-flow/trustgraph/storage/doc_embeddings/pinecone/write.py index 9e91db9a..128323aa 100644 --- a/trustgraph-flow/trustgraph/storage/doc_embeddings/pinecone/write.py +++ b/trustgraph-flow/trustgraph/storage/doc_embeddings/pinecone/write.py @@ -16,7 +16,7 @@ from .... schema import document_embeddings_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "de-write" default_input_queue = document_embeddings_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/doc_embeddings/qdrant/write.py b/trustgraph-flow/trustgraph/storage/doc_embeddings/qdrant/write.py index 810c1931..2213dbe3 100644 --- a/trustgraph-flow/trustgraph/storage/doc_embeddings/qdrant/write.py +++ b/trustgraph-flow/trustgraph/storage/doc_embeddings/qdrant/write.py @@ -13,7 +13,7 @@ from .... schema import document_embeddings_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "de-write" default_input_queue = document_embeddings_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/graph_embeddings/milvus/write.py b/trustgraph-flow/trustgraph/storage/graph_embeddings/milvus/write.py index b2d40306..8d8b68b0 100755 --- a/trustgraph-flow/trustgraph/storage/graph_embeddings/milvus/write.py +++ b/trustgraph-flow/trustgraph/storage/graph_embeddings/milvus/write.py @@ -9,7 +9,7 @@ from .... log_level import LogLevel from .... direct.milvus_graph_embeddings import EntityVectors from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "ge-write" default_input_queue = graph_embeddings_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/graph_embeddings/pinecone/write.py b/trustgraph-flow/trustgraph/storage/graph_embeddings/pinecone/write.py index 83861b54..400acf26 100755 --- a/trustgraph-flow/trustgraph/storage/graph_embeddings/pinecone/write.py +++ b/trustgraph-flow/trustgraph/storage/graph_embeddings/pinecone/write.py @@ -15,7 +15,7 @@ from .... schema import graph_embeddings_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "ge-write" default_input_queue = graph_embeddings_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/graph_embeddings/qdrant/write.py b/trustgraph-flow/trustgraph/storage/graph_embeddings/qdrant/write.py index 6b0d7371..4427a09d 100755 --- a/trustgraph-flow/trustgraph/storage/graph_embeddings/qdrant/write.py +++ b/trustgraph-flow/trustgraph/storage/graph_embeddings/qdrant/write.py @@ -13,7 +13,7 @@ from .... schema import graph_embeddings_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "ge-write" default_input_queue = graph_embeddings_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/object_embeddings/milvus/write.py b/trustgraph-flow/trustgraph/storage/object_embeddings/milvus/write.py index 5490af97..d1ad139a 100755 --- a/trustgraph-flow/trustgraph/storage/object_embeddings/milvus/write.py +++ b/trustgraph-flow/trustgraph/storage/object_embeddings/milvus/write.py @@ -9,7 +9,7 @@ from .... log_level import LogLevel from .... direct.milvus_object_embeddings import ObjectVectors from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "oe-write" default_input_queue = object_embeddings_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/rows/cassandra/write.py b/trustgraph-flow/trustgraph/storage/rows/cassandra/write.py index e6536e6c..a84aefde 100755 --- a/trustgraph-flow/trustgraph/storage/rows/cassandra/write.py +++ b/trustgraph-flow/trustgraph/storage/rows/cassandra/write.py @@ -17,7 +17,7 @@ from .... schema import rows_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "rows-write" ssl_context = SSLContext(PROTOCOL_TLSv1_2) default_input_queue = rows_store_queue diff --git a/trustgraph-flow/trustgraph/storage/triples/cassandra/write.py b/trustgraph-flow/trustgraph/storage/triples/cassandra/write.py index 17b5ae9a..f452804b 100755 --- a/trustgraph-flow/trustgraph/storage/triples/cassandra/write.py +++ b/trustgraph-flow/trustgraph/storage/triples/cassandra/write.py @@ -15,7 +15,7 @@ from .... schema import triples_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "triples-write" default_input_queue = triples_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/triples/falkordb/write.py b/trustgraph-flow/trustgraph/storage/triples/falkordb/write.py index 2d0ae38a..b3996b91 100755 --- a/trustgraph-flow/trustgraph/storage/triples/falkordb/write.py +++ b/trustgraph-flow/trustgraph/storage/triples/falkordb/write.py @@ -16,7 +16,7 @@ from .... schema import triples_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "triples-write" default_input_queue = triples_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/triples/memgraph/write.py b/trustgraph-flow/trustgraph/storage/triples/memgraph/write.py index 620e669e..8c88ea8f 100755 --- a/trustgraph-flow/trustgraph/storage/triples/memgraph/write.py +++ b/trustgraph-flow/trustgraph/storage/triples/memgraph/write.py @@ -16,7 +16,7 @@ from .... schema import triples_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "triples-write" default_input_queue = triples_store_queue default_subscriber = module diff --git a/trustgraph-flow/trustgraph/storage/triples/neo4j/write.py b/trustgraph-flow/trustgraph/storage/triples/neo4j/write.py index 3323f912..84a4d923 100755 --- a/trustgraph-flow/trustgraph/storage/triples/neo4j/write.py +++ b/trustgraph-flow/trustgraph/storage/triples/neo4j/write.py @@ -16,7 +16,7 @@ from .... schema import triples_store_queue from .... log_level import LogLevel from .... base import Consumer -module = ".".join(__name__.split(".")[1:-1]) +module = "triples-write" default_input_queue = triples_store_queue default_subscriber = module diff --git a/trustgraph-ocr/trustgraph/decoding/ocr/pdf_decoder.py b/trustgraph-ocr/trustgraph/decoding/ocr/pdf_decoder.py index f8926589..5fa436b8 100755 --- a/trustgraph-ocr/trustgraph/decoding/ocr/pdf_decoder.py +++ b/trustgraph-ocr/trustgraph/decoding/ocr/pdf_decoder.py @@ -14,7 +14,7 @@ from ... schema import document_ingest_queue, text_ingest_queue from ... log_level import LogLevel from ... base import ConsumerProducer -module = ".".join(__name__.split(".")[1:-1]) +module = "ocr" default_input_queue = document_ingest_queue default_output_queue = text_ingest_queue diff --git a/trustgraph-vertexai/trustgraph/model/text_completion/vertexai/llm.py b/trustgraph-vertexai/trustgraph/model/text_completion/vertexai/llm.py index 4d38c8c0..f8351c7c 100755 --- a/trustgraph-vertexai/trustgraph/model/text_completion/vertexai/llm.py +++ b/trustgraph-vertexai/trustgraph/model/text_completion/vertexai/llm.py @@ -30,7 +30,7 @@ from .... log_level import LogLevel from .... base import ConsumerProducer from .... exceptions import TooManyRequests -module = ".".join(__name__.split(".")[1:-1]) +module = "text-completion" default_input_queue = text_completion_request_queue default_output_queue = text_completion_response_queue