Address Pamela feedback

Author: madebygps

.github/workflows/azure-dev.yaml

@@ -28,10 +28,10 @@ jobs:
       AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
       AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
       # Project specific
-      AZURE_GPT_MODEL_NAME: ${{ vars.AZURE_GPT_MODEL_NAME }}
-      AZURE_GPT_MODEL_VERSION: ${{ vars.AZURE_GPT_MODEL_VERSION }}
-      AZURE_GPT_DEPLOYMENT_NAME: ${{ vars.AZURE_GPT_DEPLOYMENT_NAME }}
-      AZURE_GPT_DEPLOYMENT_CAPACITY: ${{ vars.AZURE_GPT_DEPLOYMENT_CAPACITY }}
+      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZURE_OPENAI_CHAT_MODEL }}
+      AZURE_OPENAI_CHAT_MODEL_VERSION: ${{ vars.AZURE_OPENAI_CHAT_MODEL_VERSION }}
+      AZURE_OPENAI_CHAT_DEPLOYMENT: ${{ vars.AZURE_OPENAI_CHAT_DEPLOYMENT }}
+      AZURE_OPENAI_CHAT_DEPLOYMENT_CAPACITY: ${{ vars.AZURE_OPENAI_CHAT_DEPLOYMENT_CAPACITY }}
     steps:
       - name: Checkout
         uses: actions/checkout@v6

README.md

@@ -1,12 +1,13 @@
 <!--
 ---
 name: Python Agent Framework Demos
-description: Collection of Python examples for Microsoft Agent Framework using GitHub Models or Azure OpenAI.
+description: Collection of Python examples for Microsoft Agent Framework using GitHub Models or Azure AI Foundry.
 languages:
 - python
 products:
 - azure-openai
 - azure
+- ai-services
 page_type: sample
 urlFragment: python-agentframework-demos
 ---
@@ -16,17 +17,16 @@ urlFragment: python-agentframework-demos
 [![Open in GitHub Codespaces](https://img.shields.io/static/v1?style=for-the-badge&label=GitHub+Codespaces&message=Open&color=brightgreen&logo=github)](https://codespaces.new/Azure-Samples/python-agentframework-demos)
 [![Open in Dev Containers](https://img.shields.io/static/v1?style=for-the-badge&label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/Azure-Samples/python-agentframework-demos)
 
-This repository provides examples of [Microsoft Agent Framework](https://learn.microsoft.com/agent-framework/) using LLMs from [GitHub Models](https://github.com/marketplace/models). Those models are free to use for anyone with a GitHub account, up to a [daily rate limit](https://docs.github.com/github-models/prototyping-with-ai-models#rate-limits).
+This repository provides examples of [Microsoft Agent Framework](https://learn.microsoft.com/agent-framework/) using LLMs from [GitHub Models](https://github.com/marketplace/models), [Azure AI Foundry](https://learn.microsoft.com/azure/ai-foundry/), or other model providers. GitHub Models are free to use for anyone with a GitHub account, up to a [daily rate limit](https://docs.github.com/github-models/prototyping-with-ai-models#rate-limits).
 
 * [Getting started](#getting-started)
   * [GitHub Codespaces](#github-codespaces)
   * [VS Code Dev Containers](#vs-code-dev-containers)
   * [Local environment](#local-environment)
 * [Configuring model providers](#configuring-model-providers)
   * [Using GitHub Models](#using-github-models)
-  * [Using Azure OpenAI models](#using-azure-openai-models)
+  * [Using Azure AI Foundry models](#using-azure-ai-foundry-models)
   * [Using OpenAI.com models](#using-openaicom-models)
-  * [Using Ollama models](#using-ollama-models)
 * [Running the Python examples](#running-the-python-examples)
 * [Resources](#resources)
 
@@ -87,7 +87,7 @@ A related option is VS Code Dev Containers, which will open the project in your
 
 ## Configuring model providers
 
-These examples can be run with Azure OpenAI account, OpenAI.com, local Ollama server, or GitHub models, depending on the environment variables you set. All the scripts reference the environment variables from a `.env` file, and an example `.env.sample` file is provided. Host-specific instructions are below.
+These examples can be run with Azure AI Foundry, OpenAI.com, or GitHub Models, depending on the environment variables you set. All the scripts reference the environment variables from a `.env` file, and an example `.env.sample` file is provided. Host-specific instructions are below.
 
 ## Using GitHub Models
 
@@ -111,11 +111,11 @@ If you want to run the scripts locally, you need to set up the `GITHUB_TOKEN` en
 
 10. Optionally, you can use a model other than "gpt-4o" by setting the `GITHUB_MODEL` environment variable. Use a model that supports function calling, such as: `gpt-5`, `gpt-5-mini`, `gpt-4o`, `gpt-4o-mini`, `o3-mini`, `AI21-Jamba-1.5-Large`, `AI21-Jamba-1.5-Mini`, `Codestral-2501`, `Cohere-command-r`, `Ministral-3B`, `Mistral-Large-2411`, `Mistral-Nemo`, `Mistral-small`
 
-## Using Azure OpenAI models
+## Using Azure AI Foundry models
 
-You can run all examples in this repository using GitHub Models. If you want to run the examples using models from Azure OpenAI instead, you need to provision the Azure AI resources, which will incur costs.
+You can run all examples in this repository using GitHub Models. If you want to run the examples using models from Azure AI Foundry instead, you need to provision the Azure AI resources, which will incur costs.
 
-This project includes infrastructure as code (IaC) to provision Azure OpenAI deployments of "gpt-4o" and "text-embedding-3-large". The IaC is defined in the `infra` directory and uses the Azure Developer CLI to provision the resources.
+This project includes infrastructure as code (IaC) to provision Azure OpenAI deployments of "gpt-5-mini" and "text-embedding-3-large" via Azure AI Foundry. The IaC is defined in the `infra` directory and uses the Azure Developer CLI to provision the resources.
 
 1. Make sure the [Azure Developer CLI (azd)](https://aka.ms/install-azd) is installed.
 
@@ -162,31 +162,6 @@ This project includes infrastructure as code (IaC) to provision Azure OpenAI dep
     OPENAI_MODEL=gpt-4o-mini
     ```
 
-## Using Ollama models
-
-1. Install [Ollama](https://ollama.com/) and follow the instructions to set it up on your local machine.
-2. Pull a model, for example:
-
-    ```shell
-    ollama pull qwen3:30b
-    ```
-
-    Note that most models do not support tool calling to the extent required by agents frameworks, so choose a model accordingly.
-
-3. Create a `.env` file by copying the `.env.sample` file and updating it with your Ollama endpoint and model name.
-
-    ```bash
-    cp .env.sample .env
-    ```
-
-4. Update the `.env` file with your Ollama endpoint and model name (any model you've pulled):
-
-    ```bash
-    API_HOST=ollama
-    OLLAMA_ENDPOINT=http://localhost:11434/v1
-    OLLAMA_MODEL=llama3.1
-    ```
-
 ## Running the Python examples
 
 You can run the examples in this repository by executing the scripts in the `examples` directory. Each script demonstrates a different Agent Framework pattern.

infra/main.bicep

@@ -41,37 +41,37 @@ param environmentName string
 param location string
 
 @description('Name of the GPT model to deploy')
-param gptModelName string = 'gpt-5-mini'
+param azureOpenaiChatModel string = 'gpt-5-mini'
 
 @description('Version of the GPT model to deploy')
 // See version availability in this table:
 // https://learn.microsoft.com/azure/ai-foundry/foundry-models/concepts/models-sold-directly-by-azure?pivots=azure-openai#models-by-deployment-type
-param gptModelVersion string = '2025-08-07'
+param azureOpenaiChatModelVersion string = '2025-08-07'
 
 @description('Name of the model deployment (can be different from the model name)')
-param gptDeploymentName string = 'gpt-5-mini'
+param azureOpenaiChatDeployment string = 'gpt-5-mini'
 
 @description('Capacity of the GPT deployment')
 // You can increase this, but capacity is limited per model/region, so you will get errors if you go over
 // https://learn.microsoft.com/en-us/azure/ai-services/openai/quotas-limits
-param gptDeploymentCapacity int = 30
+param azureOpenaiChatDeploymentCapacity int = 30
 
 
 @description('Name of the text embedding model to deploy')
-param embeddingModelName string = 'text-embedding-3-large'
+param azureOpenaiEmbeddingModel string = 'text-embedding-3-large'
 
 @description('Version of the text embedding model to deploy')
 // See version availability in this table:
 // https://learn.microsoft.com/azure/ai-services/openai/concepts/models?tabs=python-secure%2Cglobal-standard%2Cstandard-chat-completions#models-by-deployment-type
-param embeddingModelVersion string = '1'
+param azureOpenaiEmbeddingModelVersion string = '1'
 
 @description('Name of the model deployment (can be different from the model name)')
-param embeddingDeploymentName string = 'text-embedding-3-large'
+param azureOpenaiEmbeddingDeployment string = 'text-embedding-3-large'
 
 @description('Capacity of the text embedding deployment')
 // You can increase this, but capacity is limited per model/region, so you will get errors if you go over
 // https://learn.microsoft.com/en-us/azure/ai-services/openai/quotas-limits
-param embeddingDeploymentCapacity int = 30
+param azureOpenaiEmbeddingDeploymentCapacity int = 30
 
 @description('Id of the user or app to assign application roles')
 param principalId string = ''
@@ -110,27 +110,27 @@ module openAi 'br/public:avm/res/cognitive-services/account:0.7.1' = {
     }
     deployments: [
       {
-        name: gptDeploymentName
+        name: azureOpenaiChatDeployment
         model: {
           format: 'OpenAI'
-          name: gptModelName
-          version: gptModelVersion
+          name: azureOpenaiChatModel
+          version: azureOpenaiChatModelVersion
         }
         sku: {
           name: 'GlobalStandard'
-          capacity: gptDeploymentCapacity
+          capacity: azureOpenaiChatDeploymentCapacity
         }
       }
       {
-        name: embeddingDeploymentName
+        name: azureOpenaiEmbeddingDeployment
         model: {
           format: 'OpenAI'
-          name: embeddingModelName
-          version: embeddingModelVersion
+          name: azureOpenaiEmbeddingModel
+          version: azureOpenaiEmbeddingModelVersion
         }
         sku: {
           name: 'GlobalStandard'
-          capacity: embeddingDeploymentCapacity
+          capacity: azureOpenaiEmbeddingDeploymentCapacity
         }
       }
     ]
@@ -150,7 +150,7 @@ output AZURE_RESOURCE_GROUP string = resourceGroup.name
 
 // Specific to Azure OpenAI
 output AZURE_OPENAI_ENDPOINT string = openAi.outputs.endpoint
-output AZURE_OPENAI_CHAT_MODEL string = gptModelName
-output AZURE_OPENAI_CHAT_DEPLOYMENT string = gptDeploymentName
-output AZURE_OPENAI_EMBEDDING_MODEL string = embeddingModelName
-output AZURE_OPENAI_EMBEDDING_DEPLOYMENT string = embeddingDeploymentName
+output AZURE_OPENAI_CHAT_MODEL string = azureOpenaiChatModel
+output AZURE_OPENAI_CHAT_DEPLOYMENT string = azureOpenaiChatDeployment
+output AZURE_OPENAI_EMBEDDING_MODEL string = azureOpenaiEmbeddingModel
+output AZURE_OPENAI_EMBEDDING_DEPLOYMENT string = azureOpenaiEmbeddingDeployment

infra/main.parameters.json

@@ -14,16 +14,16 @@
     "runningOnGitHub": {
       "value": "${GITHUB_ACTIONS}"
     },
-    "gptModelName": {
+    "azureOpenaiChatModel": {
       "value": "${AZURE_OPENAI_CHAT_MODEL}"
     },
-    "gptModelVersion": {
+    "azureOpenaiChatModelVersion": {
       "value": "${AZURE_OPENAI_CHAT_MODEL_VERSION}"
     },
-    "gptDeploymentName": {
+    "azureOpenaiChatDeployment": {
       "value": "${AZURE_OPENAI_CHAT_DEPLOYMENT}"
     },
-    "gptDeploymentCapacity": {
+    "azureOpenaiChatDeploymentCapacity": {
       "value": "${AZURE_OPENAI_CHAT_DEPLOYMENT_CAPACITY}"
     }
   }