zrb 1.11.0__py3-none-any.whl → 1.13.0__py3-none-any.whl

zrb/task/llm_task.py

@@ -2,7 +2,7 @@ import json
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Any
 
-from zrb.attr.type import BoolAttr, IntAttr, StrAttr, fstring
+from zrb.attr.type import BoolAttr, IntAttr, StrAttr, StrListAttr, fstring
 from zrb.config.llm_rate_limitter import LLMRateLimiter
 from zrb.context.any_context import AnyContext
 from zrb.context.any_shared_context import AnySharedContext
@@ -16,14 +16,12 @@ from zrb.task.llm.config import (
     get_model_settings,
 )
 from zrb.task.llm.conversation_history import (
-    ListOfDict,
     read_conversation_history,
     write_conversation_history,
 )
 from zrb.task.llm.conversation_history_model import ConversationHistory
 from zrb.task.llm.history_summarization import maybe_summarize_history
 from zrb.task.llm.prompt import (
-    get_context_enrichment_prompt,
     get_summarization_system_prompt,
     get_system_and_user_prompt,
     get_user_message,
@@ -33,9 +31,9 @@ from zrb.xcom.xcom import Xcom
 
 if TYPE_CHECKING:
     from pydantic_ai import Agent, Tool
-    from pydantic_ai.mcp import MCPServer
     from pydantic_ai.models import Model
     from pydantic_ai.settings import ModelSettings
+    from pydantic_ai.toolsets import AbstractToolset
 
     ToolOrCallable = Tool | Callable
 else:
@@ -65,22 +63,21 @@ class LLMTask(BaseTask):
         ) = None,
         agent: "Agent | Callable[[AnySharedContext], Agent] | None" = None,
         persona: StrAttr | None = None,
+        render_persona: bool = False,
         system_prompt: StrAttr | None = None,
+        render_system_prompt: bool = False,
         special_instruction_prompt: StrAttr | None = None,
+        render_special_instruction_prompt: bool = False,
+        modes: StrListAttr | None = None,
+        render_modes: bool = True,
         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"]]
+        toolsets: (
+            list["AbstractToolset[Agent]"] | Callable[[AnySharedContext], list["Tool"]]
         ) = [],
         conversation_history: (
             ConversationHistory
@@ -100,6 +97,7 @@ class LLMTask(BaseTask):
         summarize_history: BoolAttr | None = None,
         render_summarize_history: bool = True,
         summarization_prompt: StrAttr | None = None,
+        render_summarization_prompt: bool = False,
         history_summarization_token_threshold: IntAttr | None = None,
         render_history_summarization_token_threshold: bool = True,
         rate_limitter: LLMRateLimiter | None = None,
@@ -150,24 +148,22 @@ class LLMTask(BaseTask):
         self._model_settings = model_settings
         self._agent = agent
         self._persona = persona
+        self._render_persona = render_persona
         self._system_prompt = system_prompt
+        self._render_system_prompt = render_system_prompt
         self._special_instruction_prompt = special_instruction_prompt
+        self._render_special_instruction_prompt = render_special_instruction_prompt
+        self._modes = modes
+        self._render_modes = render_modes
         self._message = message
         self._render_message = render_message
         self._summarization_prompt = summarization_prompt
-        self._should_enrich_context = enrich_context
-        self._render_enrich_context = render_enrich_context
-        self._context_enrichment_prompt = context_enrichment_prompt
-        self._render_context_enrichment_prompt = render_context_enrichment_prompt
-        self._context_enrichment_token_threshold = context_enrichment_token_threshold
-        self._render_context_enrichment_token_threshold = (
-            render_context_enrichment_token_threshold
-        )
+        self._render_summarization_prompt = render_summarization_prompt
         self._tools = tools
         self._rate_limitter = rate_limitter
         self._additional_tools: list["ToolOrCallable"] = []
-        self._mcp_servers = mcp_servers
-        self._additional_mcp_servers: list["MCPServer"] = []
+        self._toolsets = toolsets
+        self._additional_toolsets: list["AbstractToolset[Agent]"] = []
         self._conversation_history = conversation_history
         self._conversation_history_reader = conversation_history_reader
         self._conversation_history_writer = conversation_history_writer
@@ -191,18 +187,12 @@ class LLMTask(BaseTask):
         for single_tool in tool:
             self._additional_tools.append(single_tool)
 
-    def add_mcp_server(self, *mcp_server: "MCPServer"):
-        self.append_mcp_server(*mcp_server)
-
-    def append_mcp_server(self, *mcp_server: "MCPServer"):
-        for single_mcp_server in mcp_server:
-            self._additional_mcp_servers.append(single_mcp_server)
-
-    def set_should_enrich_context(self, enrich_context: bool):
-        self._should_enrich_context = enrich_context
+    def add_toolset(self, *toolset: "AbstractToolset[Agent]"):
+        self.append_toolset(*toolset)
 
-    def set_context_enrichment_token_threshold(self, enrichment_token_threshold: int):
-        self._context_enrichment_token_threshold = enrichment_token_threshold
+    def append_toolset(self, *toolset: "AbstractToolset[Agent]"):
+        for single_toolset in toolset:
+            self._additional_toolsets.append(single_toolset)
 
     def set_should_summarize_history(self, summarize_history: bool):
         self._should_summarize_history = summarize_history
@@ -227,6 +217,7 @@ class LLMTask(BaseTask):
         summarization_prompt = get_summarization_system_prompt(
             ctx=ctx,
             summarization_prompt_attr=self._summarization_prompt,
+            render_summarization_prompt=self._render_summarization_prompt,
         )
         user_message = get_user_message(ctx, self._message, self._render_message)
         # 1. Prepare initial state (read history from previous session)
@@ -243,8 +234,13 @@ class LLMTask(BaseTask):
             ctx=ctx,
             user_message=user_message,
             persona_attr=self._persona,
+            render_persona=self._render_persona,
             system_prompt_attr=self._system_prompt,
+            render_system_prompt=self._render_system_prompt,
             special_instruction_prompt_attr=self._special_instruction_prompt,
+            render_special_instruction_prompt=self._render_special_instruction_prompt,
+            modes_attr=self._modes,
+            render_modes=self._render_modes,
             conversation_history=conversation_history,
         )
         # 3. Get the agent instance
@@ -256,8 +252,8 @@ class LLMTask(BaseTask):
             model_settings=model_settings,
             tools_attr=self._tools,
             additional_tools=self._additional_tools,
-            mcp_servers_attr=self._mcp_servers,
-            additional_mcp_servers=self._additional_mcp_servers,
+            toolsets_attr=self._toolsets,
+            additional_toolsets=self._additional_toolsets,
         )
         # 4. Run the agent iteration and save the results/history
         result = await self._execute_agent(

zrb/util/callable.py

@@ -0,0 +1,23 @@
+from types import BuiltinMethodType, MethodType
+
+
+def get_callable_name(obj):
+    import functools
+    import inspect
+
+    # 1. Unwrap decorated functions
+    obj = inspect.unwrap(obj, stop=lambda f: not hasattr(f, "__wrapped__"))
+    # 2. functools.partial – delegate to the wrapped function
+    if isinstance(obj, functools.partial):
+        return get_callable_name(obj.func)
+    # 3. Plain functions, built‑ins, methods
+    if hasattr(obj, "__name__"):
+        return obj.__name__
+    # 4. Bound or unbound methods of a class
+    if isinstance(obj, (MethodType, BuiltinMethodType)):
+        return obj.__func__.__name__
+    # 5. Instances of classes defining __call__
+    if callable(obj):
+        return type(obj).__name__
+    # 6. Fallback
+    return repr(obj)

zrb/util/llm/prompt.py

@@ -1,7 +1,7 @@
 import re
 
 
-def _demote_markdown_headers(md: str) -> str:
+def _adjust_markdown_headers(md: str, level_change: int) -> str:
     lines = md.split("\n")
     new_lines = []
     fence_stack = []
@@ -11,7 +11,6 @@ def _demote_markdown_headers(md: str) -> str:
 
         if fence_match:
             current_fence = fence_match.group(1)
-            # If stack is not empty and we found a closing fence
             if (
                 fence_stack
                 and fence_stack[-1][0] == current_fence[0]
@@ -21,18 +20,28 @@ def _demote_markdown_headers(md: str) -> str:
             else:
                 fence_stack.append(current_fence)
             new_lines.append(line)
+        elif fence_stack:
+            new_lines.append(line)
         else:
-            if fence_stack:  # If we are inside a code block
-                new_lines.append(line)
+            match = re.match(r"^(#{1,6})(\s)", line)
+            if match:
+                current_level = len(match.group(1))
+                new_level = max(1, current_level + level_change)
+                new_header = "#" * new_level + line[current_level:]
+                new_lines.append(new_header)
             else:
-                match = re.match(r"^(#{1,6})(\s)", line)
-                if match:
-                    new_lines.append("#" + line)
-                else:
-                    new_lines.append(line)
+                new_lines.append(line)
     return "\n".join(new_lines)
 
 
+def demote_markdown_headers(md: str) -> str:
+    return _adjust_markdown_headers(md, level_change=1)
+
+
+def promote_markdown_headers(md: str) -> str:
+    return _adjust_markdown_headers(md, level_change=-1)
+
+
 def make_prompt_section(header: str, content: str, as_code: bool = False) -> str:
     if content.strip() == "":
         return ""
@@ -51,4 +60,4 @@ def make_prompt_section(header: str, content: str, as_code: bool = False) -> str
             fence_len = longest_backtick_sequence + 1
         fence = "`" * fence_len
         return f"# {header}\n{fence}\n{content.strip()}\n{fence}\n"
-    return f"# {header}\n{_demote_markdown_headers(content.strip())}\n"
+    return f"# {header}\n{demote_markdown_headers(content.strip())}\n"

{zrb-1.11.0.dist-info → zrb-1.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.11.0
+Version: 1.13.0
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -19,7 +19,7 @@ Provides-Extra: rag
 Requires-Dist: beautifulsoup4 (>=4.13.3,<5.0.0)
 Requires-Dist: black (>=25.1.0,<25.2.0)
 Requires-Dist: chromadb (>=0.6.3,<0.7.0) ; extra == "rag" or extra == "all"
-Requires-Dist: fastapi[standard] (>=0.115.14,<0.116.0)
+Requires-Dist: fastapi[standard] (>=0.116.1,<0.117.0)
 Requires-Dist: isort (>=6.0.1,<6.1.0)
 Requires-Dist: libcst (>=1.7.0,<2.0.0)
 Requires-Dist: openai (>=1.86.0,<2.0.0) ; extra == "rag" or extra == "all"
@@ -27,7 +27,7 @@ Requires-Dist: pdfplumber (>=0.11.6,<0.12.0) ; extra == "rag" or extra == "all"
 Requires-Dist: playwright (>=1.53.0,<2.0.0) ; extra == "playwright" or extra == "all"
 Requires-Dist: prompt-toolkit (>=3.0.51,<4.0.0)
 Requires-Dist: psutil (>=7.0.0,<8.0.0)
-Requires-Dist: pydantic-ai (>=0.4.4,<0.5.0)
+Requires-Dist: pydantic-ai (>=0.4.5,<0.5.0)
 Requires-Dist: pyjwt (>=2.10.1,<3.0.0)
 Requires-Dist: python-dotenv (>=1.1.1,<2.0.0)
 Requires-Dist: python-jose[cryptography] (>=3.4.0,<4.0.0)

{zrb-1.11.0.dist-info → zrb-1.13.0.dist-info}/RECORD

@@ -9,10 +9,10 @@ zrb/builtin/git_subtree.py,sha256=7BKwOkVTWDrR0DXXQ4iJyHqeR6sV5VYRt8y_rEB0EHg,35
 zrb/builtin/group.py,sha256=t008xLM4_fgbjfZrPoi_fQAnSHIo6MOiQSCHBO4GDYU,2379
 zrb/builtin/http.py,sha256=sLqEczuSxGYXWzyJR6frGOHkPTviu4BeyroUr3-ZuAI,4322
 zrb/builtin/jwt.py,sha256=3M5uaQhJZbKQLjTUft1OwPz_JxtmK-xtkjxWjciOQho,2859
-zrb/builtin/llm/chat_session.py,sha256=8Ux5xfgNsmTVFS9XVfSjz_AVkl3jn5gYY-P2m5ZAB5c,8466
+zrb/builtin/llm/chat_session.py,sha256=u8bW67uKCq22hVv4ZkOsKIZxBeOdKtJh4Bjyy552RM4,9424
 zrb/builtin/llm/history.py,sha256=LDOrL0p7r_AHLa5L8Dp7bHNsOALugmJd7OguXRWGnm4,3087
 zrb/builtin/llm/input.py,sha256=Nw-26uTWp2QhUgKJcP_IMHmtk-b542CCSQ_vCOjhvhM,877
-zrb/builtin/llm/llm_ask.py,sha256=oozfQwa1i2PnXV4qWbn60Pmd3fS0kgmhYCbfKlhr25o,4549
+zrb/builtin/llm/llm_ask.py,sha256=18XAxyPWF7daE0TZkRkRt8opmqLUjhpM3oMVdOP-qWY,4857
 zrb/builtin/llm/previous-session.js,sha256=xMKZvJoAbrwiyHS0OoPrWuaKxWYLoyR5sguePIoCjTY,816
 zrb/builtin/llm/tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/llm/tool/api.py,sha256=OhmfLc2TwWKQYIMweGelqb5s4JF4nB-YynbSO4yb_Jk,2342
@@ -20,7 +20,7 @@ zrb/builtin/llm/tool/cli.py,sha256=dUWZrW2X5J_lONuzR__6-SbewSdi28E3RRuksjd4mWo,1
 zrb/builtin/llm/tool/code.py,sha256=GRP_IZAkeL6RIlUm407BQRF992ES57pdzPaQdC5UsJU,8218
 zrb/builtin/llm/tool/file.py,sha256=XfTuoQOHmgiAYkfi_1ew2voxOwad5vWTe_3Ww8IeVQY,22274
 zrb/builtin/llm/tool/rag.py,sha256=wB74JV7bxs0ec77b_09Z2lPjoR1WzPUvZbuXOdb9Q9g,9675
-zrb/builtin/llm/tool/sub_agent.py,sha256=UWBLiuCK6FT8Ku0yPfSxd_k67h_Pme1K7d2VSABacjQ,4855
+zrb/builtin/llm/tool/sub_agent.py,sha256=9Su64FpNTVeE6O2qgNzo-eo4pcmv8qi_sd_QWLQBXYw,4870
 zrb/builtin/llm/tool/web.py,sha256=gQlUsmYCJOFJtNjwpjK-xk13LMvrMSpSaFHXUTnIayQ,7090
 zrb/builtin/md5.py,sha256=690RV2LbW7wQeTFxY-lmmqTSVEEZv3XZbjEUW1Q3XpE,1480
 zrb/builtin/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -217,20 +217,17 @@ 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=srXMnSQ9rjIYnX4lG1QmvIM0cM-oa92n4zqMnD6E_FM,12187
+zrb/config/config.py,sha256=d_F-hdPLADjeVRHtnpOxtOkfUBu5huSLclyD53uxO4U,12306
 zrb/config/default_prompt/file_extractor_system_prompt.md,sha256=tmeZMPzF9MGExsZZw7M2PZN6V0oFVRp1nIjiqUPvQ9M,1013
-zrb/config/default_prompt/interactive_system_prompt.md,sha256=NlG5cQ4imEGF9CIRwqH03UZ5XRtqLu1gIin3nBDtQlI,2795
+zrb/config/default_prompt/interactive_system_prompt.md,sha256=ZFPeDEV2vlcksHiVG2o-TCehmqkFolDjtH0_Fzo1gGI,3566
 zrb/config/default_prompt/persona.md,sha256=WU4JKp-p7qJePDA6NZ_CYdBggo2B3PEq8IEnNVblIHU,41
 zrb/config/default_prompt/repo_extractor_system_prompt.md,sha256=EGZ-zj78RlMEg2jduRBs8WzO4VJTkXHR96IpBepZMsY,3881
 zrb/config/default_prompt/repo_summarizer_system_prompt.md,sha256=fpG5B416OK3oE41bWPrh1M6pdH5SSadCPte_NJ_79z0,858
-zrb/config/default_prompt/summarization_prompt.md,sha256=3-swyZ2m9DQFkaN68kn-AxnFHTcQYqrPSzV3qwT-vw4,2122
-zrb/config/default_prompt/system_prompt.md,sha256=uRRiVSTs_4s2DYBO-1cPuOGPVkaelA_UuGClLawfw3o,2283
-zrb/config/default_workflow/code.md,sha256=aFVBjPwVcpRkWGHKdwDEYvRxfIQyLWaVYfleO68Aj8s,2533
-zrb/config/default_workflow/content.md,sha256=Kz_ufOApkPXhhr2R8eyt06b8gVegLc5LDkBlsN6BYV4,2057
-zrb/config/default_workflow/research.md,sha256=CSWP-uh3a-pI9DF9sJkzODWESD2wLCGhr1nrMfUjAlw,2205
-zrb/config/llm_config.py,sha256=ET2ehVdQQv-dOTXIVx81sdvybF9rprL6VUhAxE6K-Ho,9215
-zrb/config/llm_context/config.py,sha256=swc3hUaEIoL2MjKtbati13iP0MxveNG_y_6K3nszRAw,2571
-zrb/config/llm_context/config_handler.py,sha256=oQesfigIM0qMw_A3jUCN0UDJujRjuJ3jr5mXHBiLgB0,8866
+zrb/config/default_prompt/summarization_prompt.md,sha256=hRXH5E78TugSze_Hgp-KTbIhCeyrMcJg-pSXvXH3C9E,1629
+zrb/config/default_prompt/system_prompt.md,sha256=Jkne5n9HJcBCgfeENwxvqH-kbDO2CaiUzqR4VoWMRHY,3054
+zrb/config/llm_config.py,sha256=bNLxorctwtVW1F9hA-hEYpDBe7FLSZHC25Nx8NlR4-M,8597
+zrb/config/llm_context/config.py,sha256=zeqSVOKK5yyApvqTbcO3ayGxtyoag22qlWWaXp1nINs,4950
+zrb/config/llm_context/config_parser.py,sha256=h95FbOjvVobhrsfGtG_BY3hxS-OLzQj-9F5vGZuehkY,1473
 zrb/config/llm_rate_limitter.py,sha256=P4vR7qxwiGwjlKx2kHcfdIxwGbJB98vdN-UQEH-Q2WU,4894
 zrb/config/web_auth_config.py,sha256=_PXatQTYh2mX9H3HSYSQKp13zm1RlLyVIoeIr6KYMQ8,6279
 zrb/content_transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -240,7 +237,7 @@ zrb/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/context/any_context.py,sha256=2hgVKbbDwmwrEl1h1L1FaTUjuUYaDd_b7YRGkaorW6Q,6362
 zrb/context/any_shared_context.py,sha256=wJawL1jGgApcKPRcpw3js7W4-MhJRA3GMbR5zTsJmt0,1929
 zrb/context/context.py,sha256=ErGhXJgjgNaAqi6iPMejWxFZ3YvWnysC6mHEU-wodKk,6884
-zrb/context/shared_context.py,sha256=Pn0LHEYikiB3LLGnfpJVzOFgxyosQ_NYvFtKFMK_X8w,3008
+zrb/context/shared_context.py,sha256=Jaa7AYCeCksOiEAwOnY3xD6Y2Yy2wJAkpehAkbKQ-Wc,3076
 zrb/dot_dict/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/dot_dict/dot_dict.py,sha256=ubw_x8I7AOJ59xxtFVJ00VGmq_IYdZP3mUhNlO4nEK0,556
 zrb/env/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -349,17 +346,20 @@ zrb/task/base_trigger.py,sha256=WSGcmBcGAZw8EzUXfmCjqJQkz8GEmi1RzogpF6A1V4s,6902
 zrb/task/cmd_task.py,sha256=myM8WZm6NrUD-Wv0Vb5sTOrutrAVZLt5LVsSBKwX6SM,10860
 zrb/task/http_check.py,sha256=Gf5rOB2Se2EdizuN9rp65HpGmfZkGc-clIAlHmPVehs,2565
 zrb/task/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/task/llm/agent.py,sha256=A5UoHY-l8WqyptKrf42eHVW_VhMhuYsygs2Z8XNnCzk,6681
+zrb/task/llm/agent.py,sha256=aZvtcL5HmZQvD3c79R9sDIOMawO0rUMcRiq2wZ1FNas,7457
 zrb/task/llm/config.py,sha256=TlyH925_fboIlK2Ixf34tynmenqs9s9rfsnPs4jff78,3490
 zrb/task/llm/conversation_history.py,sha256=B_PDWYL_q66s0xwWBzMSomqPN6u3gkXlIeXBD5A0Apg,4416
-zrb/task/llm/conversation_history_model.py,sha256=AU5-M4Ky3X4wII1PMT75VU5OUEG0FjqdHrrpCSl-u6M,10771
+zrb/task/llm/conversation_history_model.py,sha256=DJ0KDBB0BriQuE5ugC_q0aSHhjNIBcfjUk1f0S_3I9U,9245
+zrb/task/llm/default_workflow/coding.md,sha256=2uythvPsnBpYfIhiIH1cCinQXX0i0yUqsL474Zpemw0,2484
+zrb/task/llm/default_workflow/copywriting.md,sha256=xSO7GeDolwGxiuz6kXsK2GKGpwp8UgtG0yRqTmill_s,1999
+zrb/task/llm/default_workflow/researching.md,sha256=KD-aYHFHir6Ti-4FsBBtGwiI0seSVgleYbKJZi_POXA,2139
 zrb/task/llm/error.py,sha256=QR-nIohS6pBpC_16cWR-fw7Mevo1sNYAiXMBsh_CJDE,4157
-zrb/task/llm/history_summarization.py,sha256=BUwBOS51Jzp4psliD_h1jWq-5oHezNbjF1fkn7vbh7o,8109
-zrb/task/llm/print_node.py,sha256=zocTKi9gZDxl2I6KNu095TmMc13Yip6SNuWYnswS680,4060
-zrb/task/llm/prompt.py,sha256=OXoN3ttXmQR8DxoJnKh3vgjaVzl532i3Y567xaXdQs8,7708
-zrb/task/llm/tool_wrapper.py,sha256=8_bL8m_WpRf-pVKSrvQIVqT-m2sUA87a1RBQG13lhp4,6457
+zrb/task/llm/history_summarization.py,sha256=_0RmzIeJdJA3KvtdTdKnd2Ga7_7x8C1J2PM0oSn-IYw,8000
+zrb/task/llm/print_node.py,sha256=mwdqsO2IVf5rDz-jdH9HXz6MFGCWrZ4Pv2xbUBtoNgc,4179
+zrb/task/llm/prompt.py,sha256=sMipP-NJmq4ZmCtQYEG2mcHWUD79yJRwH7nH-iw-7Z4,9661
+zrb/task/llm/tool_wrapper.py,sha256=jfKMAtTzm--HnF6TppOrbkDVsuTOIFRpowQqgwqd-7s,6756
 zrb/task/llm/typing.py,sha256=c8VAuPBw_4A3DxfYdydkgedaP-LU61W9_wj3m3CAX1E,58
-zrb/task/llm_task.py,sha256=TTYb9FYqZX_OIgDE6q5Z9IVuM6NcsKFeCVIi6ovQDE8,13712
+zrb/task/llm_task.py,sha256=jVuVeN2ylcPkycUiaTpavkkd1tBLbvcVsjMNN5FMHnk,13536
 zrb/task/make_task.py,sha256=PD3b_aYazthS8LHeJsLAhwKDEgdurQZpymJDKeN60u0,2265
 zrb/task/rsync_task.py,sha256=WfqNSaicJgYWpunNU34eYxXDqHDHOftuDHyWJKjqwg0,6365
 zrb/task/scaffolder.py,sha256=rME18w1HJUHXgi9eTYXx_T2G4JdqDYzBoNOkdOOo5-o,6806
@@ -370,6 +370,7 @@ zrb/task_status/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task_status/task_status.py,sha256=blZ8dxg9g_8MuViq-t7yJRLoE7yGUf5srgHf-PCsXNc,3069
 zrb/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/attr.py,sha256=5GlYSmVAzbcSFjNDXiqqHqNMR6NWjJ6bUHZXdE35mj8,5359
+zrb/util/callable.py,sha256=b6OFXbCXp2twow3wh2E_h5hNHLs2pXaLfGQz4iVyiQc,771
 zrb/util/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/cli/style.py,sha256=D_548KG1gXEirQGdkAVTc81vBdCeInXtnG1gV1yabBA,6655
 zrb/util/cli/subcommand.py,sha256=umTZIlrL-9g-qc_eRRgdaQgK-whvXK1roFfvnbuY7NQ,1753
@@ -394,7 +395,7 @@ zrb/util/git_subtree.py,sha256=AyQWCWEi2EIzEpYXRnYN55157KMUql0WHj70QNw5PHU,4612
 zrb/util/git_subtree_model.py,sha256=P_gJ0zhOAc3gFM6sYcjc0Ack9dFBt75TI5fXdE0q320,871
 zrb/util/group.py,sha256=T82yr3qg9I5k10VPXkMyrIRIqyfzadSH813bqzwKEPI,4718
 zrb/util/init_path.py,sha256=9eN7CkWNGhDBpjTQs2j9YHVMzui7Y8DEb1WP4aTPzeo,659
-zrb/util/llm/prompt.py,sha256=AqDcBi2IkPISCVNZ_Ccz9Q2zFHjowPMReGHZtNndD_k,1921
+zrb/util/llm/prompt.py,sha256=HMpKby27DE8lJWpytYKylp7Iw9ENwsYQI0nMMKCCi54,2190
 zrb/util/load.py,sha256=DK0KYSlu48HCoGPqnW1IxnE3pHrZSPCstfz8Fjyqqv8,2140
 zrb/util/run.py,sha256=vu-mcSWDP_WuuvIKqM_--Gk3WkABO1oTXiHmBRTvVQk,546
 zrb/util/string/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -405,7 +406,7 @@ zrb/util/todo.py,sha256=r9_KYF2-hLKMNjsp6AFK9zivykMrywd-kJ4bCwfdafI,19323
 zrb/util/todo_model.py,sha256=hhzAX-uFl5rsg7iVX1ULlJOfBtblwQ_ieNUxBWfc-Os,1670
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.11.0.dist-info/METADATA,sha256=pcdwF1Z7DIfcE3qZxe7vnYY1gbNRKjiKaLdw9oSbkuA,9778
-zrb-1.11.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.11.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.11.0.dist-info/RECORD,,
+zrb-1.13.0.dist-info/METADATA,sha256=L9X70AkHGlYTjK0tdgjlwA_Sj4U0Ao9FtPuk-g0UmJ0,9777
+zrb-1.13.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.13.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.13.0.dist-info/RECORD,,

zrb/config/llm_context/config_handler.py

@@ -1,238 +0,0 @@
-import os
-import re
-from typing import Callable, Generator, NamedTuple
-
-
-class Section(NamedTuple):
-    name: str
-    key: str
-    content: str
-    config_file: str
-
-
-def _parse_config_file(
-    config_file: str, lines: list[str]
-) -> Generator[Section, None, None]:
-    """
-    Parses a config file's lines, yielding sections.
-    It correctly handles markdown code fences.
-    """
-    any_header_pattern = re.compile(r"^# (\w+):\s*(.*)")
-    fence_pattern = re.compile(r"^([`~]{3,})")
-    fence_stack = []
-    active_section_name = None
-    active_section_key = None
-    active_section_content = []
-
-    for line in lines:
-        stripped_line = line.strip()
-        fence_match = fence_pattern.match(stripped_line)
-
-        if fence_match:
-            current_fence = fence_match.group(1)
-            if (
-                fence_stack
-                and fence_stack[-1][0] == current_fence[0]
-                and len(current_fence) >= len(fence_stack[-1])
-            ):
-                fence_stack.pop()
-            else:
-                fence_stack.append(current_fence)
-
-        if fence_stack:
-            if active_section_key is not None:
-                active_section_content.append(line)
-            continue
-
-        match = any_header_pattern.match(line)
-        if match:
-            if active_section_key is not None:
-                content = "".join(active_section_content).strip()
-                if content:
-                    yield Section(
-                        name=active_section_name,
-                        key=active_section_key,
-                        content=content,
-                        config_file=config_file,
-                    )
-
-            active_section_name = match.group(1)
-            active_section_key = match.group(2).strip()
-            active_section_content = []
-        elif active_section_key is not None:
-            active_section_content.append(line)
-
-    if active_section_key is not None:
-        content = "".join(active_section_content).strip()
-        if content:
-            yield Section(
-                name=active_section_name,
-                key=active_section_key,
-                content=content,
-                config_file=config_file,
-            )
-
-
-def _get_config_file_hierarchy(path: str, config_file_name: str) -> list[str]:
-    """Finds all config files from a given path up to the home directory."""
-    config_files = []
-    home_dir = os.path.expanduser("~")
-    current_path = os.path.abspath(path)
-    while True:
-        config_path = os.path.join(current_path, config_file_name)
-        if os.path.exists(config_path):
-            config_files.append(config_path)
-        if current_path == home_dir:
-            break
-        parent = os.path.dirname(current_path)
-        if parent == current_path:  # Reached root
-            break
-        current_path = parent
-    return config_files
-
-
-class LLMContextConfigHandler:
-    """Handles the logic for a specific section of the config."""
-
-    def __init__(
-        self,
-        section_name: str,
-        config_file_name: str = "ZRB.md",
-        filter_section_func: Callable[[str, str], bool] | None = None,
-        resolve_section_path: bool = True,
-    ):
-        self._section_name = section_name
-        self._config_file_name = config_file_name
-        self._filter_func = filter_section_func
-        self._resolve_section_path = resolve_section_path
-
-    def _include_section(self, section_path: str, base_path: str) -> bool:
-        if self._filter_func:
-            return self._filter_func(section_path, base_path)
-        return True
-
-    def get_section(self, cwd: str) -> dict[str, str]:
-        """Gathers all relevant sections for a given path."""
-        abs_path = os.path.abspath(cwd)
-        all_sections = {}
-        config_files = _get_config_file_hierarchy(abs_path, self._config_file_name)
-
-        for config_file in reversed(config_files):
-            if not os.path.exists(config_file):
-                continue
-            with open(config_file, "r") as f:
-                lines = f.readlines()
-
-            for section in _parse_config_file(config_file, lines):
-                if section.name != self._section_name:
-                    continue
-
-                config_dir = os.path.dirname(section.config_file)
-                key = (
-                    os.path.abspath(os.path.join(config_dir, section.key))
-                    if self._resolve_section_path
-                    else section.key
-                )
-
-                if self._include_section(key, abs_path):
-                    if key in all_sections:
-                        all_sections[key] = f"{all_sections[key]}\n{section.content}"
-                    else:
-                        all_sections[key] = section.content
-
-        return all_sections
-
-    def add_to_section(self, content: str, key: str, cwd: str):
-        """Adds content to a section block in the nearest configuration file."""
-        abs_search_path = os.path.abspath(cwd)
-        config_files = _get_config_file_hierarchy(
-            abs_search_path, self._config_file_name
-        )
-        closest_config_file = (
-            config_files[0]
-            if config_files
-            else os.path.join(os.path.expanduser("~"), self._config_file_name)
-        )
-
-        config_dir = os.path.dirname(closest_config_file)
-        header_key = key
-        if self._resolve_section_path and os.path.isabs(key):
-            if key == config_dir:
-                header_key = "."
-            elif key.startswith(config_dir):
-                header_key = f"./{os.path.relpath(key, config_dir)}"
-        header = f"# {self._section_name}: {header_key}"
-        new_content = content.strip()
-        lines = []
-        if os.path.exists(closest_config_file):
-            with open(closest_config_file, "r") as f:
-                lines = f.readlines()
-        header_index = next(
-            (i for i, line in enumerate(lines) if line.strip() == header), -1
-        )
-        if header_index != -1:
-            insert_index = len(lines)
-            for i in range(header_index + 1, len(lines)):
-                if re.match(r"^# \w+:", lines[i].strip()):
-                    insert_index = i
-                    break
-            if insert_index > 0 and lines[insert_index - 1].strip():
-                lines.insert(insert_index, f"\n{new_content}\n")
-            else:
-                lines.insert(insert_index, f"{new_content}\n")
-        else:
-            if lines and lines[-1].strip():
-                lines.append("\n\n")
-            lines.append(f"{header}\n")
-            lines.append(f"{new_content}\n")
-        with open(closest_config_file, "w") as f:
-            f.writelines(lines)
-
-    def remove_from_section(self, content: str, key: str, cwd: str) -> bool:
-        """Removes content from a section block in all relevant config files."""
-        abs_search_path = os.path.abspath(cwd)
-        config_files = _get_config_file_hierarchy(
-            abs_search_path, self._config_file_name
-        )
-        content_to_remove = content.strip()
-        was_removed = False
-        for config_file_path in config_files:
-            if not os.path.exists(config_file_path):
-                continue
-            with open(config_file_path, "r") as f:
-                file_content = f.read()
-            config_dir = os.path.dirname(config_file_path)
-            header_key = key
-            if self._resolve_section_path and os.path.isabs(key):
-                if key == config_dir:
-                    header_key = "."
-                elif key.startswith(config_dir):
-                    header_key = f"./{os.path.relpath(key, config_dir)}"
-            header = f"# {self._section_name}: {header_key}"
-            # Use regex to find the section content
-            section_pattern = re.compile(
-                rf"^{re.escape(header)}\n(.*?)(?=\n# \w+:|\Z)",
-                re.DOTALL | re.MULTILINE,
-            )
-            match = section_pattern.search(file_content)
-            if not match:
-                continue
-
-            section_content = match.group(1)
-            # Remove the target content and handle surrounding newlines
-            new_section_content = section_content.replace(content_to_remove, "")
-            new_section_content = "\n".join(
-                line for line in new_section_content.splitlines() if line.strip()
-            )
-
-            if new_section_content != section_content.strip():
-                was_removed = True
-                # Reconstruct the file content
-                start = match.start(1)
-                end = match.end(1)
-                new_file_content = (
-                    file_content[:start] + new_section_content + file_content[end:]
-                )
-                with open(config_file_path, "w") as f:
-                    f.write(new_file_content)
-        return was_removed