Python: add support for prompts and sample

python/samples/concepts/mcp/README.md

@@ -20,27 +20,22 @@ The code shown works the same for a Sse server, only then a MCPSsePlugin needs t
 
 The reverse, using Semantic Kernel as a server, can be found in the [demos/sk_mcp_server](../../demos/sk_mcp_server/) folder.
 
-## Running the sample
+## Running the samples
 
-1. Make sure you have the [Node.js](https://nodejs.org/en/download/) installed.
-2. Make sure you have the [npx](https://docs.npmjs.com/cli/v8/commands/npx) available in PATH.
-3. The Github MCP Server uses a Github Personal Access Token (PAT) to authenticate, see [the documentation](https://github.com/modelcontextprotocol/servers/tree/main/src/github) on how to create one.
-4. Install Semantic Kernel with the mcp extra:
+1. Depending on the sample you want to run:
+    1. [Docker](https://www.docker.com/products/docker-desktop/) installed, for the samples that use the Github MCP server.
+    1. [uv](https://docs.astral.sh/uv/getting-started/installation/) installed, for the samples that use the local MCP server.
+2. The Github MCP Server uses a Github Personal Access Token (PAT) to authenticate, see [the documentation](https://github.com/modelcontextprotocol/servers/tree/main/src/github) on how to create one.
+1. Check the comment at the start of the sample you want to run, for the appropriate environment variables to set.
+1. Install Semantic Kernel with the mcp extra:
 
 ```bash
 pip install semantic-kernel[mcp]
 ```
 
-5. Run the sample:
+4. Run any of the samples:
 
 ```bash
 cd python/samples/concepts/mcp
-python mcp_as_plugin.py
-```
-
-or:
-
-```bash
-cd python/samples/concepts/mcp
-python agent_with_mcp_plugin.py
+python <name>.py
 ```

python/samples/concepts/mcp/agent_with_mcp_plugin.py

@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft. All rights reserved.
 
 import asyncio
+import os
 
 from semantic_kernel.agents import ChatCompletionAgent, ChatHistoryAgentThread
 from semantic_kernel.connectors.ai.open_ai import AzureChatCompletion
@@ -9,8 +10,13 @@
 """
 The following sample demonstrates how to create a chat completion agent that
 answers questions about Github using a Semantic Kernel Plugin from a MCP server. 
-The Chat Completion Service is passed directly via the ChatCompletionAgent constructor.
-Additionally, the plugin is supplied via the constructor.
+
+It uses the Azure OpenAI service to create a agent, so make sure to 
+set the required environment variables for the Azure AI Foundry service:
+- AZURE_OPENAI_CHAT_DEPLOYMENT_NAME
+- Optionally: AZURE_OPENAI_API_KEY 
+If this is not set, it will try to use DefaultAzureCredential.
+
 """
 
 
@@ -27,8 +33,9 @@ async def main():
     async with MCPStdioPlugin(
         name="Github",
         description="Github Plugin",
-        command="npx",
-        args=["-y", "@modelcontextprotocol/server-github"],
+        command="docker",
+        args=["run", "-i", "--rm", "-e", "GITHUB_PERSONAL_ACCESS_TOKEN", "ghcr.io/github/github-mcp-server"],
+        env={"GITHUB_PERSONAL_ACCESS_TOKEN": os.getenv("GITHUB_PERSONAL_ACCESS_TOKEN")},
     ) as github_plugin:
         agent = ChatCompletionAgent(
             service=AzureChatCompletion(),

python/samples/concepts/mcp/agent_with_mcp_sampling.py

@@ -0,0 +1,115 @@
+# Copyright (c) Microsoft. All rights reserved.
+
+import asyncio
+import logging
+import os
+from pathlib import Path
+
+from semantic_kernel.agents import ChatCompletionAgent
+from semantic_kernel.connectors.ai.open_ai import OpenAIChatCompletion
+from semantic_kernel.connectors.mcp import MCPStdioPlugin
+
+# set this lower or higher depending on your needs
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+"""
+The following sample demonstrates how to use a MCP Server that requires sampling
+to generate release notes from a list of issues.
+
+It uses the OpenAI service to create a agent, so make sure to 
+set the required environment variables for the Azure AI Foundry service:
+- OPENAI_API_KEY
+- OPENAI_CHAT_MODEL_ID
+"""
+
+PR_MESSAGES = """* Python: Add ChatCompletionAgent integration tests by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11430
+* Python: Update Doc Gen demo based on latest agent invocation api pattern by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11426
+* Python: Update Python min version in README by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11428
+* Python: Fix `TypeError` when required is missing in MCP tool’s inputSchema by @KanchiShimono in https://github.com/microsoft/semantic-kernel/pull/11458
+* Python: Update chromadb requirement from <0.7,>=0.5 to >=0.5,<1.1 in /python by @dependabot in https://github.com/microsoft/semantic-kernel/pull/11420
+* Python: Bump google-cloud-aiplatform from 1.86.0 to 1.87.0 in /python by @dependabot in https://github.com/microsoft/semantic-kernel/pull/11423
+* Python: Support Auto Function Invocation Filter for AzureAIAgent and OpenAIAssistantAgent by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11460
+* Python: Improve agent integration tests by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11475
+* Python: Allow Kernel Functions from Prompt for image and audio content by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11403
+* Python: Introducing SK as a MCP Server by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11362
+* Python: sample using GitHub MCP Server and Azure AI Agent by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11465
+* Python: allow settings to be created directly by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11468
+* Python: Bug fix for azure ai agent truncate strategy. Add sample. by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11503
+* Python: small code improvements in code of call automation sample by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11477
+* Added missing import asyncio to agent with plugin python by @sphenry in https://github.com/microsoft/semantic-kernel/pull/11472
+* Python: version updated to 1.28.0 by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11504"""
+
+
+async def main():
+    # 1. Create the agent
+    async with MCPStdioPlugin(
+        name="ReleaseNotes",
+        description="SK Release Notes Plugin",
+        command="uv",
+        args=[
+            f"--directory={str(Path(os.path.dirname(__file__)).parent.parent.joinpath('demos', 'sk_mcp_server'))}",
+            "run",
+            "mcp_server_with_sampling.py",
+        ],
+    ) as plugin:
+        agent = ChatCompletionAgent(
+            service=OpenAIChatCompletion(),
+            name="IssueAgent",
+            instructions="For the messages supplied, call the release_notes_prompt function to get the broader "
+            "prompt, then call the run_prompt function to get the final output, return that without any other text."
+            "Do not add any other text to the output, or rewrite the output from run_prompt.",
+            plugins=[plugin],
+        )
+
+        print(f"# Task: {PR_MESSAGES}")
+        # 3. Invoke the agent for a response
+        response = await agent.get_response(messages=PR_MESSAGES)
+        print(str(response))
+
+        # 4. Cleanup: Clear the thread
+        await response.thread.delete()
+
+        """
+# Task: * Python: Add ChatCompletionAgent integration tests by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11430
+* Python: Update Doc Gen demo based on latest agent invocation api pattern by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11426
+* Python: Update Python min version in README by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11428
+* Python: Fix `TypeError` when required is missing in MCP tool’s inputSchema by @KanchiShimono in https://github.com/microsoft/semantic-kernel/pull/11458
+* Python: Update chromadb requirement from <0.7,>=0.5 to >=0.5,<1.1 in /python by @dependabot in https://github.com/microsoft/semantic-kernel/pull/11420
+* Python: Bump google-cloud-aiplatform from 1.86.0 to 1.87.0 in /python by @dependabot in https://github.com/microsoft/semantic-kernel/pull/11423
+* Python: Support Auto Function Invocation Filter for AzureAIAgent and OpenAIAssistantAgent by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11460
+* Python: Improve agent integration tests by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11475
+* Python: Allow Kernel Functions from Prompt for image and audio content by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11403
+* Python: Introducing SK as a MCP Server by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11362
+* Python: sample using GitHub MCP Server and Azure AI Agent by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11465
+* Python: allow settings to be created directly by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11468
+* Python: Bug fix for azure ai agent truncate strategy. Add sample. by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11503
+* Python: small code improvements in code of call automation sample by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11477
+* Added missing import asyncio to agent with plugin python by @sphenry in https://github.com/microsoft/semantic-kernel/pull/11472
+* Python: version updated to 1.28.0 by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11504
+
+Here’s a summary of the recent changes and contributions made to the Microsoft Semantic Kernel repository:
+
+1. **Integration Tests**: 
+   - Added integration tests for `ChatCompletionAgent` by @moonbox3 ([PR #11430](https://github.com/microsoft/semantic-kernel/pull/11430)).
+   - Improved agent integration tests by @moonbox3 ([PR #11475](https://github.com/microsoft/semantic-kernel/pull/11475)).
+
+2. **Documentation and Demos**: 
+   - Updated the Doc Gen demo to align with the latest agent invocation API pattern by @moonbox3 ([PR #11426](https://github.com/microsoft/semantic-kernel/pull/11426)).
+   - Small code improvements made in the code of the call automation sample by @eavanvalkenburg ([PR #11477](https://github.com/microsoft/semantic-kernel/pull/11477)).
+
+3. **Version Updates**:
+   - Updated the minimum Python version in the README by @moonbox3 ([PR #11428](https://github.com/microsoft/semantic-kernel/pull/11428)).
+   - Updated `chromadb` requirement to allow versions >=0.5 and <1.1 by @dependabot ([PR #11420](https://github.com/microsoft/semantic-kernel/pull/11420)).
+   - Bumped `google-cloud-aiplatform` from 1.86.0 to 1.87.0 by @dependabot ([PR #11423](https://github.com/microsoft/semantic-kernel/pull/11423)).
+   - Version updated to 1.28.0 by @eavanvalkenburg ([PR #11504](https://github.com/microsoft/semantic-kernel/pull/11504)).
+
+4. **Bug Fixes**:
+   - Fixed a `TypeError` in the MCP tool’s input schema when the required field is missing by @KanchiShimono ([PR #11458](https://github.com/microsoft/semantic-kernel/pull/11458)).
+   - Bug fix for Azure AI agent truncate strategy with an added sample by @moonbox3 ([PR #11503](https://github.com/microsoft/semantic-kernel/pull/11503)).
+   - Added a missing import for `asyncio` in the agent with plugin Python by @sphenry ([PR #11472](https://github.com/microsoft/semantic-kernel/pull/11472)).
+        """
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

python/samples/concepts/mcp/azure_ai_agent_with_local_server.py

@@ -0,0 +1,112 @@
+# Copyright (c) Microsoft. All rights reserved.
+
+import asyncio
+import os
+from pathlib import Path
+
+from azure.identity.aio import DefaultAzureCredential
+
+from semantic_kernel.agents import (
+    AzureAIAgent,
+    AzureAIAgentSettings,
+    AzureAIAgentThread,
+)
+from semantic_kernel.connectors.mcp import MCPStdioPlugin
+from semantic_kernel.functions import KernelArguments
+
+"""
+The following sample demonstrates how to create a chat completion agent that
+answers questions about Github using a Local Agent with two local MCP Servers.
+
+It uses the Azure AI Foundry Agent service to create a agent, so make sure to 
+set the required environment variables for the Azure AI Foundry service:
+- AZURE_AI_AGENT_PROJECT_CONNECTION_STRING
+- AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME
+"""
+
+USER_INPUTS = [
+    "list the latest 10 issues that have the label: triage and python and are open",
+    """generate release notes with this list:             
+* Python: Add ChatCompletionAgent integration tests by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11430
+* Python: Update Doc Gen demo based on latest agent invocation api pattern by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11426
+* Python: Update Python min version in README by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11428
+* Python: Fix `TypeError` when required is missing in MCP tool’s inputSchema by @KanchiShimono in https://github.com/microsoft/semantic-kernel/pull/11458
+* Python: Update chromadb requirement from <0.7,>=0.5 to >=0.5,<1.1 in /python by @dependabot in https://github.com/microsoft/semantic-kernel/pull/11420
+* Python: Bump google-cloud-aiplatform from 1.86.0 to 1.87.0 in /python by @dependabot in https://github.com/microsoft/semantic-kernel/pull/11423
+* Python: Support Auto Function Invocation Filter for AzureAIAgent and OpenAIAssistantAgent by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11460
+* Python: Improve agent integration tests by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11475
+* Python: Allow Kernel Functions from Prompt for image and audio content by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11403
+* Python: Introducing SK as a MCP Server by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11362
+* Python: sample using GitHub MCP Server and Azure AI Agent by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11465
+* Python: allow settings to be created directly by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11468
+* Python: Bug fix for azure ai agent truncate strategy. Add sample. by @moonbox3 in https://github.com/microsoft/semantic-kernel/pull/11503
+* Python: small code improvements in code of call automation sample by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11477
+* Added missing import asyncio to agent with plugin python by @sphenry in https://github.com/microsoft/semantic-kernel/pull/11472
+* Python: version updated to 1.28.0 by @eavanvalkenburg in https://github.com/microsoft/semantic-kernel/pull/11504""",
+]
+
+
+async def main():
+    # Load the MCP Servers as Plugins
+    async with (
+        # 1. Login to Azure and create a Azure AI Project Client
+        DefaultAzureCredential() as creds,
+        AzureAIAgent.create_client(credential=creds) as client,
+        MCPStdioPlugin(
+            name="Github",
+            description="Github Plugin",
+            command="docker",
+            args=["run", "-i", "--rm", "-e", "GITHUB_PERSONAL_ACCESS_TOKEN", "ghcr.io/github/github-mcp-server"],
+            env={"GITHUB_PERSONAL_ACCESS_TOKEN": os.getenv("GITHUB_PERSONAL_ACCESS_TOKEN")},
+        ) as github_plugin,
+        MCPStdioPlugin(
+            name="ReleaseNotes",
+            description="SK Release Notes Plugin",
+            command="uv",
+            args=[
+                f"--directory={str(Path(os.path.dirname(__file__)).parent.parent.joinpath('demos', 'sk_mcp_server'))}",
+                "run",
+                "mcp_server_with_prompts.py",
+            ],
+        ) as release_notes_plugin,
+    ):
+        # 3. Create the agent, with the MCP plugin and the thread
+        agent = AzureAIAgent(
+            client=client,
+            definition=await client.agents.create_agent(
+                model=AzureAIAgentSettings().model_deployment_name,
+                name="GithubAgent",
+                instructions="You interact with the user to help them with the Microsoft semantic-kernel github "
+                "project. You have dedicated tools for this, including one to write release notes, "
+                "make sure to use that when needed. The repo is always semantic-kernel (aka SK) with owner Microsoft. "
+                "and when doing lists, always return 5 items and sort descending by created or updated"
+                "You are specialized in Python, so always include label, python, in addition to the other labels.",
+            ),
+            plugins=[github_plugin, release_notes_plugin],  # add the sample plugin to the agent
+        )
+
+        # Create a thread to hold the conversation
+        # If no thread is provided, a new thread will be
+        # created and returned with the initial response
+        thread: AzureAIAgentThread | None = None
+        for user_input in USER_INPUTS:
+            print(f"# User: {user_input}", end="\n\n")
+            first_chunk = True
+            async for response in agent.invoke_stream(
+                messages=user_input,
+                thread=thread,
+                arguments=KernelArguments(owner="microsoft", repo="semantic-kernel"),
+            ):
+                if first_chunk:
+                    print(f"# {response.name}: ", end="", flush=True)
+                    first_chunk = False
+                print(response.content, end="", flush=True)
+                thread = response.thread
+            print()
+
+        # Cleanup: Clear the thread
+        await thread.delete() if thread else None
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

python/samples/concepts/mcp/azure_ai_agent_with_mcp_plugin.py

@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft. All rights reserved.
 
 import asyncio
+import os
 
 from azure.identity.aio import DefaultAzureCredential
 
@@ -10,6 +11,11 @@
 """
 The following sample demonstrates how to create a AzureAIAgent that
 answers questions about Github using a Semantic Kernel Plugin from a MCP server.
+
+It uses the Azure AI Foundry Agent service to create a agent, so make sure to 
+set the required environment variables for the Azure AI Foundry service:
+- AZURE_AI_AGENT_PROJECT_CONNECTION_STRING
+- AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME
 """
 
 
@@ -22,8 +28,9 @@ async def main():
         MCPStdioPlugin(
             name="github",
             description="Github Plugin",
-            command="npx",
-            args=["-y", "@modelcontextprotocol/server-github"],
+            command="docker",
+            args=["run", "-i", "--rm", "-e", "GITHUB_PERSONAL_ACCESS_TOKEN", "ghcr.io/github/github-mcp-server"],
+            env={"GITHUB_PERSONAL_ACCESS_TOKEN": os.getenv("GITHUB_PERSONAL_ACCESS_TOKEN")},
         ) as github_plugin,
     ):
         # 3. Create the agent, with the MCP plugin and the thread