Merge remote-tracking branch 'origin/main' into meta

Merge branch 'main' into meta

.devcontainer/Dockerfile

@@ -1,4 +1,10 @@
 #-------------------------------------------------------------------------------------------------------------
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogenhub
+# SPDX-License-Identifier: Apache-2.0
+# Contributions to this project, i.e., https://github.com/autogenhub/autogen, are licensed under the Apache License, Version 2.0 (Apache-2.0).
+
+# Portions derived from  https://github.com/microsoft/autogen under the MIT License.
+# SPDX-License-Identifier: MIT
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See LICENSE file in the project root for license information.
 #-------------------------------------------------------------------------------------------------------------

.devcontainer/README.md

@@ -10,32 +10,23 @@ These configurations can be used with Codespaces and locally.
 
 - **Purpose**: This Dockerfile, i.e., `./Dockerfile`, is designed for basic setups. It includes common Python libraries and essential dependencies required for general usage of AutoGen.
 - **Usage**: Ideal for those just starting with AutoGen or for general-purpose applications.
-- **Building the Image**: Run `docker build -f ./Dockerfile -t autogen_base_img .` in this directory.
+- **Building the Image**: Run `docker build -f ./Dockerfile -t autogenhub_base_img .` in this directory.
 - **Using with Codespaces**: `Code > Codespaces > Click on +` By default + creates a Codespace on the current branch.
 
 ### full
 
 - **Purpose**: This Dockerfile, i.e., `./full/Dockerfile` is for advanced features. It includes additional dependencies and is configured for more complex or feature-rich AutoGen applications.
 - **Usage**: Suited for advanced users who need the full range of AutoGen's capabilities.
-- **Building the Image**: Execute `docker build -f full/Dockerfile -t autogen_full_img .`.
+- **Building the Image**: Execute `docker build -f full/Dockerfile -t autogenhub_full_img .`.
 - **Using with Codespaces**: `Code > Codespaces > Click on ...> New with options > Choose "full" as devcontainer configuration`. This image may require a Codespace with at least 64GB of disk space.
 
 ### dev
 
 - **Purpose**: Tailored for AutoGen project developers, this Dockerfile, i.e., `./dev/Dockerfile` includes tools and configurations aiding in development and contribution.
 - **Usage**: Recommended for developers who are contributing to the AutoGen project.
-- **Building the Image**: Run `docker build -f dev/Dockerfile -t autogen_dev_img .`.
+- **Building the Image**: Run `docker build -f dev/Dockerfile -t autogenhub_dev_img .`.
 - **Using with Codespaces**: `Code > Codespaces > Click on ...> New with options > Choose "dev" as devcontainer configuration`. This image may require a Codespace with at least 64GB of disk space.
-- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://microsoft.github.io/autogen/docs/Contribute) page prior to submitting any pull requests.
-
-
-### studio
-
-- **Purpose**: Tailored for AutoGen project developers, this Dockerfile, i.e., `./studio/Dockerfile`, includes tools and configurations aiding in development and contribution.
-- **Usage**: Recommended for developers who are contributing to the AutoGen project.
-- **Building the Image**: Run `docker build -f studio/Dockerfile -t autogen_studio_img .`.
-- **Using with Codespaces**: `Code > Codespaces > Click on ...> New with options > Choose "studio" as devcontainer configuration`.
-- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://microsoft.github.io/autogen/docs/Contribute) page prior to submitting any pull requests.
+- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://autogenhub.github.io/autogen/docs/Contribute) page prior to submitting any pull requests.
 
 
 ## Customizing Dockerfiles
@@ -49,7 +40,7 @@ Feel free to modify these Dockerfiles for your specific project needs. Here are
 - **Setting Environment Variables**: Add environment variables using the `ENV` command for any application-specific configurations. We have prestaged the line needed to inject your OpenAI_key into the docker environment as a environmental variable. Others can be staged in the same way. Just uncomment the line.
     `# ENV OPENAI_API_KEY="{OpenAI-API-Key}"` to `ENV OPENAI_API_KEY="{OpenAI-API-Key}"`
 - **Need a less "Advanced" Autogen build**: If the `./full/Dockerfile` is to much but you need more than advanced then update this line in the Dockerfile file.
-`RUN pip install pyautogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra` to install just what you need. `RUN pip install pyautogen[retrievechat,blendsearch] autogenra`
+`RUN pip install autogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra` to install just what you need. `RUN pip install autogen[retrievechat,blendsearch] autogenra`
 - **Can't Dev without your favorite CLI tool**: if you need particular OS tools to be installed in your Docker container you can add those packages here right after the sudo for the `./base/Dockerfile` and `./full/Dockerfile` files. In the example below we are installing net-tools and vim to the environment.
 
     ```code

.devcontainer/dev/Dockerfile

@@ -1,7 +1,7 @@
 # Basic setup
 FROM python:3.11-slim-bookworm
 
-# add git lhs to apt
+# add git lfs to apt
 RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
 
 # Update and install necessary packages
@@ -10,21 +10,23 @@ RUN apt-get update && apt-get -y update
 RUN apt-get install -y sudo git npm vim nano curl wget git-lfs
 
 # Setup a non-root user 'autogen' with sudo access
-RUN adduser --disabled-password --gecos '' autogen
+RUN adduser --home /home/autogenhub --disabled-password --gecos '' autogen
 RUN adduser autogen sudo
 RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 USER autogen
-WORKDIR /home/autogen
+WORKDIR /home/autogenhub
 
 # Set environment variable
 # ENV OPENAI_API_KEY="{OpenAI-API-Key}"
 
 # Clone the AutoGen repository
-RUN git clone https://github.com/microsoft/autogen.git /home/autogen/autogen
-WORKDIR /home/autogen/autogen
+RUN git clone https://github.com/autogenhub/autogen.git /home/autogenhub/autogen
+WORKDIR /home/autogenhub/autogen
 
 # Install AutoGen in editable mode with extra components
-RUN sudo pip install -e .[test,teachable,lmm,retrievechat,mathchat,blendsearch]
+RUN sudo pip install --upgrade pip && \
+    sudo pip install -e .[test,teachable,lmm,retrievechat,mathchat,blendsearch] && \
+    pip install pytest-xdist pytest-cov
 
 # Install pre-commit hooks
 RUN pre-commit install
@@ -37,17 +39,16 @@ RUN yarn install --frozen-lockfile --ignore-engines
 
 RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
     wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.tar.gz && \
-    mkdir -p /home/autogen/quarto/ && \
-    tar -xzf quarto-1.5.23-linux-${arch}.tar.gz --directory /home/autogen/quarto/ && \
+    mkdir -p /home/autogenhub/quarto/ && \
+    tar -xzf quarto-1.5.23-linux-${arch}.tar.gz --directory /home/autogenhub/quarto/ && \
     rm quarto-1.5.23-linux-${arch}.tar.gz
 
-ENV PATH="${PATH}:/home/autogen/quarto/quarto-1.5.23/bin/"
+ENV PATH="${PATH}:/home/autogenhub/quarto/quarto-1.5.23/bin/"
 
 # Exposes the Yarn port for Docusaurus
 EXPOSE 3000
 
 # Pre-load popular Python packages
-RUN pip install --upgrade pip
 RUN pip install numpy pandas matplotlib seaborn scikit-learn requests urllib3 nltk pillow pytest beautifulsoup4
 
 # Set the default command to bash

.devcontainer/full/Dockerfile

@@ -11,19 +11,19 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Setup a non-root user 'autogen' with sudo access
-RUN adduser --disabled-password --gecos '' autogen
+RUN adduser --home /home/autogenhub --disabled-password --gecos '' autogen
 RUN adduser autogen sudo
 RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 USER autogen
-WORKDIR /home/autogen
+WORKDIR /home/autogenhub
 
 # Set environment variable if needed
 # ENV OPENAI_API_KEY="{OpenAI-API-Key}"
 
 # Install Python packages
 RUN pip install --upgrade pip
-RUN pip install pyautogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra
-RUN pip install numpy pandas matplotlib seaborn scikit-learn requests urllib3 nltk pillow pytest beautifulsoup4
+RUN pip install autogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra
+RUN pip install numpy pandas matplotlib seaborn scikit-learn requests urllib3 nltk pillow pytest beautifulsoup4  pytest-xdist pytest-cov
 
 # Expose port
 EXPOSE 8081

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- Thank you for your contribution! Please review https://microsoft.github.io/autogen/docs/Contribute before opening a pull request. -->
+<!-- Thank you for your contribution! Please review https://autogenhub.github.io/autogen/docs/Contribute before opening a pull request. -->
 
 <!-- Please add a reviewer to the assignee section when you create a PR. If you don't have the access to it, we will shortly find a reviewer and assign them to your PR. -->
 
@@ -12,6 +12,6 @@
 
 ## Checks
 
-- [ ] I've included any doc changes needed for https://microsoft.github.io/autogen/. See https://microsoft.github.io/autogen/docs/Contribute#documentation to build and test documentation locally.
+- [ ] I've included any doc changes needed for https://autogenhub.github.io/autogen/. See https://autogenhub.github.io/autogen/docs/Contribute#documentation to build and test documentation locally.
 - [ ] I've added tests (if relevant) corresponding to the changes introduced in this PR.
 - [ ] I've made sure all auto checks have passed.

.github/workflows/contrib-graph-rag-tests.yml

@@ -0,0 +1,66 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: ContribGraphRagTests
+
+on:
+  pull_request:
+    branches: ["main"]
+    paths:
+      - "autogen/agentchat/contrib/graph_rag/**"
+      - "test/agentchat/contrib/graph_rag/**"
+      - ".github/workflows/contrib-tests.yml"
+      - "setup.py"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+permissions:
+  {}
+  # actions: read
+  # checks: read
+  # contents: read
+  # deployments: read
+jobs:
+  GraphRagIntegrationTest-FalkorDB-Ubuntu:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.11"]
+    services:
+      falkordb:
+        image: falkordb/falkordb:edge
+        ports:
+          - 6379:6379
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install packages and dependencies for all tests
+        run: |
+          python -m pip install --upgrade pip wheel
+          pip install pytest
+      - name: Install Falkor DB SDK when on linux
+        run: |
+          pip install -e .[graph_rag_falkor_db]
+      - name: Set AUTOGEN_USE_DOCKER based on OS
+        shell: bash
+        run: |
+          echo "AUTOGEN_USE_DOCKER=False" >> $GITHUB_ENV
+      - name: Coverage
+        env:
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
+          AZURE_OPENAI_API_BASE: ${{ secrets.AZURE_OPENAI_API_BASE }}
+          OAI_CONFIG_LIST: ${{ secrets.OAI_CONFIG_LIST }}
+        run: |
+          pip install pytest-cov>=5
+          pytest test/agentchat/contrib/graph_rag/test_falkor_graph_rag.py --skip-openai
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./coverage.xml
+          flags: unittests