sofias-sdk-lite 0.4.0__tar.gz → 0.4.1__tar.gz

{sofias_sdk_lite-0.4.0 → sofias_sdk_lite-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sofias-sdk-lite
-Version: 0.4.0
+Version: 0.4.1
 Summary: Build agents on the Sofias agent graph and run them over RabbitMQ.
 Keywords: agents,ai,llm,rabbitmq,sofias
 Author: Sofias Tech, S.L.

{sofias_sdk_lite-0.4.0 → sofias_sdk_lite-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sofias-sdk-lite"
-version = "0.4.0"
+version = "0.4.1"
 description = "Build agents on the Sofias agent graph and run them over RabbitMQ."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -68,6 +68,9 @@ markers = ["integration: requires a running RabbitMQ broker"]
 line-length = 100
 target-version = "py311"
 
+[tool.ruff.lint]
+extend-select = ["TC004"]
+
 [tool.pyright]
 include = ["src"]
 typeCheckingMode = "strict"

{sofias_sdk_lite-0.4.0 → sofias_sdk_lite-0.4.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "sofias-sdk-lite"
-version = "0.4.0"
+version = "0.4.1"
 description = "Build agents on the Sofias agent graph and run them over RabbitMQ."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -75,6 +75,13 @@ markers = ["integration: requires a running RabbitMQ broker"]
 line-length = 100
 target-version = "py311"
 
+[tool.ruff.lint]
+# TC004 catches a name imported only under ``if TYPE_CHECKING:`` but used at
+# runtime. That shipped in 0.4.0 as a NameError the moment a node executed a
+# caller-owned tool (TKT-067). Neither pyright strict nor mypy flag it: to them
+# the symbol exists. Ruff is the one checker that does.
+extend-select = ["TC004"]
+
 [tool.pyright]
 include = ["src"]
 typeCheckingMode = "strict"

{sofias_sdk_lite-0.4.0 → sofias_sdk_lite-0.4.1}/src/sofias_sdk_lite/nodes/llm_node.py

@@ -600,6 +600,7 @@ class LLMNode(BaseNode):
         base_prompt: str,
         prompt: str,
         runtime_vars: dict[str, Any],
+        input_data: dict[str, Any],
     ) -> tuple[int, list[ToolSpec] | None, str]:
         """Re-read the tools when the catalog changed mid-turn.
 
@@ -616,6 +617,7 @@ class LLMNode(BaseNode):
                 would duplicate the schemas inside the text.
             prompt: Current prompt.
             runtime_vars: Template variables for this turn.
+            input_data: The node's validated input for this turn.
 
         Returns:
             Updated ``(revision, specs, prompt)``, or the ones received when
@@ -635,14 +637,33 @@ class LLMNode(BaseNode):
         return (
             revision,
             new_specs,
-            self._prompt_with_registry_tools(base_prompt, new_specs, runtime_vars),
+            self._prompt_with_registry_tools(base_prompt, new_specs, runtime_vars, input_data),
         )
 
+    def _assemble_prompt(self, runtime_vars: dict[str, Any], input_data: dict[str, Any]) -> str:
+        """Assemble this turn's prompt with the node's assembler.
+
+        ``input_data`` only reaches an assembler we built ourselves. A
+        caller-supplied one was written against ``assemble(runtime_vars=...)``
+        and would reject the extra keyword, so it keeps the signature it knows.
+
+        Args:
+            runtime_vars: Template variables for this turn (settings + input).
+            input_data: The node's validated input on its own.
+
+        Returns:
+            The assembled prompt.
+        """
+        if not self._owns_prompt_assembler:
+            return self._prompt_assembler.assemble(runtime_vars=runtime_vars)
+        return self._prompt_assembler.assemble(runtime_vars=runtime_vars, input_data=input_data)
+
     def _prompt_with_registry_tools(
         self,
         prompt: str,
         tool_specs: list[ToolSpec] | None,
         runtime_vars: dict[str, Any],
+        input_data: dict[str, Any],
     ) -> str:
         """Re-assemble the prompt including the registry's tools.
 
@@ -656,6 +677,7 @@ class LLMNode(BaseNode):
             prompt: Prompt already assembled with the node's assembler.
             tool_specs: Static plus registry tools, or None.
             runtime_vars: Template variables for this turn.
+            input_data: The node's validated input for this turn.
 
         Returns:
             The re-assembled prompt, or the one received when no rebuild applies.
@@ -671,7 +693,7 @@ class LLMNode(BaseNode):
             output_contract=self._config.output_contract,
             raw_text=self._raw_text_field is not None,
         )
-        return assembler.assemble(runtime_vars=runtime_vars)
+        return assembler.assemble(runtime_vars=runtime_vars, input_data=input_data)
 
     async def _execute_registry_tool(self, tool_call: ToolCall, tool_start: float) -> ToolResult:
         """Execute a tool call via the ToolRegistry.
@@ -779,6 +801,12 @@ class LLMNode(BaseNode):
             if modified_input is not None:
                 tool_input = modified_input
 
+        # ToolContext is a TYPE_CHECKING-only name in this module, and this is
+        # the one place that BUILDS one instead of just annotating with it, so
+        # it needs the real import at runtime. Same local-import idiom already
+        # used for DelegationNode, FanOutStrategy and StreamingResponseWorkflow.
+        from sofias_sdk_lite.tools import ToolContext
+
         # Execute the tool using BaseTool.execute() in a worker thread (async, non-blocking)
         try:
             context = ToolContext(
@@ -999,7 +1027,7 @@ class LLMNode(BaseNode):
 
         runtime_vars = self._get_runtime_vars()
         runtime_vars.update(input_data)
-        prompt = self._prompt_assembler.assemble(runtime_vars=runtime_vars)
+        prompt = self._assemble_prompt(runtime_vars, input_data)
 
         max_iterations = self._get_max_iterations()
         parallel_tool_calls = self._get_parallel_tool_calls()
@@ -1007,7 +1035,7 @@ class LLMNode(BaseNode):
         tool_catalog_revision = self._tool_catalog_revision()
 
         base_prompt = prompt
-        prompt = self._prompt_with_registry_tools(prompt, tool_specs, runtime_vars)
+        prompt = self._prompt_with_registry_tools(prompt, tool_specs, runtime_vars, input_data)
 
         history: list[tuple[LLMResponse, list[ToolResult]]] = []
         iteration = 0
@@ -1019,7 +1047,7 @@ class LLMNode(BaseNode):
 
         while iteration < max_iterations:
             tool_catalog_revision, tool_specs, prompt = await self._refresh_tool_catalog(
-                tool_catalog_revision, tool_specs, base_prompt, prompt, runtime_vars
+                tool_catalog_revision, tool_specs, base_prompt, prompt, runtime_vars, input_data
             )
 
             if token_budget and history:
@@ -1493,7 +1521,7 @@ class LLMNode(BaseNode):
             runtime_vars = self._get_runtime_vars()
             # Include validated input in runtime vars for prompt templates
             runtime_vars.update(input_data)
-            prompt = self._prompt_assembler.assemble(runtime_vars=runtime_vars)
+            prompt = self._assemble_prompt(runtime_vars, input_data)
 
             # Tool loop
             max_iterations = self._get_max_iterations()
@@ -1502,7 +1530,9 @@ class LLMNode(BaseNode):
             tool_catalog_revision = self._tool_catalog_revision()
 
             base_prompt = prompt
-            prompt = self._prompt_with_registry_tools(prompt, tool_specs, runtime_vars)
+            prompt = self._prompt_with_registry_tools(
+                prompt, tool_specs, runtime_vars, input_data
+            )
 
             history: list[tuple[LLMResponse, list[ToolResult]]] = []
             iteration = 0
@@ -1525,7 +1555,12 @@ class LLMNode(BaseNode):
 
             while iteration < max_iterations:
                 tool_catalog_revision, tool_specs, prompt = await self._refresh_tool_catalog(
-                    tool_catalog_revision, tool_specs, base_prompt, prompt, runtime_vars
+                    tool_catalog_revision,
+                    tool_specs,
+                    base_prompt,
+                    prompt,
+                    runtime_vars,
+                    input_data,
                 )
 
                 if token_budget and history:

{sofias_sdk_lite-0.4.0 → sofias_sdk_lite-0.4.1}/src/sofias_sdk_lite/nodes/prompt_assembler.py

@@ -13,6 +13,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from sofias_sdk_lite.llm import ToolSpec
+from sofias_sdk_lite.observability._log import get_logger
 
 if TYPE_CHECKING:
     from sofias_sdk_lite.contracts import StrictContract
@@ -21,6 +22,8 @@ if TYPE_CHECKING:
 # Re-export so existing importers keep working
 __all__ = ["PromptAssembler", "ToolSpec"]
 
+logger = get_logger("nodes.prompt_assembler")
+
 
 class PromptAssembler:
     """Assembles the final prompt for LLM calls.
@@ -230,7 +233,44 @@ class PromptAssembler:
         """
         return ""
 
-    def assemble(self, runtime_vars: dict[str, Any] | None = None) -> str:
+    @staticmethod
+    def _keys_used_by_template(template: str, input_data: dict[str, Any]) -> list[str]:
+        """Which input keys the template actually references as {placeholders}.
+
+        Args:
+            template: The fixed prompt, before variable resolution.
+            input_data: The node's validated input.
+
+        Returns:
+            The referenced keys, empty when the template ignores the input.
+        """
+        return [key for key in input_data if "{" + key + "}" in template]
+
+    def _format_input_section(self, input_data: dict[str, Any]) -> str:
+        """Format the node's input as its own section.
+
+        The input reaches the model ONLY through {placeholders} in the fixed
+        prompt: there is no separate "user message" channel. A node configured
+        without ``NodePromptConfig`` therefore sent the model the tool catalogue
+        and nothing else, dropping the user's message in silence (TKT-066).
+
+        Args:
+            input_data: The node's validated input.
+
+        Returns:
+            Formatted input section, or empty string when there is no input.
+        """
+        if not input_data:
+            return ""
+
+        body = json.dumps(input_data, indent=2, ensure_ascii=False, default=str)
+        return f"## Input\n\n```json\n{body}\n```"
+
+    def assemble(
+        self,
+        runtime_vars: dict[str, Any] | None = None,
+        input_data: dict[str, Any] | None = None,
+    ) -> str:
         """Assemble the final prompt.
 
         Combines the fixed prompt with variable sections (tools, output format)
@@ -238,6 +278,11 @@ class PromptAssembler:
 
         Args:
             runtime_vars: Optional runtime variables for template resolution.
+            input_data: The node's validated input, when the caller can tell it
+                apart from ``runtime_vars`` (which also carries agent settings).
+                Used to render the input for a node that has no prompt template,
+                and to warn when a template ignores it. Optional, so a
+                caller-supplied assembler keeps working without it.
 
         Returns:
             The complete assembled prompt ready for LLM invocation.
@@ -264,5 +309,24 @@ class PromptAssembler:
         if output_section:
             sections.append(output_section)
 
+        if input_data:
+            if not fixed_prompt:
+                # No template at all: without this the input never reaches the
+                # model. Appended last, after the tool schemas, so the task sits
+                # closest to where the model answers.
+                input_section = self._format_input_section(input_data)
+                if input_section:
+                    sections.append(input_section)
+            elif not self._keys_used_by_template(fixed_prompt, input_data):
+                # A template that names none of the input keys drops the input
+                # just as silently, but it may be deliberate (a node whose input
+                # only passes through to the output), so this only warns.
+                logger.warning(
+                    "Prompt template references none of the node's input: the "
+                    "model will not see it. Reference it as {placeholder}.",
+                    node_name=self._config.name,
+                    input_keys=sorted(input_data),
+                )
+
         # Join sections with clear separation
         return "\n\n".join(sections).strip()