Skip to content

Commit 83ebf74

Browse files
committed
Merge branch 'main' into hotfix/azure-ai-evaluation/1.13.3
2 parents 26c60b1 + bb35e87 commit 83ebf74

File tree

206 files changed

+30361
-68
lines changed

Some content is hidden

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

206 files changed

+30361
-68
lines changed

eng/.docsettings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ omitted_paths:
2222
language: python
2323
root_check_enabled: True
2424
required_readme_sections:
25-
- ^Azure (.+ client library for Python|Smoke Test for Python)
25+
- ^Azure (.+ client library for Python|Smoke Test for Python|AI Agent Server Adapter for .*Python)
2626
- ^Getting started$
2727
- ^Key concepts$
2828
- ^Examples$

eng/common/tsp-client/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/tsp-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"dependencies": {
3-
"@azure-tools/typespec-client-generator-cli": "0.29.0"
3+
"@azure-tools/typespec-client-generator-cli": "0.30.0"
44
}
55
}

eng/pipelines/templates/jobs/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ parameters:
6464
- name: EnvVars
6565
type: object
6666
default: {}
67+
- name: PythonVersionForAnalyze
68+
type: string
69+
default: ''
6770

6871
jobs:
6972
- job: 'Build_Linux'
@@ -217,11 +220,10 @@ jobs:
217220

218221
steps:
219222
- task: UsePythonVersion@0
220-
displayName: 'Use Python $(PythonVersion)'
223+
displayName: "Use Python ${{ coalesce(parameters.PythonVersionForAnalyze, '$(PythonVersion)') }}"
221224
condition: succeededOrFailed()
222225
inputs:
223-
versionSpec: '$(PythonVersion)'
224-
226+
versionSpec: ${{ coalesce(parameters.PythonVersionForAnalyze, '$(PythonVersion)') }}
225227
- template: /eng/pipelines/templates/steps/use-venv.yml
226228

227229
- template: /eng/common/pipelines/templates/steps/check-spelling.yml

eng/pipelines/templates/stages/archetype-sdk-client.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ parameters:
8484
- name: EnvVars
8585
type: object
8686
default: {}
87+
- name: PythonVersionForAnalyze
88+
type: string
89+
default: ''
8790

8891
extends:
8992
template: /eng/pipelines/templates/stages/1es-redirect.yml
@@ -120,6 +123,7 @@ extends:
120123
VerifyAutorest: ${{ parameters.VerifyAutorest }}
121124
TestProxy: ${{ parameters.TestProxy }}
122125
GenerateApiReviewForManualOnly: ${{ parameters.GenerateApiReviewForManualOnly }}
126+
PythonVersionForAnalyze: ${{ parameters.PythonVersionForAnalyze }}
123127

124128
variables:
125129
- template: /eng/pipelines/templates/variables/globals.yml
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Release History
2+
3+
## 1.0.0b1 (2025-11-07)
4+
5+
### Features Added
6+
7+
First version
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Copyright (c) Microsoft Corporation.
2+
3+
MIT License
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
include *.md
2+
include LICENSE
3+
recursive-include tests *.py
4+
recursive-include samples *.py *.md
5+
recursive-include doc *.rst *.md
6+
include azure/__init__.py
7+
include azure/ai/__init__.py
8+
include azure/ai/agentserver/__init__.py
9+
include azure/ai/agentserver/agentframework/py.typed
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Azure AI Agent Server Adapter for Agent-framework Python
2+
3+
4+
5+
## Getting started
6+
7+
```bash
8+
pip install azure-ai-agentserver-agentframework
9+
```
10+
11+
12+
## Key concepts
13+
14+
Azure AI Agent Server wraps your Agent-framework agent, and host it on the cloud.
15+
16+
17+
## Examples
18+
19+
```python
20+
# your existing agent
21+
from my_framework_agent import my_awesome_agent
22+
23+
# agent framework utils
24+
from azure.ai.agentserver.agentframework import from_agent_framework
25+
26+
if __name__ == "__main__":
27+
# with this simple line, your agent will be hosted on http://localhost:8088
28+
from_agent_framework(my_awesome_agent).run()
29+
30+
```
31+
32+
## Troubleshooting
33+
34+
First run your agent with azure-ai-agentserver-agentframework locally.
35+
36+
If it works on local but failed on cloud. Check your logs in the application insight connected to your Azure AI Foundry Project.
37+
38+
39+
## Next steps
40+
41+
Please visit [Samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/agentserver/azure-ai-agentserver-agentframework/samples) folder. There are several samples for you to build your agent with azure-ai-agentserver
42+
43+
44+
## Contributing
45+
46+
This project welcomes contributions and suggestions. Most contributions require
47+
you to agree to a Contributor License Agreement (CLA) declaring that you have
48+
the right to, and actually do, grant us the rights to use your contribution.
49+
For details, visit https://cla.microsoft.com.
50+
51+
When you submit a pull request, a CLA-bot will automatically determine whether
52+
you need to provide a CLA and decorate the PR appropriately (e.g., label,
53+
comment). Simply follow the instructions provided by the bot. You will only
54+
need to do this once across all repos using our CLA.
55+
56+
This project has adopted the
57+
[Microsoft Open Source Code of Conduct][code_of_conduct]. For more information,
58+
see the Code of Conduct FAQ or contact [email protected] with any
59+
additional questions or comments.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore

0 commit comments

Comments
 (0)