Merge branch 'main' into fix-microsoft#2845

.devcontainer/Dockerfile

@@ -1,32 +1,32 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See LICENSE file in the project root for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
-
-#
-# Update the OS and maybe install packages
-#
-ENV DEBIAN_FRONTEND=noninteractive
-
-# add git lhs to apt
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-
-RUN apt-get update \
-   && apt-get upgrade -y  \
-   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
-   && apt-get autoremove -y \
-   && apt-get clean -y \
-   && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
-   && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
-   && dpkg -i quarto-1.5.23-linux-${arch}.deb \
-   && rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
-ENV DEBIAN_FRONTEND=dialog
-
-# For docs
-RUN npm install --global yarn
-RUN pip install --upgrade pip
-RUN pip install pydoc-markdown
-RUN pip install pyyaml
-RUN pip install colored
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See LICENSE file in the project root for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
+
+#
+# Update the OS and maybe install packages
+#
+ENV DEBIAN_FRONTEND=noninteractive
+
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
+RUN apt-get update \
+   && apt-get upgrade -y  \
+   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
+   && apt-get autoremove -y \
+   && apt-get clean -y \
+   && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
+   && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
+   && dpkg -i quarto-1.5.23-linux-${arch}.deb \
+   && rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
+ENV DEBIAN_FRONTEND=dialog
+
+# For docs
+RUN npm install --global yarn
+RUN pip install --upgrade pip
+RUN pip install pydoc-markdown
+RUN pip install pyyaml
+RUN pip install colored

.devcontainer/studio/Dockerfile

@@ -1,27 +1,27 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See LICENSE file in the project root for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
-
-#
-# Update the OS and maybe install packages
-#
-ENV DEBIAN_FRONTEND=noninteractive
-
-# add git lhs to apt
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-
-RUN apt-get update \
-   && apt-get upgrade -y  \
-   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
-   && apt-get autoremove -y \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
-ENV DEBIAN_FRONTEND=dialog
-
-# For docs
-RUN npm install --global yarn
-RUN pip install --upgrade pip
-RUN pip install pydoc-markdown
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See LICENSE file in the project root for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
+
+#
+# Update the OS and maybe install packages
+#
+ENV DEBIAN_FRONTEND=noninteractive
+
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
+RUN apt-get update \
+   && apt-get upgrade -y  \
+   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
+   && apt-get autoremove -y \
+   && apt-get clean -y \
+   && rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND=dialog
+
+# For docs
+RUN npm install --global yarn
+RUN pip install --upgrade pip
+RUN pip install pydoc-markdown

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
     - id: check-added-large-files
     - id: check-ast
@@ -23,21 +23,21 @@ repos:
     - id: end-of-file-fixer
     - id: no-commit-to-branch
   - repo: https://github.com/psf/black
-    rev: 24.3.0
+    rev: 24.4.2
     hooks:
     - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.4
+    rev: v0.4.8
     hooks:
       - id: ruff
         types_or: [ python, pyi, jupyter ]
         args: ["--fix", "--ignore=E402"]
         exclude: notebook/agentchat_databricks_dbrx.ipynb
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
-        args: ["-L", "ans,linar,nam,tread,ot,"]
+        args: ["-L", "ans,linar,nam,tread,ot,assertIn,dependin,socio-economic"]
         exclude: |
             (?x)^(
               pyproject.toml |

OAI_CONFIG_LIST_sample

@@ -13,13 +13,13 @@
         "api_key": "<your Azure OpenAI API key here>",
         "base_url": "<your Azure OpenAI API base here>",
         "api_type": "azure",
-        "api_version": "2024-02-15-preview"
+        "api_version": "2024-02-01"
     },
     {
         "model": "<your Azure OpenAI deployment name>",
         "api_key": "<your Azure OpenAI API key here>",
         "base_url": "<your Azure OpenAI API base here>",
         "api_type": "azure",
-        "api_version": "2024-02-15-preview"
+        "api_version": "2024-02-01"
     }
 ]

autogen/agentchat/contrib/retrieve_user_proxy_agent.py

@@ -348,7 +348,7 @@ def _init_db(self):
             else:
                 chunks, sources = split_files_to_chunks(
                     get_files_from_dir(self._docs_path, self._custom_text_types, self._recursive),
-                    self._max_tokens,
+                    self._chunk_token_size,
                     self._chunk_mode,
                     self._must_break_at_empty_line,
                 )