Skip to content

GitLab

Unverified Commit 0444497e authored by Timothy Jaeryang Baek's avatar Timothy Jaeryang Baek Committed by GitHub
Browse files

Merge pull request #3734 from michaelpoluektov/refactor-main 

refactor: Refactor backend/main.py
parents 24ef5af2 1d20c275
Hide whitespace changes
Inline Side-by-side
Showing with 244 additions and 364 deletions
backend/main.py
View file @ 0444497e
import base64 import base64
import uuid import uuid
import subprocess
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
from authlib.integrations.starlette_client import OAuth from authlib.integrations.starlette_client import OAuth
from authlib.oidc.core import UserInfo from authlib.oidc.core import UserInfo
from bs4 import BeautifulSoup
import json import json
import markdown
import time import time
import os import os
import sys import sys
...@@ -19,14 +16,11 @@ import shutil ...@@ -19,14 +16,11 @@ import shutil
import os import os
import uuid import uuid
import inspect import inspect
import asyncio
from fastapi.concurrency import run_in_threadpool
from fastapi import FastAPI, Request, Depends, status, UploadFile, File, Form from fastapi import FastAPI, Request, Depends, status, UploadFile, File, Form
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from fastapi.responses import JSONResponse from fastapi.responses import JSONResponse
from fastapi import HTTPException from fastapi import HTTPException
from fastapi.middleware.wsgi import WSGIMiddleware
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from sqlalchemy import text from sqlalchemy import text
from starlette.exceptions import HTTPException as StarletteHTTPException from starlette.exceptions import HTTPException as StarletteHTTPException
...@@ -38,7 +32,6 @@ from starlette.responses import StreamingResponse, Response, RedirectResponse ...@@ -38,7 +32,6 @@ from starlette.responses import StreamingResponse, Response, RedirectResponse
from apps.socket.main import sio, app as socket_app from apps.socket.main import sio, app as socket_app
from apps.ollama.main import ( from apps.ollama.main import (
app as ollama_app, app as ollama_app,
OpenAIChatCompletionForm,
get_all_models as get_ollama_models, get_all_models as get_ollama_models,
generate_openai_chat_completion as generate_ollama_chat_completion, generate_openai_chat_completion as generate_ollama_chat_completion,
) )
...@@ -56,14 +49,14 @@ from apps.webui.main import ( ...@@ -56,14 +49,14 @@ from apps.webui.main import (
get_pipe_models, get_pipe_models,
generate_function_chat_completion, generate_function_chat_completion,
) )
from apps.webui.internal.db import Session, SessionLocal from apps.webui.internal.db import Session
from pydantic import BaseModel from pydantic import BaseModel
from typing import List, Optional, Iterator, Generator, Union from typing import List, Optional
from apps.webui.models.auths import Auths from apps.webui.models.auths import Auths
from apps.webui.models.models import Models, ModelModel from apps.webui.models.models import Models
from apps.webui.models.tools import Tools from apps.webui.models.tools import Tools
from apps.webui.models.functions import Functions from apps.webui.models.functions import Functions
from apps.webui.models.users import Users from apps.webui.models.users import Users
...@@ -86,14 +79,12 @@ from utils.task import ( ...@@ -86,14 +79,12 @@ from utils.task import (
from utils.misc import ( from utils.misc import (
get_last_user_message, get_last_user_message,
add_or_update_system_message, add_or_update_system_message,
stream_message_template,
parse_duration, parse_duration,
) )
from apps.rag.utils import get_rag_context, rag_template from apps.rag.utils import get_rag_context, rag_template
from config import ( from config import (
CONFIG_DATA,
WEBUI_NAME, WEBUI_NAME,
WEBUI_URL, WEBUI_URL,
WEBUI_AUTH, WEBUI_AUTH,
...@@ -101,7 +92,6 @@ from config import ( ...@@ -101,7 +92,6 @@ from config import (
VERSION, VERSION,
CHANGELOG, CHANGELOG,
FRONTEND_BUILD_DIR, FRONTEND_BUILD_DIR,
UPLOAD_DIR,
CACHE_DIR, CACHE_DIR,
STATIC_DIR, STATIC_DIR,
DEFAULT_LOCALE, DEFAULT_LOCALE,
...@@ -128,9 +118,8 @@ from config import ( ...@@ -128,9 +118,8 @@ from config import (
WEBUI_SESSION_COOKIE_SAME_SITE, WEBUI_SESSION_COOKIE_SAME_SITE,
WEBUI_SESSION_COOKIE_SECURE, WEBUI_SESSION_COOKIE_SECURE,
AppConfig, AppConfig,
BACKEND_DIR,
DATABASE_URL,
) )
from constants import ERROR_MESSAGES, WEBHOOK_MESSAGES, TASKS from constants import ERROR_MESSAGES, WEBHOOK_MESSAGES, TASKS
from utils.webhook import post_webhook from utils.webhook import post_webhook
...@@ -237,7 +226,7 @@ async def get_body_and_model_and_user(request): ...@@ -237,7 +226,7 @@ async def get_body_and_model_and_user(request):
model_id = body["model"] model_id = body["model"]
if model_id not in app.state.MODELS: if model_id not in app.state.MODELS:
raise "Model not found" raise Exception("Model not found")
model = app.state.MODELS[model_id] model = app.state.MODELS[model_id]
user = get_current_user( user = get_current_user(
...@@ -300,7 +289,6 @@ async def get_function_call_response( ...@@ -300,7 +289,6 @@ async def get_function_call_response(
template, template,
task_model_id, task_model_id,
user, user,
model,
__event_emitter__=None, __event_emitter__=None,
__event_call__=None, __event_call__=None,
): ):
...@@ -355,121 +343,94 @@ async def get_function_call_response( ...@@ -355,121 +343,94 @@ async def get_function_call_response(
else: else:
content = response["choices"][0]["message"]["content"] content = response["choices"][0]["message"]["content"]
if content is None:
return None, None, False
# Parse the function response # Parse the function response
if content is not None: print(f"content: {content}")
print(f"content: {content}") result = json.loads(content)
result = json.loads(content) print(result)
print(result)
citation = None
# Call the function
if "name" in result:
if tool_id in webui_app.state.TOOLS:
toolkit_module = webui_app.state.TOOLS[tool_id]
else:
toolkit_module, frontmatter = load_toolkit_module_by_id(tool_id)
webui_app.state.TOOLS[tool_id] = toolkit_module
file_handler = False
# check if toolkit_module has file_handler self variable
if hasattr(toolkit_module, "file_handler"):
file_handler = True
print("file_handler: ", file_handler)
if hasattr(toolkit_module, "valves") and hasattr(
toolkit_module, "Valves"
):
valves = Tools.get_tool_valves_by_id(tool_id)
toolkit_module.valves = toolkit_module.Valves(
**(valves if valves else {})
)
function = getattr(toolkit_module, result["name"]) citation = None
function_result = None
try:
# Get the signature of the function
sig = inspect.signature(function)
params = result["parameters"]
if "__user__" in sig.parameters: if "name" not in result:
# Call the function with the '__user__' parameter included return None, None, False
__user__ = {
"id": user.id, # Call the function
"email": user.email, if tool_id in webui_app.state.TOOLS:
"name": user.name, toolkit_module = webui_app.state.TOOLS[tool_id]
"role": user.role, else:
} toolkit_module, _ = load_toolkit_module_by_id(tool_id)
webui_app.state.TOOLS[tool_id] = toolkit_module
try:
if hasattr(toolkit_module, "UserValves"): file_handler = False
__user__["valves"] = toolkit_module.UserValves( # check if toolkit_module has file_handler self variable
**Tools.get_user_valves_by_id_and_user_id( if hasattr(toolkit_module, "file_handler"):
tool_id, user.id file_handler = True
) print("file_handler: ", file_handler)
)
except Exception as e: if hasattr(toolkit_module, "valves") and hasattr(toolkit_module, "Valves"):
print(e) valves = Tools.get_tool_valves_by_id(tool_id)
toolkit_module.valves = toolkit_module.Valves(**(valves if valves else {}))
params = {**params, "__user__": __user__}
if "__messages__" in sig.parameters: function = getattr(toolkit_module, result["name"])
# Call the function with the '__messages__' parameter included function_result = None
params = { try:
**params, # Get the signature of the function
"__messages__": messages, sig = inspect.signature(function)
} params = result["parameters"]
if "__files__" in sig.parameters: # Extra parameters to be passed to the function
# Call the function with the '__files__' parameter included extra_params = {
params = { "__model__": model,
**params, "__id__": tool_id,
"__files__": files, "__messages__": messages,
} "__files__": files,
"__event_emitter__": __event_emitter__,
if "__model__" in sig.parameters: "__event_call__": __event_call__,
# Call the function with the '__model__' parameter included }
params = {
**params, # Add extra params in contained in function signature
"__model__": model, for key, value in extra_params.items():
} if key in sig.parameters:
params[key] = value
if "__id__" in sig.parameters:
# Call the function with the '__id__' parameter included if "__user__" in sig.parameters:
params = { # Call the function with the '__user__' parameter included
**params, __user__ = {
"__id__": tool_id, "id": user.id,
} "email": user.email,
"name": user.name,
if "__event_emitter__" in sig.parameters: "role": user.role,
# Call the function with the '__event_emitter__' parameter included }
params = {
**params, try:
"__event_emitter__": __event_emitter__, if hasattr(toolkit_module, "UserValves"):
} __user__["valves"] = toolkit_module.UserValves(
**Tools.get_user_valves_by_id_and_user_id(tool_id, user.id)
if "__event_call__" in sig.parameters: )
# Call the function with the '__event_call__' parameter included
params = {
**params,
"__event_call__": __event_call__,
}
if inspect.iscoroutinefunction(function):
function_result = await function(**params)
else:
function_result = function(**params)
if hasattr(toolkit_module, "citation") and toolkit_module.citation:
citation = {
"source": {"name": f"TOOL:{tool.name}/{result['name']}"},
"document": [function_result],
"metadata": [{"source": result["name"]}],
}
except Exception as e: except Exception as e:
print(e) print(e)
# Add the function result to the system prompt params = {**params, "__user__": __user__}
if function_result is not None:
return function_result, citation, file_handler if inspect.iscoroutinefunction(function):
function_result = await function(**params)
else:
function_result = function(**params)
if hasattr(toolkit_module, "citation") and toolkit_module.citation:
citation = {
"source": {"name": f"TOOL:{tool.name}/{result['name']}"},
"document": [function_result],
"metadata": [{"source": result["name"]}],
}
except Exception as e:
print(e)
# Add the function result to the system prompt
if function_result is not None:
return function_result, citation, file_handler
except Exception as e: except Exception as e:
print(f"Error: {e}") print(f"Error: {e}")
...@@ -484,87 +445,76 @@ async def chat_completion_functions_handler( ...@@ -484,87 +445,76 @@ async def chat_completion_functions_handler(
filter_ids = get_filter_function_ids(model) filter_ids = get_filter_function_ids(model)
for filter_id in filter_ids: for filter_id in filter_ids:
filter = Functions.get_function_by_id(filter_id) filter = Functions.get_function_by_id(filter_id)
if filter: if not filter:
if filter_id in webui_app.state.FUNCTIONS: continue
function_module = webui_app.state.FUNCTIONS[filter_id]
else:
function_module, function_type, frontmatter = (
load_function_module_by_id(filter_id)
)
webui_app.state.FUNCTIONS[filter_id] = function_module
# Check if the function has a file_handler variable
if hasattr(function_module, "file_handler"):
skip_files = function_module.file_handler
if hasattr(function_module, "valves") and hasattr(
function_module, "Valves"
):
valves = Functions.get_function_valves_by_id(filter_id)
function_module.valves = function_module.Valves(
**(valves if valves else {})
)
try: if filter_id in webui_app.state.FUNCTIONS:
if hasattr(function_module, "inlet"): function_module = webui_app.state.FUNCTIONS[filter_id]
inlet = function_module.inlet else:
function_module, _, _ = load_function_module_by_id(filter_id)
webui_app.state.FUNCTIONS[filter_id] = function_module
# Get the signature of the function # Check if the function has a file_handler variable
sig = inspect.signature(inlet) if hasattr(function_module, "file_handler"):
params = {"body": body} skip_files = function_module.file_handler
if "__user__" in sig.parameters: if hasattr(function_module, "valves") and hasattr(function_module, "Valves"):
__user__ = { valves = Functions.get_function_valves_by_id(filter_id)
"id": user.id, function_module.valves = function_module.Valves(
"email": user.email, **(valves if valves else {})
"name": user.name, )
"role": user.role,
}
try:
if hasattr(function_module, "UserValves"):
__user__["valves"] = function_module.UserValves(
**Functions.get_user_valves_by_id_and_user_id(
filter_id, user.id
)
)
except Exception as e:
print(e)
params = {**params, "__user__": __user__}
if "__id__" in sig.parameters:
params = {
**params,
"__id__": filter_id,
}
if "__model__" in sig.parameters:
params = {
**params,
"__model__": model,
}
if "__event_emitter__" in sig.parameters:
params = {
**params,
"__event_emitter__": __event_emitter__,
}
if "__event_call__" in sig.parameters:
params = {
**params,
"__event_call__": __event_call__,
}
if inspect.iscoroutinefunction(inlet):
body = await inlet(**params)
else:
body = inlet(**params)
except Exception as e: if not hasattr(function_module, "inlet"):
print(f"Error: {e}") continue
raise e
try:
inlet = function_module.inlet
# Get the signature of the function
sig = inspect.signature(inlet)
params = {"body": body}
# Extra parameters to be passed to the function
extra_params = {
"__model__": model,
"__id__": filter_id,
"__event_emitter__": __event_emitter__,
"__event_call__": __event_call__,
}
# Add extra params in contained in function signature
for key, value in extra_params.items():
if key in sig.parameters:
params[key] = value
if "__user__" in sig.parameters:
__user__ = {
"id": user.id,
"email": user.email,
"name": user.name,
"role": user.role,
}
try:
if hasattr(function_module, "UserValves"):
__user__["valves"] = function_module.UserValves(
**Functions.get_user_valves_by_id_and_user_id(
filter_id, user.id
)
)
except Exception as e:
print(e)
params = {**params, "__user__": __user__}
if inspect.iscoroutinefunction(inlet):
body = await inlet(**params)
else:
body = inlet(**params)
except Exception as e:
print(f"Error: {e}")
raise e
if skip_files: if skip_files:
if "files" in body: if "files" in body:
...@@ -573,9 +523,7 @@ async def chat_completion_functions_handler( ...@@ -573,9 +523,7 @@ async def chat_completion_functions_handler(
return body, {} return body, {}
async def chat_completion_tools_handler( async def chat_completion_tools_handler(body, user, __event_emitter__, __event_call__):
body, model, user, __event_emitter__, __event_call__
):
skip_files = None skip_files = None
contexts = [] contexts = []
...@@ -596,7 +544,6 @@ async def chat_completion_tools_handler( ...@@ -596,7 +544,6 @@ async def chat_completion_tools_handler(
template=app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE, template=app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE,
task_model_id=task_model_id, task_model_id=task_model_id,
user=user, user=user,
model=model,
__event_emitter__=__event_emitter__, __event_emitter__=__event_emitter__,
__event_call__=__event_call__, __event_call__=__event_call__,
) )
...@@ -723,7 +670,7 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware): ...@@ -723,7 +670,7 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
try: try:
body, flags = await chat_completion_tools_handler( body, flags = await chat_completion_tools_handler(
body, model, user, __event_emitter__, __event_call__ body, user, __event_emitter__, __event_call__
) )
contexts.extend(flags.get("contexts", [])) contexts.extend(flags.get("contexts", []))
...@@ -817,9 +764,7 @@ app.add_middleware(ChatCompletionMiddleware) ...@@ -817,9 +764,7 @@ app.add_middleware(ChatCompletionMiddleware)
################################## ##################################
def filter_pipeline(payload, user): def get_sorted_filters(model_id):
user = {"id": user.id, "email": user.email, "name": user.name, "role": user.role}
model_id = payload["model"]
filters = [ filters = [
model model
for model in app.state.MODELS.values() for model in app.state.MODELS.values()
...@@ -835,6 +780,13 @@ def filter_pipeline(payload, user): ...@@ -835,6 +780,13 @@ def filter_pipeline(payload, user):
) )
] ]
sorted_filters = sorted(filters, key=lambda x: x["pipeline"]["priority"]) sorted_filters = sorted(filters, key=lambda x: x["pipeline"]["priority"])
return sorted_filters
def filter_pipeline(payload, user):
user = {"id": user.id, "email": user.email, "name": user.name, "role": user.role}
model_id = payload["model"]
sorted_filters = get_sorted_filters(model_id)
model = app.state.MODELS[model_id] model = app.state.MODELS[model_id]
...@@ -867,19 +819,12 @@ def filter_pipeline(payload, user): ...@@ -867,19 +819,12 @@ def filter_pipeline(payload, user):
print(f"Connection error: {e}") print(f"Connection error: {e}")
if r is not None: if r is not None:
try: res = r.json()
res = r.json()
except:
pass
if "detail" in res: if "detail" in res:
raise Exception(r.status_code, res["detail"]) raise Exception(r.status_code, res["detail"])
else: if "pipeline" not in app.state.MODELS[model_id] and "task" in payload:
pass del payload["task"]
if "pipeline" not in app.state.MODELS[model_id]:
if "task" in payload:
del payload["task"]
return payload return payload
...@@ -1114,22 +1059,7 @@ async def chat_completed(form_data: dict, user=Depends(get_verified_user)): ...@@ -1114,22 +1059,7 @@ async def chat_completed(form_data: dict, user=Depends(get_verified_user)):
) )
model = app.state.MODELS[model_id] model = app.state.MODELS[model_id]
filters = [ sorted_filters = get_sorted_filters(model_id)
model
for model in app.state.MODELS.values()
if "pipeline" in model
and "type" in model["pipeline"]
and model["pipeline"]["type"] == "filter"
and (
model["pipeline"]["pipelines"] == ["*"]
or any(
model_id == target_model_id
for target_model_id in model["pipeline"]["pipelines"]
)
)
]
sorted_filters = sorted(filters, key=lambda x: x["pipeline"]["priority"])
if "pipeline" in model: if "pipeline" in model:
sorted_filters = [model] + sorted_filters sorted_filters = [model] + sorted_filters
...@@ -1177,21 +1107,21 @@ async def chat_completed(form_data: dict, user=Depends(get_verified_user)): ...@@ -1177,21 +1107,21 @@ async def chat_completed(form_data: dict, user=Depends(get_verified_user)):
else: else:
pass pass
async def __event_emitter__(data): async def __event_emitter__(event_data):
await sio.emit( await sio.emit(
"chat-events", "chat-events",
{ {
"chat_id": data["chat_id"], "chat_id": data["chat_id"],
"message_id": data["id"], "message_id": data["id"],
"data": data, "data": event_data,
}, },
to=data["session_id"], to=data["session_id"],
) )
async def __event_call__(data): async def __event_call__(event_data):
response = await sio.call( response = await sio.call(
"chat-events", "chat-events",
{"chat_id": data["chat_id"], "message_id": data["id"], "data": data}, {"chat_id": data["chat_id"], "message_id": data["id"], "data": event_data},
to=data["session_id"], to=data["session_id"],
) )
return response return response
...@@ -1220,86 +1150,74 @@ async def chat_completed(form_data: dict, user=Depends(get_verified_user)): ...@@ -1220,86 +1150,74 @@ async def chat_completed(form_data: dict, user=Depends(get_verified_user)):
for filter_id in filter_ids: for filter_id in filter_ids:
filter = Functions.get_function_by_id(filter_id) filter = Functions.get_function_by_id(filter_id)
if filter: if not filter:
if filter_id in webui_app.state.FUNCTIONS: continue
function_module = webui_app.state.FUNCTIONS[filter_id]
else:
function_module, function_type, frontmatter = (
load_function_module_by_id(filter_id)
)
webui_app.state.FUNCTIONS[filter_id] = function_module
if hasattr(function_module, "valves") and hasattr(
function_module, "Valves"
):
valves = Functions.get_function_valves_by_id(filter_id)
function_module.valves = function_module.Valves(
**(valves if valves else {})
)
try: if filter_id in webui_app.state.FUNCTIONS:
if hasattr(function_module, "outlet"): function_module = webui_app.state.FUNCTIONS[filter_id]
outlet = function_module.outlet else:
function_module, _, _ = load_function_module_by_id(filter_id)
webui_app.state.FUNCTIONS[filter_id] = function_module
# Get the signature of the function if hasattr(function_module, "valves") and hasattr(function_module, "Valves"):
sig = inspect.signature(outlet) valves = Functions.get_function_valves_by_id(filter_id)
params = {"body": data} function_module.valves = function_module.Valves(
**(valves if valves else {})
)
if "__user__" in sig.parameters: if not hasattr(function_module, "outlet"):
__user__ = { continue
"id": user.id, try:
"email": user.email, outlet = function_module.outlet
"name": user.name,
"role": user.role, # Get the signature of the function
} sig = inspect.signature(outlet)
params = {"body": data}
try:
if hasattr(function_module, "UserValves"): # Extra parameters to be passed to the function
__user__["valves"] = function_module.UserValves( extra_params = {
**Functions.get_user_valves_by_id_and_user_id( "__model__": model,
filter_id, user.id "__id__": filter_id,
) "__event_emitter__": __event_emitter__,
) "__event_call__": __event_call__,
except Exception as e: }
print(e)
params = {**params, "__user__": __user__}
if "__id__" in sig.parameters:
params = {
**params,
"__id__": filter_id,
}
if "__model__" in sig.parameters:
params = {
**params,
"__model__": model,
}
if "__event_emitter__" in sig.parameters:
params = {
**params,
"__event_emitter__": __event_emitter__,
}
if "__event_call__" in sig.parameters:
params = {
**params,
"__event_call__": __event_call__,
}
if inspect.iscoroutinefunction(outlet):
data = await outlet(**params)
else:
data = outlet(**params)
except Exception as e: # Add extra params in contained in function signature
print(f"Error: {e}") for key, value in extra_params.items():
return JSONResponse( if key in sig.parameters:
status_code=status.HTTP_400_BAD_REQUEST, params[key] = value
content={"detail": str(e)},
) if "__user__" in sig.parameters:
__user__ = {
"id": user.id,
"email": user.email,
"name": user.name,
"role": user.role,
}
try:
if hasattr(function_module, "UserValves"):
__user__["valves"] = function_module.UserValves(
**Functions.get_user_valves_by_id_and_user_id(
filter_id, user.id
)
)
except Exception as e:
print(e)
params = {**params, "__user__": __user__}
if inspect.iscoroutinefunction(outlet):
data = await outlet(**params)
else:
data = outlet(**params)
except Exception as e:
print(f"Error: {e}")
return JSONResponse(
status_code=status.HTTP_400_BAD_REQUEST,
content={"detail": str(e)},
)
return data return data
...@@ -1375,19 +1293,9 @@ async def generate_title(form_data: dict, user=Depends(get_verified_user)): ...@@ -1375,19 +1293,9 @@ async def generate_title(form_data: dict, user=Depends(get_verified_user)):
# Check if the user has a custom task model # Check if the user has a custom task model
# If the user has a custom task model, use that model # If the user has a custom task model, use that model
if app.state.MODELS[model_id]["owned_by"] == "ollama": model_id = get_task_model_id(model_id)
if app.state.config.TASK_MODEL:
task_model_id = app.state.config.TASK_MODEL
if task_model_id in app.state.MODELS:
model_id = task_model_id
else:
if app.state.config.TASK_MODEL_EXTERNAL:
task_model_id = app.state.config.TASK_MODEL_EXTERNAL
if task_model_id in app.state.MODELS:
model_id = task_model_id
print(model_id) print(model_id)
model = app.state.MODELS[model_id]
template = app.state.config.TITLE_GENERATION_PROMPT_TEMPLATE template = app.state.config.TITLE_GENERATION_PROMPT_TEMPLATE
...@@ -1444,19 +1352,9 @@ async def generate_search_query(form_data: dict, user=Depends(get_verified_user) ...@@ -1444,19 +1352,9 @@ async def generate_search_query(form_data: dict, user=Depends(get_verified_user)
# Check if the user has a custom task model # Check if the user has a custom task model
# If the user has a custom task model, use that model # If the user has a custom task model, use that model
if app.state.MODELS[model_id]["owned_by"] == "ollama": model_id = get_task_model_id(model_id)
if app.state.config.TASK_MODEL:
task_model_id = app.state.config.TASK_MODEL
if task_model_id in app.state.MODELS:
model_id = task_model_id
else:
if app.state.config.TASK_MODEL_EXTERNAL:
task_model_id = app.state.config.TASK_MODEL_EXTERNAL
if task_model_id in app.state.MODELS:
model_id = task_model_id
print(model_id) print(model_id)
model = app.state.MODELS[model_id]
template = app.state.config.SEARCH_QUERY_GENERATION_PROMPT_TEMPLATE template = app.state.config.SEARCH_QUERY_GENERATION_PROMPT_TEMPLATE
...@@ -1501,19 +1399,9 @@ async def generate_emoji(form_data: dict, user=Depends(get_verified_user)): ...@@ -1501,19 +1399,9 @@ async def generate_emoji(form_data: dict, user=Depends(get_verified_user)):
# Check if the user has a custom task model # Check if the user has a custom task model
# If the user has a custom task model, use that model # If the user has a custom task model, use that model
if app.state.MODELS[model_id]["owned_by"] == "ollama": model_id = get_task_model_id(model_id)
if app.state.config.TASK_MODEL:
task_model_id = app.state.config.TASK_MODEL
if task_model_id in app.state.MODELS:
model_id = task_model_id
else:
if app.state.config.TASK_MODEL_EXTERNAL:
task_model_id = app.state.config.TASK_MODEL_EXTERNAL
if task_model_id in app.state.MODELS:
model_id = task_model_id
print(model_id) print(model_id)
model = app.state.MODELS[model_id]
template = ''' template = '''
Your task is to reflect the speaker's likely facial expression through a fitting emoji. Interpret emotions from the message and reflect their facial expression using fitting, diverse emojis (e.g., 😊, 😢, 😡, 😱). Your task is to reflect the speaker's likely facial expression through a fitting emoji. Interpret emotions from the message and reflect their facial expression using fitting, diverse emojis (e.g., 😊, 😢, 😡, 😱).
...@@ -1568,22 +1456,13 @@ async def get_tools_function_calling(form_data: dict, user=Depends(get_verified_ ...@@ -1568,22 +1456,13 @@ async def get_tools_function_calling(form_data: dict, user=Depends(get_verified_
# Check if the user has a custom task model # Check if the user has a custom task model
# If the user has a custom task model, use that model # If the user has a custom task model, use that model
if app.state.MODELS[model_id]["owned_by"] == "ollama": model_id = get_task_model_id(model_id)
if app.state.config.TASK_MODEL:
task_model_id = app.state.config.TASK_MODEL
if task_model_id in app.state.MODELS:
model_id = task_model_id
else:
if app.state.config.TASK_MODEL_EXTERNAL:
task_model_id = app.state.config.TASK_MODEL_EXTERNAL
if task_model_id in app.state.MODELS:
model_id = task_model_id
print(model_id) print(model_id)
template = app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE template = app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE
try: try:
context, citation, file_handler = await get_function_call_response( context, _, _ = await get_function_call_response(
form_data["messages"], form_data["messages"],
form_data.get("files", []), form_data.get("files", []),
form_data["tool_id"], form_data["tool_id"],
...@@ -1647,6 +1526,7 @@ async def upload_pipeline( ...@@ -1647,6 +1526,7 @@ async def upload_pipeline(
os.makedirs(upload_folder, exist_ok=True) os.makedirs(upload_folder, exist_ok=True)
file_path = os.path.join(upload_folder, file.filename) file_path = os.path.join(upload_folder, file.filename)
r = None
try: try:
# Save the uploaded file # Save the uploaded file
with open(file_path, "wb") as buffer: with open(file_path, "wb") as buffer:
...@@ -1670,7 +1550,9 @@ async def upload_pipeline( ...@@ -1670,7 +1550,9 @@ async def upload_pipeline(
print(f"Connection error: {e}") print(f"Connection error: {e}")
detail = "Pipeline not found" detail = "Pipeline not found"
status_code = status.HTTP_404_NOT_FOUND
if r is not None: if r is not None:
status_code = r.status_code
try: try:
res = r.json() res = r.json()
if "detail" in res: if "detail" in res:
...@@ -1679,7 +1561,7 @@ async def upload_pipeline( ...@@ -1679,7 +1561,7 @@ async def upload_pipeline(
pass pass
raise HTTPException( raise HTTPException(
status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND), status_code=status_code,
detail=detail, detail=detail,
) )
finally: finally:
...@@ -1778,8 +1660,6 @@ async def delete_pipeline(form_data: DeletePipelineForm, user=Depends(get_admin_ ...@@ -1778,8 +1660,6 @@ async def delete_pipeline(form_data: DeletePipelineForm, user=Depends(get_admin_
async def get_pipelines(urlIdx: Optional[int] = None, user=Depends(get_admin_user)): async def get_pipelines(urlIdx: Optional[int] = None, user=Depends(get_admin_user)):
r = None r = None
try: try:
urlIdx
url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx] url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
key = openai_app.state.config.OPENAI_API_KEYS[urlIdx] key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment