Merge branch 'main' into dev/DotNetDocs

microsoft · Jan 16, 2025 · ace1f44 · ace1f44
2 parents a2e40cc + 5495a02
commit ace1f44
Show file tree

Hide file tree

Showing 56 changed files with 4,038 additions and 1,612 deletions.
diff --git a/.azure/pipelines/templates/build.yaml b/.azure/pipelines/templates/build.yaml
@@ -84,12 +84,20 @@ jobs:
     inputs:
       useGlobalJson: true
       workingDirectory: $(Build.SourcesDirectory)/dotnet
+  - task: PowerShell@2
+    displayName: 'Install uv'
+    inputs:
+      targetType: 'inline'
+      script: |
+        irm https://astral.sh/uv/install.ps1 | iex
+        $env:Path = "C:\Users\cloudtest\.local\bin;$env:Path"
+        uv --version
   - task: Bash@3
     displayName: Install .NET Aspire workload
     inputs:
       targetType: 'inline'
       script: |
-        dotnet nuget locals all --clear 
+        dotnet nuget locals all --clear
         dotnet workload install aspire
   - ${{ if eq(variables.runCodeQL3000, 'true') }}:
     - task: CodeQL3000Init@0
@@ -106,6 +114,7 @@ jobs:
       arguments: '$(build_flags) /bl:${{parameters.build_configuration}}-Build.binlog /p:Configuration=${{parameters.build_configuration}} $(solution)'
       workingDirectory: $(Build.SourcesDirectory)/dotnet
     env:
+      PATH: "C:\\Users\\cloudtest\\.local\\bin;$(PATH)"
       ${{ if and(eq(parameters.include_suffix, true), eq(parameters.publish_nuget, false)) }}:
         VersionSuffix: ${{parameters.version_suffix}}
       OfficialBuild: $(official_build)
@@ -125,16 +134,23 @@ jobs:
       inputs:
         SourceFolder: '$(build.sourcesdirectory)'
         Contents: |
-          src/**/bin/${{parameters.build_configuration}}/**/AutoGen*.dll
-          src/**/bin/${{parameters.build_configuration}}/**/Microsoft.AutoGen.*.dll
+          **/AutoGen*.dll
+          **/Microsoft.AutoGen.*.dll
         TargetFolder: '$(build.artifactstagingdirectory)\codesign'
         CleanTargetFolder: true
-    - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
       displayName: 'Codesign: ESRP CodeSigning'
       inputs:
-        ConnectedServiceName: 'CodeSign Service (NuGet)'
+        ConnectedServiceName: 'AI Frontiers ESRP'
+        AppRegistrationClientId: 'c1e7a5c0-ee6b-4cec-9e11-4dc3f4670042'
+        AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
+        #EsrpClientId: '7129dd35-ad94-49a9-98c7-eb4cf3cd36a9'
+        #UseMSIAuthentication: true
+        AuthAKVName: 'aif-autogen-esrp-kv'
+        AuthCertName: 'AIF-PME-InfrastructureAuth'
+        AuthSignCertName: 'AutoGenPublishESRPPKI' # this variable is only needed for codesign
         FolderPath: '$(build.artifactstagingdirectory)\codesign'
-        Pattern: '*'
+        Pattern: '*.dll'
         signConfigType: inlineSignParams
         inlineOperation: |
           [
@@ -163,15 +179,15 @@ jobs:
                   "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
                 }
               ],
-                "toolName": "sign",
-                "toolVersion": "1.0"
-              },
-              {
-                "keyCode": "CP-230012",
-                "operationSetCode": "SigntoolVerify",
-                "parameters": [ ],
-                "toolName": "sign",
-                "toolVersion": "1.0"
+              "toolName": "sign",
+              "toolVersion": "1.0"
+            },
+            {
+              "keyCode": "CP-230012",
+              "operationSetCode": "SigntoolVerify",
+              "parameters": [ ],
+              "toolName": "sign",
+              "toolVersion": "1.0"
             }
           ]
         SessionTimeout: 180
@@ -200,10 +216,17 @@ jobs:
       inputs:
         packageType: runtime
         version: $(codesign_runtime)
-    - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
       displayName: 'Codesign: ESRP CodeSigning (nuget)'
       inputs:
-        ConnectedServiceName: 'CodeSign Service (NuGet)'
+        ConnectedServiceName: 'AI Frontiers ESRP'
+        AppRegistrationClientId: 'c1e7a5c0-ee6b-4cec-9e11-4dc3f4670042'
+        AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
+        EsrpClientId: '7129dd35-ad94-49a9-98c7-eb4cf3cd36a9'
+        UseMSIAuthentication: true
+        AuthAKVName: 'aif-autogen-esrp-kv'
+        #AuthCertName: 'AutoGenPublishESRPPKI'
+        AuthSignCertName: 'AutoGenPublishESRPPKI' # this variable is only needed for codesign
         FolderPath: '$(build.sourcesdirectory)/Artifacts/${{parameters.build_configuration}}'
         Pattern: '*.nupkg'
         signConfigType: inlineSignParams
@@ -225,4 +248,4 @@ jobs:
             }
           ]
         SessionTimeout: 180
-        VerboseLogin: true
+        VerboseLogin: true
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -18,6 +18,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -36,6 +37,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -65,6 +67,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -94,6 +97,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -121,6 +125,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -151,6 +156,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -184,6 +190,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -205,6 +212,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -223,6 +231,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -241,6 +250,7 @@ jobs:
       - uses: astral-sh/setup-uv@v3
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -259,6 +269,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -76,6 +76,7 @@ jobs:
     - 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

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -33,7 +33,7 @@ jobs:
           [
             # For main use the workflow target
             { ref: "${{github.ref}}", dest-dir: dev, uv-version: "0.5.13", sphinx-release-override: "dev" },
-            { ref: "v0.4.1", dest-dir: stable, uv-version: "0.5.13", sphinx-release-override: "stable" },
+            { ref: "v0.4.2", dest-dir: stable, uv-version: "0.5.13", sphinx-release-override: "stable" },
             { ref: "v0.4.0.dev0", dest-dir: "0.4.0.dev0", uv-version: "0.5.11", sphinx-release-override: "" },
             { ref: "v0.4.0.dev1", dest-dir: "0.4.0.dev1", uv-version: "0.5.11", sphinx-release-override: "" },
             { ref: "v0.4.0.dev2", dest-dir: "0.4.0.dev2", uv-version: "0.5.11", sphinx-release-override: "" },
@@ -50,6 +50,7 @@ jobs:
             { ref: "v0.4.0.dev13", dest-dir: "0.4.0.dev13", uv-version: "0.5.13", sphinx-release-override: "" },
             { ref: "v0.4.0.post1", dest-dir: "0.4.0", uv-version: "0.5.13", sphinx-release-override: "" },
             { ref: "v0.4.1", dest-dir: "0.4.1", uv-version: "0.5.13", sphinx-release-override: "" },
+            { ref: "v0.4.2", dest-dir: "0.4.2", uv-version: "0.5.13", sphinx-release-override: "" },
           ]
     steps:
       - name: Checkout
@@ -110,6 +111,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"

diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
@@ -79,6 +79,7 @@ jobs:
     - 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
@@ -122,6 +123,7 @@ jobs:
     - uses: astral-sh/setup-uv@v5
       with:
         enable-cache: true
+        version: "0.5.18"
     - uses: actions/setup-python@v5
       with:
         python-version: "3.11"
@@ -206,6 +208,7 @@ jobs:
     - uses: astral-sh/setup-uv@v5
       with:
         enable-cache: true
+        version: "0.5.18"
     - uses: actions/setup-python@v5
       with:
         python-version: "3.11"

diff --git a/.github/workflows/single-python-package.yml b/.github/workflows/single-python-package.yml
@@ -36,6 +36,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          version: "0.5.18"
       - run: uv build --package ${{ github.event.inputs.package }} --out-dir dist/
         working-directory: python
       - name: Publish package to PyPI

diff --git a/docs/switcher.json b/docs/switcher.json
@@ -1,6 +1,6 @@
 [
     {
-        "name": "0.4.1 (stable)",
+        "name": "0.4.2 (stable)",
         "version": "stable",
         "url": "/autogen/stable/",
         "preferred": true
@@ -14,80 +14,5 @@
         "name": "0.2",
         "version": "0.2",
         "url": "/autogen/0.2/"
-    },
-    {
-        "name": "0.4.0",
-        "version": "0.4.0",
-        "url": "/autogen/0.4.0/"
-    },
-    {
-        "name": "0.4.0.dev0",
-        "version": "0.4.0.dev0",
-        "url": "/autogen/0.4.0dev0/"
-    },
-    {
-        "name": "0.4.0.dev1",
-        "version": "0.4.0.dev1",
-        "url": "/autogen/0.4.0.dev1/"
-    },
-    {
-        "name": "0.4.0.dev2",
-        "version": "0.4.0.dev2",
-        "url": "/autogen/0.4.0.dev2/"
-    },
-    {
-        "name": "0.4.0.dev3",
-        "version": "0.4.0.dev3",
-        "url": "/autogen/0.4.0.dev3/"
-    },
-    {
-        "name": "0.4.0.dev4",
-        "version": "0.4.0.dev4",
-        "url": "/autogen/0.4.0.dev4/"
-    },
-    {
-        "name": "0.4.0.dev5",
-        "version": "0.4.0.dev5",
-        "url": "/autogen/0.4.0.dev5/"
-    },
-    {
-        "name": "0.4.0.dev6",
-        "version": "0.4.0.dev6",
-        "url": "/autogen/0.4.0.dev6/"
-    },
-    {
-        "name": "0.4.0.dev7",
-        "version": "0.4.0.dev7",
-        "url": "/autogen/0.4.0.dev7/"
-    },
-    {
-        "name": "0.4.0.dev8",
-        "version": "0.4.0.dev8",
-        "url": "/autogen/0.4.0.dev8/"
-    },
-    {
-        "name": "0.4.0.dev9",
-        "version": "0.4.0.dev9",
-        "url": "/autogen/0.4.0.dev9/"
-    },
-    {
-        "name": "0.4.0.dev10",
-        "version": "0.4.0.dev10",
-        "url": "/autogen/0.4.0.dev10/"
-    },
-    {
-        "name": "0.4.0.dev11",
-        "version": "0.4.0.dev11",
-        "url": "/autogen/0.4.0.dev11/"
-    },
-    {
-        "name": "0.4.0.dev12",
-        "version": "0.4.0.dev12",
-        "url": "/autogen/0.4.0.dev12/"
-    },
-    {
-        "name": "0.4.0.dev13",
-        "version": "0.4.0.dev13",
-        "url": "/autogen/0.4.0.dev13/"
     }
 ]
diff --git a/python/packages/autogen-agentchat/pyproject.toml b/python/packages/autogen-agentchat/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "autogen-agentchat"
-version = "0.4.1"
+version = "0.4.3"
 license = {file = "LICENSE-CODE"}
 description = "AutoGen agents and teams library"
 readme = "README.md"
@@ -15,8 +15,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "autogen-core==0.4.1",
-    "aioconsole>=0.8.1"
+    "autogen-core==0.4.3",
 ]
 
 [tool.ruff]

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_user_proxy_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_user_proxy_agent.py
@@ -5,7 +5,6 @@
 from inspect import iscoroutinefunction
 from typing import Any, AsyncGenerator, Awaitable, Callable, ClassVar, Generator, Optional, Sequence, Union, cast
 
-from aioconsole import ainput  # type: ignore
 from autogen_core import CancellationToken
 
 from ..base import Response
@@ -17,10 +16,9 @@
 InputFuncType = Union[SyncInputFunc, AsyncInputFunc]
 
 
-# TODO: ainput doesn't seem to play nicely with jupyter.
-#       No input window appears in this case.
+# TODO: check if using to_thread fixes this in jupyter
 async def cancellable_input(prompt: str, cancellation_token: Optional[CancellationToken]) -> str:
-    task: asyncio.Task[str] = asyncio.create_task(ainput(prompt))  # type: ignore
+    task: asyncio.Task[str] = asyncio.create_task(asyncio.to_thread(input, prompt))
     if cancellation_token is not None:
         cancellation_token.link_future(task)
     return await task