zrb 1.6.7__py3-none-any.whl → 1.6.9__py3-none-any.whl

zrb/context/context.py

@@ -89,7 +89,7 @@ class Context(AnyContext):
         return int(self.render(template))
 
     def render_float(self, template: str | float) -> float:
-        if isinstance(template, float):
+        if isinstance(template, float) or isinstance(template, int):
             return template
         return float(self.render(template))
 
@@ -107,6 +107,7 @@ class Context(AnyContext):
         if plain:
             # self.append_to_shared_log(remove_style(message))
             print(message, sep=sep, end=end, file=file, flush=flush)
+            self.append_to_shared_log(remove_style(f"{message}{end}"))
             return
         color = self._color
         icon = self._icon
@@ -120,7 +121,7 @@ class Context(AnyContext):
         now = datetime.datetime.now()
         formatted_time = now.strftime("%y%m%d %H:%M:%S.%f")[:19] + " "
         prefix = f"{formatted_time}{attempt_status} {padded_styled_task_name} ⬤ "
-        self.append_to_shared_log(remove_style(f"{prefix} {message}"))
+        self.append_to_shared_log(remove_style(f"{prefix} {message}{end}"))
         stylized_prefix = stylize(prefix, color=color)
         print(f"{stylized_prefix} {message}", sep=sep, end=end, file=file, flush=flush)
 

zrb/llm_config.py

@@ -68,7 +68,9 @@ class LLMConfig:
         default_history_summarization_threshold: int | None = None,
         default_enrich_context: bool | None = None,
         default_context_enrichment_threshold: int | None = None,
+        default_model: Model | None = None,
         default_model_settings: ModelSettings | None = None,
+        default_model_provider: Provider | None = None,
     ):
         self._default_model_name = default_model_name
         self._default_model_base_url = default_base_url
@@ -87,8 +89,8 @@ class LLMConfig:
             default_context_enrichment_threshold
         )
         self._default_model_settings = default_model_settings
-        self._default_provider = None
-        self._default_model = None
+        self._default_model_provider = default_model_provider
+        self._default_model = default_model
 
     @property
     def default_model_name(self) -> str | None:
@@ -121,8 +123,8 @@ class LLMConfig:
 
     @property
     def default_model_provider(self) -> Provider | str:
-        if self._default_provider is not None:
-            return self._default_provider
+        if self._default_model_provider is not None:
+            return self._default_model_provider
         if self.default_model_base_url is None and self.default_model_api_key is None:
             return "openai"
         from pydantic_ai.providers.openai import OpenAIProvider
@@ -233,8 +235,8 @@ class LLMConfig:
     def set_default_model_base_url(self, model_base_url: str):
         self._default_model_base_url = model_base_url
 
-    def set_default_provider(self, provider: Provider | str):
-        self._default_provider = provider
+    def set_default_model_provider(self, provider: Provider | str):
+        self._default_model_provider = provider
 
     def set_default_model(self, model: Model | str):
         self._default_model = model

zrb/runner/web_route/static/resources/session/current-session.js

@@ -25,7 +25,7 @@ const CURRENT_SESSION = {
                 resultTextarea.rows = resultLineCount <= 5 ? resultLineCount : 5;
                 // update text areas
                 resultTextarea.value = data.final_result;
-                logTextarea.value = data.log.join("\n");
+                logTextarea.value = data.log.join("");
                 // logTextarea.scrollTop = logTextarea.scrollHeight;
                 // visualize history
                 this.showCurrentSession(data.task_status, data.finished);

zrb/task/llm/config.py

@@ -85,7 +85,7 @@ def get_model(
         if model_base_url is None and model_api_key is None:
             default_model_provider = llm_config.default_model_provider
             if default_model_provider is not None:
-                new_llm_config.set_default_provider(default_model_provider)
+                new_llm_config.set_default_model_provider(default_model_provider)
         return new_llm_config.default_model
     # If it's already a Model instance, return it directly
     if isinstance(model, Model):

zrb/task/llm_task.py

@@ -332,7 +332,7 @@ class LLMTask(BaseTask):
                 user_prompt=user_prompt,
                 history_list=history_list,
             )
-            if agent_run:
+            if agent_run and agent_run.result:
                 new_history_list = json.loads(agent_run.result.all_messages_json())
                 data_to_write = ConversationHistoryData(
                     context=conversation_context,  # Save the final context state

{zrb-1.6.7.dist-info → zrb-1.6.9.dist-info}/METADATA

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

{zrb-1.6.7.dist-info → zrb-1.6.9.dist-info}/RECORD

@@ -223,7 +223,7 @@ zrb/content_transformer/content_transformer.py,sha256=STl77wW-I69QaGzCXjvkppngYF
 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=p1i9af_CUDz5Mf1h1kBZMAa2AEhf17I3O5IgAcjRLoY,1768
-zrb/context/context.py,sha256=VGoUwoWyL9d4QqJEhg41S-X8T2jlssGpiC9YSc3Gjqk,6601
+zrb/context/context.py,sha256=3p43LTTqkcaX00wSBwLFVTyoEdlPnMYMASqnXUxdU_U,6706
 zrb/context/shared_context.py,sha256=w6cJH41nmhTzYlUrquRMbOexXrXgadfTd5awLnKAq4Q,2801
 zrb/dot_dict/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/dot_dict/dot_dict.py,sha256=ubw_x8I7AOJ59xxtFVJ00VGmq_IYdZP3mUhNlO4nEK0,556
@@ -245,7 +245,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=6T3MngWdUs0u0ZVs5Dl11w5KS7nN1RkgrIR_zKumzPM,3695
-zrb/llm_config.py,sha256=Jy3VEzs22MuH6mYQHNQBuFkegtQZBf5wHHPdqVjN_FQ,10286
+zrb/llm_config.py,sha256=Twe7-32OxvzCSPFOY-cV3SQGPSqCcjO1ZmiYvSjNpCk,10443
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/cli.py,sha256=2xy4cPGqDZOm4EBGcP4WtKBXWjk74O2whDS3XarX0XQ,6925
 zrb/runner/common_util.py,sha256=JDMcwvQ8cxnv9kQrAoKVLA40Q1omfv-u5_d5MvvwHeE,1373
@@ -282,7 +282,7 @@ zrb/runner/web_route/static/resources/login/event.js,sha256=1-NxaUwU-X7Tu2RAwVkz
 zrb/runner/web_route/static/resources/logout/event.js,sha256=MfZxrTa2yL49Lbh7cCZDdqsIcf9e1q3W8-WjmZXV5pA,692
 zrb/runner/web_route/static/resources/pico.min.css,sha256=_Esfkjs_U_igYn-tXBUaK3AEKb7d4l9DlmaOiw9bXfI,82214
 zrb/runner/web_route/static/resources/session/common-util.js,sha256=t7_s5DXgMyZlT8L8LYZTkzOT6vWVeZvmCKjt-bflQY0,2117
-zrb/runner/web_route/static/resources/session/current-session.js,sha256=kAYHoSVjtQ4XA5yfXocKFVjOmYihQoIHTW0pHx22sPg,7010
+zrb/runner/web_route/static/resources/session/current-session.js,sha256=tzUdK7qJKnMBGlIaMZJIPc2oeL5csk1JTBbjTsjhrFA,7008
 zrb/runner/web_route/static/resources/session/event.js,sha256=X5OlSHefK0SDB9VkFCRyBKE_Pb7mqM319mW9jRGoDOk,4716
 zrb/runner/web_route/static/resources/session/past-session.js,sha256=RwGJYKSp75K8NZ-iZP58XppWgdzkiKFaiC5wgcMLxDo,5470
 zrb/runner/web_route/static/static_route.py,sha256=BxFXIhKqkPtSBVkuf6Uho8yLph_EqDTLTVB0KG2-Pbo,1539
@@ -318,7 +318,7 @@ zrb/task/cmd_task.py,sha256=3JFkWZEhyrQAwbQJs2pgICBmkohUR9T-hjXw82JyNtA,10720
 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=6wGSsw03GdY_fj12CsJh7wxB6BnE13N8RYXaWfbiUsk,5451
-zrb/task/llm/config.py,sha256=cVEeb-hdN2gxkxO4wbS0qwNfx5yg8UvAbmhzasJojvQ,3452
+zrb/task/llm/config.py,sha256=oGxHYMdIvhASnKwNuMPwcdeJiFfS0tNskzGHakpfpQU,3458
 zrb/task/llm/context.py,sha256=U9a8lxa2ikz6my0Sd5vpO763legHrMHyvBjbrqNmv0Y,3838
 zrb/task/llm/context_enrichment.py,sha256=BKiWTorUrwDCMxghFXua3d-CHA3faUaCc3am7I3YGCg,6446
 zrb/task/llm/error.py,sha256=27DQXSG8SH1-XuvXFdZQKzP39wZDWmd_YnSTz6DJKKI,3690
@@ -328,7 +328,7 @@ zrb/task/llm/print_node.py,sha256=bpISOUxSH_JBLR-4Nq6-iLrzNWFagrKFX6u8ogYYMw8,43
 zrb/task/llm/prompt.py,sha256=2JG9eey3wbysz4IjcmiNNYRIeffSJkbj_vr0Laxa6wE,3833
 zrb/task/llm/tool_wrapper.py,sha256=Xygd4VCY3ykjVv63pqlTI16ZG41ySkp683_5VTnL-Zo,6481
 zrb/task/llm/typing.py,sha256=c8VAuPBw_4A3DxfYdydkgedaP-LU61W9_wj3m3CAX1E,58
-zrb/task/llm_task.py,sha256=Bj_EJRv2qrCw6bgt7aHbaZwS5u0kc1R6NlqLkRw-0SE,15516
+zrb/task/llm_task.py,sha256=OQ-Zp00tldmtB3pH7qugTh85guBB94yh2_o236EpfTg,15537
 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
@@ -369,7 +369,7 @@ zrb/util/string/name.py,sha256=SXEfxJ1-tDOzHqmSV8kvepRVyMqs2XdV_vyoh_9XUu0,1584
 zrb/util/todo.py,sha256=VGISej2KQZERpornK-8X7bysp4JydMrMUTnG8B0-liI,20708
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.6.7.dist-info/METADATA,sha256=EFCJigILumuwW-EMlmrEnJwDluClLCEpni55anTdAkc,8385
-zrb-1.6.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.6.7.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.6.7.dist-info/RECORD,,
+zrb-1.6.9.dist-info/METADATA,sha256=Df_JAjjx5sOjoHEgD5xSvYBD_H2HL3VljWQI-VFzk-4,8385
+zrb-1.6.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.6.9.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.6.9.dist-info/RECORD,,