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

zrb/__init__.py

@@ -47,7 +47,7 @@ _LAZY_LOAD = {
     "BaseTrigger": "zrb.task.base_trigger",
     "CmdTask": "zrb.task.cmd_task",
     "HttpCheck": "zrb.task.http_check",
-    "ConversationHistoryData": "zrb.task.llm.history",
+    "ConversationHistory": "zrb.task.llm.conversation_history",
     "LLMTask": "zrb.task.llm_task",
     "make_task": "zrb.task.make_task",
     "RsyncTask": "zrb.task.rsync_task",
@@ -107,7 +107,7 @@ if TYPE_CHECKING:
     from zrb.task.base_trigger import BaseTrigger
     from zrb.task.cmd_task import CmdTask
     from zrb.task.http_check import HttpCheck
-    from zrb.task.llm.conversation_history import ConversationHistoryData
+    from zrb.task.llm.conversation_history import ConversationHistory
     from zrb.task.llm_task import LLMTask
     from zrb.task.make_task import make_task
     from zrb.task.rsync_task import RsyncTask

zrb/builtin/llm/history.py

@@ -11,7 +11,7 @@ from zrb.util.file import read_file, write_file
 def read_chat_conversation(ctx: AnySharedContext) -> dict[str, Any] | list | None:
     """Reads conversation history from the session file.
     Returns the raw dictionary or list loaded from JSON, or None if not found/empty.
-    The LLMTask will handle parsing this into ConversationHistoryData.
+    The LLMTask will handle parsing this into ConversationHistory.
     """
     if ctx.input.start_new:
         return None  # Indicate no history to load

zrb/config/llm_config.py

@@ -83,7 +83,7 @@ _DEFAULT_SYSTEM_PROMPT = (
 ).strip()
 
 _DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
-    "## Guiding Principles\n"
+    "# Guiding Principles\n"
     "- **Clarify and Scope First:** Before undertaking any complex task (like "
     "writing a new feature or a large test suite), you MUST ensure the request "
     "is not ambiguous. If it is, ask clarifying questions. Propose a concise "
@@ -97,7 +97,7 @@ _DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
     "conventions.\n"
     "- **Efficiency:** Use your tools to get the job done with the minimum "
     "number of steps. Combine commands where possible.\n\n"
-    "## Critical Prohibitions\n"
+    "# Critical Prohibitions\n"
     "- **NEVER Assume Dependencies:** Do not use a library or framework unless "
     "you have first verified it is an existing project dependency (e.g., in "
     "`package.json`, `requirements.txt`).\n"
@@ -108,7 +108,7 @@ _DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
     "- **NEVER Commit Without Verification:** Do not use `git commit` until you "
     "have staged the changes and run the project's own verification steps "
     "(tests, linter, build).\n\n"
-    "## Common Task Workflows\n\n"
+    "# Common Task Workflows\n\n"
     "**File System Operations:**\n"
     "1.  **Analyze:** Before modifying, read the file or list the "
     "directory.\n"
@@ -160,7 +160,7 @@ _DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
     "reputable sources.\n"
     "3.  **Synthesize & Cite:** Present the information clearly. For factual "
     "claims, cite the source URL.\n\n"
-    "## Communicating with the User\n"
+    "# Communicating with the User\n"
     "- **Be Concise:** When reporting results, be brief. Focus on the outcome "
     "and the verification step.\n"
     "- **Explain 'Why,' Not Just 'What':** For complex changes or bug fixes, "
@@ -187,7 +187,7 @@ _DEFAULT_SUMMARIZATION_PROMPT = (
     "    - Identify any new, stable, and globally relevant information from "
     "the recent conversation. This includes user preferences, high-level "
     "goals, or facts that will be true regardless of the current working "
-    "directory.\n"
+    "directory. Only extract facts.\n"
     "    - If you find such information, use the `write_long_term_note` tool "
     "to save a concise, updated version of the note. Keep it brief and "
     "factual.\n\n"
@@ -195,7 +195,9 @@ _DEFAULT_SUMMARIZATION_PROMPT = (
     "    - Read the existing `Contextual` note.\n"
     "    - Identify new information relevant *only* to the current project "
     "or directory. This could be the file the user is working on, the "
-    "specific bug they are fixing, or the feature they are building.\n"
+    "specific bug they are fixing, or the feature they are building. "
+    "This note might contain temporary context, and information should be "
+    "deleted once it is no longer relevant.\n"
     "    - Use the `write_contextual_note` tool to save a concise, updated "
     "note about the current working context. This note should be focused on "
     "the immediate task at hand.\n\n"

zrb/task/llm/conversation_history_model.py

@@ -81,9 +81,11 @@ class ConversationHistory:
         return None
 
     def fetch_newest_notes(self):
+        self.long_term_note = ""
         long_term_note_path = self._get_long_term_note_path()
         if os.path.isfile(long_term_note_path):
             self.long_term_note = read_file(long_term_note_path)
+        self.contextual_note = ""
         contextual_note_path = self._get_contextual_note_path()
         if os.path.isfile(contextual_note_path):
             self.contextual_note = read_file(contextual_note_path)

zrb/task/llm/prompt.py

@@ -153,16 +153,30 @@ def extract_conversation_context(user_message: str) -> tuple[str, str]:
             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)),
         ]
     )
+    iso_date = datetime.now(timezone.utc).astimezone().isoformat()
+    current_directory = os.getcwd()
+    modified_user_message = "\n".join(
+        [
+            make_prompt_section("User Message", modified_user_message),
+            make_prompt_section(
+                "Context",
+                "\n".join(
+                    [
+                        make_prompt_section(
+                            "Current working directory", current_directory
+                        ),
+                        make_prompt_section("Current time", iso_date),
+                    ]
+                ),
+            ),
+        ]
+    )
     return conversation_context, modified_user_message
 
 

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

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

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

@@ -1,4 +1,4 @@
-zrb/__init__.py,sha256=W0Wz3UcnNf5oE-C0i5wkDWPISEktXv-ea-FCFO8zf2g,5114
+zrb/__init__.py,sha256=GSVTmbO6guFI2oW5gGxQvn7ELOMa5-qPxfyQMv9H07M,5119
 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,7 +10,7 @@ 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=k4wY0anietrF5iEUVuYAAYGbhjs4TBo03goXzCk_pRM,3091
+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/previous-session.js,sha256=xMKZvJoAbrwiyHS0OoPrWuaKxWYLoyR5sguePIoCjTY,816
@@ -218,7 +218,7 @@ 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=vUmJWQHRgmMVL1FmoukjQe9J6vCuyzqBIg4FncREGmw,15108
-zrb/config/llm_config.py,sha256=ROGDX3LKE5YI9JkhcMUO0E-ffscj716PAN4b7u1EFRY,20676
+zrb/config/llm_config.py,sha256=2UO6a9DxN-WkZ6rwZX8hNEhK_UZjjDeCNCFvADbQaws,20814
 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
@@ -340,11 +340,11 @@ 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/conversation_history.py,sha256=B_PDWYL_q66s0xwWBzMSomqPN6u3gkXlIeXBD5A0Apg,4416
-zrb/task/llm/conversation_history_model.py,sha256=Zbz7w0M2FeOklWG4AVz8C2y2AZ87aNMZ5I0YbBanO0Y,16312
+zrb/task/llm/conversation_history_model.py,sha256=xsKo2QtAie_1f7rVIQ6ruaClv1NdkhLbK4Fa9WUGtnM,16379
 zrb/task/llm/error.py,sha256=QR-nIohS6pBpC_16cWR-fw7Mevo1sNYAiXMBsh_CJDE,4157
 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=ARyJ2Q0G6N7I2X2KZfLQW45yj9nmzl5SfX90rrY7TVU,7417
+zrb/task/llm/prompt.py,sha256=TZYoI5MXddhHYnlVNsIjRLdhGwA9eEBVSeGz_Wi31JQ,7833
 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=TTYb9FYqZX_OIgDE6q5Z9IVuM6NcsKFeCVIi6ovQDE8,13712
@@ -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.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-1.10.2.dist-info/METADATA,sha256=0UVwKjfnakRF8kPcW_37rGPJ5sEZwCcEywEOrg5l_D4,9778
+zrb-1.10.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.10.2.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.10.2.dist-info/RECORD,,