Merge branch '0.2' into add-support-o1

Author: rysweet

.devcontainer/README.md

@@ -49,7 +49,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-agentchat[teachable,lmm,retrievechat,mathchat,blendsearch]~=0.2 autogenra` to install just what you need. `RUN pip install autogen-agentchat[retrievechat,blendsearch]~=0.2 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/full/Dockerfile

@@ -22,7 +22,7 @@ WORKDIR /home/autogen
 
 # Install Python packages
 RUN pip install --upgrade pip
-RUN pip install pyautogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra
+RUN pip install autogen-agentchat[teachable,lmm,retrievechat,mathchat,blendsearch]~=0.2 autogenra
 RUN pip install numpy pandas matplotlib seaborn scikit-learn requests urllib3 nltk pillow pytest beautifulsoup4
 
 # Expose port

.github/ISSUE_TEMPLATE.md

@@ -1,53 +1,55 @@
 name: Bug Report
-description: File a bug report
-title: "[Bug]: "
+description: Report a bug
 labels: ["bug"]
 
 body:
   - type: textarea
-    id: description
     attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is.
-      placeholder: What went wrong?
+      label: What happened?
+      description: Please provide as much information as possible, this helps us address the issue.
+    validations:
+      required: true
   - type: textarea
-    id: reproduce
     attributes:
-      label: Steps to reproduce
-      description: |
-        Steps to reproduce the behavior:
-
-        1. Step 1
-        2. Step 2
-        3. ...
-        4. See error
-      placeholder: How can we replicate the issue?
+      label: What did you expect to happen?
+    validations:
+      required: true
   - type: textarea
-    id: modelused
     attributes:
-      label: Model Used
-      description: A description of the model that was used when the error was encountered
+      label: How can we reproduce it (as minimally and precisely as possible)?
+      description: Please provide steps to reproduce. Provide code that can be run if possible.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: AutoGen version
+      description: What version or commit of the library was used
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Which package was this bug in
+      options:
+        - Core
+        - AgentChat
+        - Extensions
+        - AutoGen Studio
+        - Magentic One
+        - AutoGen Bench
+        - Other
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Model used
+      description: If a model was used, please describe it here, indicating whether it is a local model or a cloud-hosted model
       placeholder: gpt-4, mistral-7B etc
-  - type: textarea
-    id: expected_behavior
+  - type: input
     attributes:
-      label: Expected Behavior
-      description: A clear and concise description of what you expected to happen.
-      placeholder: What should have happened?
-  - type: textarea
-    id: screenshots
+      label: Python version
+  - type: input
     attributes:
-      label: Screenshots and logs
-      description: If applicable, add screenshots and logs to help explain your problem.
-      placeholder: Add screenshots here
+      label: Operating system
   - type: textarea
-    id: additional_information
-    attributes:
-      label: Additional Information
-      description: |
-        - AutoGen Version: <!-- Specify the AutoGen version (e.g., v0.2.0) -->
-        - Operating System: <!-- Specify the OS (e.g., Windows 10, Ubuntu 20.04) -->
-        - Python Version: <!-- Specify the Python version (e.g., 3.8) -->
-        - Related Issues: <!-- Link to any related issues here (e.g., #1) -->
-        - Any other relevant information.
-      placeholder: Any additional details
+    attributes:
+      label: Any additional info you think would be helpful for fixing this bug

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1 +1,5 @@
 blank_issues_enabled: true
+contact_links:
+  - name: Questions or general help 💬
+    url: https://github.com/microsoft/autogen/discussions
+    about: Please ask and answer questions here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,26 +1,18 @@
 name: Feature Request
-description: File a feature request
+description: Request a new feature or enhancement
 labels: ["enhancement"]
-title: "[Feature Request]: "
 
 body:
   - type: textarea
-    id: problem_description
     attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-      placeholder: What problem are you trying to solve?
+      label: What feature would you like to be added?
+      description: Please describe the desired feature. Be descriptive, provide examples and if possible, provide a proposed solution.
+    validations:
+      required: true
 
   - type: textarea
-    id: solution_description
     attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-      placeholder: How do you envision the solution?
-
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
-      placeholder: Any additional information
+      label: Why is this needed?
+      description: Why is it important that this feature is implemented? What problem or need does it solve?
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -5,15 +5,13 @@ name: Build
 
 on:
   push:
-    branches: ["main"]
+    branches: ["0.2"]
   pull_request:
-    branches: ["main"]
-  merge_group:
-    types: [checks_requested]
+    branches: ["0.2"]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/0.2' }}
 permissions: {}
 jobs:
   paths-filter:

.github/ISSUE_TEMPLATE/general_issue.yml

@@ -5,7 +5,7 @@ name: OpenAI4ContribTests
 
 on:
   pull_request:
-    branches: ["main"]
+    branches: ["0.2"]
     paths:
       - "autogen/**"
       - "test/agentchat/contrib/**"

.github/workflows/build.yml

@@ -5,7 +5,7 @@ name: ContribTests
 
 on:
   pull_request:
-    branches: ["main"]
+    branches: ["0.2"]
     paths:
       - "autogen/**"
       - "test/agentchat/contrib/**"
@@ -16,7 +16,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/0.2' }}
 permissions:
   {}
   # actions: read
@@ -709,3 +709,35 @@ jobs:
         with:
           file: ./coverage.xml
           flags: unittests
+
+  OllamaTest:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-2019]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        exclude:
+          - os: macos-latest
+            python-version: "3.9"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      - 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-cov>=5
+      - name: Install packages and dependencies for Ollama
+        run: |
+          pip install -e .[ollama,test]
+          pytest test/oai/test_ollama.py --skip-openai
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./coverage.xml
+          flags: unittests