trustgraph-flow 1.3.6__tar.gz → 1.3.8__tar.gz

{trustgraph_flow-1.3.6 → trustgraph_flow-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 1.3.6
+Version: 1.3.8
 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.3.6 → trustgraph_flow-1.3.8}/pyproject.toml

@@ -96,6 +96,7 @@ pdf-ocr-mistral = "trustgraph.decoding.mistral_ocr:run"
 prompt-template = "trustgraph.prompt.template:run"
 rev-gateway = "trustgraph.rev_gateway:run"
 run-processing = "trustgraph.processing:run"
+structured-query = "trustgraph.retrieval.structured_query:run"
 text-completion-azure = "trustgraph.model.text_completion.azure:run"
 text-completion-azure-openai = "trustgraph.model.text_completion.azure_openai:run"
 text-completion-claude = "trustgraph.model.text_completion.claude:run"

{trustgraph_flow-1.3.6 → trustgraph_flow-1.3.8}/trustgraph/agent/react/service.py

@@ -12,11 +12,11 @@ import logging
 logger = logging.getLogger(__name__)
 
 from ... base import AgentService, TextCompletionClientSpec, PromptClientSpec
-from ... base import GraphRagClientSpec, ToolClientSpec
+from ... base import GraphRagClientSpec, ToolClientSpec, StructuredQueryClientSpec
 
 from ... schema import AgentRequest, AgentResponse, AgentStep, Error
 
-from . tools import KnowledgeQueryImpl, TextCompletionImpl, McpToolImpl, PromptImpl
+from . tools import KnowledgeQueryImpl, TextCompletionImpl, McpToolImpl, PromptImpl, StructuredQueryImpl
 from . agent_manager import AgentManager
 from ..tool_filter import validate_tool_config, filter_tools_by_group_and_state, get_next_state
 
@@ -80,6 +80,13 @@ class Processor(AgentService):
             )
         )
 
+        self.register_specification(
+            StructuredQueryClientSpec(
+                request_name = "structured-query-request",
+                response_name = "structured-query-response",
+            )
+        )
+
     async def on_tools_config(self, config, version):
 
         logger.info(f"Loading configuration version {version}")
@@ -138,6 +145,12 @@ class Processor(AgentService):
                             template_id=data.get("template"),
                             arguments=arguments
                         )
+                    elif impl_id == "structured-query":
+                        impl = functools.partial(
+                            StructuredQueryImpl, 
+                            collection=data.get("collection")
+                        )
+                        arguments = StructuredQueryImpl.get_arguments()
                     else:
                         raise RuntimeError(
                             f"Tool type {impl_id} not known"

{trustgraph_flow-1.3.6 → trustgraph_flow-1.3.8}/trustgraph/agent/react/tools.py

@@ -85,6 +85,43 @@ class McpToolImpl:
             return json.dumps(output)
 
 
+# This tool implementation knows how to query structured data using natural language
+class StructuredQueryImpl:
+    def __init__(self, context, collection=None):
+        self.context = context
+        self.collection = collection  # For multi-tenant scenarios
+    
+    @staticmethod
+    def get_arguments():
+        return [
+            Argument(
+                name="question",
+                type="string", 
+                description="Natural language question about structured data (tables, databases, etc.)"
+            )
+        ]
+    
+    async def invoke(self, **arguments):
+        client = self.context("structured-query-request")
+        logger.debug("Structured query question...")
+        
+        result = await client.structured_query(
+            arguments.get("question")
+        )
+        
+        # Format the result for the agent
+        if isinstance(result, dict):
+            if result.get("error"):
+                return f"Error: {result['error']['message']}"
+            elif result.get("data"):
+                # Pretty format JSON data for agent consumption
+                return json.dumps(result["data"], indent=2)
+            else:
+                return "No data returned"
+        else:
+            return str(result)
+
+
 # This tool implementation knows how to execute prompt templates
 class PromptImpl:
     def __init__(self, context, template_id, arguments=None):

trustgraph_flow-1.3.8/trustgraph/flow_version.py

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

{trustgraph_flow-1.3.6 → trustgraph_flow-1.3.8}/trustgraph/gateway/dispatch/manager.py

@@ -20,6 +20,8 @@ from . graph_rag import GraphRagRequestor
 from . document_rag import DocumentRagRequestor
 from . triples_query import TriplesQueryRequestor
 from . objects_query import ObjectsQueryRequestor
+from . nlp_query import NLPQueryRequestor
+from . structured_query import StructuredQueryRequestor
 from . embeddings import EmbeddingsRequestor
 from . graph_embeddings_query import GraphEmbeddingsQueryRequestor
 from . mcp_tool import McpToolRequestor
@@ -52,6 +54,8 @@ request_response_dispatchers = {
     "graph-embeddings": GraphEmbeddingsQueryRequestor,
     "triples": TriplesQueryRequestor,
     "objects": ObjectsQueryRequestor,
+    "nlp-query": NLPQueryRequestor,
+    "structured-query": StructuredQueryRequestor,
 }
 
 global_dispatchers = {

trustgraph_flow-1.3.8/trustgraph/gateway/dispatch/nlp_query.py

@@ -0,0 +1,30 @@
+from ... schema import QuestionToStructuredQueryRequest, QuestionToStructuredQueryResponse
+from ... messaging import TranslatorRegistry
+
+from . requestor import ServiceRequestor
+
+class NLPQueryRequestor(ServiceRequestor):
+    def __init__(
+            self, pulsar_client, request_queue, response_queue, timeout,
+            consumer, subscriber,
+    ):
+
+        super(NLPQueryRequestor, self).__init__(
+            pulsar_client=pulsar_client,
+            request_queue=request_queue,
+            response_queue=response_queue,
+            request_schema=QuestionToStructuredQueryRequest,
+            response_schema=QuestionToStructuredQueryResponse,
+            subscription = subscriber,
+            consumer_name = consumer,
+            timeout=timeout,
+        )
+
+        self.request_translator = TranslatorRegistry.get_request_translator("nlp-query")
+        self.response_translator = TranslatorRegistry.get_response_translator("nlp-query")
+
+    def to_request(self, body):
+        return self.request_translator.to_pulsar(body)
+
+    def from_response(self, message):
+        return self.response_translator.from_response_with_completion(message)

trustgraph_flow-1.3.8/trustgraph/gateway/dispatch/structured_query.py

@@ -0,0 +1,30 @@
+from ... schema import StructuredQueryRequest, StructuredQueryResponse
+from ... messaging import TranslatorRegistry
+
+from . requestor import ServiceRequestor
+
+class StructuredQueryRequestor(ServiceRequestor):
+    def __init__(
+            self, pulsar_client, request_queue, response_queue, timeout,
+            consumer, subscriber,
+    ):
+
+        super(StructuredQueryRequestor, self).__init__(
+            pulsar_client=pulsar_client,
+            request_queue=request_queue,
+            response_queue=response_queue,
+            request_schema=StructuredQueryRequest,
+            response_schema=StructuredQueryResponse,
+            subscription = subscriber,
+            consumer_name = consumer,
+            timeout=timeout,
+        )
+
+        self.request_translator = TranslatorRegistry.get_request_translator("structured-query")
+        self.response_translator = TranslatorRegistry.get_response_translator("structured-query")
+
+    def to_request(self, body):
+        return self.request_translator.to_pulsar(body)
+
+    def from_response(self, message):
+        return self.response_translator.from_response_with_completion(message)

{trustgraph_flow-1.3.6 → trustgraph_flow-1.3.8}/trustgraph/retrieval/nlp_query/service.py

@@ -8,10 +8,10 @@ import logging
 from typing import Dict, Any, Optional, List
 
 from ...schema import QuestionToStructuredQueryRequest, QuestionToStructuredQueryResponse
-from ...schema import PromptRequest, PromptResponse
+from ...schema import PromptRequest
 from ...schema import Error, RowSchema, Field as SchemaField
 
-from ...base import FlowProcessor, ConsumerSpec, ProducerSpec, ClientSpec
+from ...base import FlowProcessor, ConsumerSpec, ProducerSpec, PromptClientSpec
 
 # Module logger
 logger = logging.getLogger(__name__)
@@ -57,11 +57,9 @@ class Processor(FlowProcessor):
         
         # Client spec for calling prompt service
         self.register_specification(
-            ClientSpec(
+            PromptClientSpec(
                 request_name = "prompt-request",
                 response_name = "prompt-response",
-                request_schema = PromptRequest,
-                response_schema = PromptResponse
             )
         )
         

trustgraph_flow-1.3.8/trustgraph/retrieval/structured_query/__init__.py

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

trustgraph_flow-1.3.8/trustgraph/retrieval/structured_query/__main__.py

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

trustgraph_flow-1.3.8/trustgraph/retrieval/structured_query/service.py

@@ -0,0 +1,176 @@
+"""
+Structured Query Service - orchestrates natural language question processing.
+Takes a question, converts it to GraphQL via nlp-query, executes via objects-query,
+and returns the results.
+"""
+
+import json
+import logging
+from typing import Dict, Any, Optional
+
+from ...schema import StructuredQueryRequest, StructuredQueryResponse
+from ...schema import QuestionToStructuredQueryRequest, QuestionToStructuredQueryResponse  
+from ...schema import ObjectsQueryRequest, ObjectsQueryResponse
+from ...schema import Error
+
+from ...base import FlowProcessor, ConsumerSpec, ProducerSpec, RequestResponseSpec
+
+# Module logger
+logger = logging.getLogger(__name__)
+
+default_ident = "structured-query"
+
+class Processor(FlowProcessor):
+    
+    def __init__(self, **params):
+        
+        id = params.get("id", default_ident)
+        
+        super(Processor, self).__init__(
+            **params | {
+                "id": id,
+            }
+        )
+        
+        self.register_specification(
+            ConsumerSpec(
+                name = "request",
+                schema = StructuredQueryRequest,
+                handler = self.on_message
+            )
+        )
+        
+        self.register_specification(
+            ProducerSpec(
+                name = "response",
+                schema = StructuredQueryResponse,
+            )
+        )
+        
+        # Client spec for calling NLP query service
+        self.register_specification(
+            RequestResponseSpec(
+                request_name = "nlp-query-request",
+                response_name = "nlp-query-response", 
+                request_schema = QuestionToStructuredQueryRequest,
+                response_schema = QuestionToStructuredQueryResponse
+            )
+        )
+        
+        # Client spec for calling objects query service
+        self.register_specification(
+            RequestResponseSpec(
+                request_name = "objects-query-request",
+                response_name = "objects-query-response",
+                request_schema = ObjectsQueryRequest, 
+                response_schema = ObjectsQueryResponse
+            )
+        )
+        
+        logger.info("Structured Query service initialized")
+
+    async def on_message(self, msg, consumer, flow):
+        """Handle incoming structured query request"""
+        
+        try:
+            request = msg.value()
+            
+            # Sender-produced ID
+            id = msg.properties()["id"]
+            
+            logger.info(f"Handling structured query request {id}: {request.question[:100]}...")
+            
+            # Step 1: Convert question to GraphQL using NLP query service
+            logger.info("Step 1: Converting question to GraphQL")
+            nlp_request = QuestionToStructuredQueryRequest(
+                question=request.question,
+                max_results=100  # Default limit
+            )
+            
+            nlp_response = await self.client("nlp-query-request").request(nlp_request)
+            
+            if nlp_response.error is not None:
+                raise Exception(f"NLP query service error: {nlp_response.error.message}")
+            
+            if not nlp_response.graphql_query:
+                raise Exception("NLP query service returned empty GraphQL query")
+                
+            logger.info(f"Generated GraphQL query: {nlp_response.graphql_query[:200]}...")
+            logger.info(f"Detected schemas: {nlp_response.detected_schemas}")
+            logger.info(f"Confidence: {nlp_response.confidence}")
+            
+            # Step 2: Execute GraphQL query using objects query service
+            logger.info("Step 2: Executing GraphQL query")
+            
+            # Convert variables to strings (GraphQL variables can be various types, but Pulsar schema expects strings)
+            variables_as_strings = {}
+            if nlp_response.variables:
+                for key, value in nlp_response.variables.items():
+                    if isinstance(value, str):
+                        variables_as_strings[key] = value
+                    else:
+                        variables_as_strings[key] = str(value)
+            
+            # For now, we'll use default user/collection values
+            # In a real implementation, these would come from authentication/context
+            objects_request = ObjectsQueryRequest(
+                user="default",  # TODO: Get from authentication context
+                collection="default",  # TODO: Get from request context
+                query=nlp_response.graphql_query,
+                variables=variables_as_strings,
+                operation_name=None
+            )
+            
+            objects_response = await self.client("objects-query-request").request(objects_request)
+            
+            if objects_response.error is not None:
+                raise Exception(f"Objects query service error: {objects_response.error.message}")
+            
+            # Handle GraphQL errors from the objects query service
+            graphql_errors = []
+            if objects_response.errors:
+                for gql_error in objects_response.errors:
+                    graphql_errors.append(f"{gql_error.message} (path: {gql_error.path})")
+            
+            logger.info("Step 3: Returning results")
+            
+            # Create response
+            response = StructuredQueryResponse(
+                error=None,
+                data=objects_response.data or "null",  # JSON string
+                errors=graphql_errors
+            )
+            
+            logger.info("Sending structured query response...")
+            await flow("response").send(response, properties={"id": id})
+            
+            logger.info("Structured query request completed")
+            
+        except Exception as e:
+            
+            logger.error(f"Exception in structured query service: {e}", exc_info=True)
+            
+            logger.info("Sending error response...")
+            
+            response = StructuredQueryResponse(
+                error = Error(
+                    type = "structured-query-error",
+                    message = str(e),
+                ),
+                data = "null",
+                errors = []
+            )
+            
+            await flow("response").send(response, properties={"id": id})
+
+    @staticmethod
+    def add_args(parser):
+        """Add command-line arguments"""
+        
+        FlowProcessor.add_args(parser)
+        
+        # No additional arguments needed for this orchestrator service
+
+def run():
+    """Entry point for structured-query command"""
+    Processor.launch(default_ident, __doc__)

{trustgraph_flow-1.3.6 → trustgraph_flow-1.3.8}/trustgraph_flow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 1.3.6
+Version: 1.3.8
 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.3.6 → trustgraph_flow-1.3.8}/trustgraph_flow.egg-info/SOURCES.txt

@@ -102,12 +102,14 @@ trustgraph/gateway/dispatch/librarian.py
 trustgraph/gateway/dispatch/manager.py
 trustgraph/gateway/dispatch/mcp_tool.py
 trustgraph/gateway/dispatch/mux.py
+trustgraph/gateway/dispatch/nlp_query.py
 trustgraph/gateway/dispatch/objects_query.py
 trustgraph/gateway/dispatch/prompt.py
 trustgraph/gateway/dispatch/requestor.py
 trustgraph/gateway/dispatch/sender.py
 trustgraph/gateway/dispatch/serialize.py
 trustgraph/gateway/dispatch/streamer.py
+trustgraph/gateway/dispatch/structured_query.py
 trustgraph/gateway/dispatch/text_completion.py
 trustgraph/gateway/dispatch/text_load.py
 trustgraph/gateway/dispatch/triples_export.py
@@ -225,6 +227,9 @@ trustgraph/retrieval/graph_rag/rag.py
 trustgraph/retrieval/nlp_query/__init__.py
 trustgraph/retrieval/nlp_query/__main__.py
 trustgraph/retrieval/nlp_query/service.py
+trustgraph/retrieval/structured_query/__init__.py
+trustgraph/retrieval/structured_query/__main__.py
+trustgraph/retrieval/structured_query/service.py
 trustgraph/rev_gateway/__init__.py
 trustgraph/rev_gateway/__main__.py
 trustgraph/rev_gateway/dispatcher.py

{trustgraph_flow-1.3.6 → trustgraph_flow-1.3.8}/trustgraph_flow.egg-info/entry_points.txt

@@ -41,6 +41,7 @@ pdf-ocr-mistral = trustgraph.decoding.mistral_ocr:run
 prompt-template = trustgraph.prompt.template:run
 rev-gateway = trustgraph.rev_gateway:run
 run-processing = trustgraph.processing:run
+structured-query = trustgraph.retrieval.structured_query:run
 text-completion-azure = trustgraph.model.text_completion.azure:run
 text-completion-azure-openai = trustgraph.model.text_completion.azure_openai:run
 text-completion-claude = trustgraph.model.text_completion.claude:run

trustgraph_flow-1.3.6/trustgraph/flow_version.py

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