trustgraph-flow 1.3.7__tar.gz → 1.3.9__tar.gz

{trustgraph_flow-1.3.7 → trustgraph_flow-1.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 1.3.7
+Version: 1.3.9
 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.7 → trustgraph_flow-1.3.9}/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.7 → trustgraph_flow-1.3.9}/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.9/trustgraph/flow_version.py

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

{trustgraph_flow-1.3.7 → trustgraph_flow-1.3.9}/trustgraph/retrieval/nlp_query/service.py

@@ -122,7 +122,7 @@ class Processor(FlowProcessor):
         
         logger.info(f"Schema configuration loaded: {len(self.schemas)} schemas")
 
-    async def phase1_select_schemas(self, question: str) -> List[str]:
+    async def phase1_select_schemas(self, question: str, flow) -> List[str]:
         """Phase 1: Use prompt service to select relevant schemas for the question"""
         logger.info("Starting Phase 1: Schema selection")
         
@@ -144,20 +144,27 @@ class Processor(FlowProcessor):
         }
         
         # Call prompt service for schema selection
+        # Convert variables to JSON-encoded terms
+        terms = {k: json.dumps(v) for k, v in variables.items()}
         prompt_request = PromptRequest(
-            template=self.schema_selection_template,
-            variables=variables
+            id=self.schema_selection_template,
+            terms=terms
         )
         
         try:
-            response = await self.client("prompt-request").request(prompt_request)
+            response = await flow("prompt-request").request(prompt_request)
             
             if response.error is not None:
                 raise Exception(f"Prompt service error: {response.error}")
             
             # Parse the response to get selected schema names
-            # Expecting response.text to contain JSON array of schema names
-            selected_schemas = json.loads(response.text)
+            # Response could be in either text or object field
+            response_data = response.text if response.text else response.object
+            if response_data is None:
+                raise Exception("Prompt service returned empty response")
+            
+            # Parse JSON array of schema names
+            selected_schemas = json.loads(response_data)
             
             logger.info(f"Phase 1 selected schemas: {selected_schemas}")
             return selected_schemas
@@ -166,7 +173,7 @@ class Processor(FlowProcessor):
             logger.error(f"Phase 1 schema selection failed: {e}")
             raise
 
-    async def phase2_generate_graphql(self, question: str, selected_schemas: List[str]) -> Dict[str, Any]:
+    async def phase2_generate_graphql(self, question: str, selected_schemas: List[str], flow) -> Dict[str, Any]:
         """Phase 2: Generate GraphQL query using selected schemas"""
         logger.info(f"Starting Phase 2: GraphQL generation for schemas: {selected_schemas}")
         
@@ -200,20 +207,27 @@ class Processor(FlowProcessor):
         }
         
         # Call prompt service for GraphQL generation
+        # Convert variables to JSON-encoded terms
+        terms = {k: json.dumps(v) for k, v in variables.items()}
         prompt_request = PromptRequest(
-            template=self.graphql_generation_template,
-            variables=variables
+            id=self.graphql_generation_template,
+            terms=terms
         )
         
         try:
-            response = await self.client("prompt-request").request(prompt_request)
+            response = await flow("prompt-request").request(prompt_request)
             
             if response.error is not None:
                 raise Exception(f"Prompt service error: {response.error}")
             
             # Parse the response to get GraphQL query and variables
-            # Expecting response.text to contain JSON with "query" and "variables" fields
-            result = json.loads(response.text)
+            # Response could be in either text or object field
+            response_data = response.text if response.text else response.object
+            if response_data is None:
+                raise Exception("Prompt service returned empty response")
+            
+            # Parse JSON with "query" and "variables" fields
+            result = json.loads(response_data)
             
             logger.info(f"Phase 2 generated GraphQL: {result.get('query', '')[:100]}...")
             return result
@@ -234,10 +248,10 @@ class Processor(FlowProcessor):
             logger.info(f"Handling NLP query request {id}: {request.question[:100]}...")
             
             # Phase 1: Select relevant schemas
-            selected_schemas = await self.phase1_select_schemas(request.question)
+            selected_schemas = await self.phase1_select_schemas(request.question, flow)
             
             # Phase 2: Generate GraphQL query
-            graphql_result = await self.phase2_generate_graphql(request.question, selected_schemas)
+            graphql_result = await self.phase2_generate_graphql(request.question, selected_schemas, flow)
             
             # Create response
             response = QuestionToStructuredQueryResponse(

{trustgraph_flow-1.3.7 → trustgraph_flow-1.3.9}/trustgraph/retrieval/structured_query/service.py

@@ -87,7 +87,7 @@ class Processor(FlowProcessor):
                 max_results=100  # Default limit
             )
             
-            nlp_response = await self.client("nlp-query-request").request(nlp_request)
+            nlp_response = await flow("nlp-query-request").request(nlp_request)
             
             if nlp_response.error is not None:
                 raise Exception(f"NLP query service error: {nlp_response.error.message}")
@@ -111,17 +111,17 @@ class Processor(FlowProcessor):
                     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
+            # Use standard TrustGraph user/collection values
+            # These should eventually come from authentication/context
             objects_request = ObjectsQueryRequest(
-                user="default",  # TODO: Get from authentication context
-                collection="default",  # TODO: Get from request context
+                user="trustgraph",  # Standard TrustGraph user
+                collection="default",  # Standard default collection
                 query=nlp_response.graphql_query,
                 variables=variables_as_strings,
                 operation_name=None
             )
             
-            objects_response = await self.client("objects-query-request").request(objects_request)
+            objects_response = await flow("objects-query-request").request(objects_request)
             
             if objects_response.error is not None:
                 raise Exception(f"Objects query service error: {objects_response.error.message}")

{trustgraph_flow-1.3.7 → trustgraph_flow-1.3.9}/trustgraph_flow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 1.3.7
+Version: 1.3.9
 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.7/trustgraph/flow_version.py

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