Skip to content

Add multiple LLM API support for MCP Server #147785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 1, 2025

Conversation

Shulyaka
Copy link
Contributor

Proposed change

Add multiple LLM API support for mcp_server.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue:
  • This PR is related to issue:
  • Link to documentation pull request:
  • Link to developer documentation pull request:
  • Link to frontend pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

@home-assistant
Copy link

Hey there @allenporter, mind taking a look at this pull request as it has been labeled with an integration (mcp_server) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of mcp_server can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign mcp_server Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds support for selecting and handling multiple LLM APIs in the MCP Server integration.

  • Config flow updated to use a multi-select for CONF_LLM_HASS_API and validate that at least one API is chosen.
  • The create_server function signature now accepts either a single ID or a list of IDs.
  • Tests and fixtures have been updated to use list[str] for CONF_LLM_HASS_API and new error handling.

Reviewed Changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
tests/components/mcp_server/test_http.py Adapted to expect a list of LLM API IDs in config entry
tests/components/mcp_server/test_config_flow.py Updated form tests to use list input and added error test for empty selection
tests/components/mcp_server/conftest.py Changed fixtures to return `str
homeassistant/components/mcp_server/strings.json Added new llm_api_required error message
homeassistant/components/mcp_server/server.py Modified create_server signature to accept multiple IDs
homeassistant/components/mcp_server/config_flow.py Switched LLM API selector to multiple=True and added validation
Comments suppressed due to low confidence (3)

homeassistant/components/mcp_server/server.py:44

  • Add a test case that calls create_server with multiple API IDs to verify the new list support and expected behavior.
async def create_server(

homeassistant/components/mcp_server/server.py:44

  • Update the docstring to reflect that llm_api_id can now be str | list[str] and describe how multiple IDs are handled.
async def create_server(

homeassistant/components/mcp_server/server.py:44

  • The signature now allows a list of IDs, but the implementation likely only handles a single string. Ensure create_server iterates over the list of IDs (or otherwise handles multiple values) so it doesn’t break when more than one API is passed.
async def create_server(

@home-assistant
Copy link

home-assistant bot commented Jul 1, 2025

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@home-assistant home-assistant bot marked this pull request as draft July 1, 2025 03:24
@Shulyaka Shulyaka marked this pull request as ready for review July 1, 2025 08:21
@home-assistant home-assistant bot requested a review from allenporter July 1, 2025 08:21
Copy link
Contributor

@allenporter allenporter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for trying it, appreciate it.

@allenporter allenporter merged commit 7deca35 into home-assistant:dev Jul 1, 2025
34 checks passed
@Shulyaka Shulyaka deleted the mcp_server_multiple_api branch July 1, 2025 15:03
pelicarno pushed a commit to OlarmTech/home-assistant-core that referenced this pull request Jul 1, 2025
* Add multiple LLM API support for MCP Server

* Update homeassistant/components/mcp_server/config_flow.py

Co-authored-by: Copilot <[email protected]>

* ruff

* Update tests/components/mcp_server/conftest.py

Co-authored-by: Allen Porter <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>
Co-authored-by: Allen Porter <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants