zrb 1.15.24__tar.gz → 1.15.25__tar.gz

{zrb-1.15.24 → zrb-1.15.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: zrb
-Version: 1.15.24
+Version: 1.15.25
 Summary: Your Automation Powerhouse
 License: AGPL-3.0-or-later
 Keywords: Automation,Task Runner,Code Generator,Monorepo,Low Code

{zrb-1.15.24 → zrb-1.15.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.15.24"
+version = "1.15.25"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

{zrb-1.15.24 → zrb-1.15.25}/src/zrb/__init__.py

@@ -61,6 +61,7 @@ _LAZY_LOAD = {
 }
 
 if TYPE_CHECKING:
+    from zrb import builtin
     from zrb.attr.type import (
         AnyAttr,
         BoolAttr,
@@ -126,9 +127,4 @@ def __getattr__(name: str) -> Any:
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
 
 
-# Eager load CFG
-CFG = __getattr__("CFG")
-if CFG.LOAD_BUILTIN:
-    from zrb import builtin
-
-    assert builtin
+from zrb import builtin

{zrb-1.15.24 → zrb-1.15.25}/src/zrb/builtin/group.py

@@ -1,39 +1,51 @@
+from zrb.config.config import CFG
 from zrb.group.group import Group
 from zrb.runner.cli import cli
 
-base64_group = cli.add_group(Group(name="base64", description="📄 Base64 operations"))
-uuid_group = cli.add_group(Group(name="uuid", description="🆔 UUID operations"))
+
+def _maybe_add_group(group: Group):
+    if CFG.LOAD_BUILTIN:
+        cli.add_group(group)
+    return group
+
+
+base64_group = _maybe_add_group(
+    Group(name="base64", description="📄 Base64 operations")
+)
+uuid_group = _maybe_add_group(Group(name="uuid", description="🆔 UUID operations"))
 uuid_v1_group = uuid_group.add_group(Group(name="v1", description="UUID V1 operations"))
 uuid_v3_group = uuid_group.add_group(Group(name="v3", description="UUID V3 operations"))
 uuid_v4_group = uuid_group.add_group(Group(name="v4", description="UUID V4 operations"))
 uuid_v5_group = uuid_group.add_group(Group(name="v5", description="UUID V5 operations"))
-ulid_group = cli.add_group(Group(name="ulid", description="🔢 ULID operations"))
-jwt_group = cli.add_group(Group(name="jwt", description="🔒 JWT encode/decode"))
-http_group = cli.add_group(Group(name="http", description="🌐 HTTP request operations"))
+ulid_group = _maybe_add_group(Group(name="ulid", description="🔢 ULID operations"))
+jwt_group = _maybe_add_group(Group(name="jwt", description="🔒 JWT encode/decode"))
+http_group = _maybe_add_group(
+    Group(name="http", description="🌐 HTTP request operations")
+)
 
-random_group = cli.add_group(Group(name="random", description="🔀 Random operation"))
-git_group = cli.add_group(Group(name="git", description="🌱 Git related commands"))
+random_group = _maybe_add_group(Group(name="random", description="🔀 Random operation"))
+git_group = _maybe_add_group(Group(name="git", description="🌱 Git related commands"))
 git_branch_group = git_group.add_group(
     Group(name="branch", description="🌿 Git branch related commands")
 )
 git_subtree_group = git_group.add_group(
     Group(name="subtree", description="🌳 Git subtree related commands")
 )
-llm_group = cli.add_group(Group(name="llm", description="🤖 LLM operations"))
-md5_group = cli.add_group(Group(name="md5", description="🔢 Md5 operations"))
-python_group = cli.add_group(
+llm_group = _maybe_add_group(Group(name="llm", description="🤖 LLM operations"))
+md5_group = _maybe_add_group(Group(name="md5", description="🔢 Md5 operations"))
+python_group = _maybe_add_group(
     Group(name="python", description="🐍 Python related commands")
 )
-todo_group = cli.add_group(Group(name="todo", description="✅ Todo management"))
+todo_group = _maybe_add_group(Group(name="todo", description="✅ Todo management"))
 
-shell_group = cli.add_group(
+shell_group = _maybe_add_group(
     Group(name="shell", description="💬 Shell related commands")
 )
 shell_autocomplete_group: Group = shell_group.add_group(
     Group(name="autocomplete", description="⌨️ Shell autocomplete related commands")
 )
 
-project_group = cli.add_group(
+project_group = _maybe_add_group(
     Group(name="project", description="📁 Project related commands")
 )
 add_to_project_group = project_group.add_group(
@@ -43,7 +55,7 @@ add_fastapp_to_project_group = add_to_project_group.add_group(
     Group(name="fastapp", description="🚀 Add Fastapp resources")
 )
 
-setup_group = cli.add_group(Group(name="setup", description="🔧 Setup"))
+setup_group = _maybe_add_group(Group(name="setup", description="🔧 Setup"))
 setup_latex_group = setup_group.add_group(
     Group(name="latex", description="✍️ Setup LaTeX")
 )

{zrb-1.15.24 → zrb-1.15.25}/src/zrb/builtin/llm/llm_ask.py

@@ -1,3 +1,6 @@
+from collections.abc import Callable
+from typing import TYPE_CHECKING
+
 from zrb.builtin.group import llm_group
 from zrb.builtin.llm.chat_session import get_llm_ask_input_mapping, read_user_prompt
 from zrb.builtin.llm.history import read_chat_conversation, write_chat_conversation
@@ -32,6 +35,42 @@ from zrb.task.base_trigger import BaseTrigger
 from zrb.task.llm_task import LLMTask
 from zrb.util.string.conversion import to_boolean
 
+if TYPE_CHECKING:
+    from pydantic_ai import Tool
+
+    ToolOrCallable = Tool | Callable
+
+
+def _get_tool(ctx: AnyContext) -> list["ToolOrCallable"]:
+    tools = []
+    if CFG.LLM_ALLOW_ANALYZE_REPO:
+        tools.append(analyze_repo)
+    if CFG.LLM_ALLOW_ANALYZE_FILE:
+        tools.append(analyze_file)
+    if CFG.LLM_ALLOW_ACCESS_LOCAL_FILE:
+        tools.append(search_files)
+        tools.append(list_files)
+        tools.append(read_from_file)
+        tools.append(read_many_files)
+        tools.append(replace_in_file)
+        tools.append(write_to_file)
+        tools.append(write_many_files)
+    if CFG.LLM_ALLOW_ACCESS_SHELL:
+        tools.append(run_shell_command)
+    if CFG.LLM_ALLOW_OPEN_WEB_PAGE:
+        tools.append(open_web_page)
+    if CFG.LLM_ALLOW_SEARCH_WIKIPEDIA:
+        tools.append(search_wikipedia)
+    if CFG.LLM_ALLOW_SEARCH_ARXIV:
+        tools.append(search_arxiv)
+    if CFG.LLM_ALLOW_GET_CURRENT_LOCATION:
+        tools.append(get_current_location)
+    if CFG.LLM_ALLOW_GET_CURRENT_WEATHER:
+        tools.append(get_current_weather)
+    if CFG.SERPAPI_KEY != "" and CFG.LLM_ALLOW_SEARCH_INTERNET:
+        tools.append(create_search_internet_tool(CFG.SERPAPI_KEY))
+    return tools
+
 
 def _get_default_yolo_mode(ctx: AnyContext) -> str:
     default_value = llm_config.default_yolo_mode
@@ -92,7 +131,7 @@ _llm_ask_inputs = [
         "modes",
         description="Modes",
         prompt="Modes",
-        default="coding",
+        default=lambda ctx: ",".join(llm_config.default_modes),
         allow_positional_parsing=False,
         always_prompt=False,
     ),
@@ -144,6 +183,7 @@ llm_ask: LLMTask = llm_group.add_task(
             None if ctx.input.modes.strip() == "" else ctx.input.modes.split(",")
         ),
         message="{ctx.input.message}",
+        tools=_get_tool,
         yolo_mode=_render_yolo_mode_input,
         retries=0,
     ),
@@ -169,41 +209,3 @@ llm_group.add_task(
     ),
     alias="chat",
 )
-
-if CFG.LLM_ALLOW_ANALYZE_REPO:
-    llm_ask.append_tool(analyze_repo)
-
-if CFG.LLM_ALLOW_ANALYZE_FILE:
-    llm_ask.append_tool(analyze_file)
-
-if CFG.LLM_ALLOW_ACCESS_LOCAL_FILE:
-    llm_ask.append_tool(
-        search_files,
-        list_files,
-        read_from_file,
-        read_many_files,
-        replace_in_file,
-        write_to_file,
-        write_many_files,
-    )
-
-if CFG.LLM_ALLOW_ACCESS_SHELL:
-    llm_ask.append_tool(run_shell_command)
-
-if CFG.LLM_ALLOW_OPEN_WEB_PAGE:
-    llm_ask.append_tool(open_web_page)
-
-if CFG.LLM_ALLOW_SEARCH_WIKIPEDIA:
-    llm_ask.append_tool(search_wikipedia)
-
-if CFG.LLM_ALLOW_SEARCH_ARXIV:
-    llm_ask.append_tool(search_arxiv)
-
-if CFG.LLM_ALLOW_GET_CURRENT_LOCATION:
-    llm_ask.append_tool(get_current_location)
-
-if CFG.LLM_ALLOW_GET_CURRENT_WEATHER:
-    llm_ask.append_tool(get_current_weather)
-
-if CFG.SERPAPI_KEY != "" and CFG.LLM_ALLOW_SEARCH_INTERNET:
-    llm_ask.append_tool(create_search_internet_tool(CFG.SERPAPI_KEY))