Merge branch 'main' into aw-faq

Author: thinkall

autogen/code_utils.py

@@ -1,4 +1,3 @@
-import signal
 import subprocess
 import sys
 import os
@@ -9,6 +8,7 @@
 from hashlib import md5
 import logging
 from autogen import oai
+from concurrent.futures import ThreadPoolExecutor, TimeoutError
 
 try:
     import docker
@@ -307,21 +307,20 @@ def execute_code(
                 text=True,
             )
         else:
-            signal.signal(signal.SIGALRM, timeout_handler)
-            try:
-                signal.alarm(timeout)
-                # run the code in a subprocess in the current docker container in the working directory
-                result = subprocess.run(
+            with ThreadPoolExecutor(max_workers=1) as executor:
+                future = executor.submit(
+                    subprocess.run,
                     cmd,
                     cwd=work_dir,
                     capture_output=True,
                     text=True,
                 )
-                signal.alarm(0)
-            except TimeoutError:
-                if original_filename is None:
-                    os.remove(filepath)
-                return 1, TIMEOUT_MSG, None
+                try:
+                    result = future.result(timeout=timeout)
+                except TimeoutError:
+                    if original_filename is None:
+                        os.remove(filepath)
+                    return 1, TIMEOUT_MSG, None
         if original_filename is None:
             os.remove(filepath)
         if result.returncode:

notebook/agentchat_RetrieveChat.ipynb

@@ -194,8 +194,13 @@
     "\n",
     "# 2. create the RetrieveUserProxyAgent instance named \"ragproxyagent\"\n",
     "# By default, the human_input_mode is \"ALWAYS\", which means the agent will ask for human input at every step. We set it to \"NEVER\" here.\n",
-    "# `docs_path` is the path to the docs directory. By default, it is set to \"./docs\". Here we generated the documentations from FLAML's docstrings.\n",
-    "# Navigate to the website folder and run `pydoc-markdown` and it will generate folder `reference` under `website/docs`.\n",
+    "# `docs_path` is the path to the docs directory. It can also be the path to a single file, or the url to a single file. By default, \n",
+    "# it is set to None, which works only if the collection is already created.\n",
+    "# \n",
+    "# Here we generated the documentations from FLAML's docstrings. Not needed if you just want to try this notebook but not to reproduce the\n",
+    "# outputs. Clone the FLAML (https://github.com/microsoft/FLAML) repo and navigate to its website folder. Pip install and run `pydoc-markdown`\n",
+    "# and it will generate folder `reference` under `website/docs`.\n",
+    "#\n",
     "# `task` indicates the kind of task we're working on. In this example, it's a `code` task.\n",
     "# `chunk_token_size` is the chunk token size for the retrieve chat. By default, it is set to `max_tokens * 0.6`, here we set it to 2000.\n",
     "ragproxyagent = RetrieveUserProxyAgent(\n",
@@ -204,11 +209,12 @@
     "    max_consecutive_auto_reply=10,\n",
     "    retrieve_config={\n",
     "        \"task\": \"code\",\n",
-    "        \"docs_path\": \"../website/docs/reference\",\n",
+    "        \"docs_path\": \"~/code/FLAML/website/docs/reference\",  # change this to your own path, such as https://raw.githubusercontent.com/microsoft/autogen/main/README.md\n",
     "        \"chunk_token_size\": 2000,\n",
     "        \"model\": config_list[0][\"model\"],\n",
     "        \"client\": chromadb.PersistentClient(path=\"/tmp/chromadb\"),\n",
     "        \"embedding_model\": \"all-mpnet-base-v2\",\n",
+    "        \"get_or_create\": False,  # set to True if you want to recreate the collection\n",
     "    },\n",
     ")"
    ]