Revert "Integrate RecalcEngine to compute Env variables"

This reverts commit caf61440f6.

dotnet/samples/GettingStarted/DeclarativeAgents/Azure/Program.cs

@@ -8,6 +8,7 @@ using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 
 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
 
 // Read command-line arguments
 if (args.Length < 2)
@@ -31,6 +32,9 @@ if (!File.Exists(yamlFilePath))
 // Read the YAML content from the file
 var text = await File.ReadAllTextAsync(yamlFilePath);
 
+// TODO: Remove this workaround when the agent framework supports environment variable substitution in YAML files.
+text = text.Replace("=Env.AZURE_OPENAI_DEPLOYMENT_NAME", deploymentName, StringComparison.OrdinalIgnoreCase);
+
 var endpointUri = new Uri(endpoint);
 var tokenCredential = new AzureCliCredential();
 

dotnet/samples/GettingStarted/DeclarativeAgents/Azure/Properties/launchSettings.json

@@ -1,16 +0,0 @@
-{
-  "profiles": {
-    "Chat": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\azure\\AzureOpenAIChat.yaml \"What is the weather in Cambridge, MA in °C?\""
-    },
-    "Responses": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\azure\\AzureOpenAIResponses.yaml \"What is the weather in Cambridge, MA in °C?\""
-    },
-    "Assistants": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\azure\\AzureOpenAIAssistants.yaml \"What is the weather in Cambridge, MA in °C?\""
-    }
-  }
-}

dotnet/samples/GettingStarted/DeclarativeAgents/ChatClient/Properties/launchSettings.json

@@ -1,12 +0,0 @@
-{
-  "profiles": {
-    "GetWeather": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\chatclient\\GetWeather.yaml \"What is the weather in Cambridge, MA in °C?\""
-    },
-    "Assistant": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\chatclient\\Assistant.yaml \"Tell me a joke about a pirate in Italian.\""
-    }
-  }
-}

dotnet/samples/GettingStarted/DeclarativeAgents/Foundry/Program.cs

@@ -6,9 +6,9 @@ using System.ComponentModel;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
-using Microsoft.Extensions.Configuration;
 
 var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var model = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_MODEL_ID") ?? "gpt-4.1-mini";
 
 // Read command-line arguments
 if (args.Length < 2)
@@ -32,13 +32,9 @@ if (!File.Exists(yamlFilePath))
 // Read the YAML content from the file
 var text = await File.ReadAllTextAsync(yamlFilePath);
 
-// Set up configuration with the Azure Foundry project endpoint
-IConfiguration configuration = new ConfigurationBuilder()
-    .AddInMemoryCollection(new Dictionary<string, string?>
-    {
-        ["AZURE_FOUNDRY_PROJECT_ENDPOINT"] = endpoint,
-    })
-    .Build();
+// TODO: Remove this workaround when the agent framework supports environment variable substitution in YAML files.
+text = text.Replace("=Env.AZURE_FOUNDRY_PROJECT_ENDPOINT", endpoint, StringComparison.OrdinalIgnoreCase);
+text = text.Replace("=Env.AZURE_FOUNDRY_PROJECT_MODEL_ID", model, StringComparison.OrdinalIgnoreCase);
 
 // Example function tool that can be used by the agent.
 [Description("Get the weather for a given location.")]
@@ -48,7 +44,7 @@ static string GetWeather(
     => $"The weather in {location} is cloudy with a high of {(unit.Equals("celsius", StringComparison.Ordinal) ? "15°C" : "59°F")}.";
 
 // Create the agent from the YAML definition.
-var agentFactory = new FoundryPersistentAgentFactory(new AzureCliCredential(), configuration);
+var agentFactory = new FoundryPersistentAgentFactory(new AzureCliCredential());
 var agent = await agentFactory.CreateFromYamlAsync(text);
 
 // Create agent run options

dotnet/samples/GettingStarted/DeclarativeAgents/Foundry/Properties/launchSettings.json

@@ -1,12 +0,0 @@
-{
-  "profiles": {
-    "PersistentAgent": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\foundry\\PersistentAgent.yaml \"What is the weather in Cambridge, MA in °C?\""
-    },
-    "MicrosoftLearnAgent": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\foundry\\MicrosoftLearnAgent.yaml \"Tell me a joke about a pirate in Italian.\""
-    }
-  }
-}

dotnet/samples/GettingStarted/DeclarativeAgents/OpenAI/DeclarativeOpenAIAgents.csproj

@@ -11,7 +11,6 @@
   <ItemGroup>
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Azure.AI.Agents.Persistent" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Bot.ObjectModel" />
     <PackageReference Include="Microsoft.Bot.ObjectModel.Json" />

dotnet/samples/GettingStarted/DeclarativeAgents/OpenAI/Program.cs

@@ -5,9 +5,9 @@
 using System.ComponentModel;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
-using Microsoft.Extensions.Configuration;
 
 var apiKey = Environment.GetEnvironmentVariable("OPENAI_APIKEY") ?? throw new InvalidOperationException("OPENAI_APIKEY is not set.");
+var model = Environment.GetEnvironmentVariable("OPENAI_MODEL") ?? "gpt-4o-mini";
 
 // Read command-line arguments
 if (args.Length < 2)
@@ -31,20 +31,16 @@ if (!File.Exists(yamlFilePath))
 // Read the YAML content from the file
 var text = await File.ReadAllTextAsync(yamlFilePath);
 
-// Set up configuration with the OpenAI API key
-IConfiguration configuration = new ConfigurationBuilder()
-    .AddInMemoryCollection(new Dictionary<string, string?>
-    {
-        ["OPENAI_APIKEY"] = apiKey
-    })
-    .Build();
+// TODO: Remove this workaround when the agent framework supports environment variable substitution in YAML files.
+text = text.Replace("=Env.OPENAI_APIKEY", apiKey, StringComparison.OrdinalIgnoreCase);
+text = text.Replace("=Env.OPENAI_MODEL", model, StringComparison.OrdinalIgnoreCase);
 
 // Create the agent from the YAML definition.
 var agentFactory = new AggregatorAgentFactory(
     [
-        new OpenAIChatAgentFactory(configuration: configuration),
-        new OpenAIResponseAgentFactory(configuration: configuration),
-        new OpenAIAssistantAgentFactory(configuration: configuration)
+        new OpenAIChatAgentFactory(),
+        new OpenAIResponseAgentFactory(),
+        new OpenAIAssistantAgentFactory()
     ]);
 var agent = await agentFactory.CreateFromYamlAsync(text);
 

dotnet/samples/GettingStarted/DeclarativeAgents/OpenAI/Properties/launchSettings.json

@@ -1,16 +0,0 @@
-{
-  "profiles": {
-    "Chat": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\openai\\OpenAIChat.yaml \"What is the weather in Cambridge, MA in °C?\""
-    },
-    "Responses": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\openai\\OpenAIResponses.yaml \"What is the weather in Cambridge, MA in °C?\""
-    },
-    "Assistants": {
-      "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\openai\\OpenAIAssistants.yaml \"What is the weather in Cambridge, MA in °C?\""
-    }
-  }
-}