Merge branch 'custom_client' of github.com:olgavrou/autogen into custom_client

Author: olgavrou

autogen/agentchat/conversable_agent.py

@@ -7,6 +7,7 @@
 import re
 from collections import defaultdict
 from typing import Any, Awaitable, Callable, Dict, List, Literal, Optional, Tuple, Type, TypeVar, Union
+import warnings
 
 from .. import OpenAIWrapper, ModelClient
 from ..cache.cache import Cache
@@ -69,7 +70,7 @@ def __init__(
         max_consecutive_auto_reply: Optional[int] = None,
         human_input_mode: Optional[str] = "TERMINATE",
         function_map: Optional[Dict[str, Callable]] = None,
-        code_execution_config: Optional[Union[Dict, Literal[False]]] = None,
+        code_execution_config: Union[Dict, Literal[False]] = {},
         llm_config: Optional[Union[Dict, Literal[False]]] = None,
         default_auto_reply: Optional[Union[str, Dict, None]] = "",
         description: Optional[str] = None,
@@ -139,6 +140,13 @@ def __init__(
         # Initialize standalone client cache object.
         self.client_cache = None
 
+        if code_execution_config is None:
+            warnings.warn(
+                "Using None to signal a default code_execution_config is deprecated. "
+                "Use {} to use default or False to disable code execution.",
+                stacklevel=2,
+            )
+
         self._code_execution_config: Union[Dict, Literal[False]] = (
             {} if code_execution_config is None else code_execution_config
         )

autogen/oai/openai_utils.py

@@ -46,6 +46,8 @@
     "gpt-3.5-turbo-1106": (0.001, 0.002),
     "gpt-35-turbo-1106": (0.001, 0.002),
     "gpt-4-1106-preview": (0.01, 0.03),
+    "gpt-4-0125-preview": (0.01, 0.03),
+    "gpt-4-turbo-preview": (0.01, 0.03),
     "gpt-4-1106-vision-preview": (0.01, 0.03),  # TODO: support vision pricing of images
 }
 

autogen/token_count_utils.py

@@ -28,6 +28,8 @@ def get_max_token_limit(model="gpt-3.5-turbo-0613"):
         "gpt-4-0613": 8192,
         "gpt-4-32k-0613": 32768,
         "gpt-4-1106-preview": 128000,
+        "gpt-4-0125-preview": 128000,
+        "gpt-4-turbo-preview": 128000,
         "gpt-4-vision-preview": 128000,
     }
     return max_token_limit[model]

notebook/agentchat_auto_feedback_from_code_execution.ipynb

@@ -67,7 +67,7 @@
     "from typing import Dict, Union\n",
     "\n",
     "from IPython import get_ipython\n",
-    "from IPython.display import Image\n",
+    "from IPython.display import display, Image\n",
     "\n",
     "import autogen\n",
     "\n",
@@ -498,7 +498,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -515,7 +515,8 @@
    ],
    "source": [
     "try:\n",
-    "    Image(filename=\"coding/stock_price_ytd.png\")\n",
+    "    image = Image(filename=\"coding/stock_price_ytd.png\")\n",
+    "    display(image)\n",
     "except FileNotFoundError:\n",
     "    print(\"Image not found. Please check the file name and modify if necessary.\")"
    ]
@@ -813,7 +814,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.10.13"
   },
   "vscode": {
    "interpreter": {

website/docs/Contribute.md

@@ -201,6 +201,7 @@ pip install pydoc-markdown  # skip if you use the dev container we provided
 cd website
 yarn install --frozen-lockfile --ignore-engines
 pydoc-markdown
+quarto render ./docs
 yarn start
 ```
 
@@ -225,6 +226,7 @@ Once at the CLI in Docker run the following commands:
 cd website
 yarn install --frozen-lockfile --ignore-engines
 pydoc-markdown
+quarto render ./docs
 yarn start --host 0.0.0.0 --port 3000
 ```