diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx index f891f6aba0..617085f9aa 100644 --- a/dotnet/agent-framework-dotnet.slnx +++ b/dotnet/agent-framework-dotnet.slnx @@ -7,6 +7,17 @@ + + + + + + + + + + + @@ -37,7 +48,6 @@ - @@ -84,9 +94,6 @@ - - - @@ -146,7 +153,6 @@ - @@ -261,7 +267,6 @@ - diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj b/dotnet/samples/01-get-started/01_hello_agent/01_hello_agent.csproj similarity index 80% rename from dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj rename to dotnet/samples/01-get-started/01_hello_agent/01_hello_agent.csproj index 0f9de7c359..b32de63906 100644 --- a/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj +++ b/dotnet/samples/01-get-started/01_hello_agent/01_hello_agent.csproj @@ -15,7 +15,7 @@ - + diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Program.cs b/dotnet/samples/01-get-started/01_hello_agent/Program.cs similarity index 100% rename from dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Program.cs rename to dotnet/samples/01-get-started/01_hello_agent/Program.cs diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj b/dotnet/samples/01-get-started/02_add_tools/02_add_tools.csproj similarity index 80% rename from dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj rename to dotnet/samples/01-get-started/02_add_tools/02_add_tools.csproj index 0f9de7c359..b32de63906 100644 --- a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj +++ b/dotnet/samples/01-get-started/02_add_tools/02_add_tools.csproj @@ -15,7 +15,7 @@ - + diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Program.cs b/dotnet/samples/01-get-started/02_add_tools/Program.cs similarity index 100% rename from dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Program.cs rename to dotnet/samples/01-get-started/02_add_tools/Program.cs diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj b/dotnet/samples/01-get-started/03_multi_turn/03_multi_turn.csproj similarity index 80% rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj rename to dotnet/samples/01-get-started/03_multi_turn/03_multi_turn.csproj index 0f9de7c359..b32de63906 100644 --- a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj +++ b/dotnet/samples/01-get-started/03_multi_turn/03_multi_turn.csproj @@ -15,7 +15,7 @@ - + diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Program.cs b/dotnet/samples/01-get-started/03_multi_turn/Program.cs similarity index 100% rename from dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Program.cs rename to dotnet/samples/01-get-started/03_multi_turn/Program.cs diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj b/dotnet/samples/01-get-started/04_memory/04_memory.csproj similarity index 80% rename from dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj rename to dotnet/samples/01-get-started/04_memory/04_memory.csproj index 0f9de7c359..b32de63906 100644 --- a/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj +++ b/dotnet/samples/01-get-started/04_memory/04_memory.csproj @@ -15,7 +15,7 @@ - + diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/Program.cs b/dotnet/samples/01-get-started/04_memory/Program.cs similarity index 100% rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/Program.cs rename to dotnet/samples/01-get-started/04_memory/Program.cs diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj b/dotnet/samples/01-get-started/05_first_workflow/05_first_workflow.csproj similarity index 69% rename from dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj rename to dotnet/samples/01-get-started/05_first_workflow/05_first_workflow.csproj index 2f41070759..8430479a72 100644 --- a/dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj +++ b/dotnet/samples/01-get-started/05_first_workflow/05_first_workflow.csproj @@ -9,7 +9,7 @@ - + diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/Program.cs b/dotnet/samples/01-get-started/05_first_workflow/Program.cs similarity index 100% rename from dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/Program.cs rename to dotnet/samples/01-get-started/05_first_workflow/Program.cs diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/01_SingleAgent.csproj b/dotnet/samples/01-get-started/06_host_your_agent/06_host_your_agent.csproj similarity index 85% rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/01_SingleAgent.csproj rename to dotnet/samples/01-get-started/06_host_your_agent/06_host_your_agent.csproj index 0c0e4f7fe0..99f78cc1ab 100644 --- a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/01_SingleAgent.csproj +++ b/dotnet/samples/01-get-started/06_host_your_agent/06_host_your_agent.csproj @@ -36,7 +36,7 @@ --> - - + + diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/Program.cs b/dotnet/samples/01-get-started/06_host_your_agent/Program.cs similarity index 100% rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/Program.cs rename to dotnet/samples/01-get-started/06_host_your_agent/Program.cs diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/README.md b/dotnet/samples/01-get-started/06_host_your_agent/README.md similarity index 100% rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/README.md rename to dotnet/samples/01-get-started/06_host_your_agent/README.md diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/demo.http b/dotnet/samples/01-get-started/06_host_your_agent/demo.http similarity index 100% rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/demo.http rename to dotnet/samples/01-get-started/06_host_your_agent/demo.http diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/host.json b/dotnet/samples/01-get-started/06_host_your_agent/host.json similarity index 100% rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/host.json rename to dotnet/samples/01-get-started/06_host_your_agent/host.json diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/local.settings.json deleted file mode 100644 index 54dfbb5664..0000000000 --- a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/local.settings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "IsEncrypted": false, - "Values": { - "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated", - "AzureWebJobsStorage": "UseDevelopmentStorage=true", - "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None", - "AZURE_OPENAI_ENDPOINT": "", - "AZURE_OPENAI_DEPLOYMENT": "" - } -} diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/README.md b/dotnet/samples/Durable/Agents/AzureFunctions/README.md index 2545712ea4..7ae9ecd3e9 100644 --- a/dotnet/samples/Durable/Agents/AzureFunctions/README.md +++ b/dotnet/samples/Durable/Agents/AzureFunctions/README.md @@ -2,7 +2,6 @@ This directory contains samples for Azure Functions. -- **[01_SingleAgent](01_SingleAgent)**: A sample that demonstrates how to host a single conversational agent in an Azure Functions app and invoke it directly over HTTP. - **[02_AgentOrchestration_Chaining](02_AgentOrchestration_Chaining)**: A sample that demonstrates how to host a single conversational agent in an Azure Functions app and invoke it using a durable orchestration. - **[03_AgentOrchestration_Concurrency](03_AgentOrchestration_Concurrency)**: A sample that demonstrates how to host multiple agents in an Azure Functions app and run them concurrently using a durable orchestration. - **[04_AgentOrchestration_Conditionals](04_AgentOrchestration_Conditionals)**: A sample that demonstrates how to host multiple agents in an Azure Functions app and run them sequentially using a durable orchestration with conditionals. @@ -135,7 +134,7 @@ These environment variables, when set, will override the values in the `local.se Navigate to the sample directory and start the Azure Functions app: ```bash -cd dotnet/samples/AzureFunctions/01_SingleAgent +cd dotnet/samples/01-get-started/06_host_your_agent func start ``` diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/README.md b/dotnet/samples/GettingStarted/AgentWithMemory/README.md index 903fcf1b78..670ef564d3 100644 --- a/dotnet/samples/GettingStarted/AgentWithMemory/README.md +++ b/dotnet/samples/GettingStarted/AgentWithMemory/README.md @@ -6,4 +6,4 @@ These samples show how to create an agent with the Agent Framework that uses Mem |---|---| |[Chat History memory](./AgentWithMemory_Step01_ChatHistoryMemory/)|This sample demonstrates how to enable an agent to remember messages from previous conversations.| |[Memory with MemoryStore](./AgentWithMemory_Step02_MemoryUsingMem0/)|This sample demonstrates how to create and run an agent that uses the Mem0 service to extract and retrieve individual memories.| -|[Custom Memory Implementation](./AgentWithMemory_Step03_CustomMemory/)|This sample demonstrates how to create a custom memory component and attach it to an agent.| +|[Custom Memory Implementation](../../01-get-started/04_memory/)|This sample demonstrates how to create a custom memory component and attach it to an agent.| diff --git a/dotnet/samples/GettingStarted/Agents/README.md b/dotnet/samples/GettingStarted/Agents/README.md index 64af82a23e..e9079210d6 100644 --- a/dotnet/samples/GettingStarted/Agents/README.md +++ b/dotnet/samples/GettingStarted/Agents/README.md @@ -26,9 +26,6 @@ Before you begin, ensure you have the following prerequisites: |Sample|Description| |---|---| -|[Running a simple agent](./Agent_Step01_Running/)|This sample demonstrates how to create and run a basic agent with instructions| -|[Multi-turn conversation with a simple agent](./Agent_Step02_MultiturnConversation/)|This sample demonstrates how to implement a multi-turn conversation with a simple agent| -|[Using function tools with a simple agent](./Agent_Step03_UsingFunctionTools/)|This sample demonstrates how to use function tools with a simple agent| |[Using OpenAPI function tools with a simple agent](https://github.com/microsoft/semantic-kernel/tree/main/dotnet/samples/AgentFrameworkMigration/AzureOpenAI/Step04_ToolCall_WithOpenAPI)|This sample demonstrates how to create function tools from an OpenAPI spec and use them with a simple agent (note that this sample is in the Semantic Kernel repository)| |[Using function tools with approvals](./Agent_Step04_UsingFunctionToolsWithApprovals/)|This sample demonstrates how to use function tools where approvals require human in the loop approvals before execution| |[Structured output with a simple agent](./Agent_Step05_StructuredOutput/)|This sample demonstrates how to use structured output with a simple agent| diff --git a/dotnet/samples/GettingStarted/Workflows/README.md b/dotnet/samples/GettingStarted/Workflows/README.md index f7704d0e42..36a88fff5d 100644 --- a/dotnet/samples/GettingStarted/Workflows/README.md +++ b/dotnet/samples/GettingStarted/Workflows/README.md @@ -12,7 +12,6 @@ Please begin with the [Foundational](./_Foundational) samples in order. These th | Sample | Concepts | |--------|----------| -| [Executors and Edges](./_Foundational/01_ExecutorsAndEdges) | Minimal workflow with basic executors and edges | | [Streaming](./_Foundational/02_Streaming) | Extends workflows with event streaming | | [Agents](./_Foundational/03_AgentsInWorkflows) | Use agents in workflows | | [Agentic Workflow Patterns](./_Foundational/04_AgentWorkflowPatterns) | Demonstrates common agentic workflow patterns | diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md b/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md index 4ec203892b..5b93a83b6f 100644 --- a/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md +++ b/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md @@ -146,8 +146,8 @@ I cannot process this request as it appears to contain unsafe content. ## Related Samples +- **05_first_workflow** - Basic executor and edge concepts - **03_AgentsInWorkflows** - Introduction to using agents in workflows -- **01_ExecutorsAndEdges** - Basic executor and edge concepts - **02_Streaming** - Understanding streaming events - **Concurrent** - Parallel processing with fan-out/fan-in patterns