prompture 1.13.12.dev2__tar.gz → 1.14.1.dev1__tar.gz

{prompture-1.13.12.dev2 → prompture-1.14.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prompture
-Version: 1.13.12.dev2
+Version: 1.14.1.dev1
 Summary: Ask LLMs to return structured JSON and run cross-model tests. API-first.
 Author-email: Juan Denis <juan@vene.co>
 License-Expression: MIT

{prompture-1.13.12.dev2 → prompture-1.14.1.dev1}/prompture/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.13.12.dev2'
-__version_tuple__ = version_tuple = (1, 13, 12, 'dev2')
+__version__ = version = '1.14.1.dev1'
+__version_tuple__ = version_tuple = (1, 14, 1, 'dev1')
 
 __commit_id__ = commit_id = None

{prompture-1.13.12.dev2 → prompture-1.14.1.dev1}/prompture/agents/async_conversation.py

@@ -1466,11 +1466,13 @@ class AsyncConversation(ToolContextMixin):
         cleaned = clean_json_text(text)
         try:
             json_obj = json.loads(cleaned)
-        except json.JSONDecodeError:
+        except json.JSONDecodeError as exc:
             if ai_cleanup:
                 from ..extraction.async_core import clean_json_text_with_ai
 
-                cleaned, cleanup_meta = await clean_json_text_with_ai(self._driver, cleaned, self._model_name, merged)
+                cleaned, cleanup_meta = await clean_json_text_with_ai(
+                    self._driver, cleaned, self._model_name, merged, json_schema=json_schema, error=str(exc)
+                )
                 json_obj = json.loads(cleaned)
                 if cleanup_meta:
                     self._accumulate_usage(cleanup_meta)

{prompture-1.13.12.dev2 → prompture-1.14.1.dev1}/prompture/agents/async_deep_agent.py

@@ -44,12 +44,14 @@ class AsyncDeepAgent(AsyncAgent):
         subagents: list[SubAgentSpec] | None = None,
         persona: Persona | str | None = None,
         system_prompt: str | Persona | None = None,
+        base_prompt: str | None = None,
         enable_planning: bool = True,
         enable_vfs: bool = True,
         enable_summarization: bool = True,
         summarize_at_tokens: int | Literal["auto"] = "auto",
         summarize_keep_last_n: int = 6,
         summarizer_model: str | AsyncDriver | None = None,
+        summarizer_prompt: str | None = None,
         initial_files: dict[str, str] | None = None,
         max_iterations: int = 50,
         max_tool_result_length: int | None = 10_000,
@@ -100,6 +102,7 @@ class AsyncDeepAgent(AsyncAgent):
             enable_planning=self._enable_planning,
             enable_vfs=self._enable_vfs,
             subagent_section=subagent_section,
+            base_prompt=base_prompt,
         )
 
         super().__init__(
@@ -128,6 +131,7 @@ class AsyncDeepAgent(AsyncAgent):
                 state=self.deep_state,
                 model=model,
                 max_output_tokens=max_output_option(options),
+                system_prompt=summarizer_prompt,
                 summariser=summariser,
             )
             self._before_turn_hook: Callable[..., Any] | None = self._summarizer
@@ -222,12 +226,14 @@ def create_async_deep_agent(
     subagents: list[SubAgentSpec] | None = None,
     persona: Persona | str | None = None,
     system_prompt: str | Persona | None = None,
+    base_prompt: str | None = None,
     enable_planning: bool = True,
     enable_vfs: bool = True,
     enable_summarization: bool = True,
     summarize_at_tokens: int | Literal["auto"] = "auto",
     summarize_keep_last_n: int = 6,
     summarizer_model: str | AsyncDriver | None = None,
+    summarizer_prompt: str | None = None,
     initial_files: dict[str, str] | None = None,
     max_iterations: int = 50,
     max_tool_result_length: int | None = 10_000,
@@ -250,12 +256,14 @@ def create_async_deep_agent(
         subagents=subagents,
         persona=persona,
         system_prompt=system_prompt,
+        base_prompt=base_prompt,
         enable_planning=enable_planning,
         enable_vfs=enable_vfs,
         enable_summarization=enable_summarization,
         summarize_at_tokens=summarize_at_tokens,
         summarize_keep_last_n=summarize_keep_last_n,
         summarizer_model=summarizer_model,
+        summarizer_prompt=summarizer_prompt,
         initial_files=initial_files,
         max_iterations=max_iterations,
         max_tool_result_length=max_tool_result_length,

{prompture-1.13.12.dev2 → prompture-1.14.1.dev1}/prompture/agents/conversation.py

@@ -1597,11 +1597,13 @@ class Conversation(ToolContextMixin):
         cleaned = clean_json_text(text)
         try:
             json_obj = json.loads(cleaned)
-        except json.JSONDecodeError:
+        except json.JSONDecodeError as exc:
             if ai_cleanup:
                 from ..extraction.core import clean_json_text_with_ai
 
-                cleaned, cleanup_meta = clean_json_text_with_ai(self._driver, cleaned, self._model_name, merged)
+                cleaned, cleanup_meta = clean_json_text_with_ai(
+                    self._driver, cleaned, self._model_name, merged, json_schema=json_schema, error=str(exc)
+                )
                 json_obj = json.loads(cleaned)
                 # Track cleanup call tokens in conversation usage
                 if cleanup_meta:

{prompture-1.13.12.dev2 → prompture-1.14.1.dev1}/prompture/agents/deep/subagents.py

@@ -13,7 +13,7 @@ from typing import Any
 from ...drivers.base import Driver
 from ...infra.budget import BudgetPolicy
 from ...infra.callbacks import DriverCallbacks
-from ..deep_prompts import TASK_TOOL_DESC_TEMPLATE
+from ..deep_prompts import SUBAGENT_REPORT_NOTE, TASK_TOOL_DESC_TEMPLATE
 from ..deep_state import DeepAgentState, SubAgentCallRecord, SubAgentSpec
 from ..persona import Persona
 from ..tools_schema import ToolDefinition
@@ -31,10 +31,9 @@ def _truncate(text: str, limit: int = 500) -> str:
 
 
 def _resolve_subagent_prompt(prompt: str | Persona) -> str:
-    """Render a sub-agent system prompt from string or Persona."""
-    if isinstance(prompt, Persona):
-        return prompt.render()
-    return str(prompt)
+    """Render a sub-agent system prompt from string or Persona, plus the report contract."""
+    text = prompt.render() if isinstance(prompt, Persona) else str(prompt)
+    return f"{text.strip()}\n\n{SUBAGENT_REPORT_NOTE}" if text.strip() else SUBAGENT_REPORT_NOTE
 
 
 def make_task_tool(
@@ -170,7 +169,7 @@ def make_task_tool(
             "properties": {
                 "description": {
                     "type": "string",
-                    "description": "Self-contained instructions for the sub-agent.",
+                    "description": "Full brief: goal and why, what is known or ruled out, exact inputs, and what to return.",
                 },
                 "subagent_type": {
                     "type": "string",
@@ -290,7 +289,7 @@ def make_async_task_tool(
             "properties": {
                 "description": {
                     "type": "string",
-                    "description": "Self-contained instructions for the sub-agent.",
+                    "description": "Full brief: goal and why, what is known or ruled out, exact inputs, and what to return.",
                 },
                 "subagent_type": {
                     "type": "string",

{prompture-1.13.12.dev2 → prompture-1.14.1.dev1}/prompture/agents/deep/summarizer.py

@@ -25,7 +25,7 @@ from typing import TYPE_CHECKING, Any, Literal
 from ..._internal.json_encoder import PromptureJSONEncoder
 from ...drivers import get_driver_for_model
 from ...drivers.base import Driver
-from ..deep_prompts import SUMMARIZER_SYSTEM_PROMPT, SUMMARY_PRELUDE
+from ..deep_prompts import SUMMARIZER_SYSTEM_PROMPT, SUMMARY_PRELUDE, format_summarizer_input
 from ..deep_state import DeepAgentState, SummaryEvent
 
 if TYPE_CHECKING:
@@ -136,6 +136,8 @@ def _stringify_message(msg: dict[str, Any]) -> str:
     if role == "tool":
         tc_id = msg.get("tool_call_id", "?")
         return f"[tool_result id={tc_id}]\n{content}"
+    if role == "user" and content.startswith(SUMMARY_PRELUDE):
+        return f"[earlier summary]\n{content[len(SUMMARY_PRELUDE) :]}"
 
     return f"[{role}]\n{content}"
 
@@ -152,6 +154,8 @@ class SummarizationMiddleware(_Threshold):
         keep_last_n: Number of most-recent messages preserved verbatim.
         state: Shared :class:`DeepAgentState` for recording events.
         summariser: Driver used to perform the summarisation call.
+        system_prompt: Instructions for the summariser; defaults to
+            :data:`SUMMARIZER_SYSTEM_PROMPT`.
     """
 
     def __init__(
@@ -163,10 +167,12 @@ class SummarizationMiddleware(_Threshold):
         *,
         model: str = "",
         max_output_tokens: int | None = None,
+        system_prompt: str | None = None,
     ) -> None:
         self._init_threshold(threshold_tokens, model, max_output_tokens)
         self.keep_last_n = max(2, int(keep_last_n))
         self.state = state
+        self.system_prompt = system_prompt or SUMMARIZER_SYSTEM_PROMPT
         if isinstance(summariser, str):
             self._summariser: Driver = get_driver_for_model(summariser)  # type: ignore[assignment]
         else:
@@ -260,9 +266,9 @@ class SummarizationMiddleware(_Threshold):
 
     def _call_summariser(self, rendered_history: str) -> tuple[str, dict[str, Any]]:
         """Invoke the summariser driver and return (summary_text, usage)."""
-        prompt = f"Conversation fragment to summarise:\n\n=====\n{rendered_history}\n=====\n\nProduce the summary now."
+        prompt = format_summarizer_input(rendered_history, list(self.state.files), self.state.todos)
         messages = [
-            {"role": "system", "content": SUMMARIZER_SYSTEM_PROMPT},
+            {"role": "system", "content": self.system_prompt},
             {"role": "user", "content": prompt},
         ]
         try:
@@ -270,7 +276,7 @@ class SummarizationMiddleware(_Threshold):
         except AttributeError:
             # Some drivers expose only generate(prompt, options).
             resp = self._summariser.generate(
-                f"{SUMMARIZER_SYSTEM_PROMPT}\n\n{prompt}",
+                f"{self.system_prompt}\n\n{prompt}",
                 {},
             )
         text = (resp.get("text") if isinstance(resp, dict) else "") or ""
@@ -290,10 +296,12 @@ class AsyncSummarizationMiddleware(_Threshold):
         *,
         model: str = "",
         max_output_tokens: int | None = None,
+        system_prompt: str | None = None,
     ) -> None:
         self._init_threshold(threshold_tokens, model, max_output_tokens)
         self.keep_last_n = max(2, int(keep_last_n))
         self.state = state
+        self.system_prompt = system_prompt or SUMMARIZER_SYSTEM_PROMPT
         if isinstance(summariser, str):
             from ...drivers.async_registry import get_async_driver_for_model
 
@@ -346,16 +354,16 @@ class AsyncSummarizationMiddleware(_Threshold):
         )
 
     async def _call_summariser(self, rendered_history: str) -> tuple[str, dict[str, Any]]:
-        prompt = f"Conversation fragment to summarise:\n\n=====\n{rendered_history}\n=====\n\nProduce the summary now."
+        prompt = format_summarizer_input(rendered_history, list(self.state.files), self.state.todos)
         messages = [
-            {"role": "system", "content": SUMMARIZER_SYSTEM_PROMPT},
+            {"role": "system", "content": self.system_prompt},
             {"role": "user", "content": prompt},
         ]
         try:
             resp = await self._summariser.generate_messages(messages, {})
         except AttributeError:
             resp = await self._summariser.generate(
-                f"{SUMMARIZER_SYSTEM_PROMPT}\n\n{prompt}",
+                f"{self.system_prompt}\n\n{prompt}",
                 {},
             )
         text = (resp.get("text") if isinstance(resp, dict) else "") or ""

{prompture-1.13.12.dev2 → prompture-1.14.1.dev1}/prompture/agents/deep/vfs.py

@@ -23,6 +23,8 @@ from ..deep_state import DeepAgentState
 from ..tools_schema import ToolDefinition
 
 _DEFAULT_READ_LIMIT = 2000
+# read_file's "{line_no:6d}\t" prefix, as it appears when copied into old_string.
+_LINE_PREFIX = re.compile(r"(?m)^ *\d+\t")
 
 
 def _normalise_path(path: str) -> str:
@@ -109,7 +111,13 @@ def make_vfs_tools(state: DeepAgentState) -> list[ToolDefinition]:
         original = state.files[path]
         count = original.count(old_string)
         if count == 0:
-            return f"Error: old_string not found in {path}"
+            if _LINE_PREFIX.search(old_string):
+                return (
+                    f"Error: old_string not found in {path}. It looks like it includes "
+                    "read_file's line-number prefixes; remove the number and tab at the "
+                    "start of each line and retry."
+                )
+            return f"Error: old_string not found in {path}. Read the file again and copy the text exactly."
         if count > 1 and not replace_all:
             return (
                 f"Error: old_string appears {count} times in {path}. "
@@ -195,7 +203,7 @@ def make_vfs_tools(state: DeepAgentState) -> list[ToolDefinition]:
                     "file_path": {"type": "string", "description": "Path of the file to read."},
                     "offset": {
                         "type": "integer",
-                        "description": "Line number to start reading from (0-indexed). Default 0.",
+                        "description": "Lines to skip before reading; 0 starts at line 1. Default 0.",
                     },
                     "limit": {
                         "type": "integer",
@@ -226,8 +234,11 @@ def make_vfs_tools(state: DeepAgentState) -> list[ToolDefinition]:
                 "type": "object",
                 "properties": {
                     "file_path": {"type": "string", "description": "Path of the file."},
-                    "old_string": {"type": "string", "description": "Substring to replace."},
-                    "new_string": {"type": "string", "description": "Replacement substring."},
+                    "old_string": {
+                        "type": "string",
+                        "description": "Exact text to replace, without read_file line-number prefixes.",
+                    },
+                    "new_string": {"type": "string", "description": "Replacement text; empty deletes old_string."},
                     "replace_all": {
                         "type": "boolean",
                         "description": "When true, replace every occurrence. Default false.",
@@ -257,7 +268,7 @@ def make_vfs_tools(state: DeepAgentState) -> list[ToolDefinition]:
             parameters={
                 "type": "object",
                 "properties": {
-                    "pattern": {"type": "string", "description": "fnmatch glob pattern."},
+                    "pattern": {"type": "string", "description": "fnmatch pattern matched against the full path."},
                 },
                 "required": ["pattern"],
             },
@@ -269,7 +280,7 @@ def make_vfs_tools(state: DeepAgentState) -> list[ToolDefinition]:
             parameters={
                 "type": "object",
                 "properties": {
-                    "pattern": {"type": "string", "description": "Python regex."},
+                    "pattern": {"type": "string", "description": "Python regular expression."},
                     "glob": {
                         "type": "string",
                         "description": "fnmatch pattern to restrict files. Default '*'.",

{prompture-1.13.12.dev2 → prompture-1.14.1.dev1}/prompture/agents/deep_agent.py

@@ -70,12 +70,14 @@ class DeepAgent(Agent):
         subagents: list[SubAgentSpec] | None = None,
         persona: Persona | str | None = None,
         system_prompt: str | Persona | None = None,
+        base_prompt: str | None = None,
         enable_planning: bool = True,
         enable_vfs: bool = True,
         enable_summarization: bool = True,
         summarize_at_tokens: int | Literal["auto"] = "auto",
         summarize_keep_last_n: int = 6,
         summarizer_model: str | Driver | None = None,
+        summarizer_prompt: str | None = None,
         initial_files: dict[str, str] | None = None,
         max_iterations: int = 50,
         max_tool_result_length: int | None = 10_000,
@@ -135,6 +137,7 @@ class DeepAgent(Agent):
             enable_planning=self._enable_planning,
             enable_vfs=self._enable_vfs,
             subagent_section=subagent_section,
+            base_prompt=base_prompt,
         )
 
         # Initialise the underlying Agent.
@@ -166,6 +169,7 @@ class DeepAgent(Agent):
                 state=self.deep_state,
                 model=model,
                 max_output_tokens=max_output_option(options),
+                system_prompt=summarizer_prompt,
                 summariser=summariser_driver,
             )
             self._before_turn_hook: Callable[..., Any] | None = self._summarizer
@@ -296,12 +300,14 @@ def create_deep_agent(
     subagents: list[SubAgentSpec] | None = None,
     persona: Persona | str | None = None,
     system_prompt: str | Persona | None = None,
+    base_prompt: str | None = None,
     enable_planning: bool = True,
     enable_vfs: bool = True,
     enable_summarization: bool = True,
     summarize_at_tokens: int | Literal["auto"] = "auto",
     summarize_keep_last_n: int = 6,
     summarizer_model: str | Driver | None = None,
+    summarizer_prompt: str | None = None,
     initial_files: dict[str, str] | None = None,
     max_iterations: int = 50,
     max_tool_result_length: int | None = 10_000,
@@ -324,12 +330,14 @@ def create_deep_agent(
         subagents=subagents,
         persona=persona,
         system_prompt=system_prompt,
+        base_prompt=base_prompt,
         enable_planning=enable_planning,
         enable_vfs=enable_vfs,
         enable_summarization=enable_summarization,
         summarize_at_tokens=summarize_at_tokens,
         summarize_keep_last_n=summarize_keep_last_n,
         summarizer_model=summarizer_model,
+        summarizer_prompt=summarizer_prompt,
         initial_files=initial_files,
         max_iterations=max_iterations,
         max_tool_result_length=max_tool_result_length,