zrb 1.9.7__py3-none-any.whl → 1.9.9__py3-none-any.whl

zrb/builtin/llm/tool/code.py

@@ -3,40 +3,10 @@ import os
 
 from zrb.builtin.llm.tool.file import DEFAULT_EXCLUDED_PATTERNS, is_excluded
 from zrb.builtin.llm.tool.sub_agent import create_sub_agent_tool
+from zrb.config.config import CFG
 from zrb.config.llm_rate_limitter import llm_rate_limitter
 from zrb.context.any_context import AnyContext
 
-_EXTRACT_INFO_FROM_REPO_SYSTEM_PROMPT = """
-You are an extraction info agent.
-Your goal is to help to extract relevant information to help the main assistant.
-You write your output is in markdown format containing path and relevant information.
-Extract only information that relevant to main assistant's goal.
-
-Extracted Information format (Use this as reference, extract relevant information only):
-# <file-name>
-## imports
-- <imported-package>
-- ...
-## variables
-- <variable-type> <variable-name>: <the-purpose-of-the-variable>
-- ...
-## functions
-- <function-name>:
-  - parameters: <parameters>
-  - logic/description: <what-the-function-do-and-how-it-works>
-...
-# <other-file-name>
-...
-""".strip()
-
-
-_SUMMARIZE_INFO_SYSTEM_PROMPT = """
-You are an information summarization agent.
-Your goal is to summarize information to help the main assistant.
-The summarization result should contains all necessary details
-to help main assistant achieve the goal.
-"""
-
 _DEFAULT_EXTENSIONS = [
     "py",
     "go",
@@ -82,8 +52,8 @@ async def analyze_repo(
     goal: str,
     extensions: list[str] = _DEFAULT_EXTENSIONS,
     exclude_patterns: list[str] = DEFAULT_EXCLUDED_PATTERNS,
-    extraction_token_limit: int = 40000,
-    summarization_token_limit: int = 40000,
+    extraction_token_threshold: int | None = None,
+    summarization_token_threshold: int | None = None,
 ) -> str:
     """
     Performs a deep, goal-oriented analysis of a code repository or directory.
@@ -102,14 +72,20 @@ async def analyze_repo(
         goal (str): A clear and specific description of what you want to achieve. A good goal is critical for getting a useful result. For example: "Understand the database schema by analyzing all the .sql files" or "Create a summary of all the API endpoints defined in the 'api' directory".
         extensions (list[str], optional): A list of file extensions to include in the analysis. Defaults to a comprehensive list of common code and configuration files.
         exclude_patterns (list[str], optional): A list of glob patterns for files and directories to exclude from the analysis. Defaults to common patterns like '.git', 'node_modules', and '.venv'.
-        extraction_token_limit (int, optional): The maximum token limit for the extraction sub-agent.
-        summarization_token_limit (int, optional): The maximum token limit for the summarization sub-agent.
+        extraction_token_threshold (int, optional): The maximum token threshold for the extraction sub-agent.
+        summarization_token_threshold (int, optional): The maximum token threshold for the summarization sub-agent.
 
     Returns:
         str: A detailed, markdown-formatted analysis and summary of the repository, tailored to the specified goal.
     Raises:
         Exception: If an error occurs during the analysis.
     """
+    if extraction_token_threshold is None:
+        extraction_token_threshold = CFG.LLM_REPO_ANALYSIS_EXTRACTION_TOKEN_THRESHOLD
+    if summarization_token_threshold is None:
+        summarization_token_threshold = (
+            CFG.LLM_REPO_ANALYSIS_SUMMARIZATION_TOKEN_THRESHOLD
+        )
     abs_path = os.path.abspath(os.path.expanduser(path))
     file_metadatas = _get_file_metadatas(abs_path, extensions, exclude_patterns)
     ctx.print("Extraction")
@@ -117,7 +93,7 @@ async def analyze_repo(
         ctx,
         file_metadatas=file_metadatas,
         goal=goal,
-        token_limit=extraction_token_limit,
+        token_limit=extraction_token_threshold,
     )
     if len(extracted_infos) == 1:
         return extracted_infos[0]
@@ -129,7 +105,7 @@ async def analyze_repo(
             ctx,
             extracted_infos=summarized_infos,
             goal=goal,
-            token_limit=summarization_token_limit,
+            token_limit=summarization_token_threshold,
         )
     return summarized_infos[0]
 
@@ -167,7 +143,7 @@ async def _extract_info(
     extract = create_sub_agent_tool(
         tool_name="extract",
         tool_description="extract",
-        system_prompt=_EXTRACT_INFO_FROM_REPO_SYSTEM_PROMPT,
+        system_prompt=CFG.LLM_REPO_EXTRACTOR_SYSTEM_PROMPT,
     )
     extracted_infos = []
     content_buffer = []
@@ -218,7 +194,7 @@ async def _summarize_info(
     summarize = create_sub_agent_tool(
         tool_name="extract",
         tool_description="extract",
-        system_prompt=_SUMMARIZE_INFO_SYSTEM_PROMPT,
+        system_prompt=CFG.LLM_REPO_SUMMARIZER_SYSTEM_PROMPT,
     )
     summarized_infos = []
     content_buffer = ""

zrb/builtin/llm/tool/file.py

@@ -5,30 +5,12 @@ import re
 from typing import Any, Dict, List, Optional
 
 from zrb.builtin.llm.tool.sub_agent import create_sub_agent_tool
+from zrb.config.config import CFG
 from zrb.config.llm_rate_limitter import llm_rate_limitter
 from zrb.context.any_context import AnyContext
 from zrb.util.file import read_file, read_file_with_line_numbers, write_file
 
-_EXTRACT_INFO_FROM_FILE_SYSTEM_PROMPT = """
-You are an extraction info agent.
-Your goal is to help to extract relevant information to help the main assistant.
-You write your output is in markdown format containing path and relevant information.
-Extract only information that relevant to main assistant's goal.
-
-Extracted Information format (Use this as reference, extract relevant information only):
-# imports
-- <imported-package>
-- ...
-# variables
-- <variable-type> <variable-name>: <the-purpose-of-the-variable>
-- ...
-# functions
-- <function-name>:
-  - parameters: <parameters>
-  - logic/description: <what-the-function-do-and-how-it-works>
-...
-...
-""".strip()
+_EXTRACT_INFO_FROM_FILE_SYSTEM_PROMPT = CFG.LLM_ANALYZE_FILE_EXTRACTOR_SYSTEM_PROMPT
 
 
 DEFAULT_EXCLUDED_PATTERNS = [
@@ -457,7 +439,7 @@ def replace_in_file(
 
 
 async def analyze_file(
-    ctx: AnyContext, path: str, query: str, token_limit: int = 40000
+    ctx: AnyContext, path: str, query: str, token_limit: int | None = None
 ) -> str:
     """
     Performs a deep, goal-oriented analysis of a single file using a sub-agent.
@@ -480,6 +462,8 @@ async def analyze_file(
     Raises:
         FileNotFoundError: If the specified file does not exist.
     """
+    if token_limit is None:
+        token_limit = CFG.LLM_FILE_ANALYSIS_TOKEN_LIMIT
     abs_path = os.path.abspath(os.path.expanduser(path))
     if not os.path.exists(abs_path):
         raise FileNotFoundError(f"File not found: {path}")
@@ -487,7 +471,7 @@ async def analyze_file(
     _analyze_file = create_sub_agent_tool(
         tool_name="analyze_file",
         tool_description="analyze file with LLM capability",
-        system_prompt=_EXTRACT_INFO_FROM_FILE_SYSTEM_PROMPT,
+        system_prompt=CFG.LLM_ANALYZE_FILE_EXTRACTOR_SYSTEM_PROMPT,
         tools=[read_from_file, search_files],
     )
     payload = json.dumps(

zrb/config/config.py

@@ -19,6 +19,75 @@ Your Automation Powerhouse
 🐤 Follow us at: https://twitter.com/zarubastalchmst
 """
 
+_DEFAULT_LLM_ANALYZE_FILE_EXTRACTOR_SYSTEM_PROMPT = (
+    "You are an intelligent code and configuration analysis agent.\n"
+    "Your primary goal is to extract key information from the provided file(s) "
+    "that is directly relevant to the main assistant's objective.\n"
+    "\n"
+    "Analyze the file content and determine its type (e.g., Python script, "
+    "YAML configuration, Dockerfile, Markdown documentation).\n"
+    "Based on the file type, extract the most important information in a "
+    "structured markdown format.\n"
+    "\n"
+    "- For source code (e.g., .py, .js, .go): Extract key components like "
+    "classes, functions, important variables, and their purposes.\n"
+    "- For configuration files (e.g., .yaml, .toml, .json): Extract the main "
+    "configuration sections, keys, and their values.\n"
+    "- For infrastructure files (e.g., Dockerfile, .tf): Extract resources, "
+    "settings, and commands.\n"
+    "- For documentation (e.g., .md): Extract headings, summaries, code "
+    "blocks, and links.\n"
+    "\n"
+    "Focus on quality and relevance over quantity. The output should be a "
+    "concise yet comprehensive summary that directly helps the main "
+    "assistant achieve its goal."
+).strip()
+
+_DEFAULT_LLM_REPO_EXTRACTOR_SYSTEM_PROMPT = (
+    "You are an intelligent code and configuration analysis agent.\n"
+    "Your primary goal is to extract key information from the provided file(s) "
+    "that is directly relevant to the main assistant's objective.\n"
+    "\n"
+    "Analyze the file content and determine its type (e.g., Python script, "
+    "YAML configuration, Dockerfile, Markdown documentation).\n"
+    "Based on the file type, extract the most important information in a "
+    "structured markdown format.\n"
+    "\n"
+    "- For source code (e.g., .py, .js, .go): Extract key components like "
+    "classes, functions, important variables, and their purposes.\n"
+    "- For configuration files (e.g., .yaml, .toml, .json): Extract the main "
+    "configuration sections, keys, and their values.\n"
+    "- For infrastructure files (e.g., Dockerfile, .tf): Extract resources, "
+    "settings, and commands.\n"
+    "- For documentation (e.g., .md): Extract headings, summaries, code "
+    "blocks, and links.\n"
+    "\n"
+    "Focus on quality and relevance over quantity. The output should be a "
+    "concise yet comprehensive summary that directly helps the main "
+    "assistant achieve its goal."
+).strip()
+
+_DEFAULT_LLM_REPO_SUMMARIZER_SYSTEM_PROMPT = (
+    "You are an expert summarization and synthesis agent.\n"
+    "Your goal is to consolidate multiple pieces of extracted information into a "
+    "single, coherent summary that directly addresses the main assistant's "
+    "objective.\n"
+    "\n"
+    "Do not simply list the information you receive. Instead, perform the "
+    "following actions:\n"
+    "1.  **Synthesize**: Combine related pieces of information from different "
+    "sources into a unified narrative.\n"
+    "2.  **Consolidate**: Merge duplicate or overlapping information to create a "
+    "concise summary.\n"
+    "3.  **Identify Patterns**: Look for high-level patterns, architectural "
+    "structures, or recurring themes in the data.\n"
+    "4.  **Structure**: Organize the final output in a logical markdown format "
+    "that tells a clear story and directly answers the main assistant's goal.\n"
+    "\n"
+    "Focus on creating a holistic understanding of the subject matter based on "
+    "the provided context."
+).strip()
+
 
 class Config:
     @property
@@ -277,7 +346,7 @@ class Config:
 
     @property
     def LLM_HISTORY_SUMMARIZATION_TOKEN_THRESHOLD(self) -> int:
-        return int(os.getenv("ZRB_LLM_HISTORY_SUMMARIZATION_TOKEN_THRESHOLD", "3000"))
+        return int(os.getenv("ZRB_LLM_HISTORY_SUMMARIZATION_TOKEN_THRESHOLD", "20000"))
 
     @property
     def LLM_ENRICH_CONTEXT(self) -> bool:
@@ -285,7 +354,42 @@ class Config:
 
     @property
     def LLM_CONTEXT_ENRICHMENT_TOKEN_THRESHOLD(self) -> int:
-        return int(os.getenv("ZRB_LLM_CONTEXT_ENRICHMENT_TOKEN_THRESHOLD", "3000"))
+        return int(os.getenv("ZRB_LLM_CONTEXT_ENRICHMENT_TOKEN_THRESHOLD", "20000"))
+
+    @property
+    def LLM_REPO_ANALYSIS_EXTRACTION_TOKEN_THRESHOLD(self) -> int:
+        return int(os.getenv("ZRB_LLM_REPO_ANALYSIS_EXTRACTION_TOKEN_LIMIT", "35000"))
+
+    @property
+    def LLM_REPO_ANALYSIS_SUMMARIZATION_TOKEN_THRESHOLD(self) -> int:
+        return int(
+            os.getenv("ZRB_LLM_REPO_ANALYSIS_SUMMARIZATION_TOKEN_LIMIT", "35000")
+        )
+
+    @property
+    def LLM_FILE_ANALYSIS_TOKEN_LIMIT(self) -> int:
+        return int(os.getenv("ZRB_LLM_FILE_ANALYSIS_TOKEN_LIMIT", "35000"))
+
+    @property
+    def LLM_ANALYZE_FILE_EXTRACTOR_SYSTEM_PROMPT(self) -> str:
+        return os.getenv(
+            "ZRB_LLM_ANALYZE_FILE_EXTRACTOR_SYSTEM_PROMPT",
+            _DEFAULT_LLM_ANALYZE_FILE_EXTRACTOR_SYSTEM_PROMPT,
+        )
+
+    @property
+    def LLM_REPO_EXTRACTOR_SYSTEM_PROMPT(self) -> str:
+        return os.getenv(
+            "ZRB_LLM_REPO_EXTRACTOR_SYSTEM_PROMPT",
+            _DEFAULT_LLM_REPO_EXTRACTOR_SYSTEM_PROMPT,
+        )
+
+    @property
+    def LLM_REPO_SUMMARIZER_SYSTEM_PROMPT(self) -> str:
+        return os.getenv(
+            "ZRB_LLM_REPO_SUMMARIZER_SYSTEM_PROMPT",
+            _DEFAULT_LLM_REPO_SUMMARIZER_SYSTEM_PROMPT,
+        )
 
     @property
     def LLM_HISTORY_DIR(self) -> str:

zrb/config/llm_config.py

@@ -8,57 +8,79 @@ if TYPE_CHECKING:
     from pydantic_ai.settings import ModelSettings
 
 
-DEFAULT_PERSONA = (
+_DEFAULT_PERSONA = (
     "You are a helpful and efficient AI agent specializing in CLI " "interaction."
 )
 
-DEFAULT_INTERACTIVE_SYSTEM_PROMPT = (
+_DEFAULT_INTERACTIVE_SYSTEM_PROMPT = (
     "This is an interactive CLI session. Your standard response format is\n"
     "GitHub-flavored Markdown. You MUST follow this thinking process:\n\n"
-    "1.  **Analyze Request:** Use the `Scratchpad` and `Narrative Summary` to\n"
-    "    fully understand the user's request in the context of the\n"
-    "    conversation.\n\n"
-    "2.  **Plan & Verify Pre-conditions:** Create a step-by-step plan. Before\n"
+    "1.  **Analyze Request, Scope & Identify Gaps:** Use the `Scratchpad`\n"
+    "    and `Narrative Summary` to fully understand the user's request.\n"
+    "    - **Determine Scope:** Critically assess if the request is a\n"
+    "      one-time command or a standing order that should affect future\n"
+    "      interactions (e.g., 'From now on...'). Resolve contextual\n"
+    "      references like 'it' or 'that' to the immediate topic.\n"
+    "    - **Identify Gaps:** Assess if you have enough information to\n"
+    "      proceed. If not, identify the missing information as an\n"
+    "      'information gap'.\n\n"
+    "2.  **Fill Information Gaps:** Before planning, you MUST proactively use\n"
+    "    your tools to fill any identified information gaps. Be persistent.\n"
+    "    If one tool or approach fails, try another until you have the\n"
+    "    necessary information or determine it's impossible to obtain.\n\n"
+    "3.  **Plan & Verify Pre-conditions:** Create a step-by-step plan. Before\n"
     "    executing, use read-only tools to check the current state. For\n"
     "    example, if the plan is to create a file, check if it already\n"
     "    exists. If pre-conditions are not as expected, inform the user.\n\n"
-    "3.  **Assess Consent & Execute:**\n"
+    "4.  **Assess Consent & Execute:**\n"
+    "    - **You have standing consent to use any read-only tools** for\n"
+    "      information gathering, planning, and verification. You do not\n"
+    "      need to ask for permission for these actions.\n"
     "    - If the user's last instruction was an explicit command (e.g.,\n"
     '      "create file X", "delete Y"), you have consent. Proceed with the\n'
     "      action.\n"
     '    - If the request was general (e.g., "fix the bug") and your plan\n'
     "      involves a potentially altering action, you MUST explain the\n"
     "      action and ask for user approval before proceeding.\n\n"
-    "4.  **Verify Outcome:** After executing the action, use read-only tools to\n"
+    "5.  **Verify Outcome:** After executing the action, use read-only tools to\n"
     "    confirm it was successful. Report the outcome to the user.\n\n"
-    "For software engineering tasks, you MUST follow the guidelines in the\n"
-    "`DEFAULT_SPECIAL_INSTRUCTION_PROMPT`."
 ).strip()
 
-DEFAULT_SYSTEM_PROMPT = (
+_DEFAULT_SYSTEM_PROMPT = (
     "This is a one-shot CLI session. Your final answer MUST be in\n"
     "GitHub-flavored Markdown. You MUST follow this thinking process:\n\n"
-    "1.  **Analyze Request:** Use the `Scratchpad` and `Narrative Summary` to\n"
-    "    fully understand the user's request in the context of the\n"
-    "    conversation.\n\n"
-    "2.  **Plan & Verify Pre-conditions:** Create a step-by-step plan. Before\n"
+    "1.  **Analyze Request, Scope & Identify Gaps:** Use the `Scratchpad`\n"
+    "    and `Narrative Summary` to fully understand the user's request.\n"
+    "    - **Determine Scope:** Critically assess if the request is a\n"
+    "      one-time command or a standing order that should affect future\n"
+    "      interactions (e.g., 'From now on...'). Resolve contextual\n"
+    "      references like 'it' or 'that' to the immediate topic.\n"
+    "    - **Identify Gaps:** Assess if you have enough information to\n"
+    "      proceed. If not, identify the missing information as an\n"
+    "      'information gap'.\n\n"
+    "2.  **Fill Information Gaps:** Before planning, you MUST proactively use\n"
+    "    your tools to fill any identified information gaps. Be persistent.\n"
+    "    If one tool or approach fails, try another until you have the\n"
+    "    necessary information or determine it's impossible to obtain.\n\n"
+    "3.  **Plan & Verify Pre-conditions:** Create a step-by-step plan. Before\n"
     "    executing, use read-only tools to check the current state. For\n"
     "    example, if the plan is to create a file, check if it already\n"
     "    exists. If pre-conditions are not as expected, state that and stop.\n\n"
-    "3.  **Assess Consent & Execute:**\n"
+    "4.  **Assess Consent & Execute:**\n"
+    "    - **You have standing consent to use any read-only tools** for\n"
+    "      information gathering, planning, and verification. You do not\n"
+    "      need to ask for permission for these actions.\n"
     "    - If the user's last instruction was an explicit command (e.g.,\n"
     '      "create file X", "delete Y"), you have consent. Proceed with the\n'
     "      action.\n"
     '    - If the request was general (e.g., "fix the bug") and your plan\n'
     "      involves a potentially altering action, you MUST explain the\n"
     "      action and ask for user approval before proceeding.\n\n"
-    "4.  **Verify Outcome:** After executing the action, use read-only tools to\n"
+    "5.  **Verify Outcome:** After executing the action, use read-only tools to\n"
     "    confirm it was successful. Report the outcome to the user.\n\n"
-    "For software engineering tasks, you MUST follow the guidelines in the\n"
-    "`DEFAULT_SPECIAL_INSTRUCTION_PROMPT`."
 ).strip()
 
-DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
+_DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
     "## Software Engineering Tasks\n"
     "When requested to perform tasks like fixing bugs, adding features,\n"
     "refactoring, or explaining code, follow this sequence:\n"
@@ -77,6 +99,10 @@ DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
     "5. **Verify (Standards):** After making code changes, execute the\n"
     "project-specific build, linting and type-checking commands. This\n"
     "ensures code quality and adherence to standards.\n\n"
+    "## Shell Command Guidelines\n"
+    "NEVER use backticks (`` ` ``) for command substitution; use `$(...)` "
+    "instead. Always enclose literal strings and paths in single quotes (`'`) "
+    "to prevent unintended interpretation of special characters.\n\n"
     "## New Applications\n"
     "When asked to create a new application, follow this workflow:\n"
     "1. **Understand Requirements:** Analyze the user's request to identify\n"
@@ -111,7 +137,7 @@ DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
 ).strip()
 
 
-DEFAULT_SUMMARIZATION_PROMPT = (
+_DEFAULT_SUMMARIZATION_PROMPT = (
     "You are a Conversation Historian. Your task is to distill the\n"
     "conversation history into a dense, structured snapshot for the main\n"
     "assistant. This snapshot is CRITICAL, as it will become the agent's\n"
@@ -143,7 +169,8 @@ DEFAULT_SUMMARIZATION_PROMPT = (
     "2.  `## Scratchpad` (The new, non-truncated recent history)"
 ).strip()
 
-DEFAULT_CONTEXT_ENRICHMENT_PROMPT = (
+
+_DEFAULT_CONTEXT_ENRICHMENT_PROMPT = (
     "You are a Memory Curator. Your sole purpose is to process a\n"
     "conversation and produce a concise, up-to-date Markdown block of\n"
     "long-term context for the main assistant.\n\n"
@@ -157,22 +184,31 @@ DEFAULT_CONTEXT_ENRICHMENT_PROMPT = (
     "3.  **Re-write:** Create the new 'Long-Term Context' by applying these\n"
     "    changes.\n\n"
     "**CRITICAL CURATION RULES:**\n"
+    "- **Do Not Assume Permanence:** A one-time request (e.g., 'Write it in\n"
+    "  JSON') is NOT a permanent preference. Only save preferences that are\n"
+    "  explicitly stated as long-term (e.g., 'From now on, always...').\n"
     "- **The context MUST NOT grow indefinitely.** Your primary goal is to\n"
     "  keep it concise and relevant to the *current* state of the\n"
     "  conversation.\n"
-    "- **ADD** new, stable facts (e.g., long-term user preferences).\n"
-    "- **UPDATE** existing facts if the user provides new information.\n"
-    "- **REMOVE** goals, tasks, or files that are completed or no longer\n"
-    "  relevant. Be aggressive in pruning irrelevant information.\n"
+    "- **ADD** new, explicitly stable facts (e.g., long-term user\n"
+    "  preferences).\n"
+    "- **UPDATE** existing facts if the user provides new information or if\n"
+    "  new information overrides the previous one.\n"
+    "- **Your primary goal is to create a concise, relevant context.** "
+    "Aggressively prune outdated or irrelevant information, but retain any "
+    "detail, fact, or nuance that is critical for understanding the user's "
+    "current and future goals.\n"
     "- **CONDENSE** older entries that are still relevant but not the\n"
     "  immediate focus. For example, a completed high-level goal might be\n"
-    "  condensed into a single 'Past Accomplishments' line item.\n\n"
+    "  condensed into a single 'Past Accomplishments' line item.\n"
+    "\n"
     "**A Note on Dynamic Information:**\n"
-    "Be mindful that some information is temporary. Details like the current\n"
-    "working directory, project context, or file contents can change\n"
-    "frequently. The main assistant MUST NOT assume this information is\n"
-    "current and should always use its tools to verify the latest state when\n"
-    "needed."
+    "Be mindful that some information is temporary and highly dynamic (e.g.,\n"
+    "current weather, location, current working directory, project context,\n"
+    "or file contents). You MUST add a note to this kind of information,\n"
+    "for example: `(short-term, must be re-verified)`.\n"
+    "The main assistant MUST NOT assume this information is current and\n"
+    "should always use its tools to verify the latest state when needed."
 ).strip()
 
 
@@ -265,7 +301,7 @@ class LLMConfig:
             return self._default_system_prompt
         if CFG.LLM_SYSTEM_PROMPT is not None:
             return CFG.LLM_SYSTEM_PROMPT
-        return DEFAULT_SYSTEM_PROMPT
+        return _DEFAULT_SYSTEM_PROMPT
 
     @property
     def default_interactive_system_prompt(self) -> str:
@@ -273,7 +309,7 @@ class LLMConfig:
             return self._default_interactive_system_prompt
         if CFG.LLM_INTERACTIVE_SYSTEM_PROMPT is not None:
             return CFG.LLM_INTERACTIVE_SYSTEM_PROMPT
-        return DEFAULT_INTERACTIVE_SYSTEM_PROMPT
+        return _DEFAULT_INTERACTIVE_SYSTEM_PROMPT
 
     @property
     def default_persona(self) -> str:
@@ -281,7 +317,7 @@ class LLMConfig:
             return self._default_persona
         if CFG.LLM_PERSONA is not None:
             return CFG.LLM_PERSONA
-        return DEFAULT_PERSONA
+        return _DEFAULT_PERSONA
 
     @property
     def default_special_instruction_prompt(self) -> str:
@@ -289,7 +325,7 @@ class LLMConfig:
             return self._default_special_instruction_prompt
         if CFG.LLM_SPECIAL_INSTRUCTION_PROMPT is not None:
             return CFG.LLM_SPECIAL_INSTRUCTION_PROMPT
-        return DEFAULT_SPECIAL_INSTRUCTION_PROMPT
+        return _DEFAULT_SPECIAL_INSTRUCTION_PROMPT
 
     @property
     def default_summarization_prompt(self) -> str:
@@ -297,7 +333,7 @@ class LLMConfig:
             return self._default_summarization_prompt
         if CFG.LLM_SUMMARIZATION_PROMPT is not None:
             return CFG.LLM_SUMMARIZATION_PROMPT
-        return DEFAULT_SUMMARIZATION_PROMPT
+        return _DEFAULT_SUMMARIZATION_PROMPT
 
     @property
     def default_context_enrichment_prompt(self) -> str:
@@ -305,7 +341,7 @@ class LLMConfig:
             return self._default_context_enrichment_prompt
         if CFG.LLM_CONTEXT_ENRICHMENT_PROMPT is not None:
             return CFG.LLM_CONTEXT_ENRICHMENT_PROMPT
-        return DEFAULT_CONTEXT_ENRICHMENT_PROMPT
+        return _DEFAULT_CONTEXT_ENRICHMENT_PROMPT
 
     @property
     def default_model(self) -> "Model | str | None":

zrb/task/llm_task.py

@@ -262,7 +262,7 @@ class LLMTask(BaseTask):
             should_enrich_context_attr=self._should_enrich_context,
             render_enrich_context=self._render_enrich_context,
             context_enrichment_token_threshold_attr=self._context_enrichment_token_threshold,
-            render_context_enrichment_token_threshold=self._render_context_enrichment_token_threshold,
+            render_context_enrichment_token_threshold=self._render_context_enrichment_token_threshold,  # noqa
             model=model,
             model_settings=model_settings,
             context_enrichment_prompt=context_enrichment_prompt,
@@ -274,7 +274,7 @@ class LLMTask(BaseTask):
             conversation_summary=conversation_summary,
             should_summarize_history_attr=self._should_summarize_history,
             render_summarize_history=self._render_summarize_history,
-            history_summarization_token_threshold_attr=self._history_summarization_token_threshold,
+            history_summarization_token_threshold_attr=self._history_summarization_token_threshold,  # noqa
             render_history_summarization_token_threshold=(
                 self._render_history_summarization_token_threshold
             ),
@@ -364,134 +364,3 @@ class LLMTask(BaseTask):
         except Exception as e:
             ctx.log_error(f"Error during agent execution or history saving: {str(e)}")
             raise  # Re-raise the exception after logging
-
-
-def llm_task(
-    name: str,
-    color: int | None = None,
-    icon: str | None = None,
-    description: str | None = None,
-    cli_only: bool = False,
-    input: list[AnyInput | None] | AnyInput | None = None,
-    env: list[AnyEnv | None] | AnyEnv | None = None,
-    model: "Callable[[AnySharedContext], Model | str | fstring] | Model | None" = None,
-    render_model: bool = True,
-    model_base_url: StrAttr | None = None,
-    render_model_base_url: bool = True,
-    model_api_key: StrAttr | None = None,
-    render_model_api_key: bool = True,
-    model_settings: "ModelSettings | Callable[[AnySharedContext], ModelSettings] | None" = None,
-    agent: "Agent | Callable[[AnySharedContext], Agent] | None" = None,
-    persona: StrAttr | None = None,
-    system_prompt: StrAttr | None = None,
-    special_instruction_prompt: StrAttr | None = None,
-    message: StrAttr | None = None,
-    render_message: bool = True,
-    enrich_context: BoolAttr | None = None,
-    render_enrich_context: bool = True,
-    context_enrichment_prompt: StrAttr | None = None,
-    render_context_enrichment_prompt: bool = True,
-    context_enrichment_token_threshold: IntAttr | None = None,
-    render_context_enrichment_token_threshold: bool = True,
-    tools: (
-        list["ToolOrCallable"] | Callable[[AnySharedContext], list["ToolOrCallable"]]
-    ) = [],
-    mcp_servers: (
-        list["MCPServer"] | Callable[[AnySharedContext], list["MCPServer"]]
-    ) = [],
-    conversation_history: (
-        ConversationHistoryData
-        | Callable[[AnySharedContext], ConversationHistoryData | dict | list]
-        | dict
-        | list
-    ) = ConversationHistoryData(),
-    conversation_history_reader: (
-        Callable[[AnySharedContext], ConversationHistoryData | dict | list | None]
-        | None
-    ) = None,
-    conversation_history_writer: (
-        Callable[[AnySharedContext, ConversationHistoryData], None] | None
-    ) = None,
-    conversation_history_file: StrAttr | None = None,
-    render_history_file: bool = True,
-    summarize_history: BoolAttr | None = None,
-    render_summarize_history: bool = True,
-    summarization_prompt: StrAttr | None = None,
-    history_summarization_token_threshold: IntAttr | None = None,
-    render_history_summarization_token_threshold: bool = True,
-    rate_limitter: LLMRateLimiter | None = None,
-    execute_condition: bool | str | Callable[[AnySharedContext], bool] = True,
-    retries: int = 2,
-    retry_period: float = 0,
-    readiness_check: list[AnyTask] | AnyTask | None = None,
-    readiness_check_delay: float = 0.5,
-    readiness_check_period: float = 5,
-    readiness_failure_threshold: int = 1,
-    readiness_timeout: int = 60,
-    monitor_readiness: bool = False,
-    max_call_iteration: int = 20,
-    upstream: list[AnyTask] | AnyTask | None = None,
-    fallback: list[AnyTask] | AnyTask | None = None,
-    successor: list[AnyTask] | AnyTask | None = None,
-    conversation_context: (
-        dict[str, Any] | Callable[[AnySharedContext], dict[str, Any]] | None
-    ) = None,
-) -> LLMTask:
-    """
-    Create a new LLM task.
-    """
-    return LLMTask(
-        name=name,
-        color=color,
-        icon=icon,
-        description=description,
-        cli_only=cli_only,
-        input=input,
-        env=env,
-        model=model,
-        render_model=render_model,
-        model_base_url=model_base_url,
-        render_model_base_url=render_model_base_url,
-        model_api_key=model_api_key,
-        render_model_api_key=render_model_api_key,
-        model_settings=model_settings,
-        agent=agent,
-        persona=persona,
-        system_prompt=system_prompt,
-        special_instruction_prompt=special_instruction_prompt,
-        message=message,
-        render_message=render_message,
-        enrich_context=enrich_context,
-        render_enrich_context=render_enrich_context,
-        context_enrichment_prompt=context_enrichment_prompt,
-        render_context_enrichment_prompt=render_context_enrichment_prompt,
-        context_enrichment_token_threshold=context_enrichment_token_threshold,
-        render_context_enrichment_token_threshold=render_context_enrichment_token_threshold,
-        tools=tools,
-        mcp_servers=mcp_servers,
-        conversation_history=conversation_history,
-        conversation_history_reader=conversation_history_reader,
-        conversation_history_writer=conversation_history_writer,
-        conversation_history_file=conversation_history_file,
-        render_history_file=render_history_file,
-        summarize_history=summarize_history,
-        render_summarize_history=render_summarize_history,
-        summarization_prompt=summarization_prompt,
-        history_summarization_token_threshold=history_summarization_token_threshold,
-        render_history_summarization_token_threshold=render_history_summarization_token_threshold,
-        rate_limitter=rate_limitter,
-        execute_condition=execute_condition,
-        retries=retries,
-        retry_period=retry_period,
-        readiness_check=readiness_check,
-        readiness_check_delay=readiness_check_delay,
-        readiness_check_period=readiness_check_period,
-        readiness_failure_threshold=readiness_failure_threshold,
-        readiness_timeout=readiness_timeout,
-        monitor_readiness=monitor_readiness,
-        max_call_iteration=max_call_iteration,
-        upstream=upstream,
-        fallback=fallback,
-        successor=successor,
-        conversation_context=conversation_context,
-    )

{zrb-1.9.7.dist-info → zrb-1.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.9.7
+Version: 1.9.9
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.9.7.dist-info → zrb-1.9.9.dist-info}/RECORD

@@ -17,8 +17,8 @@ zrb/builtin/llm/previous-session.js,sha256=xMKZvJoAbrwiyHS0OoPrWuaKxWYLoyR5sgueP
 zrb/builtin/llm/tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/llm/tool/api.py,sha256=OhmfLc2TwWKQYIMweGelqb5s4JF4nB-YynbSO4yb_Jk,2342
 zrb/builtin/llm/tool/cli.py,sha256=QqIil29dVOjbTxwb9Gib4KhlaJcOcto-OxEX5hHmA1s,1377
-zrb/builtin/llm/tool/code.py,sha256=EROMSmeVtVSqLVF6DZLAo97oj6rVOpGfnG7VNagWzfE,8799
-zrb/builtin/llm/tool/file.py,sha256=2_S5KCgB-9mhwc_w2YKsQkH_zAW42GTrM6qvYoV_2_o,22737
+zrb/builtin/llm/tool/code.py,sha256=GRP_IZAkeL6RIlUm407BQRF992ES57pdzPaQdC5UsJU,8218
+zrb/builtin/llm/tool/file.py,sha256=qoQh5C0RPlQcIoLJp_nT16-w3FAekj7YtIdtsjigARg,22290
 zrb/builtin/llm/tool/rag.py,sha256=wB74JV7bxs0ec77b_09Z2lPjoR1WzPUvZbuXOdb9Q9g,9675
 zrb/builtin/llm/tool/sub_agent.py,sha256=7Awa9dpXqtJAZhxyXaKeZv5oIE2N_OqXhAbNmsOG49Y,4951
 zrb/builtin/llm/tool/web.py,sha256=gQlUsmYCJOFJtNjwpjK-xk13LMvrMSpSaFHXUTnIayQ,7090
@@ -217,8 +217,8 @@ zrb/callback/callback.py,sha256=PFhCqzfxdk6IAthmXcZ13DokT62xtBzJr_ciLw6I8Zg,4030
 zrb/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/cmd/cmd_result.py,sha256=L8bQJzWCpcYexIxHBNsXj2pT3BtLmWex0iJSMkvimOA,597
 zrb/cmd/cmd_val.py,sha256=7Doowyg6BK3ISSGBLt-PmlhzaEkBjWWm51cED6fAUOQ,1014
-zrb/config/config.py,sha256=PbtmVWIdCTCFdeAIF5Y-J7wa99ZhLWIe_GMYqpZzhXk,10576
-zrb/config/llm_config.py,sha256=c9ySC40hToXP91FZ2wylXVnvRDLkwhBr1Skqw8RmvHU,19006
+zrb/config/config.py,sha256=UpVm_IFD_bSfGS-QJoRo86xV63eGIuIwWICMaUZgR00,15268
+zrb/config/llm_config.py,sha256=-eQCD6A3rCpIrR6XtcEA-aeTX73FcyFTacXa_T0A-4o,21524
 zrb/config/llm_rate_limitter.py,sha256=0U0qm4qgCWqBjohPdwANNUzLR3joJCFYr6oW6Xpccfo,4436
 zrb/config/web_auth_config.py,sha256=_PXatQTYh2mX9H3HSYSQKp13zm1RlLyVIoeIr6KYMQ8,6279
 zrb/content_transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -348,7 +348,7 @@ zrb/task/llm/print_node.py,sha256=zocTKi9gZDxl2I6KNu095TmMc13Yip6SNuWYnswS680,40
 zrb/task/llm/prompt.py,sha256=qhR8qS8RgaQ23D3amaHSHnBNv_NOnFB_1uxaQNc8KFw,3417
 zrb/task/llm/tool_wrapper.py,sha256=8_bL8m_WpRf-pVKSrvQIVqT-m2sUA87a1RBQG13lhp4,6457
 zrb/task/llm/typing.py,sha256=c8VAuPBw_4A3DxfYdydkgedaP-LU61W9_wj3m3CAX1E,58
-zrb/task/llm_task.py,sha256=ELp71FsJ9SOGiMcgrAXHm00FB4OxchKjRiW-LtJ9t7c,21063
+zrb/task/llm_task.py,sha256=Vq2kPnE40xJZtHYHjeCBv-nNFKzSCkyMJaVUNXmEmuc,15616
 zrb/task/make_task.py,sha256=PD3b_aYazthS8LHeJsLAhwKDEgdurQZpymJDKeN60u0,2265
 zrb/task/rsync_task.py,sha256=GSL9144bmp6F0EckT6m-2a1xG25AzrrWYzH4k3SVUKM,6370
 zrb/task/scaffolder.py,sha256=rME18w1HJUHXgi9eTYXx_T2G4JdqDYzBoNOkdOOo5-o,6806
@@ -391,7 +391,7 @@ zrb/util/todo.py,sha256=r9_KYF2-hLKMNjsp6AFK9zivykMrywd-kJ4bCwfdafI,19323
 zrb/util/todo_model.py,sha256=0SJ8aLYfJAscDOk5JsH7pXP3h1rAG91VMCS20-c2Y6A,1576
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.9.7.dist-info/METADATA,sha256=dbMBlJF94NvRI5dnwBcMuZXruw7smDWSmwPdEmMkfjM,9777
-zrb-1.9.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.9.7.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.9.7.dist-info/RECORD,,
+zrb-1.9.9.dist-info/METADATA,sha256=Zcc7Rl-rD3Viu68pG9hu2gNQtCbjAaRf41JodYCXm2A,9777
+zrb-1.9.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.9.9.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.9.9.dist-info/RECORD,,