Skip to content

Convert Ollama to subentries #147286

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 3 commits into from
Jun 24, 2025
Merged

Convert Ollama to subentries #147286

merged 3 commits into from
Jun 24, 2025

Conversation

balloob
Copy link
Member

@balloob balloob commented Jun 22, 2025

Breaking change

Proposed change

Convert Ollama to use config subentries

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: fixes #
  • 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 @synesthesiam, mind taking a look at this pull request as it has been labeled with an integration (ollama) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of ollama 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 ollama 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.

@balloob balloob requested review from allenporter and removed request for synesthesiam June 22, 2025 02:01
@balloob balloob marked this pull request as draft June 22, 2025 16:54
@balloob
Copy link
Member Author

balloob commented Jun 22, 2025

Converting to draft until we have sign off on the Google one.

@balloob balloob marked this pull request as ready for review June 23, 2025 14:17
@balloob balloob marked this pull request as draft June 23, 2025 16:56
@balloob
Copy link
Member Author

balloob commented Jun 23, 2025

Marked as draft until we adopt the "single entry to rule them all" approach coming to Google subentries PR

@balloob balloob force-pushed the ollama-subentries branch from 1e18148 to 62ac530 Compare June 24, 2025 02:33
@balloob balloob marked this pull request as ready for review June 24, 2025 02:33
DOMAIN = "ollama"
type OllamaConfigEntry = ConfigEntry[ollama.AsyncClient]
Copy link
Member

Choose a reason for hiding this comment

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

why don't we move this to __init__.py?

Copy link
Member Author

Choose a reason for hiding this comment

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

it's also used in the platforms.

Copy link
Member Author

Choose a reason for hiding this comment

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

AI had added it to __init__ and I had manually moved it to const 🙈

@balloob balloob merged commit f735331 into dev Jun 24, 2025
33 of 34 checks passed
@balloob balloob deleted the ollama-subentries branch June 24, 2025 20:13
@github-actions github-actions bot locked and limited conversation to collaborators Jun 25, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants