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

Author: bassmang

.github/workflows/dotnet-build.yml

@@ -46,8 +46,9 @@ jobs:
       - name: workflows has changes
         run: echo "workflows has changes"
         if: steps.filter.outputs.workflows == 'true'
+
   build:
-    name: Dotnet Build
+    name: Dotnet Build & Test
     needs: paths-filter
     if: needs.paths-filter.outputs.hasChanges == 'true'
     defaults:
@@ -64,35 +65,12 @@ jobs:
     - 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 jupyter and ipykernel
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install jupyter
-        python -m pip install ipykernel
-    - name: list available kernels
-      run: |
-        python -m jupyter kernelspec list
-    - uses: astral-sh/setup-uv@v5
-      with:
-        enable-cache: true
-        version: "0.5.18"
-    - run: uv sync --locked --all-extras
-      working-directory: ./python
-    - name: Prepare python venv
-      run: |
-        source ${{ github.workspace }}/python/.venv/bin/activate
     - name: Setup .NET 8.0
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.0.x'
     - name: Restore dependencies
-      run: |
-        # dotnet nuget add source --name dotnet-tool https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json --configfile NuGet.config
-        dotnet restore -bl
+      run: dotnet restore -bl
     - name: Format check
       run: |
         echo "Format check"
@@ -104,40 +82,43 @@ jobs:
         dotnet build --no-restore --configuration Release -bl /p:SignAssembly=true
     - name: Unit Test V1
       run: dotnet test --no-build -bl --configuration Release --filter "Category=UnitV1"
-    - name: Unit Test V2
-      run: dotnet test --no-build -bl --configuration Release --filter "Category=UnitV2"
-
-  grpc-unit-tests:
-    name: Dotnet Grpc unit tests
-    needs: paths-filter
-    if: needs.paths-filter.outputs.hasChanges == 'true'
-    defaults:
-      run:
-        working-directory: dotnet
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest ]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-    - uses: actions/checkout@v4
+    - name: Unit Test V2 (With Coverage)
+      run: dotnet test --no-build -bl --configuration Release --filter "Category=UnitV2" --collect:"XPlat Code Coverage"
+    - name: Install Dev Certs for GRPC
+      if: matrix.os == 'ubuntu-latest'
+      run: dotnet dev-certs https --trust
+    - name: GRPC Tests (With Coverage)
+      if: matrix.os == 'ubuntu-latest'
+      run: dotnet test --no-build -bl --configuration Release --filter "Category=GRPC" --collect:"XPlat Code Coverage"
+    - name: Generate & Merge Coverage Report
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        # Install reportgenerator
+        dotnet tool install -g dotnet-reportgenerator-globaltool || dotnet tool update -g dotnet-reportgenerator-globaltool
+        # Ensure output directory exists
+        mkdir -p ${{ github.workspace }}/dotnet/coverage-report
+        # Merge all coverage reports and generate HTML + XML
+        reportgenerator \
+          -reports:${{ github.workspace }}/dotnet/**/TestResults/**/coverage.cobertura.xml \
+          -targetdir:${{ github.workspace }}/dotnet/coverage-report \
+          -reporttypes:"Cobertura;Html"
+        ls -R ${{ github.workspace }}/dotnet/coverage-report
+    - name: Upload Merged Coverage Report
+      if: matrix.os == 'ubuntu-latest'
+      uses: actions/upload-artifact@v4
       with:
-        lfs: true
-    - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v4
+        name: CodeCoverageReport
+        path: ${{ github.workspace }}/dotnet/coverage-report/
+        retention-days: 7
+    - name: Upload Coverage to Codecov
+      if: matrix.os == 'ubuntu-latest'
+      uses: codecov/codecov-action@v5
       with:
-        dotnet-version: '8.0.x'
-    - name: Install dev certs
-      run:  dotnet --version && dotnet dev-certs https --trust
-    - name: Restore dependencies
-      run: |
-        # dotnet nuget add source --name dotnet-tool https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json --configfile NuGet.config
-        dotnet restore -bl
-    - name: Build
-      run: dotnet build --no-restore --configuration Release -bl /p:SignAssembly=true
-    - name: GRPC tests
-      run: dotnet test --no-build -bl --configuration Release --filter "Category=GRPC"
+        files: ${{ github.workspace }}/dotnet/coverage-report/*.xml
+        flags: unittests
+        name: dotnet-codecov
+        fail_ci_if_error: true
+        token: ${{ secrets.CODECOV_TOKEN }}
 
   integration-test:
     strategy:

README.md

@@ -7,9 +7,14 @@
 [![LinkedIn](https://img.shields.io/badge/LinkedIn-Company?style=flat&logo=linkedin&logoColor=white)](https://www.linkedin.com/company/105812540)
 [![Discord](https://img.shields.io/badge/discord-chat-green?logo=discord)](https://aka.ms/autogen-discord)
 [![Documentation](https://img.shields.io/badge/Documentation-AutoGen-blue?logo=read-the-docs)](https://microsoft.github.io/autogen/)
+[![Blog](https://img.shields.io/badge/Blog-AutoGen-blue?logo=blogger)](https://devblogs.microsoft.com/autogen/)
 
 </div>
 
+<div align="center" style="background-color: rgba(255, 235, 59, 0.5); padding: 10px; border-radius: 5px; margin: 20px 0;">
+  <strong>Important:</strong> This is the official project. We are not affiliated with any fork or startup. See our <a href="https://x.com/pyautogen/status/1857264760951296210">statement</a>.
+</div>
+
 # AutoGen
 
 **AutoGen** is a framework for creating multi-agent AI applications that can act autonomously or work alongside humans.
@@ -130,7 +135,7 @@ With AutoGen you get to join and contribute to a thriving ecosystem. We host wee
 
 Interested in contributing? See [CONTRIBUTING.md](./CONTRIBUTING.md) for guidelines on how to get started. We welcome contributions of all kinds, including bug fixes, new features, and documentation improvements. Join our community and help us make AutoGen better!
 
-Have questions? Check out our [Frequently Asked Questions (FAQ)](./FAQ.md) for answers to common queries. If you don't find what you're looking for, feel free to ask in our [GitHub Discussions](https://github.com/microsoft/autogen/discussions) or join our [Discord server](https://aka.ms/autogen-discord) for real-time support.
+Have questions? Check out our [Frequently Asked Questions (FAQ)](./FAQ.md) for answers to common queries. If you don't find what you're looking for, feel free to ask in our [GitHub Discussions](https://github.com/microsoft/autogen/discussions) or join our [Discord server](https://aka.ms/autogen-discord) for real-time support. You can also read our [blog](https://devblogs.microsoft.com/autogen/) for updates.
 
 ## Legal Notices
 

dotnet/test/Microsoft.AutoGen.Core.Grpc.Tests/Microsoft.AutoGen.Core.Grpc.Tests.csproj

@@ -8,6 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <ProjectReference Include="..\..\src\Microsoft.AutoGen\Core\Microsoft.AutoGen.Core.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AutoGen\Core.Grpc\Microsoft.AutoGen.Core.Grpc.csproj" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />

dotnet/test/Microsoft.AutoGen.Core.Tests/Microsoft.AutoGen.Core.Tests.csproj

@@ -8,6 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <ProjectReference Include="..\..\src\Microsoft.AutoGen\Core\Microsoft.AutoGen.Core.csproj" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
   </ItemGroup>

dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/GrpcGatewayServiceTests.cs

@@ -12,7 +12,7 @@
 
 namespace Microsoft.AutoGen.Runtime.Grpc.Tests;
 [Collection(ClusterCollection.Name)]
-[Trait("Category", "UnitV2")]
+[Trait("Category", "GRPC")]
 public class GrpcGatewayServiceTests
 {
     private readonly ClusterFixture _fixture;

dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Microsoft.AutoGen.Runtime.Grpc.Tests.csproj

@@ -8,6 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
     <PackageReference Include="Microsoft.Orleans.TestingHost" />
   </ItemGroup>

python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py

@@ -62,6 +62,7 @@ class AssistantAgentConfig(BaseModel):
     tools: List[ComponentModel] | None
     handoffs: List[HandoffBase | str] | None = None
     model_context: ComponentModel | None = None
+    memory: List[ComponentModel] | None = None
     description: str
     system_message: str | None = None
     model_client_stream: bool = False
@@ -591,6 +592,7 @@ def _to_config(self) -> AssistantAgentConfig:
             tools=[tool.dump_component() for tool in self._tools],
             handoffs=list(self._handoffs.values()),
             model_context=self._model_context.dump_component(),
+            memory=[memory.dump_component() for memory in self._memory] if self._memory else None,
             description=self.description,
             system_message=self._system_messages[0].content
             if self._system_messages and isinstance(self._system_messages[0].content, str)
@@ -609,6 +611,7 @@ def _from_config(cls, config: AssistantAgentConfig) -> Self:
             tools=[BaseTool.load_component(tool) for tool in config.tools] if config.tools else None,
             handoffs=config.handoffs,
             model_context=None,
+            memory=[Memory.load_component(memory) for memory in config.memory] if config.memory else None,
             description=config.description,
             system_message=config.system_message,
             model_client_stream=config.model_client_stream,

python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_orchestrator.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import re
 from typing import Any, Dict, List, Mapping
 
 from autogen_core import AgentId, CancellationToken, DefaultTopicId, MessageContext, event, rpc
@@ -80,14 +81,12 @@ def __init__(
         self._plan = ""
         self._n_rounds = 0
         self._n_stalls = 0
-        self._team_description = "\n".join(
-            [
-                f"{topic_type}: {description}".strip()
-                for topic_type, description in zip(
-                    self._participant_topic_types, self._participant_descriptions, strict=True
-                )
-            ]
-        )
+
+        # Produce a team description. Each agent sould appear on a single line.
+        self._team_description = ""
+        for topic_type, description in zip(self._participant_topic_types, self._participant_descriptions, strict=True):
+            self._team_description += re.sub(r"\s+", " ", f"{topic_type}: {description}").strip() + "\n"
+        self._team_description = self._team_description.strip()
 
     def _get_task_ledger_facts_prompt(self, task: str) -> str:
         return ORCHESTRATOR_TASK_LEDGER_FACTS_PROMPT.format(task=task)

python/packages/autogen-agentchat/tests/test_assistant_agent.py

@@ -18,7 +18,7 @@
     ToolCallRequestEvent,
     ToolCallSummaryMessage,
 )
-from autogen_core import FunctionCall, Image
+from autogen_core import ComponentModel, FunctionCall, Image
 from autogen_core.memory import ListMemory, Memory, MemoryContent, MemoryMimeType, MemoryQueryResult
 from autogen_core.model_context import BufferedChatCompletionContext
 from autogen_core.models import (
@@ -754,7 +754,12 @@ async def test_run_with_memory(monkeypatch: pytest.MonkeyPatch) -> None:
         "test_agent", model_client=OpenAIChatCompletionClient(model=model, api_key=""), memory=[memory2]
     )
 
-    result = await agent.run(task="test task")
+    # Test dump and load component with memory
+    agent_config: ComponentModel = agent.dump_component()
+    assert agent_config.provider == "autogen_agentchat.agents.AssistantAgent"
+    agent2 = AssistantAgent.load_component(agent_config)
+
+    result = await agent2.run(task="test task")
     assert len(result.messages) > 0
     memory_event = next((msg for msg in result.messages if isinstance(msg, MemoryQueryEvent)), None)
     assert memory_event is not None
@@ -795,9 +800,10 @@ async def test_assistant_agent_declarative(monkeypatch: pytest.MonkeyPatch) -> N
         "test_agent",
         model_client=OpenAIChatCompletionClient(model=model, api_key=""),
         model_context=model_context,
+        memory=[ListMemory(name="test_memory")],
     )
 
-    agent_config = agent.dump_component()
+    agent_config: ComponentModel = agent.dump_component()
     assert agent_config.provider == "autogen_agentchat.agents.AssistantAgent"
 
     agent2 = AssistantAgent.load_component(agent_config)

python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/custom-agents.ipynb

@@ -49,7 +49,7 @@
     }
    ],
    "source": [
-    "from typing import AsyncGenerator, List, Sequence, Tuple\n",
+    "from typing import AsyncGenerator, List, Sequence\n",
     "\n",
     "from autogen_agentchat.agents import BaseChatAgent\n",
     "from autogen_agentchat.base import Response\n",
@@ -310,4 +310,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}

python/packages/autogen-core/src/autogen_core/memory/_base_memory.py

@@ -5,6 +5,7 @@
 from pydantic import BaseModel, ConfigDict
 
 from .._cancellation_token import CancellationToken
+from .._component_config import ComponentBase
 from .._image import Image
 from ..model_context import ChatCompletionContext
 
@@ -49,7 +50,7 @@ class UpdateContextResult(BaseModel):
     memories: MemoryQueryResult
 
 
-class Memory(ABC):
+class Memory(ABC, ComponentBase[BaseModel]):
     """Protocol defining the interface for memory implementations.
 
     A memory is the storage for data that can be used to enrich or modify the model context.
@@ -64,6 +65,8 @@ class Memory(ABC):
     See :class:`~autogen_core.memory.ListMemory` for an example implementation.
     """
 
+    component_type = "memory"
+
     @abstractmethod
     async def update_context(
         self,

python/packages/autogen-core/src/autogen_core/memory/_list_memory.py

@@ -1,12 +1,25 @@
 from typing import Any, List
 
+from pydantic import BaseModel
+from typing_extensions import Self
+
 from .._cancellation_token import CancellationToken
+from .._component_config import Component
 from ..model_context import ChatCompletionContext
 from ..models import SystemMessage
 from ._base_memory import Memory, MemoryContent, MemoryQueryResult, UpdateContextResult
 
 
-class ListMemory(Memory):
+class ListMemoryConfig(BaseModel):
+    """Configuration for ListMemory component."""
+
+    name: str | None = None
+    """Optional identifier for this memory instance."""
+    memory_contents: List[MemoryContent] = []
+    """List of memory contents stored in this memory instance."""
+
+
+class ListMemory(Memory, Component[ListMemoryConfig]):
     """Simple chronological list-based memory implementation.
 
     This memory implementation stores contents in a list and retrieves them in
@@ -53,9 +66,13 @@ async def main() -> None:
 
     """
 
-    def __init__(self, name: str | None = None) -> None:
+    component_type = "memory"
+    component_provider_override = "autogen_core.memory.ListMemory"
+    component_config_schema = ListMemoryConfig
+
+    def __init__(self, name: str | None = None, memory_contents: List[MemoryContent] | None = None) -> None:
         self._name = name or "default_list_memory"
-        self._contents: List[MemoryContent] = []
+        self._contents: List[MemoryContent] = memory_contents if memory_contents is not None else []
 
     @property
     def name(self) -> str:
@@ -146,3 +163,10 @@ async def clear(self) -> None:
     async def close(self) -> None:
         """Cleanup resources if needed."""
         pass
+
+    @classmethod
+    def _from_config(cls, config: ListMemoryConfig) -> Self:
+        return cls(name=config.name, memory_contents=config.memory_contents)
+
+    def _to_config(self) -> ListMemoryConfig:
+        return ListMemoryConfig(name=self.name, memory_contents=self._contents)