trustgraph-flow 1.2.3__tar.gz → 1.2.4__tar.gz

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 1.2.3
+Version: 1.2.4
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Author-email: "trustgraph.ai" <security@trustgraph.ai>
 Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/agent/mcp_tool/service.py

@@ -5,11 +5,15 @@ name + parameters, output is the response, either a string or an object.
 """
 
 import json
+import logging
 from mcp.client.streamable_http import streamablehttp_client
 from mcp import ClientSession
 
 from ... base import ToolService
 
+# Module logger
+logger = logging.getLogger(__name__)
+
 default_ident = "mcp-tool"
 
 class Service(ToolService):
@@ -26,7 +30,7 @@ class Service(ToolService):
 
     async def on_mcp_config(self, config, version):
 
-        print("Got config version", version)
+        logger.info(f"Got config version {version}")
 
         if "mcp" not in config: return
 
@@ -52,7 +56,7 @@ class Service(ToolService):
             else:
                 remote_name = name
 
-            print("Invoking", remote_name, "at", url, flush=True)
+            logger.info(f"Invoking {remote_name} at {url}")
 
             # Connect to a streamable HTTP server
             async with streamablehttp_client(url) as (
@@ -86,13 +90,13 @@ class Service(ToolService):
         except BaseExceptionGroup as e:
 
             for child in e.exceptions:
-                print(child)
+                logger.debug(f"Child: {child}")
 
             raise e.exceptions[0]
 
         except Exception as e:
 
-            print(e)
+            logger.error(f"Error invoking MCP tool: {e}", exc_info=True)
             raise e
             
     @staticmethod

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/agent/react/agent_manager.py

@@ -164,18 +164,18 @@ class AgentManager:
 
     async def reason(self, question, history, context):
 
-        print(f"calling reason: {question}", flush=True)
+        logger.debug(f"calling reason: {question}")
 
         tools = self.tools
 
-        print(f"in reason", flush=True)
-        print(tools, flush=True)
+        logger.debug("in reason")
+        logger.debug(f"tools: {tools}")
 
         tool_names = ",".join([
             t for t in self.tools.keys()
         ])
 
-        print("Tool names:", tool_names, flush=True)
+        logger.debug(f"Tool names: {tool_names}")
 
         variables = {
             "question": question,
@@ -208,14 +208,14 @@ class AgentManager:
             ]
         }
 
-        print(json.dumps(variables, indent=4), flush=True)
+        logger.debug(f"Variables: {json.dumps(variables, indent=4)}")
 
         logger.info(f"prompt: {variables}")
 
         # Get text response from prompt service
         response_text = await context("prompt-request").agent_react(variables)
 
-        print(f"Response text:\n{response_text}", flush=True)
+        logger.debug(f"Response text:\n{response_text}")
 
         logger.info(f"response: {response_text}")
 
@@ -233,7 +233,6 @@ class AgentManager:
     async def react(self, question, history, think, observe, context):
 
         logger.info(f"question: {question}")
-        print(f"question: {question}", flush=True)
 
         act = await self.reason(
             question = question,
@@ -256,7 +255,7 @@ class AgentManager:
             else:
                 raise RuntimeError(f"No action for {act.name}!")
 
-            print("TOOL>>>", act, flush=True)
+            logger.debug(f"TOOL>>> {act}")
 
             resp = await action.implementation(context).invoke(
                 **act.arguments

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/agent/react/service.py

@@ -8,7 +8,7 @@ import sys
 import functools
 import logging
 
-logging.basicConfig(level=logging.DEBUG)
+# Module logger
 logger = logging.getLogger(__name__)
 
 from ... base import AgentService, TextCompletionClientSpec, PromptClientSpec
@@ -81,7 +81,7 @@ class Processor(AgentService):
 
     async def on_tools_config(self, config, version):
 
-        print("Loading configuration version", version)
+        logger.info(f"Loading configuration version {version}")
 
         try:
 
@@ -151,13 +151,13 @@ class Processor(AgentService):
                 additional_context=additional
             )
 
-            print(f"Loaded {len(tools)} tools", flush=True)
-            print("Tool configuration reloaded.", flush=True)
+            logger.info(f"Loaded {len(tools)} tools")
+            logger.info("Tool configuration reloaded.")
 
         except Exception as e:
 
-            print("on_tools_config Exception:", e, flush=True)
-            print("Configuration reload failed", flush=True)
+            logger.error(f"on_tools_config Exception: {e}", exc_info=True)
+            logger.error("Configuration reload failed")
 
     async def agent_request(self, request, respond, next, flow):
 
@@ -176,16 +176,16 @@ class Processor(AgentService):
             else:
                 history = []
 
-            print(f"Question: {request.question}", flush=True)
+            logger.info(f"Question: {request.question}")
 
             if len(history) >= self.max_iterations:
                 raise RuntimeError("Too many agent iterations")
 
-            print(f"History: {history}", flush=True)
+            logger.debug(f"History: {history}")
 
             async def think(x):
 
-                print(f"Think: {x}", flush=True)
+                logger.debug(f"Think: {x}")
 
                 r = AgentResponse(
                     answer=None,
@@ -198,7 +198,7 @@ class Processor(AgentService):
 
             async def observe(x):
 
-                print(f"Observe: {x}", flush=True)
+                logger.debug(f"Observe: {x}")
 
                 r = AgentResponse(
                     answer=None,
@@ -209,7 +209,7 @@ class Processor(AgentService):
 
                 await respond(r)
 
-            print("Call React", flush=True)
+            logger.debug("Call React")
 
             act = await self.agent.react(
                 question = request.question,
@@ -219,11 +219,11 @@ class Processor(AgentService):
                 context = flow,
             )
 
-            print(f"Action: {act}", flush=True)
+            logger.debug(f"Action: {act}")
 
             if isinstance(act, Final):
 
-                print("Send final response...", flush=True)
+                logger.debug("Send final response...")
 
                 if isinstance(act.final, str):
                     f = act.final
@@ -238,11 +238,11 @@ class Processor(AgentService):
 
                 await respond(r)
 
-                print("Done.", flush=True)
+                logger.debug("Done.")
 
                 return
 
-            print("Send next...", flush=True)
+            logger.debug("Send next...")
 
             history.append(act)
 
@@ -263,15 +263,15 @@ class Processor(AgentService):
 
             await next(r)
 
-            print("Done.", flush=True)
+            logger.debug("React agent processing complete")
 
             return
 
         except Exception as e:
 
-            print(f"agent_request Exception: {e}")
+            logger.error(f"agent_request Exception: {e}", exc_info=True)
 
-            print("Send error response...", flush=True)
+            logger.debug("Send error response...")
 
             r = AgentResponse(
                 error=Error(

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/agent/react/tools.py

@@ -1,7 +1,11 @@
 
 import json
+import logging
 from .types import Argument
 
+# Module logger
+logger = logging.getLogger(__name__)
+
 # This tool implementation knows how to put a question to the graph RAG
 # service
 class KnowledgeQueryImpl:
@@ -21,7 +25,7 @@ class KnowledgeQueryImpl:
     
     async def invoke(self, **arguments):
         client = self.context("graph-rag-request")
-        print("Graph RAG question...", flush=True)
+        logger.debug("Graph RAG question...")
         return await client.rag(
             arguments.get("question")
         )
@@ -44,7 +48,7 @@ class TextCompletionImpl:
     
     async def invoke(self, **arguments):
         client = self.context("prompt-request")
-        print("Prompt question...", flush=True)
+        logger.debug("Prompt question...")
         return await client.question(
             arguments.get("question")
         )
@@ -67,13 +71,13 @@ class McpToolImpl:
 
         client = self.context("mcp-tool-request")
 
-        print(f"MCP tool invocation: {self.mcp_tool_id}...", flush=True)
+        logger.debug(f"MCP tool invocation: {self.mcp_tool_id}...")
         output = await client.invoke(
             name = self.mcp_tool_id,
             parameters = arguments,  # Pass the actual arguments
         )
 
-        print(output)
+        logger.debug(f"MCP tool output: {output}")
 
         if isinstance(output, str):
             return output
@@ -94,7 +98,7 @@ class PromptImpl:
     
     async def invoke(self, **arguments):
         client = self.context("prompt-request")
-        print(f"Prompt template invocation: {self.template_id}...", flush=True)
+        logger.debug(f"Prompt template invocation: {self.template_id}...")
         return await client.prompt(
             id=self.template_id,
             variables=arguments

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/chunking/recursive/chunker.py

@@ -4,12 +4,16 @@ Simple decoder, accepts text documents on input, outputs chunks from the
 as text as separate output objects.
 """
 
+import logging
 from langchain_text_splitters import RecursiveCharacterTextSplitter
 from prometheus_client import Histogram
 
 from ... schema import TextDocument, Chunk
 from ... base import FlowProcessor, ConsumerSpec, ProducerSpec
 
+# Module logger
+logger = logging.getLogger(__name__)
+
 default_ident = "chunker"
 
 class Processor(FlowProcessor):
@@ -54,12 +58,12 @@ class Processor(FlowProcessor):
             )
         )
 
-        print("Chunker initialised", flush=True)
+        logger.info("Recursive chunker initialized")
 
     async def on_message(self, msg, consumer, flow):
 
         v = msg.value()
-        print(f"Chunking {v.metadata.id}...", flush=True)
+        logger.info(f"Chunking document {v.metadata.id}...")
 
         texts = self.text_splitter.create_documents(
             [v.text.decode("utf-8")]
@@ -67,7 +71,7 @@ class Processor(FlowProcessor):
 
         for ix, chunk in enumerate(texts):
 
-            print("Chunk", len(chunk.page_content), flush=True)
+            logger.debug(f"Created chunk of size {len(chunk.page_content)}")
 
             r = Chunk(
                 metadata=v.metadata,
@@ -80,7 +84,7 @@ class Processor(FlowProcessor):
 
             await flow("output").send(r)
 
-        print("Done.", flush=True)
+        logger.debug("Document chunking complete")
 
     @staticmethod
     def add_args(parser):

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/chunking/token/chunker.py

@@ -4,12 +4,16 @@ Simple decoder, accepts text documents on input, outputs chunks from the
 as text as separate output objects.
 """
 
+import logging
 from langchain_text_splitters import TokenTextSplitter
 from prometheus_client import Histogram
 
 from ... schema import TextDocument, Chunk
 from ... base import FlowProcessor
 
+# Module logger
+logger = logging.getLogger(__name__)
+
 default_ident = "chunker"
 
 class Processor(FlowProcessor):
@@ -53,12 +57,12 @@ class Processor(FlowProcessor):
             )
         )
 
-        print("Chunker initialised", flush=True)
+        logger.info("Token chunker initialized")
 
     async def on_message(self, msg, consumer, flow):
 
         v = msg.value()
-        print(f"Chunking {v.metadata.id}...", flush=True)
+        logger.info(f"Chunking document {v.metadata.id}...")
 
         texts = self.text_splitter.create_documents(
             [v.text.decode("utf-8")]
@@ -66,7 +70,7 @@ class Processor(FlowProcessor):
 
         for ix, chunk in enumerate(texts):
 
-            print("Chunk", len(chunk.page_content), flush=True)
+            logger.debug(f"Created chunk of size {len(chunk.page_content)}")
 
             r = Chunk(
                 metadata=v.metadata,
@@ -79,7 +83,7 @@ class Processor(FlowProcessor):
 
             await flow("output").send(r)
 
-        print("Done.", flush=True)
+        logger.debug("Document chunking complete")
 
     @staticmethod
     def add_args(parser):

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/config/service/config.py

@@ -1,9 +1,14 @@
 
+import logging
+
 from trustgraph.schema import ConfigResponse
 from trustgraph.schema import ConfigValue, Error
 
 from ... tables.config import ConfigTableStore
 
+# Module logger
+logger = logging.getLogger(__name__)
+
 class ConfigurationClass:
     
     async def keys(self):
@@ -228,7 +233,7 @@ class Configuration:
 
     async def handle(self, msg):
 
-        print("Handle message ", msg.operation)
+        logger.debug(f"Handling config message: {msg.operation}")
 
         if msg.operation == "get":
 

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/config/service/flow.py

@@ -1,6 +1,10 @@
 
 from trustgraph.schema import FlowResponse, Error
 import json
+import logging
+
+# Module logger
+logger = logging.getLogger(__name__)
 
 class FlowConfig:
     def __init__(self, config):
@@ -41,7 +45,7 @@ class FlowConfig:
     
     async def handle_delete_class(self, msg):
 
-        print(msg)
+        logger.debug(f"Flow config message: {msg}")
 
         await self.config.get("flow-classes").delete(msg.class_name)
 
@@ -218,7 +222,7 @@ class FlowConfig:
     
     async def handle(self, msg):
 
-        print("Handle message ", msg.operation)
+        logger.debug(f"Handling flow message: {msg.operation}")
 
         if msg.operation == "list-classes":
             resp = await self.handle_list_classes(msg)

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/config/service/service.py

@@ -3,6 +3,8 @@
 Config service.  Manages system global configuration state
 """
 
+import logging
+
 from trustgraph.schema import Error
 
 from trustgraph.schema import ConfigRequest, ConfigResponse, ConfigPush
@@ -20,6 +22,9 @@ from . flow import FlowConfig
 from ... base import ProcessorMetrics, ConsumerMetrics, ProducerMetrics
 from ... base import Consumer, Producer
 
+# Module logger
+logger = logging.getLogger(__name__)
+
 # FIXME: How to ensure this doesn't conflict with other usage?
 keyspace = "config"
 
@@ -146,7 +151,7 @@ class Processor(AsyncProcessor):
 
         self.flow = FlowConfig(self.config)
 
-        print("Service initialised.")
+        logger.info("Config service initialized")
 
     async def start(self):
 
@@ -172,7 +177,7 @@ class Processor(AsyncProcessor):
 
         # Race condition, should make sure version & config sync
 
-        print("Pushed version ", await self.config.get_version())
+        logger.info(f"Pushed configuration version {await self.config.get_version()}")
         
     async def on_config_request(self, msg, consumer, flow):
 
@@ -183,7 +188,7 @@ class Processor(AsyncProcessor):
             # Sender-produced ID
             id = msg.properties()["id"]
 
-            print(f"Handling {id}...", flush=True)
+            logger.info(f"Handling config request {id}...")
 
             resp = await self.config.handle(v)
 
@@ -214,7 +219,7 @@ class Processor(AsyncProcessor):
             # Sender-produced ID
             id = msg.properties()["id"]
 
-            print(f"Handling {id}...", flush=True)
+            logger.info(f"Handling flow request {id}...")
 
             resp = await self.flow.handle(v)
 

{trustgraph_flow-1.2.3 → trustgraph_flow-1.2.4}/trustgraph/cores/knowledge.py

@@ -8,6 +8,10 @@ from .. base import Publisher
 import base64
 import asyncio
 import uuid
+import logging
+
+# Module logger
+logger = logging.getLogger(__name__)
 
 class KnowledgeManager:
 
@@ -26,7 +30,7 @@ class KnowledgeManager:
 
     async def delete_kg_core(self, request, respond):
 
-        print("Deleting core...", flush=True)
+        logger.info("Deleting knowledge core...")
 
         await self.table_store.delete_kg_core(
             request.user, request.id
@@ -44,7 +48,7 @@ class KnowledgeManager:
 
     async def get_kg_core(self, request, respond):
 
-        print("Get core...", flush=True)
+        logger.info("Getting knowledge core...")
 
         async def publish_triples(t):
             await respond(
@@ -82,7 +86,7 @@ class KnowledgeManager:
             publish_ge,
         )
 
-        print("Get complete", flush=True)
+        logger.debug("Knowledge core retrieval complete")
 
         await respond(
             KnowledgeResponse(
@@ -158,13 +162,13 @@ class KnowledgeManager:
 
     async def core_loader(self):
 
-        print("Running...", flush=True)
+        logger.info("Knowledge background processor running...")
         while True:
 
-            print("Wait for next load...", flush=True)
+            logger.debug("Waiting for next load...")
             request, respond = await self.loader_queue.get()
 
-            print("Loading...", request.id, flush=True)
+            logger.info(f"Loading knowledge: {request.id}")
 
             try:
 
@@ -204,7 +208,7 @@ class KnowledgeManager:
 
             except Exception as e:
 
-                print("Exception:", e, flush=True)
+                logger.error(f"Knowledge exception: {e}", exc_info=True)
                 await respond(
                     KnowledgeResponse(
                         error = Error(
@@ -219,15 +223,15 @@ class KnowledgeManager:
                 )
 
 
-            print("Going to start loading...", flush=True)
+            logger.debug("Starting knowledge loading process...")
 
             try:
 
                 t_pub = None
                 ge_pub = None
 
-                print(t_q, flush=True)
-                print(ge_q, flush=True)
+                logger.debug(f"Triples queue: {t_q}")
+                logger.debug(f"Graph embeddings queue: {ge_q}")
 
                 t_pub = Publisher(
                     self.flow_config.pulsar_client, t_q,
@@ -238,7 +242,7 @@ class KnowledgeManager:
                     schema=GraphEmbeddings
                 )
 
-                print("Start publishers...", flush=True)
+                logger.debug("Starting publishers...")
 
                 await t_pub.start()
                 await ge_pub.start()
@@ -246,7 +250,7 @@ class KnowledgeManager:
                 async def publish_triples(t):
                     await t_pub.send(None, t)
 
-                print("Publish triples...", flush=True)
+                logger.debug("Publishing triples...")
 
                 # Remove doc table row
                 await self.table_store.get_triples(
@@ -258,7 +262,7 @@ class KnowledgeManager:
                 async def publish_ge(g):
                     await ge_pub.send(None, g)
 
-                print("Publish GEs...", flush=True)
+                logger.debug("Publishing graph embeddings...")
 
                 # Remove doc table row
                 await self.table_store.get_graph_embeddings(
@@ -267,19 +271,19 @@ class KnowledgeManager:
                     publish_ge,
                 )
 
-                print("Completed that.", flush=True)
+                logger.debug("Knowledge loading completed")
 
             except Exception as e:
 
-                print("Exception:", e, flush=True)
+                logger.error(f"Knowledge exception: {e}", exc_info=True)
 
             finally:
 
-                print("Stopping publishers...", flush=True)
+                logger.debug("Stopping publishers...")
 
                 if t_pub: await t_pub.stop()
                 if ge_pub: await ge_pub.stop()
 
-            print("Done", flush=True)
+            logger.debug("Knowledge processing done")
 
             continue