Merge branch 'bpsaog' into v1.24-bp

Author: joaopauloschuler

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bpsa"
-version = "1.24.5"
+version = "1.24.6"
 description = "Beyond Python SmolAgents (BPSA) — a multi-language, multi-agent framework forked from HuggingFace smolagents."
 authors = [
   { name="Joao Paulo Schwarz Schuler" },

src/smolagents/__init__.py

@@ -14,7 +14,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-__version__ = "1.24.5"
+__version__ = "1.24.6"
 
 from .agent_types import *  # noqa: I001
 from .agents import *  # Above noqa avoids a circular dependency due to cli.py

src/smolagents/agents.py

@@ -2146,9 +2146,7 @@ def _step_stream(
 """ 
             error_msg = """Error in code parsing. Follow examples with the desired structure in the tags <example></example>:
 <example>
-<savetofile filename="free-will.txt">
-I am going to solve this task with confidence.
-</savetofile>
+<savetofile filename="free-will.txt">I am going to solve this task with confidence.</savetofile>
 <runcode>
 result = 5 + 3 + 1294.678
 final_answer(result)
@@ -2157,13 +2155,9 @@ def _step_stream(
 
 If you need to include any file in the file system, use the <includefile></includefile> tags. This is an example:
 <example>
-<savetofile filename="first_step.py">
-print("first step")
-</savetofile>
+<savetofile filename="first_step.py">print("first step")</savetofile>
 
-<savetofile filename="second_step.py">
-print("second step")
-</savetofile>
+<savetofile filename="second_step.py">print("second step")</savetofile>
 
 <runcode>
 <includefile>first_step.py</includefile>
@@ -2179,21 +2173,15 @@ def _step_stream(
                     error_msg = error_msg + """
 If you are trying to save or run a too big file, you can try to save and append in steps:
 <example>
-<savetofile filename="large_file.txt">
-First section, function or chapter
-</savetofile>
+<savetofile filename="large_file.txt">First section, function or chapter</savetofile>
 <runcode>
 print('Starting well.')
 </runcode>
-<appendtofile filename="large_file.txt">
-Second section, function or chapter
-</savetofile>
+<appendtofile filename="large_file.txt">Second section, function or chapter</appendtofile>
 <runcode>
 print('Continuing awesome!')
 </runcode>
-<appendtofile filename="large_file.txt">
-Third section, function or chapter
-</savetofile>
+<appendtofile filename="large_file.txt">Third section, function or chapter</appendtofile>
 <runcode>
 print('Finishing fantastic!!!')
 </runcode>

src/smolagents/bp_thinkers.py

@@ -76,9 +76,7 @@
 <example>
 <thoughts>I will use python code to compute the result of the operation and then return the final answer using the `final_answer` tool.</thoughts>
 <freewill>I am going to solve this task with confidence.</freewill>
-<savetofile filename="free-will.txt">
-I am going to solve this task with confidence.
-</savetofile>
+<savetofile filename="free-will.txt">I am going to solve this task with confidence.</savetofile>
 <runcode>
 result = 5 + 3 + 1294.678
 final_answer(result)
@@ -87,32 +85,22 @@
 
 For saving text files (text, csv, python code), just enclose your text into the <savetofile></savetofile> tags as per examples below:
 <example>
-<savetofile filename="example.txt">
-This is the content of example.txt
-</savetofile>
+<savetofile filename="example.txt">This is the content of example.txt</savetofile>
 
-<savetofile filename="another_file.csv">
-header1,header2
+<savetofile filename="another_file.csv">header1,header2
 value1,value2
-value3,value4
-</savetofile>
+value3,value4</savetofile>
 
-<savetofile filename="hello.py">
-print("hello")
-</savetofile>
+<savetofile filename="hello.py">print("hello")</savetofile>
 </example>
 
 For saving source code files, use the tags <savetofile></savetofile> is the best method.
 
 You may also append content to file with the tags <appendtofile></appendtofile>. This is an example:
 <example>
-<savetofile filename="another_csv.csv">
-header1,header2
-</savetofile>
-<appendtofile filename="another_csv.csv">
-value1,value2
-value3,value4
-</appendtofile>
+<savetofile filename="another_csv.csv">header1,header2</savetofile>
+<appendtofile filename="another_csv.csv">value1,value2
+value3,value4</appendtofile>
 
 The above will create a csv file with the following content:
 header1,header2
@@ -124,13 +112,9 @@
 
 If you need to include any file in the file system, use the <includefile></includefile> tags. This is an example:
 <example>
-<savetofile filename="first_step.py">
-print("first step")
-</savetofile>
+<savetofile filename="first_step.py">print("first step")</savetofile>
 
-<savetofile filename="second_step.py">
-print("second step")
-</savetofile>
+<savetofile filename="second_step.py">print("second step")</savetofile>
 
 <runcode>
 <includefile>first_step.py</includefile>
@@ -457,9 +441,7 @@ def test_and_refine(local_agent, solution_file):
             task_description="""Fantastic! Save the full updated solution that solves the task described in <task></task> into the file '"""+solution_file+"""'.
 YOU ARE REQUIRED TO SAVE THE FULL SOLUTION AND NOT JUST THE PORTIONS THAT YOU HAVE MODIFIED.
 You can follow this example:
-<savetofile filename="""+solution_file+""">
-print("your source code or text here")
-</savetofile>
+<savetofile filename="""+solution_file+""">print("your source code or text here")</savetofile>
 <runcode>
 final_answer("Task completed! YAY!")
 </runcode>
@@ -489,9 +471,7 @@ def test_and_refine(local_agent, solution_file):
               task_description="""Fantastic! Save the full merged solution into the file '"""+solution_file+"""'.
 YOU ARE REQUIRED TO SAVE THE FULL SOLUTION AND NOT JUST THE PORTIONS THAT YOU HAVE MODIFIED.
 You can follow this example:
-<savetofile filename="""+solution_file+""">
-print("your source code or text here")
-</savetofile>
+<savetofile filename="""+solution_file+""">print("your source code or text here")</savetofile>
 <runcode>
 final_answer("Task completed! YAY!")
 </runcode>

src/smolagents/bp_tools.py

@@ -77,11 +77,9 @@ def load_string_from_file(filename: str) -> str:
 Loads the content from the specified file.
 For saving and printing a file, just enclose your text into the <savetofile></savetofile>:
 <example>
-<savetofile filename="another_file.csv">
-header1,header2
+<savetofile filename="another_file.csv">header1,header2
 value1,value2
-value3,value4
-</savetofile>
+value3,value4</savetofile>
 <runcode>
 # print the content of another_file.csv
 print(load_string_from_file(filename="another_file.csv"))
@@ -155,15 +153,9 @@ def replace_in_file_from_files(filename: str, file_with_old_value: str, file_wit
 
 In the case that you need to replace strings in an existing file, you can do it using the replace_in_file tool. This is an example:
 <example>
-<savetofile filename="tmp1.txt">
-hello world
-</savetofile>
-<savetofile filename="tmp2.txt">
-hello home!
-</savetofile>
-<savetofile filename="test.txt">
-Hey! hello world
-</savetofile>
+<savetofile filename="tmp1.txt">hello world</savetofile>
+<savetofile filename="tmp2.txt">hello home!</savetofile>
+<savetofile filename="test.txt">Hey! hello world</savetofile>
 <runcode>
 replace_in_file_from_files('test.txt', 'tmp1.txt', 'tmp2.txt')
 </runcode>
@@ -274,9 +266,7 @@ def run_os_command(str_command: str, timeout: int = 60, max_memory:int = 2748779
 
 You can use run_os_command to run php code. This is an example:
 <example>
-<savetofile filename="hello.php">
-<?php echo "hello"; ?>
-</savetofile>
+<savetofile filename="hello.php"><?php echo "hello"; ?></savetofile>
 <runcode>
 # 60 seconds of timeout and 512MB of max memory
 print(run_os_command("php hello.php", timeout=60, max_memory=512*1024*1024))
@@ -589,9 +579,7 @@ def run_php_file(filename: str, timeout: int = 60) -> str:
 Runs a PHP file and returns the output.
 To run PHP code, follow tis an example:
 <example>
-<savetofile filename="hello.php">
-<?php echo "hello"; ?>
-</savetofile>
+<savetofile filename="hello.php"><?php echo "hello"; ?></savetofile>
 <runcode>
 print(run_php_file("hello.php", timeout=60))
 </runcode>
@@ -613,12 +601,10 @@ def compile_and_run_pascal_code(pasfilename: str, timeout: int = 60) -> str:
 
 This is an example for running pascal code:
 <example>
-<savetofile filename="hello.pas">
-program hello;
+<savetofile filename="hello.pas">program hello;
 begin
 WriteLn('Hello');
-end.
-</savetofile>
+end.</savetofile>
 <runcode>
 compile_and_run_pascal_code("hello.pas", timeout=60)
 </runcode>

src/smolagents/bp_tools_browser.py

@@ -14,12 +14,46 @@
 prompt_toolkit's asyncio.run() on the main thread.
 """
 
+import os
 import queue
 import threading
 
 from .tools import Tool
 
 
+def _check_chromium_installed():
+    """Check if Chromium browser is installed for Playwright.
+    
+    Returns the path to the Chromium executable if found, None otherwise.
+    """
+    # Get the Playwright cache directory
+    cache_dir = os.path.expanduser("~/.cache/ms-playwright")
+    
+    if not os.path.exists(cache_dir):
+        return None
+    
+    # Look for chromium directories (they start with 'chromium-')
+    try:
+        chromium_dirs = [d for d in os.listdir(cache_dir) if d.startswith('chromium-')]
+        if not chromium_dirs:
+            return None
+        
+        # Check if the chrome executable exists in any of the chromium directories
+        for chromium_dir in chromium_dirs:
+            chrome_path = os.path.join(cache_dir, chromium_dir, 'chrome-linux', 'chrome')
+            if os.path.exists(chrome_path):
+                return chrome_path
+            
+            # Also check for chrome-linux64 (newer versions)
+            chrome_path = os.path.join(cache_dir, chromium_dir, 'chrome-linux64', 'chrome')
+            if os.path.exists(chrome_path):
+                return chrome_path
+        
+        return None
+    except Exception:
+        return None
+
+
 class BrowserManager:
     """Manages a headed Chromium browser in a dedicated thread.
 
@@ -45,6 +79,21 @@ def _ensure_thread(self):
     def _run_loop(self):
         """Background thread: owns Playwright, browser, and page."""
         from playwright.sync_api import sync_playwright
+        
+        # Check if Chromium is installed before trying to launch
+        chromium_path = _check_chromium_installed()
+        if chromium_path is None:
+            error_msg = (
+                "Chromium browser is not installed for Playwright.\n"
+                "Please run the following command to install it:\n"
+                "  playwright install chromium\n"
+                "Or if you're using a virtual environment:\n"
+                "  python -m playwright install chromium"
+            )
+            self._res_q.put((False, RuntimeError(error_msg)))
+            self._ready.set()
+            return
+        
         pw = sync_playwright().start()
         browser = pw.chromium.launch(headless=False, slow_mo=300)
         page = browser.new_page()

src/smolagents/prompts/code_agent.yaml

@@ -29,9 +29,7 @@ system_prompt: |-
   <example>
   <thoughts>I will use python code to compute the result of the operation and then return the final answer using the `final_answer` tool.</thoughts>
   <freewill>I am going to solve this task with confidence.</freewill>
-  <savetofile filename="free-will.txt">
-  I am going to solve this task with confidence.
-  </savetofile>
+  <savetofile filename="free-will.txt">I am going to solve this task with confidence.</savetofile>
   <runcode>
   result = 5 + 3 + 1294.678
   final_answer(result)
@@ -40,32 +38,22 @@ system_prompt: |-
 
   For saving text files (text, csv, python code), just enclose your text into the <savetofile></savetofile> tags as per examples below:
   <example>
-  <savetofile filename="example.txt">
-  This is the content of example.txt
-  </savetofile>
+  <savetofile filename="example.txt">This is the content of example.txt</savetofile>
 
-  <savetofile filename="another_file.csv">
-  header1,header2
+  <savetofile filename="another_file.csv">header1,header2
   value1,value2
-  value3,value4
-  </savetofile>
+  value3,value4</savetofile>
 
-  <savetofile filename="hello.py">
-  print("hello")
-  </savetofile>
+  <savetofile filename="hello.py">print("hello")</savetofile>
   </example>
 
   For saving source code files, using the <savetofile></savetofile> tags is the best method.
 
   You may also append content to file with the tags <appendtofile></appendtofile>. This is an example:
   <example>
-  <savetofile filename="another_csv.csv">
-  header1,header2
-  </savetofile>
-  <appendtofile filename="another_csv.csv">
-  value1,value2
-  value3,value4
-  </appendtofile>
+  <savetofile filename="another_csv.csv">header1,header2</savetofile>
+  <appendtofile filename="another_csv.csv">value1,value2
+  value3,value4</appendtofile>
 
   The above will create a csv file with the following content:
   header1,header2
@@ -77,13 +65,9 @@ system_prompt: |-
 
   If you need to include any file in the file system, use the <includefile></includefile> tags. This is an example:
   <example>
-  <savetofile filename="first_step.py">
-  print("first step")
-  </savetofile>
+  <savetofile filename="first_step.py">print("first step")</savetofile>
 
-  <savetofile filename="second_step.py">
-  print("second step")
-  </savetofile>
+  <savetofile filename="second_step.py">print("second step")</savetofile>
 
   <runcode>
   <includefile>first_step.py</includefile>
@@ -136,10 +120,8 @@ system_prompt: |-
   5. If you find yourself repeating logic across steps, or if a task would benefit from
     reusable helper functions, create your own tools by saving Python functions to a file
     and importing them in later steps. Use the bpsa/ directory for this. Example:
-    <savetofile filename="bpsa/helpers.py">
-    def parse_csv_row(row):
-      return [x.strip() for x in row.split(',')]
-    </savetofile>
+    <savetofile filename="bpsa/helpers.py">def parse_csv_row(row):
+      return [x.strip() for x in row.split(',')]</savetofile>
     <runcode>
     from bpsa.helpers import parse_csv_row
     result = parse_csv_row("a, b, c")