zrb 1.8.0__py3-none-any.whl → 1.8.2__py3-none-any.whl

zrb/builtin/llm/tool/rag.py

@@ -203,15 +203,4 @@ def _read_txt_content(file_path: str, file_reader: list[RAGFileReader]):
     for reader in file_reader:
         if reader.is_match(file_path):
             return reader.read(file_path)
-    if file_path.lower().endswith(".pdf"):
-        return _read_pdf(file_path)
     return read_file(file_path)
-
-
-def _read_pdf(file_path: str) -> str:
-    import pdfplumber
-
-    with pdfplumber.open(file_path) as pdf:
-        return "\n".join(
-            page.extract_text() for page in pdf.pages if page.extract_text()
-        )

zrb/config.py

@@ -14,7 +14,7 @@ _DEFAULT_BANNER = """
    zzzzz rr     bbbbbb   {VERSION} Janggala
    _ _ . .  . _ .  _ . . .
 Your Automation Powerhouse
-☕ Donate at: https://stalchmst.com/donation
+☕ Donate at: https://stalchmst.com
 🐙 Submit issues/PR at: https://github.com/state-alchemists/zrb
 🐤 Follow us at: https://twitter.com/zarubastalchmst
 """
@@ -229,10 +229,6 @@ class Config:
     def LLM_PERSONA(self) -> str | None:
         return os.getenv("ZRB_LLM_PERSONA", None)
 
-    @property
-    def LLM_CODE_REVIEW_INSTRUCTION_PROMPT(self) -> str | None:
-        return os.getenv("ZRB_LLM_CODE_REVIEW_INSTRUCTION_PROMPT", None)
-
     @property
     def LLM_SPECIAL_INSTRUCTION_PROMPT(self) -> str | None:
         return os.getenv("ZRB_LLM_SPECIAL_INSTRUCTION_PROMPT", None)

zrb/llm_config.py

@@ -51,9 +51,9 @@ another JSON object with these details (i.e., {"response": {"context_name": "val
 If no context can be extracted, return {"response": {}}.
 """.strip()
 
-DEFAULT_SPECIAL_INSTRUCTION_PROMPT = ""  # Default to empty
-DEFAULT_CODE_REVIEW_INSTRUCTION_PROMPT = """
-Your goal is to review code provided by the user for correctness, readability,
+DEFAULT_SPECIAL_INSTRUCTION_PROMPT = """
+# Coding and Code Review
+When asked to do coding/code review related task, you prioritize correctness, readability,
 performance, security, and maintainability.
 Follow these principles:
 1. **Correctness** Check whether the code performs the intended logic,
@@ -66,9 +66,10 @@ Follow these principles:
     that could lead to security issues.
 5. **Consistency** Ensure the code adheres to common language idioms,
     style guides, and project conventions.
-Provide clear, concise, and actionable feedback.
-Use inline code examples when helpful.
-Do not restate the code unnecessarily.
+
+## Code Review
+When asked to do code review, you provide clear, concise, and actionable feedback.
+Use inline code examples when helpful. Do not restate the code unnecessarily.
 Focus on meaningful insights that help the user improve the code quality.
 Avoid excessive nitpicking unless requested.
 """.strip()
@@ -84,7 +85,6 @@ class LLMConfig:
         default_persona: str | None = None,
         default_system_prompt: str | None = None,
         default_special_instruction_prompt: str | None = None,
-        default_code_review_instruction_prompt: str | None = None,
         default_summarization_prompt: str | None = None,
         default_context_enrichment_prompt: str | None = None,
         default_summarize_history: bool | None = None,
@@ -101,9 +101,6 @@ class LLMConfig:
         self._default_persona = default_persona
         self._default_system_prompt = default_system_prompt
         self._default_special_instruction_prompt = default_special_instruction_prompt
-        self._default_code_review_instruction_prompt = (
-            default_code_review_instruction_prompt
-        )
         self._default_summarization_prompt = default_summarization_prompt
         self._default_context_enrichment_prompt = default_context_enrichment_prompt
         self._default_summarize_history = default_summarize_history
@@ -175,14 +172,6 @@ class LLMConfig:
             return CFG.LLM_PERSONA
         return DEFAULT_PERSONA
 
-    @property
-    def default_code_review_instruction_prompt(self) -> str:
-        if self._default_code_review_instruction_prompt is not None:
-            return self._default_code_review_instruction_prompt
-        if CFG.LLM_CODE_REVIEW_INSTRUCTION_PROMPT is not None:
-            return CFG.LLM_CODE_REVIEW_INSTRUCTION_PROMPT
-        return DEFAULT_CODE_REVIEW_INSTRUCTION_PROMPT
-
     @property
     def default_special_instruction_prompt(self) -> str:
         if self._default_special_instruction_prompt is not None:

zrb/task/llm/prompt.py

@@ -52,19 +52,7 @@ def get_special_instruction_prompt(
     )
     if special_instruction is not None:
         return special_instruction
-    aggregated_special_instruction = ""
-    if llm_config.default_code_review_instruction_prompt:
-        aggregated_special_instruction += "\n".join(
-            [
-                "# Code review instruction",
-                llm_config.default_code_review_instruction_prompt,
-            ]
-        )
-    if llm_config.default_special_instruction_prompt:
-        aggregated_special_instruction += "\n" + "\n".join(
-            ["# Code review instruction", llm_config.default_special_instruction_prompt]
-        )
-    return aggregated_special_instruction or ""
+    return llm_config.default_special_instruction_prompt
 
 
 def get_combined_system_prompt(

zrb/util/file.py

@@ -12,15 +12,33 @@ def read_file(file_path: str, replace_map: dict[str, str] = {}) -> str:
     Returns:
         The content of the file with replacements applied.
     """
-    with open(
-        os.path.abspath(os.path.expanduser(file_path)), "r", encoding="utf-8"
-    ) as f:
-        content = f.read()
+    abs_file_path = os.path.abspath(os.path.expanduser(file_path))
+    is_pdf = abs_file_path.lower().endswith(".pdf")
+    content = (
+        _read_pdf_file_content(abs_file_path)
+        if is_pdf
+        else _read_text_file_content(abs_file_path)
+    )
     for key, val in replace_map.items():
         content = content.replace(key, val)
     return content
 
 
+def _read_text_file_content(file_path: str) -> str:
+    with open(file_path, "r", encoding="utf-8") as f:
+        content = f.read()
+    return content
+
+
+def _read_pdf_file_content(file_path: str) -> str:
+    import pdfplumber
+
+    with pdfplumber.open(file_path) as pdf:
+        return "\n".join(
+            page.extract_text() for page in pdf.pages if page.extract_text()
+        )
+
+
 def read_file_with_line_numbers(
     file_path: str, replace_map: dict[str, str] = {}
 ) -> str:

{zrb-1.8.0.dist-info → zrb-1.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.8.0
+Version: 1.8.2
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -194,6 +194,32 @@ Then open your browser and visit `http://localhost:21213`
 ![Zrb Web UI](https://raw.githubusercontent.com/state-alchemists/zrb/main/_images/zrb-web-ui.png)
 
 
+# 🐋 As Container
+
+Zrb has two version of container:
+- The normal version
+- The dind (Docker in Docker) version
+
+The dind version has builtin docker command, and is suitable to access host's docker CLI command.
+
+To run the normal version, you can execute:
+
+```bash
+# docker run -v <host-path>:<container-path> -it stalchmst/zrb:<version> <command>
+docker run -v ${HOME}:/zrb-home -it --rm stalchmst/zrb:1.8.1 zrb
+```
+
+While to run the dind version, you can execute:
+
+```bash
+# docker run -v <host-path>:<container-path> -it stalchmst/zrb:<version>-dind <command>
+docker run \
+    -v ${HOME}:/zrb-home \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    -it --rm stalchmst/zrb:1.8.1-dind docker ps
+```
+
+
 # 🎥 Demo & Documentation
 
 - **Full documentation:** [Zrb Documentation](https://github.com/state-alchemists/zrb/blob/main/docs/README.md)
@@ -214,7 +240,7 @@ Then open your browser and visit `http://localhost:21213`
 
 If you find Zrb valuable, please consider donating:
 
-[![](https://raw.githubusercontent.com/state-alchemists/zrb/main/_images/donator.png)](https://stalchmst.com/donation)
+[![](https://raw.githubusercontent.com/state-alchemists/zrb/main/_images/donator.png)](https://stalchmst.com)
 
 # 🎉 Fun Fact
 

{zrb-1.8.0.dist-info → zrb-1.8.2.dist-info}/RECORD

@@ -18,7 +18,7 @@ zrb/builtin/llm/tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 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=nCY74VtruTr9LgAq5mroSr4zF0g6LA_uXMI5sh9c8OE,17909
-zrb/builtin/llm/tool/rag.py,sha256=VUyRBvnSeDf8T_lKY--c5HVTfccNgiEJU3QpwssJF8E,8182
+zrb/builtin/llm/tool/rag.py,sha256=yqx7vXXyrOCJjhQJl4s0TnLL-2uQUTuKRnkWlSQBW0M,7883
 zrb/builtin/llm/tool/sub_agent.py,sha256=7n14KzUSFe5Bjf2lpluKlLyL-b1Mehj2QekkuDzo0ik,5091
 zrb/builtin/llm/tool/web.py,sha256=pXRLhcB_Y6z-2w4C4WezH8n-pg3PSMgt_bwn3aaqi6g,5479
 zrb/builtin/md5.py,sha256=690RV2LbW7wQeTFxY-lmmqTSVEEZv3XZbjEUW1Q3XpE,1480
@@ -216,7 +216,7 @@ zrb/callback/callback.py,sha256=mk_RIHuWi-oP5b81jfhzU6fruhsIjhRtKpwh2yYmsiM,3876
 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.py,sha256=rvCymdWpVKfwa1XlLNbFMxz2kkJyzqvqoqv5R8_zLDY,9584
+zrb/config.py,sha256=lpJJv5ns-bNntEpScSLptPHv9gQYvEl4M8LP6rE7zfk,9423
 zrb/content_transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/content_transformer/any_content_transformer.py,sha256=v8ZUbcix1GGeDQwB6OKX_1TjpY__ksxWVeqibwa_iZA,850
 zrb/content_transformer/content_transformer.py,sha256=STl77wW-I69QaGzCXjvkppngYFLufow8ybPLSyAvlHs,2404
@@ -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=GtwPqBtKDq5_vazOZF8cMRZK_7dK0I5nnwnMWPuzrMA,12242
+zrb/llm_config.py,sha256=w_GSyQiJ_Q2jupej8xvQULScqPaSYICdNcH9J54W1lE,11696
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/cli.py,sha256=AbLTNqFy5FuyGQOWOjHZGaBC8e2yuE_Dx1sBdnisR18,6984
 zrb/runner/common_util.py,sha256=JDMcwvQ8cxnv9kQrAoKVLA40Q1omfv-u5_d5MvvwHeE,1373
@@ -343,7 +343,7 @@ zrb/task/llm/error.py,sha256=27DQXSG8SH1-XuvXFdZQKzP39wZDWmd_YnSTz6DJKKI,3690
 zrb/task/llm/history.py,sha256=3WMXoi7RquxosXQf3iv2_BCeF8iKtY1f407pR71xERs,7745
 zrb/task/llm/history_summarization.py,sha256=n3GbgwXlDIkgpJppMGfpqF_8Wpi9yAoZYh46O1pFQeU,6432
 zrb/task/llm/print_node.py,sha256=bpISOUxSH_JBLR-4Nq6-iLrzNWFagrKFX6u8ogYYMw8,4395
-zrb/task/llm/prompt.py,sha256=AUuyxjFgdK72yFNmNqsUDe55wjjxjK37vL7q7XPcgt8,4332
+zrb/task/llm/prompt.py,sha256=zBo3xT3YPX_A4_t8Cd-QjNqQZl9dsoWMTt-NdytI2f4,3827
 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=Yav1pmV26Eh4h9xTh16dN-DbTvhfYINI0EDp_ptJHLg,15643
@@ -374,7 +374,7 @@ zrb/util/codemod/modify_function_call.py,sha256=wbyoRRsM4V9fPYkT5kHN0zpBetpRDq2S
 zrb/util/codemod/modify_method.py,sha256=5fioXjqNQmrf4CV2qlTZHpViF9PMnNer4FvuKam7byo,6344
 zrb/util/codemod/modify_module.py,sha256=2mzi_NxJ-kNFo5G0U_Rqb3JoYQl1s6Izt7b_wAl10F0,715
 zrb/util/cron.py,sha256=UWqqhhM7DDTPx6wjCIdBndnVh3NRu-sdKazp8aZkXh8,3833
-zrb/util/file.py,sha256=Y5pRJxkpshyELxsv8qw_gp1qM5OXgeDwYXqt7Y6Lqu8,2242
+zrb/util/file.py,sha256=jygiPSXx2DqaUH5o9P6AKt2nyfynGfvH5mFfeIKrp_w,2754
 zrb/util/git.py,sha256=gS_Y9sQgJbY0PfgSQiowLvV3Nf0y9C8nT3j6z6oEsG8,8186
 zrb/util/git_subtree.py,sha256=E_UB5OIgm8WkHL9beifRxpZ25_BB9p1H578OhLZTgRU,4611
 zrb/util/group.py,sha256=T82yr3qg9I5k10VPXkMyrIRIqyfzadSH813bqzwKEPI,4718
@@ -388,7 +388,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.8.0.dist-info/METADATA,sha256=UO-2C_syFn5vfZHq_IBrPT4Zgw3QFSJAzWOw1yx5Fng,8385
-zrb-1.8.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.8.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.8.0.dist-info/RECORD,,
+zrb-1.8.2.dist-info/METADATA,sha256=NRlAG2IfE1oZDH9CDlAn9hAaQ8Arn5ytoXyZ6pdDZBA,9086
+zrb-1.8.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.8.2.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.8.2.dist-info/RECORD,,