trustgraph-flow 1.1.10__tar.gz → 1.2.0__tar.gz

{trustgraph-flow-1.1.10 → trustgraph-flow-1.2.0}/PKG-INFO

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

trustgraph-flow-1.2.0/scripts/kg-extract-agent

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

trustgraph-flow-1.2.0/scripts/prompt-template

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

{trustgraph-flow-1.1.10 → trustgraph-flow-1.2.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>=1.1,<1.2",
+        "trustgraph-base>=1.2,<1.3",
         "aiohttp",
         "anthropic",
         "cassandra-driver",
@@ -96,7 +96,7 @@ setuptools.setup(
         "scripts/graph-rag",
         "scripts/kg-extract-definitions",
         "scripts/kg-extract-relationships",
-        "scripts/kg-extract-topics",
+        "scripts/kg-extract-agent",
         "scripts/kg-store",
         "scripts/kg-manager",
         "scripts/librarian",
@@ -106,7 +106,6 @@ setuptools.setup(
         "scripts/oe-write-milvus",
         "scripts/pdf-decoder",
         "scripts/pdf-ocr-mistral",
-        "scripts/prompt-generic",
         "scripts/prompt-template",
         "scripts/rows-write-cassandra",
         "scripts/run-processing",

trustgraph-flow-1.2.0/trustgraph/agent/react/agent_manager.py

@@ -0,0 +1,280 @@
+
+import logging
+import json
+import re
+
+from . types import Action, Final
+
+logger = logging.getLogger(__name__)
+
+class AgentManager:
+
+    def __init__(self, tools, additional_context=None):
+        self.tools = tools
+        self.additional_context = additional_context
+
+    def parse_react_response(self, text):
+        """Parse text-based ReAct response format.
+        
+        Expected format:
+        Thought: [reasoning about what to do next]
+        Action: [tool_name]
+        Args: {
+            "param": "value"
+        }
+        
+        OR
+        
+        Thought: [reasoning about the final answer]
+        Final Answer: [the answer]
+        """
+        if not isinstance(text, str):
+            raise ValueError(f"Expected string response, got {type(text)}")
+        
+        # Remove any markdown code blocks that might wrap the response
+        text = re.sub(r'^```[^\n]*\n', '', text.strip())
+        text = re.sub(r'\n```$', '', text.strip())
+            
+        lines = text.strip().split('\n')
+        
+        thought = None
+        action = None
+        args = None
+        final_answer = None
+        
+        i = 0
+        while i < len(lines):
+            line = lines[i].strip()
+            
+            # Parse Thought
+            if line.startswith("Thought:"):
+                thought = line[8:].strip()
+                # Handle multi-line thoughts
+                i += 1
+                while i < len(lines):
+                    next_line = lines[i].strip()
+                    if next_line.startswith(("Action:", "Final Answer:", "Args:")):
+                        break
+                    thought += " " + next_line
+                    i += 1
+                continue
+            
+            # Parse Final Answer
+            if line.startswith("Final Answer:"):
+                final_answer = line[13:].strip()
+                # Handle multi-line final answers (including JSON)
+                i += 1
+                
+                # Check if the answer might be JSON
+                if final_answer.startswith('{') or (i < len(lines) and lines[i].strip().startswith('{')):
+                    # Collect potential JSON answer
+                    json_text = final_answer if final_answer.startswith('{') else ""
+                    brace_count = json_text.count('{') - json_text.count('}')
+                    
+                    while i < len(lines) and (brace_count > 0 or not json_text):
+                        current_line = lines[i].strip()
+                        if current_line.startswith(("Thought:", "Action:")) and brace_count == 0:
+                            break
+                        json_text += ("\n" if json_text else "") + current_line
+                        brace_count += current_line.count('{') - current_line.count('}')
+                        i += 1
+                    
+                    # Try to parse as JSON
+                    # try:
+                    #     final_answer = json.loads(json_text)
+                    # except json.JSONDecodeError:
+                    #     # Not valid JSON, treat as regular text
+                    #     final_answer = json_text
+                    final_answer = json_text
+                else:
+                    # Regular text answer
+                    while i < len(lines):
+                        next_line = lines[i].strip()
+                        if next_line.startswith(("Thought:", "Action:")):
+                            break
+                        final_answer += " " + next_line
+                        i += 1
+                    
+                # If we have a final answer, return Final object
+                return Final(
+                    thought=thought or "",
+                    final=final_answer
+                )
+            
+            # Parse Action
+            if line.startswith("Action:"):
+                action = line[7:].strip()
+            
+            # Parse Args
+            if line.startswith("Args:"):
+                # Check if JSON starts on the same line
+                args_on_same_line = line[5:].strip()
+                if args_on_same_line:
+                    args_text = args_on_same_line
+                    brace_count = args_on_same_line.count('{') - args_on_same_line.count('}')
+                else:
+                    args_text = ""
+                    brace_count = 0
+                
+                # Collect all lines that form the JSON arguments
+                i += 1
+                started = bool(args_on_same_line and '{' in args_on_same_line)
+                
+                while i < len(lines) and (not started or brace_count > 0):
+                    current_line = lines[i]
+                    args_text += ("\n" if args_text else "") + current_line
+                    
+                    # Count braces to determine when JSON is complete
+                    for char in current_line:
+                        if char == '{':
+                            brace_count += 1
+                            started = True
+                        elif char == '}':
+                            brace_count -= 1
+                    
+                    # If we've started and braces are balanced, we're done
+                    if started and brace_count == 0:
+                        break
+                    
+                    i += 1
+                
+                # Parse the JSON arguments
+                try:
+                    args = json.loads(args_text.strip())
+                except json.JSONDecodeError as e:
+                    logger.error(f"Failed to parse JSON arguments: {args_text}")
+                    raise ValueError(f"Invalid JSON in Args: {e}")
+            
+            i += 1
+        
+        # If we have an action, return Action object
+        if action:
+            return Action(
+                thought=thought or "",
+                name=action,
+                arguments=args or {},
+                observation=""
+            )
+        
+        # If we only have a thought but no action or final answer
+        if thought and not action and not final_answer:
+            raise ValueError(f"Response has thought but no action or final answer: {text}")
+        
+        raise ValueError(f"Could not parse response: {text}")
+
+    async def reason(self, question, history, context):
+
+        print(f"calling reason: {question}", flush=True)
+
+        tools = self.tools
+
+        print(f"in reason", flush=True)
+        print(tools, flush=True)
+
+        tool_names = ",".join([
+            t for t in self.tools.keys()
+        ])
+
+        print("Tool names:", tool_names, flush=True)
+
+        variables = {
+            "question": question,
+            "tools": [
+                {
+                    "name": tool.name,
+                    "description": tool.description,
+                    "arguments": [
+                        {
+                            "name": arg.name,
+                            "type": arg.type,
+                            "description": arg.description
+                        }
+                        for arg in tool.arguments
+                    ]
+                }
+                for tool in self.tools.values()
+            ],
+            "context": self.additional_context,
+            "question": question,
+            "tool_names": tool_names,
+            "history": [
+                {
+                    "thought": h.thought,
+                    "action": h.name,
+                    "arguments": h.arguments,
+                    "observation": h.observation,
+                }
+                for h in history
+            ]
+        }
+
+        print(json.dumps(variables, indent=4), flush=True)
+
+        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.info(f"response: {response_text}")
+
+        # Parse the text response
+        try:
+            result = self.parse_react_response(response_text)
+            logger.info(f"Parsed result: {result}")
+            return result
+        except ValueError as e:
+            logger.error(f"Failed to parse response: {e}")
+            # Try to provide a helpful error message
+            logger.error(f"Response was: {response_text}")
+            raise RuntimeError(f"Failed to parse agent response: {e}")
+
+    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,
+            history = history,
+            context = context,
+        )
+        logger.info(f"act: {act}")
+
+        if isinstance(act, Final):
+
+            await think(act.thought)
+            return act
+
+        else:
+
+            await think(act.thought)
+
+            if act.name in self.tools:
+                action = self.tools[act.name]
+            else:
+                raise RuntimeError(f"No action for {act.name}!")
+
+            print("TOOL>>>", act, flush=True)
+
+            resp = await action.implementation(context).invoke(
+                **act.arguments
+            )
+
+            if isinstance(resp, str):
+                resp = resp.strip()
+            else:
+                resp = str(resp)
+                resp = resp.strip()
+
+            logger.info(f"resp: {resp}")
+
+            await observe(resp)
+
+            act.observation = resp
+
+            logger.info(f"iter: {act}")
+
+            return act
+

{trustgraph-flow-1.1.10 → trustgraph-flow-1.2.0}/trustgraph/agent/react/service.py

@@ -6,6 +6,10 @@ import json
 import re
 import sys
 import functools
+import logging
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
 
 from ... base import AgentService, TextCompletionClientSpec, PromptClientSpec
 from ... base import GraphRagClientSpec, ToolClientSpec
@@ -221,6 +225,11 @@ class Processor(AgentService):
 
                 print("Send final response...", flush=True)
 
+                if isinstance(act.final, str):
+                    f = act.final
+                else:
+                    f = json.dumps(act.final)
+
                 r = AgentResponse(
                     answer=act.final,
                     error=None,
@@ -292,6 +301,5 @@ class Processor(AgentService):
         )
 
 def run():
-
     Processor.launch(default_ident, __doc__)
 

trustgraph-flow-1.2.0/trustgraph/extract/kg/agent/__init__.py

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

trustgraph-flow-1.2.0/trustgraph/extract/kg/agent/__main__.py

@@ -0,0 +1,4 @@
+from .extract import Processor
+
+if __name__ == "__main__":
+    Processor.run()