Fix four outstanding bugs in the bash library #133
Merged
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
This commit provides fixes for four separate bugs that affected streaming, JSON handling, and the random model selection fallback. The following issues have been addressed: - **#132: `jq error` in `ollama_chat_stream`** The streaming functions (`ollama_chat_stream` and `ollama_chat_stream_json`) were incorrectly calling `ollama_chat`, which disables streaming. This caused them to parse a single pretty-printed JSON object as a stream, leading to `jq` errors. The fix ensures they call `ollama_chat_json` directly, which respects the streaming setting. - **#131: `random awk` fallback is buggy** The `awk` command in `ollama_model_random` was missing `BEGIN{srand()}` to seed the random number generator and used a non-standard formula. The command has been replaced with a more robust version that correctly selects a random model. - **#130: Incorrect `curl http_code` parsing** The `_call_curl` function used `tail` to extract the HTTP status code, which was unreliable if the response body ended in a newline. This has been fixed by using a unique delimiter to safely separate the body from the status code. - **#114: Invalid JSON with slashes in model names** The `_ollama_chat_payload` function constructed the `messages` JSON array using fragile string concatenation. This has been refactored to build the payload safely within a single `jq` command, preventing errors with special characters.
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.
This commit addresses four separate bugs identified in the GitHub issues, improving the robustness and correctness of the library.