zrb 1.9.16__py3-none-any.whl → 1.10.0__py3-none-any.whl

zrb/task/llm/prompt.py

@@ -1,7 +1,15 @@
+import os
+import platform
+import re
+from datetime import datetime, timezone
+
 from zrb.attr.type import StrAttr
 from zrb.config.llm_config import llm_config as llm_config
 from zrb.context.any_context import AnyContext
+from zrb.task.llm.conversation_history_model import ConversationHistory
 from zrb.util.attr import get_attr, get_str_attr
+from zrb.util.file import read_dir, read_file_with_line_numbers
+from zrb.util.llm.prompt import make_prompt_section
 
 
 def get_persona(
@@ -52,26 +60,110 @@ def get_special_instruction_prompt(
     return llm_config.default_special_instruction_prompt
 
 
-def get_combined_system_prompt(
+def get_system_and_user_prompt(
     ctx: AnyContext,
-    persona_attr: StrAttr | None,
-    system_prompt_attr: StrAttr | None,
-    special_instruction_prompt_attr: StrAttr | None,
-) -> str:
+    user_message: str,
+    persona_attr: StrAttr | None = None,
+    system_prompt_attr: StrAttr | None = None,
+    special_instruction_prompt_attr: StrAttr | None = None,
+    conversation_history: ConversationHistory | None = None,
+) -> tuple[str, str]:
     """Combines persona, base system prompt, and special instructions."""
     persona = get_persona(ctx, persona_attr)
     base_system_prompt = get_base_system_prompt(ctx, system_prompt_attr)
     special_instruction = get_special_instruction_prompt(
         ctx, special_instruction_prompt_attr
     )
-    parts = []
-    if persona:
-        parts.append(persona)
-    if base_system_prompt:
-        parts.append(base_system_prompt)
-    if special_instruction:
-        parts.append(special_instruction)
-    return "\n\n".join(parts).strip()
+    if conversation_history is None:
+        conversation_history = ConversationHistory()
+    conversation_context, new_user_message = extract_conversation_context(user_message)
+    new_system_prompt = "\n".join(
+        [
+            make_prompt_section("Persona", persona),
+            make_prompt_section("System Prompt", base_system_prompt),
+            make_prompt_section("Special Instruction", special_instruction),
+            make_prompt_section(
+                "Past Conversation",
+                "\n".join(
+                    [
+                        make_prompt_section(
+                            "Summary",
+                            conversation_history.past_conversation_summary,
+                            as_code=True,
+                        ),
+                        make_prompt_section(
+                            "Last Transcript",
+                            conversation_history.past_conversation_transcript,
+                            as_code=True,
+                        ),
+                    ]
+                ),
+            ),
+            make_prompt_section(
+                "Notes",
+                "\n".join(
+                    [
+                        make_prompt_section(
+                            "Long Term",
+                            conversation_history.long_term_note,
+                            as_code=True,
+                        ),
+                        make_prompt_section(
+                            "Contextual",
+                            conversation_history.contextual_note,
+                            as_code=True,
+                        ),
+                    ]
+                ),
+            ),
+            make_prompt_section("Conversation Context", conversation_context),
+        ]
+    )
+    return new_system_prompt, new_user_message
+
+
+def extract_conversation_context(user_message: str) -> tuple[str, str]:
+    modified_user_message = user_message
+    # Match “@” + any non-space/comma sequence that contains at least one “/”
+    pattern = r"(?<!\w)@(?=[^,\s]*/)([^,\s]+)"
+    potential_resource_path = re.findall(pattern, user_message)
+    apendixes = []
+    for ref in potential_resource_path:
+        resource_path = os.path.abspath(os.path.expanduser(ref))
+        print("RESOURCE PATH", resource_path)
+        if os.path.isfile(resource_path):
+            content = read_file_with_line_numbers(resource_path)
+            apendixes.append(
+                make_prompt_section(
+                    f"`{ref}` (file path: `{resource_path}`)", content, as_code=True
+                )
+            )
+            # Remove the '@' from the modified user message for valid file paths
+            modified_user_message = modified_user_message.replace(f"@{ref}", ref, 1)
+        elif os.path.isdir(resource_path):
+            content = read_dir(resource_path)
+            apendixes.append(
+                make_prompt_section(
+                    f"`{ref}` (directory path: `{resource_path}`)",
+                    content,
+                    as_code=True,
+                )
+            )
+            # Remove the '@' from the modified user message for valid directory paths
+            modified_user_message = modified_user_message.replace(f"@{ref}", ref, 1)
+    conversation_context = "\n".join(
+        [
+            make_prompt_section(
+                "Current Time", datetime.now(timezone.utc).astimezone().isoformat()
+            ),
+            make_prompt_section("Current Working Directory", os.getcwd()),
+            make_prompt_section("Current OS", platform.system()),
+            make_prompt_section("OS Version", platform.version()),
+            make_prompt_section("Python Version", platform.python_version()),
+            make_prompt_section("Apendixes", "\n".join(apendixes)),
+        ]
+    )
+    return conversation_context, modified_user_message
 
 
 def get_user_message(
@@ -85,7 +177,7 @@ def get_user_message(
     )
 
 
-def get_summarization_prompt(
+def get_summarization_system_prompt(
     ctx: AnyContext,
     summarization_prompt_attr: StrAttr | None,
 ) -> str:

zrb/task/llm_task.py

@@ -15,19 +15,17 @@ from zrb.task.llm.config import (
     get_model,
     get_model_settings,
 )
-from zrb.task.llm.context import extract_default_context
-from zrb.task.llm.context_enrichment import maybe_enrich_context
-from zrb.task.llm.history import (
-    ConversationHistoryData,
+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_combined_system_prompt,
     get_context_enrichment_prompt,
-    get_summarization_prompt,
+    get_summarization_system_prompt,
+    get_system_and_user_prompt,
     get_user_message,
 )
 from zrb.util.cli.style import stylize_faint
@@ -85,17 +83,17 @@ class LLMTask(BaseTask):
             list["MCPServer"] | Callable[[AnySharedContext], list["MCPServer"]]
         ) = [],
         conversation_history: (
-            ConversationHistoryData
-            | Callable[[AnySharedContext], ConversationHistoryData | dict | list]
+            ConversationHistory
+            | Callable[[AnySharedContext], ConversationHistory | dict | list]
             | dict
             | list
-        ) = ConversationHistoryData(),
+        ) = ConversationHistory(),
         conversation_history_reader: (
-            Callable[[AnySharedContext], ConversationHistoryData | dict | list | None]
+            Callable[[AnySharedContext], ConversationHistory | dict | list | None]
             | None
         ) = None,
         conversation_history_writer: (
-            Callable[[AnySharedContext, ConversationHistoryData], None] | None
+            Callable[[AnySharedContext, ConversationHistory], None] | None
         ) = None,
         conversation_history_file: StrAttr | None = None,
         render_history_file: bool = True,
@@ -226,55 +224,57 @@ class LLMTask(BaseTask):
             model_api_key_attr=self._model_api_key,
             render_model_api_key=self._render_model_api_key,
         )
-        context_enrichment_prompt = get_context_enrichment_prompt(
-            ctx=ctx,
-            context_enrichment_prompt_attr=self._context_enrichment_prompt,
-        )
-        summarization_prompt = get_summarization_prompt(
+        summarization_prompt = get_summarization_system_prompt(
             ctx=ctx,
             summarization_prompt_attr=self._summarization_prompt,
         )
         user_message = get_user_message(ctx, self._message, self._render_message)
-        # Get the combined system prompt using the new getter
-        system_prompt = get_combined_system_prompt(
-            ctx=ctx,
-            persona_attr=self._persona,
-            system_prompt_attr=self._system_prompt,
-            special_instruction_prompt_attr=self._special_instruction_prompt,
-        )
         # 1. Prepare initial state (read history from previous session)
-        history_data = await read_conversation_history(
+        conversation_history = await read_conversation_history(
             ctx=ctx,
             conversation_history_reader=self._conversation_history_reader,
             conversation_history_file_attr=self._conversation_history_file,
             render_history_file=self._render_history_file,
             conversation_history_attr=self._conversation_history,
         )
-        history_list = history_data.history
-        long_term_context = history_data.long_term_context
-        conversation_summary = history_data.conversation_summary
-
-        # 2. Enrich context and summarize history sequentially
-        new_long_term_context = await maybe_enrich_context(
+        conversation_history.fetch_newest_notes()
+        # 2. Get system prompt and user prompt
+        system_prompt, user_message = get_system_and_user_prompt(
+            ctx=ctx,
+            user_message=user_message,
+            persona_attr=self._persona,
+            system_prompt_attr=self._system_prompt,
+            special_instruction_prompt_attr=self._special_instruction_prompt,
+            conversation_history=conversation_history,
+        )
+        # 3. Get the agent instance
+        agent = get_agent(
             ctx=ctx,
-            history_list=history_list,
-            long_term_context=long_term_context,
-            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,  # noqa
+            agent_attr=self._agent,
             model=model,
+            system_prompt=system_prompt,
             model_settings=model_settings,
-            context_enrichment_prompt=context_enrichment_prompt,
-            rate_limitter=self._rate_limitter,
+            tools_attr=self._tools,
+            additional_tools=self._additional_tools,
+            mcp_servers_attr=self._mcp_servers,
+            additional_mcp_servers=self._additional_mcp_servers,
         )
-        new_history_list, new_conversation_summary = await maybe_summarize_history(
+        # 4. Run the agent iteration and save the results/history
+        result = await self._execute_agent(
+            ctx,
+            agent,
+            user_message,
+            conversation_history,
+        )
+        # 5. Summarize
+        conversation_history = await maybe_summarize_history(
             ctx=ctx,
-            history_list=history_list,
-            conversation_summary=conversation_summary,
+            conversation_history=conversation_history,
             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,  # noqa
+            history_summarization_token_threshold_attr=(
+                self._history_summarization_token_threshold
+            ),
             render_history_summarization_token_threshold=(
                 self._render_history_summarization_token_threshold
             ),
@@ -283,50 +283,22 @@ class LLMTask(BaseTask):
             summarization_prompt=summarization_prompt,
             rate_limitter=self._rate_limitter,
         )
-
-        # 3. Build the final user prompt and system prompt
-        final_user_prompt, system_info = extract_default_context(user_message)
-        context_parts = [
-            f"## System Information\n{json.dumps(system_info, indent=2)}",
-        ]
-        if new_long_term_context:
-            context_parts.append(new_long_term_context)
-        if new_conversation_summary:
-            context_parts.append(new_conversation_summary)
-
-        final_system_prompt = "\n\n".join(
-            [system_prompt, "# Context", "\n\n---\n\n".join(context_parts)]
-        )
-        # 4. Get the agent instance
-        agent = get_agent(
+        # 6. Write conversation history
+        await write_conversation_history(
             ctx=ctx,
-            agent_attr=self._agent,
-            model=model,
-            system_prompt=final_system_prompt,
-            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,
-        )
-        # 5. Run the agent iteration and save the results/history
-        return await self._run_agent_and_save_history(
-            ctx,
-            agent,
-            final_user_prompt,
-            new_history_list,
-            new_long_term_context,
-            new_conversation_summary,
+            history_data=conversation_history,
+            conversation_history_writer=self._conversation_history_writer,
+            conversation_history_file_attr=self._conversation_history_file,
+            render_history_file=self._render_history_file,
         )
+        return result
 
-    async def _run_agent_and_save_history(
+    async def _execute_agent(
         self,
         ctx: AnyContext,
         agent: "Agent",
         user_prompt: str,
-        history_list: ListOfDict,
-        long_term_context: str,
-        conversation_summary: str,
+        conversation_history: ConversationHistory,
     ) -> Any:
         """Executes the agent, processes results, and saves history."""
         try:
@@ -334,23 +306,12 @@ class LLMTask(BaseTask):
                 ctx=ctx,
                 agent=agent,
                 user_prompt=user_prompt,
-                history_list=history_list,
+                history_list=conversation_history.history,
                 rate_limitter=self._rate_limitter,
             )
             if agent_run and agent_run.result:
                 new_history_list = json.loads(agent_run.result.all_messages_json())
-                data_to_write = ConversationHistoryData(
-                    long_term_context=long_term_context,
-                    conversation_summary=conversation_summary,
-                    history=new_history_list,
-                )
-                await write_conversation_history(
-                    ctx=ctx,
-                    history_data=data_to_write,
-                    conversation_history_writer=self._conversation_history_writer,
-                    conversation_history_file_attr=self._conversation_history_file,
-                    render_history_file=self._render_history_file,
-                )
+                conversation_history.history = new_history_list
                 xcom_usage_key = f"{self.name}-usage"
                 if xcom_usage_key not in ctx.xcom:
                     ctx.xcom[xcom_usage_key] = Xcom([])

zrb/util/llm/prompt.py

@@ -0,0 +1,18 @@
+import re
+
+
+def _demote_markdown_headers(md: str) -> str:
+    def demote(match):
+        hashes = match.group(1)
+        return "#" + hashes + match.group(2)  # add one `#`
+
+    # Replace headers at the beginning of a line
+    return re.sub(r"^(#{1,6})(\s)", demote, md, flags=re.MULTILINE)
+
+
+def make_prompt_section(header: str, content: str, as_code: bool = False) -> str:
+    if content.strip() == "":
+        return ""
+    if as_code:
+        return f"# {header}\n````\n{content.strip()}\n````\n"
+    return f"# {header}\n{_demote_markdown_headers(content.strip())}\n"

{zrb-1.9.16.dist-info → zrb-1.10.0.dist-info}/METADATA

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

{zrb-1.9.16.dist-info → zrb-1.10.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zrb/__init__.py,sha256=Rp5YD2qgKmUiz-f53JHYpxnHcAByrLOrCyjue6LbAMk,5101
+zrb/__init__.py,sha256=W0Wz3UcnNf5oE-C0i5wkDWPISEktXv-ea-FCFO8zf2g,5114
 zrb/__main__.py,sha256=9SXH9MK4PVyU9lkEyHxiIUABbcsV2wseP94HmlqTR4M,2657
 zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
@@ -10,17 +10,17 @@ 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=0R04DpBr_LGfNJbXIQ_4XQSxL7kY2M3U-bbu5lsXZ54,8542
-zrb/builtin/llm/history.py,sha256=jCMeRCHUsDFnQWyDoH9SOBptzceOs_wACvVpYkDOoTk,3086
+zrb/builtin/llm/history.py,sha256=k4wY0anietrF5iEUVuYAAYGbhjs4TBo03goXzCk_pRM,3091
 zrb/builtin/llm/input.py,sha256=Nw-26uTWp2QhUgKJcP_IMHmtk-b542CCSQ_vCOjhvhM,877
 zrb/builtin/llm/llm_ask.py,sha256=oozfQwa1i2PnXV4qWbn60Pmd3fS0kgmhYCbfKlhr25o,4549
 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
-zrb/builtin/llm/tool/cli.py,sha256=QqIil29dVOjbTxwb9Gib4KhlaJcOcto-OxEX5hHmA1s,1377
+zrb/builtin/llm/tool/cli.py,sha256=dUWZrW2X5J_lONuzR__6-SbewSdi28E3RRuksjd4mWo,1234
 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/file.py,sha256=vUpkHPJHszdFKWjsh5Ma8_WGFwZMcm1nlJ-rGCIA_tI,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/sub_agent.py,sha256=UWBLiuCK6FT8Ku0yPfSxd_k67h_Pme1K7d2VSABacjQ,4855
 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,9 +217,9 @@ 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=UpVm_IFD_bSfGS-QJoRo86xV63eGIuIwWICMaUZgR00,15268
-zrb/config/llm_config.py,sha256=YxMV_rRY8SU57aq4xlRiMm223yMzfQUzADmqAyoNRTI,17415
-zrb/config/llm_rate_limitter.py,sha256=0U0qm4qgCWqBjohPdwANNUzLR3joJCFYr6oW6Xpccfo,4436
+zrb/config/config.py,sha256=vUmJWQHRgmMVL1FmoukjQe9J6vCuyzqBIg4FncREGmw,15108
+zrb/config/llm_config.py,sha256=ROGDX3LKE5YI9JkhcMUO0E-ffscj716PAN4b7u1EFRY,20676
+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
 zrb/content_transformer/any_content_transformer.py,sha256=v8ZUbcix1GGeDQwB6OKX_1TjpY__ksxWVeqibwa_iZA,850
@@ -339,16 +339,15 @@ 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=BZHbz-YXgSdm1tTwGMR_maqcd3yMFGSdzLyDjuxT_XI,6702
 zrb/task/llm/config.py,sha256=TlyH925_fboIlK2Ixf34tynmenqs9s9rfsnPs4jff78,3490
-zrb/task/llm/context.py,sha256=LGGQ_mb1dWorfshHjGgXEW_pRweGj-6MZcIUFq3AHy4,2213
-zrb/task/llm/context_enrichment.py,sha256=djY4fE9C0zUxJPrrb2xDboBXr_2kPUS_b4HjqslVpHg,6051
+zrb/task/llm/conversation_history.py,sha256=B_PDWYL_q66s0xwWBzMSomqPN6u3gkXlIeXBD5A0Apg,4416
+zrb/task/llm/conversation_history_model.py,sha256=Zbz7w0M2FeOklWG4AVz8C2y2AZ87aNMZ5I0YbBanO0Y,16312
 zrb/task/llm/error.py,sha256=QR-nIohS6pBpC_16cWR-fw7Mevo1sNYAiXMBsh_CJDE,4157
-zrb/task/llm/history.py,sha256=dqCwJYRoMVrvyMHb4M6-KLcwAUF4tbDCP7qgD1h694s,8540
-zrb/task/llm/history_summarization.py,sha256=V0G1BiISnxxmD8040PrvT0_dfqGE7zbLtk74KUpuqig,6050
+zrb/task/llm/history_summarization.py,sha256=vY2_iLULgSNTaqW1xJqOhI8oOH3vNEsZn_yNcx6jYX8,8104
 zrb/task/llm/print_node.py,sha256=zocTKi9gZDxl2I6KNu095TmMc13Yip6SNuWYnswS680,4060
-zrb/task/llm/prompt.py,sha256=qhR8qS8RgaQ23D3amaHSHnBNv_NOnFB_1uxaQNc8KFw,3417
+zrb/task/llm/prompt.py,sha256=ARyJ2Q0G6N7I2X2KZfLQW45yj9nmzl5SfX90rrY7TVU,7417
 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=Vq2kPnE40xJZtHYHjeCBv-nNFKzSCkyMJaVUNXmEmuc,15616
+zrb/task/llm_task.py,sha256=TTYb9FYqZX_OIgDE6q5Z9IVuM6NcsKFeCVIi6ovQDE8,13712
 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
@@ -383,6 +382,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=tJEGV2X7v13b1PXUzRXzu1e1HnY6d9JLtqbUGiZqHoo,573
 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
@@ -393,7 +393,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.9.16.dist-info/METADATA,sha256=mDFOvi0SF15P4y4BKlynOsHZrQJClrZC2dNeTB-Xzz0,9778
-zrb-1.9.16.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.9.16.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.9.16.dist-info/RECORD,,
+zrb-1.10.0.dist-info/METADATA,sha256=L0WbyLS9Ormz797L5aHD2ycfplf___3mDYqx05H_Eqs,9778
+zrb-1.10.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.10.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.10.0.dist-info/RECORD,,

zrb/task/llm/context.py

@@ -1,58 +0,0 @@
-import datetime
-import os
-import platform
-import re
-from typing import Any
-
-from zrb.util.file import read_dir, read_file_with_line_numbers
-
-
-def extract_default_context(user_message: str) -> tuple[str, dict[str, Any]]:
-    """
-    Return modified user message and default context including time, OS, and file references.
-    """
-    modified_user_message = user_message
-    # Match “@” + any non-space/comma sequence that contains at least one “/”
-    pattern = r"(?<!\w)@(?=[^,\s]*/)([^,\s]+)"
-    potential_resource_path = re.findall(pattern, user_message)
-    current_references = []
-
-    for ref in potential_resource_path:
-        resource_path = os.path.abspath(os.path.expanduser(ref))
-        print("RESOURCE PATH", resource_path)
-        if os.path.isfile(resource_path):
-            content = read_file_with_line_numbers(resource_path)
-            current_references.append(
-                {
-                    "reference": ref,
-                    "name": resource_path,
-                    "type": "file",
-                    "note": "line numbers are included in the content",
-                    "content": content,
-                }
-            )
-            # Remove the '@' from the modified user message for valid file paths
-            modified_user_message = modified_user_message.replace(f"@{ref}", ref, 1)
-        elif os.path.isdir(resource_path):
-            content = read_dir(resource_path)
-            current_references.append(
-                {
-                    "reference": ref,
-                    "name": resource_path,
-                    "type": "directory",
-                    "content": content,
-                }
-            )
-            # Remove the '@' from the modified user message for valid directory paths
-            modified_user_message = modified_user_message.replace(f"@{ref}", ref, 1)
-
-    context = {
-        "current_time": datetime.datetime.now().isoformat(),
-        "current_working_directory": os.getcwd(),
-        "current_os": platform.system(),
-        "os_version": platform.version(),
-        "python_version": platform.python_version(),
-        "current_references": current_references,
-    }
-
-    return modified_user_message, context