zrb 1.5.8__py3-none-any.whl → 1.5.10__py3-none-any.whl

zrb/task/llm/prompt.py

@@ -9,12 +9,29 @@ from zrb.task.llm.context import get_default_context  # Updated import
 from zrb.util.attr import get_attr, get_str_attr
 
 
-def get_system_prompt(
+def get_persona(
+    ctx: AnyContext,
+    persona_attr: StrAttr | None,
+    render_persona: bool,
+) -> str:
+    """Gets the persona, prioritizing task-specific, then default."""
+    persona = get_attr(
+        ctx,
+        persona_attr,
+        None,
+        auto_render=render_persona,
+    )
+    if persona is not None:
+        return persona
+    return default_llm_config.get_default_persona() or ""
+
+
+def get_base_system_prompt(
     ctx: AnyContext,
     system_prompt_attr: StrAttr | None,
     render_system_prompt: bool,
 ) -> str:
-    """Gets the system prompt, rendering if configured and handling defaults."""
+    """Gets the base system prompt, prioritizing task-specific, then default."""
     system_prompt = get_attr(
         ctx,
         system_prompt_attr,
@@ -23,7 +40,51 @@ def get_system_prompt(
     )
     if system_prompt is not None:
         return system_prompt
-    return default_llm_config.get_default_system_prompt()
+    return default_llm_config.get_default_system_prompt() or ""
+
+
+def get_special_instruction_prompt(
+    ctx: AnyContext,
+    special_instruction_prompt_attr: StrAttr | None,
+    render_special_instruction_prompt: bool,
+) -> str:
+    """Gets the special instruction prompt, prioritizing task-specific, then default."""
+    special_instruction = get_attr(
+        ctx,
+        special_instruction_prompt_attr,
+        None,
+        auto_render=render_special_instruction_prompt,
+    )
+    if special_instruction is not None:
+        return special_instruction
+    return default_llm_config.get_default_special_instruction_prompt() or ""
+
+
+def get_combined_system_prompt(
+    ctx: AnyContext,
+    persona_attr: StrAttr | None,
+    render_persona: bool,
+    system_prompt_attr: StrAttr | None,
+    render_system_prompt: bool,
+    special_instruction_prompt_attr: StrAttr | None,
+    render_special_instruction_prompt: bool,
+) -> str:
+    """Combines persona, base system prompt, and special instructions."""
+    persona = get_persona(ctx, persona_attr, render_persona)
+    base_system_prompt = get_base_system_prompt(
+        ctx, system_prompt_attr, render_system_prompt
+    )
+    special_instruction = get_special_instruction_prompt(
+        ctx, special_instruction_prompt_attr, render_special_instruction_prompt
+    )
+    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()
 
 
 def get_user_message(

zrb/task/llm_task.py

@@ -15,6 +15,8 @@ from zrb.input.any_input import AnyInput
 from zrb.task.any_task import AnyTask
 from zrb.task.base_task import BaseTask
 from zrb.task.llm.agent import get_agent, run_agent_iteration
+
+# No longer need llm_config here
 from zrb.task.llm.config import (
     get_model,
     get_model_settings,
@@ -30,9 +32,9 @@ from zrb.task.llm.history import (
 from zrb.task.llm.history_summarization import maybe_summarize_history
 from zrb.task.llm.prompt import (
     build_user_prompt,
+    get_combined_system_prompt,
     get_context_enrichment_prompt,
     get_summarization_prompt,
-    get_system_prompt,
 )
 from zrb.util.cli.style import stylize_faint
 from zrb.xcom.xcom import Xcom
@@ -62,12 +64,16 @@ class LLMTask(BaseTask):
             ModelSettings | Callable[[AnySharedContext], ModelSettings] | None
         ) = None,
         agent: Agent | Callable[[AnySharedContext], Agent] | None = None,
+        persona: StrAttr | None = None,
+        render_persona: bool = True,
         system_prompt: StrAttr | None = None,
         render_system_prompt: bool = True,
+        special_instruction_prompt: StrAttr | None = None,
+        render_special_instruction_prompt: bool = True,
         message: StrAttr | None = None,
         summarization_prompt: StrAttr | None = None,
         render_summarization_prompt: bool = True,
-        enrich_context: BoolAttr = False,
+        enrich_context: BoolAttr | None = None,
         render_enrich_context: bool = True,
         context_enrichment_prompt: StrAttr | None = None,
         render_context_enrichment_prompt: bool = True,
@@ -78,28 +84,23 @@ class LLMTask(BaseTask):
             list[MCPServer] | Callable[[AnySharedContext], list[MCPServer]]
         ) = [],
         conversation_history: (
-            ConversationHistoryData  # Use the new BaseModel
-            | Callable[
-                [AnySharedContext], ConversationHistoryData | dict | list
-            ]  # Allow returning raw dict/list too
-            | dict  # Allow raw dict
-            | list  # Allow raw list (old format)
-        ) = ConversationHistoryData(),  # Default to an empty model instance
+            ConversationHistoryData
+            | Callable[[AnySharedContext], ConversationHistoryData | dict | list]
+            | dict
+            | list
+        ) = ConversationHistoryData(),
         conversation_history_reader: (
             Callable[[AnySharedContext], ConversationHistoryData | dict | list | None]
             | None
-            # Allow returning raw dict/list or None
         ) = None,
         conversation_history_writer: (
-            Callable[[AnySharedContext, ConversationHistoryData], None]
-            | None
-            # Writer expects the model instance
+            Callable[[AnySharedContext, ConversationHistoryData], None] | None
         ) = None,
         conversation_history_file: StrAttr | None = None,
         render_history_file: bool = True,
-        summarize_history: BoolAttr = True,
+        summarize_history: BoolAttr | None = None,
         render_summarize_history: bool = True,
-        history_summarization_threshold: IntAttr = 5,  # -1 means no summarization trigger
+        history_summarization_threshold: IntAttr | None = None,
         render_history_summarization_threshold: bool = True,
         execute_condition: bool | str | Callable[[AnySharedContext], bool] = True,
         retries: int = 2,
@@ -147,8 +148,12 @@ class LLMTask(BaseTask):
         self._render_model_api_key = render_model_api_key
         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._message = message
         self._summarization_prompt = summarization_prompt
         self._render_summarization_prompt = render_summarization_prompt
@@ -211,10 +216,15 @@ class LLMTask(BaseTask):
             summarization_prompt_attr=self._summarization_prompt,
             render_summarization_prompt=self._render_summarization_prompt,
         )
-        system_prompt = get_system_prompt(
+        # Get the combined system prompt using the new getter
+        system_prompt = get_combined_system_prompt(
             ctx=ctx,
+            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,
         )
         # 1. Prepare initial state (read history, get initial context)
         history_list, conversation_context = await prepare_initial_state(

zrb/task/scheduler.py

@@ -12,7 +12,6 @@ from zrb.task.any_task import AnyTask
 from zrb.task.base_trigger import BaseTrigger
 from zrb.util.attr import get_str_attr
 from zrb.util.cron import match_cron
-from zrb.xcom.xcom import Xcom
 
 
 class Scheduler(BaseTrigger):
@@ -77,6 +76,6 @@ class Scheduler(BaseTrigger):
             ctx.print(f"Current time: {now}")
             if match_cron(cron_pattern, now):
                 ctx.print(f"Matching {now} with pattern: {cron_pattern}")
-                xcom: Xcom = ctx.xcom[self.queue_name]
+                xcom = self.get_exchange_xcom(ctx.session)
                 xcom.push(now)
             await asyncio.sleep(60)

{zrb-1.5.8.dist-info → zrb-1.5.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.5.8
+Version: 1.5.10
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -26,7 +26,7 @@ Requires-Dist: openai (>=1.70.0,<2.0.0) ; extra == "rag" or extra == "all"
 Requires-Dist: pdfplumber (>=0.11.6,<0.12.0) ; extra == "rag" or extra == "all"
 Requires-Dist: playwright (>=1.51.0,<2.0.0) ; extra == "playwright" or extra == "all"
 Requires-Dist: psutil (>=7.0.0,<8.0.0)
-Requires-Dist: pydantic-ai (>=0.0.52,<0.0.53)
+Requires-Dist: pydantic-ai (>=0.1.2,<0.2.0)
 Requires-Dist: python-dotenv (>=1.1.0,<2.0.0)
 Requires-Dist: python-jose[cryptography] (>=3.4.0,<4.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)

{zrb-1.5.8.dist-info → zrb-1.5.10.dist-info}/RECORD

@@ -13,7 +13,7 @@ zrb/builtin/llm/llm_chat.py,sha256=XL5HK_o1EejkYS0fJIBI39vApuqYYsGHFSigvXfS7CI,4
 zrb/builtin/llm/previous-session.js,sha256=xMKZvJoAbrwiyHS0OoPrWuaKxWYLoyR5sguePIoCjTY,816
 zrb/builtin/llm/tool/api.py,sha256=yR9I0ZsI96OeQl9pgwORMASVuXsAL0a89D_iPS4C8Dc,1699
 zrb/builtin/llm/tool/cli.py,sha256=_CNEmEc6K2Z0i9ppYeM7jGpqaEdT3uxaWQatmxP3jKE,858
-zrb/builtin/llm/tool/file.py,sha256=ecFBmbMaqCIfqNGTmvd-Yt3vLtKuQ15KbjXlnIMWdho,19269
+zrb/builtin/llm/tool/file.py,sha256=e2-Mh9AeltCJGZrvhuMFMzmgQgsQbaxvSpAzcruIB9o,19222
 zrb/builtin/llm/tool/rag.py,sha256=45t0o88l7F62oq2P61NnC1hsZJ4h72dZsVQfcsOIUc8,7521
 zrb/builtin/llm/tool/web.py,sha256=4qzom9xX-JxztIaTWneNfyTRlgweHIxzC1uSEAxJ00A,5507
 zrb/builtin/md5.py,sha256=0pNlrfZA0wlZlHvFHLgyqN0JZJWGKQIF5oXxO44_OJk,949
@@ -239,7 +239,7 @@ zrb/input/option_input.py,sha256=TQB82ko5odgzkULEizBZi0e9TIHEbIgvdP0AR3RhA74,213
 zrb/input/password_input.py,sha256=szBojWxSP9QJecgsgA87OIYwQrY2AQ3USIKdDZY6snU,1465
 zrb/input/str_input.py,sha256=NevZHX9rf1g8eMatPyy-kUX3DglrVAQpzvVpKAzf7bA,81
 zrb/input/text_input.py,sha256=shvVbc2U8Is36h23M5lcW8IEwKc9FR-4uEPZZroj3rU,3377
-zrb/llm_config.py,sha256=88EboqaAercNY6kgU9Sl4ua361K6x-qTsAeDlbP9eEE,7514
+zrb/llm_config.py,sha256=sf2cMjD-eSTvOywT1qKVeSftRmxLQ92K3mzho6yP2S8,8952
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/cli.py,sha256=0mT0oO_yEhc8N4nYCJNujhgLjVykZ0B-kAOFXyAvAqM,6672
 zrb/runner/common_util.py,sha256=0zhZn1Jdmr194_nsL5_L-Kn9-_NDpMTI2z6_LXUQJ-U,1369
@@ -297,8 +297,15 @@ zrb/session_state_logger/any_session_state_logger.py,sha256=OEP7RQD6sPSJP0OY8oDK
 zrb/session_state_logger/file_session_state_logger.py,sha256=1ue7-Bcwg4wlLn2G_7ARR4Rij2zUISj_Y56VBQsCaMQ,3666
 zrb/session_state_logger/session_state_logger_factory.py,sha256=wXf2DVmeRmx399MFYYty6uNcPZMcf7iayHBYCLGlhfc,189
 zrb/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/task/any_task.py,sha256=9rCdKe-Sayr34Han9AsbhRxFpkbk6Rteg1DOyETulwQ,4917
-zrb/task/base_task.py,sha256=H1D2KyJ9qK0GIPJ4kYyvfRe7fseJibmLVGjj8iRuLs4,21320
+zrb/task/any_task.py,sha256=zklUjkLRQ62TEvfnOUUYfXChj8Zk4igee3w8V3_rN08,5846
+zrb/task/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+zrb/task/base/context.py,sha256=73k3fKwup0AJwTTLpay0f_-axJextaxgbTem4w4Bmas,3670
+zrb/task/base/dependencies.py,sha256=Kcxhn7z4OU9Fc_y-cD1Sc96wgNXs0VDoi8r5cJMu0oY,1952
+zrb/task/base/execution.py,sha256=lB6cfivk-EM6sZSaPjYs_ufb7jb-A2jLJNhBupwBFgI,11101
+zrb/task/base/lifecycle.py,sha256=YIugyqRmEKMnc9MTCDEZr9jVhie3Kwt7LTMtAVAN9Ks,7278
+zrb/task/base/monitoring.py,sha256=UAOEcPiYNtZR4FFxzWCosuOEFE_P3c4GT5vAhQmohqI,5663
+zrb/task/base/operators.py,sha256=uAMFqpZJsPnCrojgOl1FUDXTS15mtOa_IqiAXltyYRU,1576
+zrb/task/base_task.py,sha256=3MLPYDzNgjIJiQTxSyKLmvG_FspOl61htuRZG7l34QA,8915
 zrb/task/base_trigger.py,sha256=jC722rDvodaBLeNaFghkTyv1u0QXrK6BLZUUqcmBJ7Q,4581
 zrb/task/cmd_task.py,sha256=f1OWajOBmdtx2QcXBr_8s6o82Fp4UTLqCXJqp2gxwzU,10750
 zrb/task/http_check.py,sha256=Gf5rOB2Se2EdizuN9rp65HpGmfZkGc-clIAlHmPVehs,2565
@@ -306,19 +313,19 @@ zrb/task/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/llm/agent.py,sha256=2u1zlX41oBzMKozXWXD3gDEOzOsHNsFpedRcJXbUNHI,5105
 zrb/task/llm/config.py,sha256=fXasnGb_DVTJIeY--HZ8bf1jd7iCUNttfUDJB5PvHRk,3071
 zrb/task/llm/context.py,sha256=JAI1DqqiXlDkyL4aEXVyeutU8K5YfdSsWMbzx1rxMZU,3281
-zrb/task/llm/context_enrichment.py,sha256=nnALfQ_jnRpQZJad0pgOY8JkOb9Au4LoH_NNhw4rTMQ,4442
+zrb/task/llm/context_enrichment.py,sha256=zz2hmJZgXRa6354eTz8fAz3NclGgwD5VciWzD_mFTEM,4641
 zrb/task/llm/error.py,sha256=YOwnEdFMtqOlaiA83tDHpC6uh2_9r5NeS-inrlb5a8E,3622
 zrb/task/llm/history.py,sha256=LnrJdXLyo2qz-bNCwLorhoqGmgSiPTUU0bzY63w67-E,9257
-zrb/task/llm/history_summarization.py,sha256=MW9wg6m0y2Vjcdyvh-NCOCyYWUZeqamlL3z3LCkn1J0,5996
+zrb/task/llm/history_summarization.py,sha256=UaeepcIVMTxJTwqy3V22rpeBXXN04KLvEzOsFtWmyDM,6259
 zrb/task/llm/print_node.py,sha256=Dkb0xFyEXpNRKFRCM4Md0lfg6K3nI0t8yH3Abh20PjE,4430
-zrb/task/llm/prompt.py,sha256=PmzeSeUBoqZqqHox1Kq8FkikvmB2lNA3hus-pybXAQg,2719
+zrb/task/llm/prompt.py,sha256=Xql45nZfkB9BXbVVxfKiawtnAVCao2QhaowVdL7qTLg,4627
 zrb/task/llm/tool_wrapper.py,sha256=gZgoxcuOCgAVDPnLqfJ3ps57ZCVQi7q68z_KnS5Mx1U,3350
 zrb/task/llm/typing.py,sha256=c8VAuPBw_4A3DxfYdydkgedaP-LU61W9_wj3m3CAX1E,58
-zrb/task/llm_task.py,sha256=mrv7AVZd2LEz_z6CqC2gN6iqg27riUyrpTH99HdqpX0,13731
+zrb/task/llm_task.py,sha256=uLptMfoRawCCPo8_DSneKd8Uag9WDCXkU0oOvO5Lh0M,14218
 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
-zrb/task/scheduler.py,sha256=aSDF_WtDbmwrYXaVo3BesCG8w21UNV8XLtn-5x9GWzY,3137
+zrb/task/scheduler.py,sha256=5xoet0bMjVq0JKwSwwivD1Jo84wwwA2PrL5WaKwJAGA,3110
 zrb/task/task.py,sha256=KCrCaWYOQQvv1RJsYtHDeo9RBFmlXQ28oKyEFU4Q7pA,73
 zrb/task/tcp_check.py,sha256=P_QgGqwd5dXDaud3oQRxe_WuxyxG4s7CTY2wDk9Qcu0,2511
 zrb/task_status/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -355,7 +362,7 @@ zrb/util/string/name.py,sha256=8picJfUBXNpdh64GNaHv3om23QHhUZux7DguFLrXHp8,1163
 zrb/util/todo.py,sha256=1nDdwPc22oFoK_1ZTXyf3638Bg6sqE2yp_U4_-frHoc,16015
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.5.8.dist-info/METADATA,sha256=Av7ZK7PbcYfMR6KUZ0IjN39HKabpxoWNUdAxP7yli_E,8470
-zrb-1.5.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.5.8.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.5.8.dist-info/RECORD,,
+zrb-1.5.10.dist-info/METADATA,sha256=ukEcYJvB_RA35-S1X5JPJT8v3qq5oN2Y2L2sYp4hiic,8469
+zrb-1.5.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.5.10.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.5.10.dist-info/RECORD,,