trustgraph-base 2.2.7__tar.gz → 2.2.9__tar.gz

{trustgraph_base-2.2.7 → trustgraph_base-2.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 2.2.7
+Version: 2.2.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_base-2.2.7 → trustgraph_base-2.2.9}/trustgraph/api/socket_client.py

@@ -402,23 +402,6 @@ class SocketClient:
                 content=resp.get("content", ""),
                 end_of_message=resp.get("end_of_message", False)
             )
-        # Non-streaming agent format: chunk_type is empty but has thought/observation/answer fields
-        elif resp.get("thought"):
-            return AgentThought(
-                content=resp.get("thought", ""),
-                end_of_message=resp.get("end_of_message", False)
-            )
-        elif resp.get("observation"):
-            return AgentObservation(
-                content=resp.get("observation", ""),
-                end_of_message=resp.get("end_of_message", False)
-            )
-        elif resp.get("answer"):
-            return AgentAnswer(
-                content=resp.get("answer", ""),
-                end_of_message=resp.get("end_of_message", False),
-                end_of_dialog=resp.get("end_of_dialog", False)
-            )
         else:
             content = resp.get("response", resp.get("chunk", resp.get("text", "")))
             return RAGChunk(

{trustgraph_base-2.2.7 → trustgraph_base-2.2.9}/trustgraph/base/agent_client.py

@@ -57,8 +57,7 @@ class AgentClient(RequestResponse):
         await self.request(
             AgentRequest(
                 question = question,
-                plan = plan,
-                state = state,
+                state = state or "",
                 history = history,
             ),
             recipient=recipient,

{trustgraph_base-2.2.7 → trustgraph_base-2.2.9}/trustgraph/base/agent_service.py

@@ -90,9 +90,6 @@ class AgentService(FlowProcessor):
                         type = "agent-error",
                         message = str(e),
                     ),
-                    thought = None,
-                    observation = None,
-                    answer = None,
                     end_of_message = True,
                     end_of_dialog = True,
                 ),

trustgraph_base-2.2.9/trustgraph/base_version.py

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

{trustgraph_base-2.2.7 → trustgraph_base-2.2.9}/trustgraph/messaging/translators/agent.py

@@ -16,6 +16,14 @@ class AgentRequestTranslator(MessageTranslator):
             collection=data.get("collection", "default"),
             streaming=data.get("streaming", False),
             session_id=data.get("session_id", ""),
+            conversation_id=data.get("conversation_id", ""),
+            pattern=data.get("pattern", ""),
+            task_type=data.get("task_type", ""),
+            framing=data.get("framing", ""),
+            correlation_id=data.get("correlation_id", ""),
+            parent_session_id=data.get("parent_session_id", ""),
+            subagent_goal=data.get("subagent_goal", ""),
+            expected_siblings=data.get("expected_siblings", 0),
         )
 
     def from_pulsar(self, obj: AgentRequest) -> Dict[str, Any]:
@@ -28,6 +36,14 @@ class AgentRequestTranslator(MessageTranslator):
             "collection": getattr(obj, "collection", "default"),
             "streaming": getattr(obj, "streaming", False),
             "session_id": getattr(obj, "session_id", ""),
+            "conversation_id": getattr(obj, "conversation_id", ""),
+            "pattern": getattr(obj, "pattern", ""),
+            "task_type": getattr(obj, "task_type", ""),
+            "framing": getattr(obj, "framing", ""),
+            "correlation_id": getattr(obj, "correlation_id", ""),
+            "parent_session_id": getattr(obj, "parent_session_id", ""),
+            "subagent_goal": getattr(obj, "subagent_goal", ""),
+            "expected_siblings": getattr(obj, "expected_siblings", 0),
         }
 
 
@@ -40,24 +56,15 @@ class AgentResponseTranslator(MessageTranslator):
     def from_pulsar(self, obj: AgentResponse) -> Dict[str, Any]:
         result = {}
 
-        # Check if this is a streaming response (has chunk_type)
-        if hasattr(obj, 'chunk_type') and obj.chunk_type:
+        if obj.chunk_type:
             result["chunk_type"] = obj.chunk_type
-            if obj.content:
-                result["content"] = obj.content
-            result["end_of_message"] = getattr(obj, "end_of_message", False)
-            result["end_of_dialog"] = getattr(obj, "end_of_dialog", False)
-        else:
-            # Legacy format (non-streaming)
-            if obj.answer:
-                result["answer"] = obj.answer
-            if obj.thought:
-                result["thought"] = obj.thought
-            if obj.observation:
-                result["observation"] = obj.observation
-            # Include completion flags for legacy format too
-            result["end_of_message"] = getattr(obj, "end_of_message", False)
-            result["end_of_dialog"] = getattr(obj, "end_of_dialog", False)
+        if obj.content:
+            result["content"] = obj.content
+        result["end_of_message"] = getattr(obj, "end_of_message", False)
+        result["end_of_dialog"] = getattr(obj, "end_of_dialog", False)
+
+        if getattr(obj, "message_id", ""):
+            result["message_id"] = obj.message_id
 
         # Include explainability fields if present
         explain_id = getattr(obj, "explain_id", None)
@@ -76,11 +83,5 @@ class AgentResponseTranslator(MessageTranslator):
 
     def from_response_with_completion(self, obj: AgentResponse) -> Tuple[Dict[str, Any], bool]:
         """Returns (response_dict, is_final)"""
-        # For streaming responses, check end_of_dialog
-        if hasattr(obj, 'chunk_type') and obj.chunk_type:
-            is_final = getattr(obj, 'end_of_dialog', False)
-        else:
-            # For legacy responses, check if answer is present
-            is_final = (obj.answer is not None)
-
+        is_final = getattr(obj, 'end_of_dialog', False)
         return self.from_pulsar(obj), is_final

{trustgraph_base-2.2.7 → trustgraph_base-2.2.9}/trustgraph/messaging/translators/document_loading.py

@@ -4,6 +4,29 @@ from ...schema import Document, TextDocument, Chunk, DocumentEmbeddings, ChunkEm
 from .base import SendTranslator
 
 
+def _decode_text_payload(payload: str | bytes, charset: str) -> str:
+    """
+    Decode text-load payloads.
+
+    Historical clients send base64-encoded text, but direct REST callers may
+    send raw UTF-8 text. Support both so Unicode text-load requests do not fail
+    at the gateway translation layer.
+    """
+    if isinstance(payload, bytes):
+        if not payload.isascii():
+            return payload.decode(charset)
+        candidate = payload.decode("ascii")
+    else:
+        if not payload.isascii():
+            return payload
+        candidate = payload
+
+    try:
+        return base64.b64decode(candidate, validate=True).decode(charset)
+    except (ValueError, UnicodeDecodeError):
+        return candidate
+
+
 class DocumentTranslator(SendTranslator):
     """Translator for Document schema objects (PDF docs etc.)"""
 
@@ -49,8 +72,7 @@ class TextDocumentTranslator(SendTranslator):
     def to_pulsar(self, data: Dict[str, Any]) -> TextDocument:
         charset = data.get("charset", "utf-8")
 
-        # Text is base64 encoded in input
-        text = base64.b64decode(data["text"]).decode(charset)
+        text = _decode_text_payload(data["text"], charset)
 
         from ...schema import Metadata
         return TextDocument(
@@ -169,4 +191,4 @@ class DocumentEmbeddingsTranslator(SendTranslator):
 
             result["metadata"] = metadata_dict
 
-        return result
+        return result

{trustgraph_base-2.2.7 → trustgraph_base-2.2.9}/trustgraph/schema/services/agent.py

@@ -1,5 +1,6 @@
 
 from dataclasses import dataclass, field
+from typing import Optional
 
 from ..core.topic import topic
 from ..core.primitives import Error
@@ -8,6 +9,14 @@ from ..core.primitives import Error
 
 # Prompt services, abstract the prompt generation
 
+@dataclass
+class PlanStep:
+    goal: str = ""
+    tool_hint: str = ""                   # Suggested tool for this step
+    depends_on: list[int] = field(default_factory=list)  # Indices of prerequisite steps
+    status: str = "pending"               # pending, running, completed, failed
+    result: str = ""                      # Result of step execution
+
 @dataclass
 class AgentStep:
     thought: str = ""
@@ -15,6 +24,9 @@ class AgentStep:
     arguments: dict[str, str] = field(default_factory=dict)
     observation: str = ""
     user: str = ""              # User context for the step
+    step_type: str = ""         # "react", "plan", "execute", "decompose", "synthesise"
+    plan: list[PlanStep] = field(default_factory=list)      # Plan steps (for plan-then-execute)
+    subagent_results: dict[str, str] = field(default_factory=dict)  # Subagent results keyed by goal
 
 @dataclass
 class AgentRequest:
@@ -27,6 +39,16 @@ class AgentRequest:
     streaming: bool = False     # Enable streaming response delivery (default false)
     session_id: str = ""        # For provenance tracking across iterations
 
+    # Orchestration fields
+    conversation_id: str = ""   # Groups related requests into a conversation
+    pattern: str = ""           # Selected pattern: "react", "plan-then-execute", "supervisor"
+    task_type: str = ""         # Task type from config: "general", "research", etc.
+    framing: str = ""           # Domain framing text injected into prompts
+    correlation_id: str = ""    # Links fan-out subagents to parent for fan-in
+    parent_session_id: str = "" # Session ID of the supervisor that spawned this subagent
+    subagent_goal: str = ""     # Specific goal for a subagent (set by supervisor)
+    expected_siblings: int = 0  # Number of sibling subagents in this fan-out
+
 @dataclass
 class AgentResponse:
     # Streaming-first design
@@ -39,11 +61,10 @@ class AgentResponse:
     explain_id: str | None = None     # Provenance URI (announced as created)
     explain_graph: str | None = None  # Named graph where explain was stored
 
-    # Legacy fields (deprecated but kept for backward compatibility)
-    answer: str = ""
+    # Orchestration fields
+    message_id: str = ""              # Unique ID for this response message
+
     error: Error | None = None
-    thought: str = ""
-    observation: str = ""
 
 ############################################################################
 

{trustgraph_base-2.2.7 → trustgraph_base-2.2.9}/trustgraph_base.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 2.2.7
+Version: 2.2.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_base-2.2.7/trustgraph/base_version.py

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