refac
This commit is contained in:
1 parent
8ab44ed3b1
commit
4493b56e42
3 files changed
+29
-49
No files matched your search
@@ -24,7 +24,6 @@ from open_webui.constants import ERROR_MESSAGES
|
||||
from open_webui.events import EVENTS, publish_event, publish_model_provider_request_failed
|
||||
from open_webui.env import (
|
||||
AIOHTTP_CLIENT_SESSION_SSL,
|
||||
AIOHTTP_CLIENT_TIMEOUT,
|
||||
AIOHTTP_CLIENT_TIMEOUT_MODEL_LIST,
|
||||
AIOHTTP_FILE_STREAM_CHUNK_SIZE,
|
||||
BYPASS_MODEL_ACCESS_CONTROL,
|
||||
@@ -58,6 +57,7 @@ log = logging.getLogger(__name__)
|
||||
# clients to attempt decompression of an already-decoded payload, resulting
|
||||
# in ZlibError. See https://github.com/aio-libs/aiohttp/issues/4462.
|
||||
_STRIP_PROXY_HEADERS = frozenset({'Content-Encoding', 'Content-Length', 'Transfer-Encoding'})
|
||||
_MODEL_LIST_TIMEOUT = aiohttp.ClientTimeout(total=AIOHTTP_CLIENT_TIMEOUT_MODEL_LIST)
|
||||
|
||||
|
||||
def _clean_proxy_headers(raw_headers) -> dict:
|
||||
@@ -85,7 +85,7 @@ async def send_get_request(
|
||||
url,
|
||||
headers=headers,
|
||||
ssl=AIOHTTP_CLIENT_SESSION_SSL,
|
||||
timeout=aiohttp.ClientTimeout(total=AIOHTTP_CLIENT_TIMEOUT_MODEL_LIST),
|
||||
timeout=_MODEL_LIST_TIMEOUT,
|
||||
) as r:
|
||||
return await r.json(loads=JSONCodec.loads)
|
||||
except Exception as exc:
|
||||
@@ -267,7 +267,7 @@ async def verify_connection(
|
||||
f'{form_data.url}/api/version',
|
||||
headers=headers,
|
||||
ssl=AIOHTTP_CLIENT_SESSION_SSL,
|
||||
timeout=aiohttp.ClientTimeout(total=AIOHTTP_CLIENT_TIMEOUT_MODEL_LIST),
|
||||
timeout=_MODEL_LIST_TIMEOUT,
|
||||
) as r:
|
||||
if r.status != 200:
|
||||
detail = f'HTTP Error: {r.status}'
|
||||
@@ -1117,7 +1117,7 @@ async def generate_chat_completion(
|
||||
raise HTTPException(status_code=400, detail=str(exc))
|
||||
|
||||
if isinstance(form_data, BaseModel):
|
||||
payload = {**form_data.model_dump(exclude_none=True)}
|
||||
payload = form_data.model_dump(exclude_none=True)
|
||||
|
||||
payload.pop('metadata', None)
|
||||
|
||||
@@ -1221,8 +1221,7 @@ async def generate_openai_completion(
|
||||
log.exception(exc)
|
||||
raise HTTPException(status_code=400, detail=str(exc))
|
||||
|
||||
payload = {**form_data.model_dump(exclude_none=True, exclude=['metadata'])}
|
||||
payload.pop('metadata', None)
|
||||
payload = form_data.model_dump(exclude_none=True, exclude=['metadata'])
|
||||
|
||||
model_id = form_data.model
|
||||
model_info = await Models.get_model_by_id(model_id)
|
||||
@@ -1276,7 +1275,7 @@ async def generate_openai_embeddings(
|
||||
log.exception(exc)
|
||||
raise HTTPException(status_code=400, detail=str(exc))
|
||||
|
||||
payload = {**form_data.model_dump(exclude_none=True)}
|
||||
payload = form_data.model_dump(exclude_none=True)
|
||||
payload.pop('metadata', None)
|
||||
|
||||
model_id = form_data.model
|
||||
@@ -1326,8 +1325,7 @@ async def generate_openai_chat_completion(
|
||||
log.exception(exc)
|
||||
raise HTTPException(status_code=400, detail=str(exc))
|
||||
|
||||
payload = {**form_data.model_dump(exclude_none=True, exclude=['metadata'])}
|
||||
payload.pop('metadata', None)
|
||||
payload = form_data.model_dump(exclude_none=True, exclude=['metadata'])
|
||||
|
||||
model_id = form_data.model
|
||||
model_info = await Models.get_model_by_id(model_id)
|
||||
@@ -1669,7 +1667,7 @@ async def upload_model(
|
||||
data=blob_chunks(),
|
||||
headers={'Content-Length': str(total_size)},
|
||||
ssl=AIOHTTP_CLIENT_SESSION_SSL,
|
||||
timeout=aiohttp.ClientTimeout(total=AIOHTTP_CLIENT_TIMEOUT),
|
||||
timeout=get_client_timeout(),
|
||||
) as resp:
|
||||
if not resp.ok:
|
||||
raise Exception('Ollama: Could not create blob, Please try again.')
|
||||
@@ -1692,7 +1690,7 @@ async def upload_model(
|
||||
headers={'Content-Type': 'application/json'},
|
||||
data=json.dumps(create_payload),
|
||||
ssl=AIOHTTP_CLIENT_SESSION_SSL,
|
||||
timeout=aiohttp.ClientTimeout(total=AIOHTTP_CLIENT_TIMEOUT),
|
||||
timeout=get_client_timeout(),
|
||||
) as create_resp:
|
||||
if create_resp.ok:
|
||||
log.info('API SUCCESS!')
|
||||
|
||||
Reference in new issue
Block a user