Skip to content

Commit bdda3e6

Browse files
NanthagopalEswaranNanthagopalEswaran
authored
Merge branch 'main' into fix-microsoft#2845 
2 parents 2368df2 + a0787ac commit bdda3e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4515
-1886
lines changed

‎.devcontainer/Dockerfile

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
#-------------------------------------------------------------------------------------------------------------
2-
# Copyright (c) Microsoft Corporation. All rights reserved.
3-
# Licensed under the MIT License. See LICENSE file in the project root for license information.
4-
#-------------------------------------------------------------------------------------------------------------
5-
6-
FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
7-
8-
#
9-
# Update the OS and maybe install packages
10-
#
11-
ENV DEBIAN_FRONTEND=noninteractive
12-
13-
# add git lhs to apt
14-
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
15-
16-
RUN apt-get update \
17-
&& apt-get upgrade -y \
18-
&& apt-get -y install --no-install-recommends build-essential npm git-lfs \
19-
&& apt-get autoremove -y \
20-
&& apt-get clean -y \
21-
&& arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
22-
&& wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
23-
&& dpkg -i quarto-1.5.23-linux-${arch}.deb \
24-
&& rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
25-
ENV DEBIAN_FRONTEND=dialog
26-
27-
# For docs
28-
RUN npm install --global yarn
29-
RUN pip install --upgrade pip
30-
RUN pip install pydoc-markdown
31-
RUN pip install pyyaml
32-
RUN pip install colored
1+
#-------------------------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See LICENSE file in the project root for license information.
4+
#-------------------------------------------------------------------------------------------------------------
5+
6+
FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
7+
8+
#
9+
# Update the OS and maybe install packages
10+
#
11+
ENV DEBIAN_FRONTEND=noninteractive
12+
13+
# add git lhs to apt
14+
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
15+
16+
RUN apt-get update \
17+
&& apt-get upgrade -y \
18+
&& apt-get -y install --no-install-recommends build-essential npm git-lfs \
19+
&& apt-get autoremove -y \
20+
&& apt-get clean -y \
21+
&& arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
22+
&& wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
23+
&& dpkg -i quarto-1.5.23-linux-${arch}.deb \
24+
&& rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
25+
ENV DEBIAN_FRONTEND=dialog
26+
27+
# For docs
28+
RUN npm install --global yarn
29+
RUN pip install --upgrade pip
30+
RUN pip install pydoc-markdown
31+
RUN pip install pyyaml
32+
RUN pip install colored

‎.devcontainer/studio/Dockerfile

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
#-------------------------------------------------------------------------------------------------------------
2-
# Copyright (c) Microsoft Corporation. All rights reserved.
3-
# Licensed under the MIT License. See LICENSE file in the project root for license information.
4-
#-------------------------------------------------------------------------------------------------------------
5-
6-
FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
7-
8-
#
9-
# Update the OS and maybe install packages
10-
#
11-
ENV DEBIAN_FRONTEND=noninteractive
12-
13-
# add git lhs to apt
14-
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
15-
16-
RUN apt-get update \
17-
&& apt-get upgrade -y \
18-
&& apt-get -y install --no-install-recommends build-essential npm git-lfs \
19-
&& apt-get autoremove -y \
20-
&& apt-get clean -y \
21-
&& rm -rf /var/lib/apt/lists/*
22-
ENV DEBIAN_FRONTEND=dialog
23-
24-
# For docs
25-
RUN npm install --global yarn
26-
RUN pip install --upgrade pip
27-
RUN pip install pydoc-markdown
1+
#-------------------------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See LICENSE file in the project root for license information.
4+
#-------------------------------------------------------------------------------------------------------------
5+
6+
FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
7+
8+
#
9+
# Update the OS and maybe install packages
10+
#
11+
ENV DEBIAN_FRONTEND=noninteractive
12+
13+
# add git lhs to apt
14+
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
15+
16+
RUN apt-get update \
17+
&& apt-get upgrade -y \
18+
&& apt-get -y install --no-install-recommends build-essential npm git-lfs \
19+
&& apt-get autoremove -y \
20+
&& apt-get clean -y \
21+
&& rm -rf /var/lib/apt/lists/*
22+
ENV DEBIAN_FRONTEND=dialog
23+
24+
# For docs
25+
RUN npm install --global yarn
26+
RUN pip install --upgrade pip
27+
RUN pip install pydoc-markdown

‎.pre-commit-config.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ci:
88

99
repos:
1010
- repo: https://github.com/pre-commit/pre-commit-hooks
11-
rev: v4.5.0
11+
rev: v4.6.0
1212
hooks:
1313
- id: check-added-large-files
1414
- id: check-ast
@@ -23,21 +23,21 @@ repos:
2323
- id: end-of-file-fixer
2424
- id: no-commit-to-branch
2525
- repo: https://github.com/psf/black
26-
rev: 24.3.0
26+
rev: 24.4.2
2727
hooks:
2828
- id: black
2929
- repo: https://github.com/astral-sh/ruff-pre-commit
30-
rev: v0.3.4
30+
rev: v0.4.8
3131
hooks:
3232
- id: ruff
3333
types_or: [ python, pyi, jupyter ]
3434
args: ["--fix", "--ignore=E402"]
3535
exclude: notebook/agentchat_databricks_dbrx.ipynb
3636
- repo: https://github.com/codespell-project/codespell
37-
rev: v2.2.6
37+
rev: v2.3.0
3838
hooks:
3939
- id: codespell
40-
args: ["-L", "ans,linar,nam,tread,ot,"]
40+
args: ["-L", "ans,linar,nam,tread,ot,assertIn,dependin,socio-economic"]
4141
exclude: |
4242
(?x)^(
4343
pyproject.toml |

‎OAI_CONFIG_LIST_sample

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"api_key": "<your Azure OpenAI API key here>",
1414
"base_url": "<your Azure OpenAI API base here>",
1515
"api_type": "azure",
16-
"api_version": "2024-02-15-preview"
16+
"api_version": "2024-02-01"
1717
},
1818
{
1919
"model": "<your Azure OpenAI deployment name>",
2020
"api_key": "<your Azure OpenAI API key here>",
2121
"base_url": "<your Azure OpenAI API base here>",
2222
"api_type": "azure",
23-
"api_version": "2024-02-15-preview"
23+
"api_version": "2024-02-01"
2424
}
2525
]

‎autogen/agentchat/contrib/retrieve_user_proxy_agent.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ def _init_db(self):
348348
else:
349349
chunks, sources = split_files_to_chunks(
350350
get_files_from_dir(self._docs_path, self._custom_text_types, self._recursive),
351-
self._max_tokens,
351+
self._chunk_token_size,
352352
self._chunk_mode,
353353
self._must_break_at_empty_line,
354354
)

0 commit comments

Comments
 (0)