Split Ollama entity #147769
Merged
Split Ollama entity #147769
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hey there @synesthesiam, mind taking a look at this pull request as it has been labeled with an integration ( Code owner commandsCode owners of
|
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the Ollama conversation integration by extracting shared chat‐handling logic into a new base LLM entity class and updating the conversation entity to inherit from it.
- Moved chat‐streaming and message‐history functions into
OllamaBaseLLMEntityinentity.py - Updated
OllamaConversationEntityto reuse the base class via multiple inheritance - Removed duplicate logic and imports from
conversation.py
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
entity.py |
Introduces OllamaBaseLLMEntity and moves helper functions for chat handling and history trimming here |
conversation.py |
Simplifies OllamaConversationEntity to extend the new base class and strips out duplicated code |
Comments suppressed due to low confidence (2)
homeassistant/components/ollama/entity.py:120
- Add unit tests for
_transform_streamto verify it correctly yields deltas for streaming responses, including role, content, and tool_calls under various chunk sequences.
async def _transform_stream(
homeassistant/components/ollama/entity.py:233
- Add tests covering
_trim_historybehavior for edge cases (e.g., max_messages=0, max_messages=1, trimming when history contains only system prompt).
def _trim_history(self, message_history: MessageHistory, max_messages: int) -> None:
balloob
commented
Jun 29, 2025
frenck
approved these changes
Jun 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Breaking change
Proposed change
Split Ollama conversation entity into a base LLM entity and one that implements conversation specific logic.
Type of change
Additional information
Checklist
ruff format homeassistant tests)If user exposed functionality or configuration variables are added/changed:
If the code communicates with devices, web services, or third-party tools:
Updated and included derived files by running:
python3 -m script.hassfest.requirements_all.txt.Updated by running
python3 -m script.gen_requirements_all.To help with the load of incoming pull requests: