Before submitting, make sure you've checked the following:
Target branch: Please verify that the pull request targets the dev branch.
Description: Provide a concise description of the changes made in this pull request.
Changelog: Ensure a changelog entry following the format of Keep a Changelog is added at the bottom of the PR description.
Documentation: Have you updated relevant documentation Open WebUI Docs, or other documentation sources?
Dependencies: Are there any new dependencies? Have you updated the dependency versions in the documentation?
Testing: Have you written and run sufficient tests for validating the changes?
Code review: Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards?
Prefix: To cleary categorize this pull request, prefix the pull request title, using one of the following:
BREAKING CHANGE: Significant changes that may affect compatibility
build: Changes that affect the build system or external dependencies
ci: Changes to our continuous integration processes or workflows
chore: Refactor, cleanup, or other non-functional code changes
docs: Documentation update or addition
feat: Introduces a new feature or enhancement to the codebase
fix: Bug fix or error correction
i18n: Internationalization or localization changes
perf: Performance improvement
refactor: Code restructuring for better maintainability, readability, or scalability
style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)
test: Adding missing tests or correcting existing tests
WIP: Work in progress, a temporary label for incomplete or ongoing work
Changelog Entry
Description
Refactor apps/ollama/main.py and utils around it in preparation for tools refactor:
Search and replace: == None -> is None, except: -> except Exception:
Move r = requests.request outside try: to avoid variable being potentially unbound
Factor out get_ollama_url()
Re-use utils.misc for Ollama completions
Rename apply_model_params_to_body to apply_model_params_to_body_openai, add apply_model_params_to_body_ollama.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
## 📋 Pull Request Information
**Original PR:** https://github.com/open-webui/open-webui/pull/4402
**Author:** [@michaelpoluektov](https://github.com/michaelpoluektov)
**Created:** 8/6/2024
**Status:** ✅ Merged
**Merged:** 8/11/2024
**Merged by:** [@tjbck](https://github.com/tjbck)
**Base:** `dev` ← **Head:** `remove-ollama`
---
### 📝 Commits (10+)
- [`831fe9f`](https://github.com/open-webui/open-webui/commit/831fe9f509d0f7438369edda9497e761e3494acf) cleanup
- [`44c781f`](https://github.com/open-webui/open-webui/commit/44c781f414007a7968d7c38560668a457c0f1900) cleanup
- [`fc31267`](https://github.com/open-webui/open-webui/commit/fc31267a54c4ba20a4a0252b05f46d878791eb55) refac: re-use utils.misc
- [`ed205d8`](https://github.com/open-webui/open-webui/commit/ed205d82e8799a06ea9db4e6334228d99fad6678) fix: pop
- [`f62281a`](https://github.com/open-webui/open-webui/commit/f62281a0c7b0bf1841cd08e66eac67ae49670a86) Merge branch 'dev' of https://github.com/open-webui/open-webui into remove-ollama
- [`670f28d`](https://github.com/open-webui/open-webui/commit/670f28d694e177dfd9cdba9125a9168e16bc929f) Merge branch 'dev' into remove-ollama
- [`e6bbce4`](https://github.com/open-webui/open-webui/commit/e6bbce439d81443cf37da9573df1fc9bc4d813e8) fix: repeat_penalty
- [`8cdf981`](https://github.com/open-webui/open-webui/commit/8cdf9814bde8049a31c09961263f3ef91d4607c0) fix: name differences
- [`a725801`](https://github.com/open-webui/open-webui/commit/a725801e5559956f33291706b89af774cbefb472) fix: formatting test errors, remove print, merge dev
- [`309cd64`](https://github.com/open-webui/open-webui/commit/309cd645f13de63d36650293f1424195955168d5) undo del
### 📊 Changes
**5 files changed** (+139 additions, -320 deletions)
<details>
<summary>View changed files</summary>
📝 `backend/apps/images/utils/comfyui.py` (+3 -2)
📝 `backend/apps/ollama/main.py` (+84 -309)
📝 `backend/apps/openai/main.py` (+5 -2)
📝 `backend/apps/webui/main.py` (+2 -2)
📝 `backend/utils/misc.py` (+45 -5)
</details>
### 📄 Description
**Before submitting, make sure you've checked the following:**
- [x] **Target branch:** Please verify that the pull request targets the `dev` branch.
- [x] **Description:** Provide a concise description of the changes made in this pull request.
- [x] **Changelog:** Ensure a changelog entry following the format of [Keep a Changelog](https://keepachangelog.com/) is added at the bottom of the PR description.
- [x] **Documentation:** Have you updated relevant documentation [Open WebUI Docs](https://github.com/open-webui/docs), or other documentation sources?
- [x] **Dependencies:** Are there any new dependencies? Have you updated the dependency versions in the documentation?
- [x] **Testing:** Have you written and run sufficient tests for validating the changes?
- [x] **Code review:** Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards?
- [x] **Prefix:** To cleary categorize this pull request, prefix the pull request title, using one of the following:
- **BREAKING CHANGE**: Significant changes that may affect compatibility
- **build**: Changes that affect the build system or external dependencies
- **ci**: Changes to our continuous integration processes or workflows
- **chore**: Refactor, cleanup, or other non-functional code changes
- **docs**: Documentation update or addition
- **feat**: Introduces a new feature or enhancement to the codebase
- **fix**: Bug fix or error correction
- **i18n**: Internationalization or localization changes
- **perf**: Performance improvement
- **refactor**: Code restructuring for better maintainability, readability, or scalability
- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)
- **test**: Adding missing tests or correcting existing tests
- **WIP**: Work in progress, a temporary label for incomplete or ongoing work
# Changelog Entry
### Description
Refactor `apps/ollama/main.py` and utils around it in preparation for tools refactor:
- Search and replace: `== None` -> `is None`, `except:` -> `except Exception:`
- Move `r = requests.request` outside `try:` to avoid variable being potentially unbound
- Factor out `get_ollama_url()`
- Re-use `utils.misc` for Ollama completions
- Rename `apply_model_params_to_body` to `apply_model_params_to_body_openai`, add `apply_model_params_to_body_ollama`.
---
<sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
📋 Pull Request Information
Original PR: https://github.com/open-webui/open-webui/pull/4402
Author: @michaelpoluektov
Created: 8/6/2024
Status: ✅ Merged
Merged: 8/11/2024
Merged by: @tjbck
Base:
dev← Head:remove-ollama📝 Commits (10+)
831fe9fcleanup44c781fcleanupfc31267refac: re-use utils.misced205d8fix: popf62281aMerge branch 'dev' of https://github.com/open-webui/open-webui into remove-ollama670f28dMerge branch 'dev' into remove-ollamae6bbce4fix: repeat_penalty8cdf981fix: name differencesa725801fix: formatting test errors, remove print, merge dev309cd64undo del📊 Changes
5 files changed (+139 additions, -320 deletions)
View changed files
📝
backend/apps/images/utils/comfyui.py(+3 -2)📝
backend/apps/ollama/main.py(+84 -309)📝
backend/apps/openai/main.py(+5 -2)📝
backend/apps/webui/main.py(+2 -2)📝
backend/utils/misc.py(+45 -5)📄 Description
Before submitting, make sure you've checked the following:
devbranch.Changelog Entry
Description
Refactor
apps/ollama/main.pyand utils around it in preparation for tools refactor:== None->is None,except:->except Exception:r = requests.requestoutsidetry:to avoid variable being potentially unboundget_ollama_url()utils.miscfor Ollama completionsapply_model_params_to_bodytoapply_model_params_to_body_openai, addapply_model_params_to_body_ollama.🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.