-
Notifications
You must be signed in to change notification settings - Fork 113
Fix: harden Ollama request handling and response validation #233
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
Open
Aryama-srivastav
wants to merge
3
commits into
fireform-core:main
Choose a base branch
from
Aryama-srivastav:#228
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,10 @@ | ||
| Officer Voldemort here, at an incident reported at 456 Oak Street. Two victims, Mark Smith and Jane Doe. Medical aid rendered for minor lacerations. Handed off to Sheriff's Deputy Alvarez. End of transmission. | ||
| UC Vaccine Declination Statement | ||
|
|
||
| Name/SID: Sarah Johnson, SID 4527891 | ||
| Job Title: Research Scientist | ||
| Department: Microbiology | ||
| Phone Number: 831-555-0142 | ||
| Email: sjohnson@ucsc.edu | ||
| Date: 03/15/2026 | ||
|
|
||
| Signature: ________________________ |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import pytest | ||
| import requests | ||
|
|
||
| from src.llm import LLM | ||
|
|
||
|
|
||
| class DummyResponse: | ||
| def __init__(self, status_error=None, json_data=None, json_error=None): | ||
| self._status_error = status_error | ||
| self._json_data = json_data | ||
| self._json_error = json_error | ||
|
|
||
| def raise_for_status(self): | ||
| if self._status_error: | ||
| raise self._status_error | ||
|
|
||
| def json(self): | ||
| if self._json_error: | ||
| raise self._json_error | ||
| return self._json_data | ||
|
|
||
|
|
||
| def make_llm(): | ||
| return LLM(transcript_text="incident text", target_fields={"name": "string"}) | ||
|
|
||
|
|
||
| def test_llm_timeout_raises_timeouterror(monkeypatch): | ||
| def fake_post(*args, **kwargs): | ||
| raise requests.exceptions.Timeout("timed out") | ||
|
|
||
| monkeypatch.setattr(requests, "post", fake_post) | ||
|
|
||
| with pytest.raises(TimeoutError, match="timed out"): | ||
| make_llm().main_loop() | ||
|
|
||
|
|
||
| def test_llm_http_error_raises_runtimeerror(monkeypatch): | ||
| http_error = requests.exceptions.HTTPError("500 Server Error") | ||
|
|
||
| def fake_post(*args, **kwargs): | ||
| return DummyResponse(status_error=http_error) | ||
|
|
||
| monkeypatch.setattr(requests, "post", fake_post) | ||
|
|
||
| with pytest.raises(RuntimeError, match="HTTP error"): | ||
| make_llm().main_loop() | ||
|
|
||
|
|
||
| def test_llm_invalid_json_raises_valueerror(monkeypatch): | ||
| def fake_post(*args, **kwargs): | ||
| return DummyResponse(json_error=ValueError("bad json")) | ||
|
|
||
| monkeypatch.setattr(requests, "post", fake_post) | ||
|
|
||
| with pytest.raises(ValueError, match="Invalid JSON response"): | ||
| make_llm().main_loop() | ||
|
|
||
|
|
||
| def test_llm_missing_response_key_raises_valueerror(monkeypatch): | ||
| def fake_post(*args, **kwargs): | ||
| return DummyResponse(json_data={"other": "value"}) | ||
|
|
||
| monkeypatch.setattr(requests, "post", fake_post) | ||
|
|
||
| with pytest.raises(ValueError, match="missing 'response' key"): | ||
| make_llm().main_loop() |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The connection error path raises a built-in
ConnectionErrorwithout including the field context, and it differs from the PR description which states transport-layer failures should raise a contextualRuntimeError. Consider including the field name and chaining the original exception (and/or using a consistent exception type across transport/HTTP failures) so callers can handle failures uniformly.