diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b6bdd98fb3dc7b2d2d190d9be0bfa2770f81f67..d0b175fbfbb243df8a31751ef914753451255264 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,33 +5,6 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.3.13] - 2024-08-14 - -### Added - -- **🎨 Enhanced Markdown Rendering**: Significant improvements in rendering markdown, ensuring smooth and reliable display of LaTeX and Mermaid charts, enhancing user experience with more robust visual content. -- **🔄 Auto-Install Tools & Functions Python Dependencies**: For 'Tools' and 'Functions', Open WebUI now automatically install extra python requirements specified in the frontmatter, streamlining setup processes and customization. -- **🌀 OAuth Email Claim Customization**: Introduced an 'OAUTH_EMAIL_CLAIM' variable to allow customization of the default "email" claim within OAuth configurations, providing greater flexibility in authentication processes. -- **📶 Websocket Reconnection**: Enhanced reliability with the capability to automatically reconnect when a websocket is closed, ensuring consistent and stable communication. -- **🤳 Haptic Feedback on Support Devices**: Android devices now support haptic feedback for an immersive tactile experience during certain interactions. - -### Fixed - -- **🛠️ ComfyUI Performance Improvement**: Addressed an issue causing FastAPI to stall when ComfyUI image generation was active; now runs in a separate thread to prevent UI unresponsiveness. -- **🔀 Session Handling**: Fixed an issue mandating session_id on client-side to ensure smoother session management and transitions. -- **🖋️ Minor Bug Fixes and Format Corrections**: Various minor fixes including typo corrections, backend formatting improvements, and test amendments enhancing overall system stability and performance. - -### Changed - -- **🚀 Migration to SvelteKit 2**: Upgraded the underlying framework to SvelteKit version 2, offering enhanced speed, better code structure, and improved deployment capabilities. -- **🧹 General Cleanup and Refactoring**: Performed broad cleanup and refactoring across the platform, improving code efficiency and maintaining high standards of code health. -- **🚧 Integration Testing Improvements**: Modified how Cypress integration tests detect chat messages and updated sharing tests for better reliability and accuracy. -- **📁 Standardized '.safetensors' File Extension**: Renamed the '.sft' file extension to '.safetensors' for ComfyUI workflows, standardizing file formats across the platform. - -### Removed - -- **🗑️ Deprecated Frontend Functions**: Removed frontend functions that were migrated to backend to declutter the codebase and reduce redundancy. - ## [0.3.12] - 2024-08-07 ### Added diff --git a/backend/apps/audio/main.py b/backend/apps/audio/main.py index 20519b59b168f35f8873c8fbaf8b542a16cf24e8..167db77bae81b01688a2c9c7abd363c7e47dee22 100644 --- a/backend/apps/audio/main.py +++ b/backend/apps/audio/main.py @@ -15,7 +15,7 @@ from fastapi.responses import StreamingResponse, JSONResponse, FileResponse from fastapi.middleware.cors import CORSMiddleware from pydantic import BaseModel - +from typing import List import uuid import requests import hashlib @@ -244,7 +244,7 @@ async def speech(request: Request, user=Depends(get_verified_user)): res = r.json() if "error" in res: error_detail = f"External: {res['error']['message']}" - except Exception: + except: error_detail = f"External: {e}" raise HTTPException( @@ -299,7 +299,7 @@ async def speech(request: Request, user=Depends(get_verified_user)): res = r.json() if "error" in res: error_detail = f"External: {res['error']['message']}" - except Exception: + except: error_detail = f"External: {e}" raise HTTPException( @@ -353,7 +353,7 @@ def transcribe( try: model = WhisperModel(**whisper_kwargs) - except Exception: + except: log.warning( "WhisperModel initialization failed, attempting download with local_files_only=False" ) @@ -421,7 +421,7 @@ def transcribe( res = r.json() if "error" in res: error_detail = f"External: {res['error']['message']}" - except Exception: + except: error_detail = f"External: {e}" raise HTTPException( @@ -438,7 +438,7 @@ def transcribe( ) -def get_available_models() -> list[dict]: +def get_available_models() -> List[dict]: if app.state.config.TTS_ENGINE == "openai": return [{"id": "tts-1"}, {"id": "tts-1-hd"}] elif app.state.config.TTS_ENGINE == "elevenlabs": @@ -466,7 +466,7 @@ async def get_models(user=Depends(get_verified_user)): return {"models": get_available_models()} -def get_available_voices() -> list[dict]: +def get_available_voices() -> List[dict]: if app.state.config.TTS_ENGINE == "openai": return [ {"name": "alloy", "id": "alloy"}, diff --git a/backend/apps/images/main.py b/backend/apps/images/main.py index d2f5ddd5d6c4de23b0fdb991edc4698320d5c11f..f4dfc8a732ac824800c855b2f46cedbb0fee47d3 100644 --- a/backend/apps/images/main.py +++ b/backend/apps/images/main.py @@ -94,7 +94,7 @@ app.state.config.COMFYUI_FLUX_FP8_CLIP = COMFYUI_FLUX_FP8_CLIP def get_automatic1111_api_auth(): - if app.state.config.AUTOMATIC1111_API_AUTH is None: + if app.state.config.AUTOMATIC1111_API_AUTH == None: return "" else: auth1111_byte_string = app.state.config.AUTOMATIC1111_API_AUTH.encode("utf-8") @@ -145,7 +145,7 @@ async def get_engine_url(user=Depends(get_admin_user)): async def update_engine_url( form_data: EngineUrlUpdateForm, user=Depends(get_admin_user) ): - if form_data.AUTOMATIC1111_BASE_URL is None: + if form_data.AUTOMATIC1111_BASE_URL == None: app.state.config.AUTOMATIC1111_BASE_URL = AUTOMATIC1111_BASE_URL else: url = form_data.AUTOMATIC1111_BASE_URL.strip("/") @@ -156,7 +156,7 @@ async def update_engine_url( except Exception as e: raise HTTPException(status_code=400, detail=ERROR_MESSAGES.INVALID_URL) - if form_data.COMFYUI_BASE_URL is None: + if form_data.COMFYUI_BASE_URL == None: app.state.config.COMFYUI_BASE_URL = COMFYUI_BASE_URL else: url = form_data.COMFYUI_BASE_URL.strip("/") @@ -168,7 +168,7 @@ async def update_engine_url( except Exception as e: raise HTTPException(status_code=400, detail=ERROR_MESSAGES.INVALID_URL) - if form_data.AUTOMATIC1111_API_AUTH is None: + if form_data.AUTOMATIC1111_API_AUTH == None: app.state.config.AUTOMATIC1111_API_AUTH = AUTOMATIC1111_API_AUTH else: app.state.config.AUTOMATIC1111_API_AUTH = form_data.AUTOMATIC1111_API_AUTH diff --git a/backend/apps/images/utils/comfyui.py b/backend/apps/images/utils/comfyui.py index f11dca57c5fd6ae623ec282492dfb0254ac062e8..94875d9595c8db062319e385142984892e4187f1 100644 --- a/backend/apps/images/utils/comfyui.py +++ b/backend/apps/images/utils/comfyui.py @@ -170,7 +170,7 @@ FLUX_DEFAULT_PROMPT = """ }, "10": { "inputs": { - "vae_name": "ae.safetensors" + "vae_name": "ae.sft" }, "class_type": "VAELoader" }, @@ -184,7 +184,7 @@ FLUX_DEFAULT_PROMPT = """ }, "12": { "inputs": { - "unet_name": "flux1-dev.safetensors", + "unet_name": "flux1-dev.sft", "weight_dtype": "default" }, "class_type": "UNETLoader" diff --git a/backend/apps/ollama/main.py b/backend/apps/ollama/main.py index 03a8e198ee81bfa1b689708e373a883d893b4171..f479ad35c0d039173b464342e0317709d8870056 100644 --- a/backend/apps/ollama/main.py +++ b/backend/apps/ollama/main.py @@ -21,7 +21,7 @@ import asyncio import logging import time from urllib.parse import urlparse -from typing import Optional, Union +from typing import Optional, List, Union from starlette.background import BackgroundTask @@ -114,7 +114,7 @@ async def get_ollama_api_urls(user=Depends(get_admin_user)): class UrlUpdateForm(BaseModel): - urls: list[str] + urls: List[str] @app.post("/urls/update") @@ -646,7 +646,7 @@ def generate_ollama_embeddings( class GenerateCompletionForm(BaseModel): model: str prompt: str - images: Optional[list[str]] = None + images: Optional[List[str]] = None format: Optional[str] = None options: Optional[dict] = None system: Optional[str] = None @@ -689,12 +689,12 @@ async def generate_completion( class ChatMessage(BaseModel): role: str content: str - images: Optional[list[str]] = None + images: Optional[List[str]] = None class GenerateChatCompletionForm(BaseModel): model: str - messages: list[ChatMessage] + messages: List[ChatMessage] format: Optional[str] = None options: Optional[dict] = None template: Optional[str] = None @@ -772,7 +772,7 @@ class OpenAIChatMessage(BaseModel): class OpenAIChatCompletionForm(BaseModel): model: str - messages: list[OpenAIChatMessage] + messages: List[OpenAIChatMessage] model_config = ConfigDict(extra="allow") diff --git a/backend/apps/openai/main.py b/backend/apps/openai/main.py index d344c662225eab565481374a4d5095a52520d5c7..50de53a53781e3495043a96f6f46be0916527dac 100644 --- a/backend/apps/openai/main.py +++ b/backend/apps/openai/main.py @@ -33,7 +33,7 @@ from config import ( MODEL_FILTER_LIST, AppConfig, ) -from typing import Optional, Literal, overload +from typing import List, Optional, Literal, overload import hashlib @@ -89,11 +89,11 @@ async def update_config(form_data: OpenAIConfigForm, user=Depends(get_admin_user class UrlsUpdateForm(BaseModel): - urls: list[str] + urls: List[str] class KeysUpdateForm(BaseModel): - keys: list[str] + keys: List[str] @app.get("/urls") diff --git a/backend/apps/rag/main.py b/backend/apps/rag/main.py index f9788556bc0682e5527f36a3ab5060108f2a2139..dc6b8830efec53d1d153ecf165852a1c3820b85a 100644 --- a/backend/apps/rag/main.py +++ b/backend/apps/rag/main.py @@ -13,7 +13,7 @@ import os, shutil, logging, re from datetime import datetime from pathlib import Path -from typing import Union, Sequence, Iterator, Any +from typing import List, Union, Sequence, Iterator, Any from chromadb.utils.batch_utils import create_batches from langchain_core.documents import Document @@ -376,7 +376,7 @@ async def update_reranking_config( try: app.state.config.RAG_RERANKING_MODEL = form_data.reranking_model - update_reranking_model(app.state.config.RAG_RERANKING_MODEL, True) + update_reranking_model(app.state.config.RAG_RERANKING_MODEL), True return { "status": True, @@ -439,7 +439,7 @@ class ChunkParamUpdateForm(BaseModel): class YoutubeLoaderConfig(BaseModel): - language: list[str] + language: List[str] translation: Optional[str] = None @@ -642,7 +642,7 @@ def query_doc_handler( class QueryCollectionsForm(BaseModel): - collection_names: list[str] + collection_names: List[str] query: str k: Optional[int] = None r: Optional[float] = None @@ -1021,7 +1021,7 @@ class TikaLoader: self.file_path = file_path self.mime_type = mime_type - def load(self) -> list[Document]: + def load(self) -> List[Document]: with open(self.file_path, "rb") as f: data = f.read() @@ -1185,7 +1185,7 @@ def store_doc( f.close() f = open(file_path, "rb") - if collection_name is None: + if collection_name == None: collection_name = calculate_sha256(f)[:63] f.close() @@ -1238,7 +1238,7 @@ def process_doc( f = open(file_path, "rb") collection_name = form_data.collection_name - if collection_name is None: + if collection_name == None: collection_name = calculate_sha256(f)[:63] f.close() @@ -1296,7 +1296,7 @@ def store_text( ): collection_name = form_data.collection_name - if collection_name is None: + if collection_name == None: collection_name = calculate_sha256_string(form_data.content) result = store_text_in_vector_db( @@ -1339,7 +1339,7 @@ def scan_docs_dir(user=Depends(get_admin_user)): sanitized_filename = sanitize_filename(filename) doc = Documents.get_doc_by_name(sanitized_filename) - if doc is None: + if doc == None: doc = Documents.insert_new_doc( user.id, DocumentForm( diff --git a/backend/apps/rag/search/brave.py b/backend/apps/rag/search/brave.py index 681caa97612681053dd15abd82f85596734311aa..76ad1fb4731d2e572027cec32f65267a3f9f3675 100644 --- a/backend/apps/rag/search/brave.py +++ b/backend/apps/rag/search/brave.py @@ -1,5 +1,5 @@ import logging -from typing import Optional +from typing import List, Optional import requests from apps.rag.search.main import SearchResult, get_filtered_results @@ -10,7 +10,7 @@ log.setLevel(SRC_LOG_LEVELS["RAG"]) def search_brave( - api_key: str, query: str, count: int, filter_list: Optional[list[str]] = None + api_key: str, query: str, count: int, filter_list: Optional[List[str]] = None ) -> list[SearchResult]: """Search using Brave's Search API and return the results as a list of SearchResult objects. diff --git a/backend/apps/rag/search/duckduckgo.py b/backend/apps/rag/search/duckduckgo.py index e994ef47a9efa3fe3132665920dc8c34e733a73a..f0cc2a71035d5279d9c184f2c20787d41b16de52 100644 --- a/backend/apps/rag/search/duckduckgo.py +++ b/backend/apps/rag/search/duckduckgo.py @@ -1,5 +1,5 @@ import logging -from typing import Optional +from typing import List, Optional from apps.rag.search.main import SearchResult, get_filtered_results from duckduckgo_search import DDGS from config import SRC_LOG_LEVELS @@ -9,7 +9,7 @@ log.setLevel(SRC_LOG_LEVELS["RAG"]) def search_duckduckgo( - query: str, count: int, filter_list: Optional[list[str]] = None + query: str, count: int, filter_list: Optional[List[str]] = None ) -> list[SearchResult]: """ Search using DuckDuckGo's Search API and return the results as a list of SearchResult objects. @@ -18,7 +18,7 @@ def search_duckduckgo( count (int): The number of results to return Returns: - list[SearchResult]: A list of search results + List[SearchResult]: A list of search results """ # Use the DDGS context manager to create a DDGS object with DDGS() as ddgs: diff --git a/backend/apps/rag/search/google_pse.py b/backend/apps/rag/search/google_pse.py index 7fedb3dad9759ec7243bfed55f8e9cfad07a7296..0c78512e74ef82d391dad426c42e55e3a25a148c 100644 --- a/backend/apps/rag/search/google_pse.py +++ b/backend/apps/rag/search/google_pse.py @@ -1,6 +1,6 @@ import json import logging -from typing import Optional +from typing import List, Optional import requests from apps.rag.search.main import SearchResult, get_filtered_results @@ -15,7 +15,7 @@ def search_google_pse( search_engine_id: str, query: str, count: int, - filter_list: Optional[list[str]] = None, + filter_list: Optional[List[str]] = None, ) -> list[SearchResult]: """Search using Google's Programmable Search Engine API and return the results as a list of SearchResult objects. diff --git a/backend/apps/rag/search/jina_search.py b/backend/apps/rag/search/jina_search.py index 8d1c582a1e79c713ddff4b0246f1426a5ab6127c..65f9ad68fe7984fa0568ac6b32367a1cf8632c26 100644 --- a/backend/apps/rag/search/jina_search.py +++ b/backend/apps/rag/search/jina_search.py @@ -17,7 +17,7 @@ def search_jina(query: str, count: int) -> list[SearchResult]: count (int): The number of results to return Returns: - list[SearchResult]: A list of search results + List[SearchResult]: A list of search results """ jina_search_endpoint = "https://s.jina.ai/" headers = { diff --git a/backend/apps/rag/search/searxng.py b/backend/apps/rag/search/searxng.py index 94bed2857bb9df38c2ff65989e50581719a7e3c7..6e545e994e8659c63a82cf0fce48b4724e042d84 100644 --- a/backend/apps/rag/search/searxng.py +++ b/backend/apps/rag/search/searxng.py @@ -1,7 +1,7 @@ import logging import requests -from typing import Optional +from typing import List, Optional from apps.rag.search.main import SearchResult, get_filtered_results from config import SRC_LOG_LEVELS @@ -14,9 +14,9 @@ def search_searxng( query_url: str, query: str, count: int, - filter_list: Optional[list[str]] = None, + filter_list: Optional[List[str]] = None, **kwargs, -) -> list[SearchResult]: +) -> List[SearchResult]: """ Search a SearXNG instance for a given query and return the results as a list of SearchResult objects. @@ -31,10 +31,10 @@ def search_searxng( language (str): Language filter for the search results; e.g., "en-US". Defaults to an empty string. safesearch (int): Safe search filter for safer web results; 0 = off, 1 = moderate, 2 = strict. Defaults to 1 (moderate). time_range (str): Time range for filtering results by date; e.g., "2023-04-05..today" or "all-time". Defaults to ''. - categories: (Optional[list[str]]): Specific categories within which the search should be performed, defaulting to an empty string if not provided. + categories: (Optional[List[str]]): Specific categories within which the search should be performed, defaulting to an empty string if not provided. Returns: - list[SearchResult]: A list of SearchResults sorted by relevance score in descending order. + List[SearchResult]: A list of SearchResults sorted by relevance score in descending order. Raise: requests.exceptions.RequestException: If a request error occurs during the search process. diff --git a/backend/apps/rag/search/serper.py b/backend/apps/rag/search/serper.py index e71fbb6283f18e91006010429c4361f2de11a175..b278a4df15a1322a03dad373518043cf2c003eab 100644 --- a/backend/apps/rag/search/serper.py +++ b/backend/apps/rag/search/serper.py @@ -1,6 +1,6 @@ import json import logging -from typing import Optional +from typing import List, Optional import requests from apps.rag.search.main import SearchResult, get_filtered_results @@ -11,7 +11,7 @@ log.setLevel(SRC_LOG_LEVELS["RAG"]) def search_serper( - api_key: str, query: str, count: int, filter_list: Optional[list[str]] = None + api_key: str, query: str, count: int, filter_list: Optional[List[str]] = None ) -> list[SearchResult]: """Search using serper.dev's API and return the results as a list of SearchResult objects. diff --git a/backend/apps/rag/search/serply.py b/backend/apps/rag/search/serply.py index 28c15fd78854d7b440a116060afb1382b1b2d492..24b249b739425b9ad941c336f3daa76f46272297 100644 --- a/backend/apps/rag/search/serply.py +++ b/backend/apps/rag/search/serply.py @@ -1,6 +1,6 @@ import json import logging -from typing import Optional +from typing import List, Optional import requests from urllib.parse import urlencode @@ -19,7 +19,7 @@ def search_serply( limit: int = 10, device_type: str = "desktop", proxy_location: str = "US", - filter_list: Optional[list[str]] = None, + filter_list: Optional[List[str]] = None, ) -> list[SearchResult]: """Search using serper.dev's API and return the results as a list of SearchResult objects. diff --git a/backend/apps/rag/search/serpstack.py b/backend/apps/rag/search/serpstack.py index 5c19bd1342043bfa0420b53d3a5fde37f1ef6f10..64b0f117d906414714d56470271ca13a0a9d4bb9 100644 --- a/backend/apps/rag/search/serpstack.py +++ b/backend/apps/rag/search/serpstack.py @@ -1,6 +1,6 @@ import json import logging -from typing import Optional +from typing import List, Optional import requests from apps.rag.search.main import SearchResult, get_filtered_results @@ -14,7 +14,7 @@ def search_serpstack( api_key: str, query: str, count: int, - filter_list: Optional[list[str]] = None, + filter_list: Optional[List[str]] = None, https_enabled: bool = True, ) -> list[SearchResult]: """Search using serpstack.com's and return the results as a list of SearchResult objects. diff --git a/backend/apps/rag/search/tavily.py b/backend/apps/rag/search/tavily.py index ed4ab6e08407d4e0ddfe3ee3c06b11f6c05500d3..b15d6ef9d5b55aa2eee6f77212e6561f1fbaf4fa 100644 --- a/backend/apps/rag/search/tavily.py +++ b/backend/apps/rag/search/tavily.py @@ -17,7 +17,7 @@ def search_tavily(api_key: str, query: str, count: int) -> list[SearchResult]: query (str): The query to search for Returns: - list[SearchResult]: A list of search results + List[SearchResult]: A list of search results """ url = "https://api.tavily.com/search" data = {"query": query, "api_key": api_key} diff --git a/backend/apps/rag/utils.py b/backend/apps/rag/utils.py index 034f71292c7ac4994bc95ec08a644f4d2c194e88..fde89b0697414a54a5fdabf4cdfb853c12e11c70 100644 --- a/backend/apps/rag/utils.py +++ b/backend/apps/rag/utils.py @@ -2,7 +2,7 @@ import os import logging import requests -from typing import Union +from typing import List, Union from apps.ollama.main import ( generate_ollama_embeddings, @@ -142,7 +142,7 @@ def merge_and_sort_query_results(query_results, k, reverse=False): def query_collection( - collection_names: list[str], + collection_names: List[str], query: str, embedding_function, k: int, @@ -157,13 +157,13 @@ def query_collection( embedding_function=embedding_function, ) results.append(result) - except Exception: + except: pass return merge_and_sort_query_results(results, k=k) def query_collection_with_hybrid_search( - collection_names: list[str], + collection_names: List[str], query: str, embedding_function, k: int, @@ -182,7 +182,7 @@ def query_collection_with_hybrid_search( r=r, ) results.append(result) - except Exception: + except: pass return merge_and_sort_query_results(results, k=k, reverse=True) @@ -411,7 +411,7 @@ class ChromaRetriever(BaseRetriever): query: str, *, run_manager: CallbackManagerForRetrieverRun, - ) -> list[Document]: + ) -> List[Document]: query_embeddings = self.embedding_function(query) results = self.collection.query( diff --git a/backend/apps/webui/models/auths.py b/backend/apps/webui/models/auths.py index 3cbe8c887579047d992d17a092473cba492fcc58..bcea4a367ae2d328fd69e770363fcc400083c866 100644 --- a/backend/apps/webui/models/auths.py +++ b/backend/apps/webui/models/auths.py @@ -140,7 +140,7 @@ class AuthsTable: return None else: return None - except Exception: + except: return None def authenticate_user_by_api_key(self, api_key: str) -> Optional[UserModel]: @@ -152,7 +152,7 @@ class AuthsTable: try: user = Users.get_user_by_api_key(api_key) return user if user else None - except Exception: + except: return False def authenticate_user_by_trusted_header(self, email: str) -> Optional[UserModel]: @@ -163,7 +163,7 @@ class AuthsTable: if auth: user = Users.get_user_by_id(auth.id) return user - except Exception: + except: return None def update_user_password_by_id(self, id: str, new_password: str) -> bool: @@ -174,7 +174,7 @@ class AuthsTable: ) db.commit() return True if result == 1 else False - except Exception: + except: return False def update_email_by_id(self, id: str, email: str) -> bool: @@ -183,7 +183,7 @@ class AuthsTable: result = db.query(Auth).filter_by(id=id).update({"email": email}) db.commit() return True if result == 1 else False - except Exception: + except: return False def delete_auth_by_id(self, id: str) -> bool: @@ -200,7 +200,7 @@ class AuthsTable: return True else: return False - except Exception: + except: return False diff --git a/backend/apps/webui/models/chats.py b/backend/apps/webui/models/chats.py index be77595ecad394ff9e7c44d081d25093affd2bbc..d504b18c3fb33416eb36fa3704f6126c9499561e 100644 --- a/backend/apps/webui/models/chats.py +++ b/backend/apps/webui/models/chats.py @@ -1,5 +1,5 @@ from pydantic import BaseModel, ConfigDict -from typing import Union, Optional +from typing import List, Union, Optional import json import uuid @@ -164,7 +164,7 @@ class ChatTable: db.refresh(chat) return self.get_chat_by_id(chat.share_id) - except Exception: + except: return None def delete_shared_chat_by_chat_id(self, chat_id: str) -> bool: @@ -175,7 +175,7 @@ class ChatTable: db.commit() return True - except Exception: + except: return False def update_chat_share_id_by_id( @@ -189,7 +189,7 @@ class ChatTable: db.commit() db.refresh(chat) return ChatModel.model_validate(chat) - except Exception: + except: return None def toggle_chat_archive_by_id(self, id: str) -> Optional[ChatModel]: @@ -201,7 +201,7 @@ class ChatTable: db.commit() db.refresh(chat) return ChatModel.model_validate(chat) - except Exception: + except: return None def archive_all_chats_by_user_id(self, user_id: str) -> bool: @@ -210,12 +210,12 @@ class ChatTable: db.query(Chat).filter_by(user_id=user_id).update({"archived": True}) db.commit() return True - except Exception: + except: return False def get_archived_chat_list_by_user_id( self, user_id: str, skip: int = 0, limit: int = 50 - ) -> list[ChatModel]: + ) -> List[ChatModel]: with get_db() as db: all_chats = ( @@ -233,7 +233,7 @@ class ChatTable: include_archived: bool = False, skip: int = 0, limit: int = 50, - ) -> list[ChatModel]: + ) -> List[ChatModel]: with get_db() as db: query = db.query(Chat).filter_by(user_id=user_id) if not include_archived: @@ -251,7 +251,7 @@ class ChatTable: include_archived: bool = False, skip: int = 0, limit: int = -1, - ) -> list[ChatTitleIdResponse]: + ) -> List[ChatTitleIdResponse]: with get_db() as db: query = db.query(Chat).filter_by(user_id=user_id) if not include_archived: @@ -279,8 +279,8 @@ class ChatTable: ] def get_chat_list_by_chat_ids( - self, chat_ids: list[str], skip: int = 0, limit: int = 50 - ) -> list[ChatModel]: + self, chat_ids: List[str], skip: int = 0, limit: int = 50 + ) -> List[ChatModel]: with get_db() as db: all_chats = ( db.query(Chat) @@ -297,7 +297,7 @@ class ChatTable: chat = db.get(Chat, id) return ChatModel.model_validate(chat) - except Exception: + except: return None def get_chat_by_share_id(self, id: str) -> Optional[ChatModel]: @@ -319,10 +319,10 @@ class ChatTable: chat = db.query(Chat).filter_by(id=id, user_id=user_id).first() return ChatModel.model_validate(chat) - except Exception: + except: return None - def get_chats(self, skip: int = 0, limit: int = 50) -> list[ChatModel]: + def get_chats(self, skip: int = 0, limit: int = 50) -> List[ChatModel]: with get_db() as db: all_chats = ( @@ -332,7 +332,7 @@ class ChatTable: ) return [ChatModel.model_validate(chat) for chat in all_chats] - def get_chats_by_user_id(self, user_id: str) -> list[ChatModel]: + def get_chats_by_user_id(self, user_id: str) -> List[ChatModel]: with get_db() as db: all_chats = ( @@ -342,7 +342,7 @@ class ChatTable: ) return [ChatModel.model_validate(chat) for chat in all_chats] - def get_archived_chats_by_user_id(self, user_id: str) -> list[ChatModel]: + def get_archived_chats_by_user_id(self, user_id: str) -> List[ChatModel]: with get_db() as db: all_chats = ( @@ -360,7 +360,7 @@ class ChatTable: db.commit() return True and self.delete_shared_chat_by_chat_id(id) - except Exception: + except: return False def delete_chat_by_id_and_user_id(self, id: str, user_id: str) -> bool: @@ -371,7 +371,7 @@ class ChatTable: db.commit() return True and self.delete_shared_chat_by_chat_id(id) - except Exception: + except: return False def delete_chats_by_user_id(self, user_id: str) -> bool: @@ -385,7 +385,7 @@ class ChatTable: db.commit() return True - except Exception: + except: return False def delete_shared_chats_by_user_id(self, user_id: str) -> bool: @@ -400,7 +400,7 @@ class ChatTable: db.commit() return True - except Exception: + except: return False diff --git a/backend/apps/webui/models/documents.py b/backend/apps/webui/models/documents.py index 4157c2c95f8288ffee05fb13a56595ec44ea6148..ac8655da9ce4ee2fd50299aaaf1a9a6bdba86b58 100644 --- a/backend/apps/webui/models/documents.py +++ b/backend/apps/webui/models/documents.py @@ -1,5 +1,5 @@ from pydantic import BaseModel, ConfigDict -from typing import Optional +from typing import List, Optional import time import logging @@ -93,7 +93,7 @@ class DocumentsTable: return DocumentModel.model_validate(result) else: return None - except Exception: + except: return None def get_doc_by_name(self, name: str) -> Optional[DocumentModel]: @@ -102,10 +102,10 @@ class DocumentsTable: document = db.query(Document).filter_by(name=name).first() return DocumentModel.model_validate(document) if document else None - except Exception: + except: return None - def get_docs(self) -> list[DocumentModel]: + def get_docs(self) -> List[DocumentModel]: with get_db() as db: return [ @@ -160,7 +160,7 @@ class DocumentsTable: db.query(Document).filter_by(name=name).delete() db.commit() return True - except Exception: + except: return False diff --git a/backend/apps/webui/models/files.py b/backend/apps/webui/models/files.py index 2de5c33b599dc608d2240c634afb7546dd8bd26d..16272f24ad11f9fda4047f2c2721123cdea3a2aa 100644 --- a/backend/apps/webui/models/files.py +++ b/backend/apps/webui/models/files.py @@ -1,5 +1,5 @@ from pydantic import BaseModel, ConfigDict -from typing import Union, Optional +from typing import List, Union, Optional import time import logging @@ -90,10 +90,10 @@ class FilesTable: try: file = db.get(File, id) return FileModel.model_validate(file) - except Exception: + except: return None - def get_files(self) -> list[FileModel]: + def get_files(self) -> List[FileModel]: with get_db() as db: return [FileModel.model_validate(file) for file in db.query(File).all()] @@ -107,7 +107,7 @@ class FilesTable: db.commit() return True - except Exception: + except: return False def delete_all_files(self) -> bool: @@ -119,7 +119,7 @@ class FilesTable: db.commit() return True - except Exception: + except: return False diff --git a/backend/apps/webui/models/functions.py b/backend/apps/webui/models/functions.py index 3afdc1ea9185029b5ea46b9526d0e24e7efc444e..cb73da69449482a35264e688748422323880583b 100644 --- a/backend/apps/webui/models/functions.py +++ b/backend/apps/webui/models/functions.py @@ -1,5 +1,5 @@ from pydantic import BaseModel, ConfigDict -from typing import Union, Optional +from typing import List, Union, Optional import time import logging @@ -122,10 +122,10 @@ class FunctionsTable: function = db.get(Function, id) return FunctionModel.model_validate(function) - except Exception: + except: return None - def get_functions(self, active_only=False) -> list[FunctionModel]: + def get_functions(self, active_only=False) -> List[FunctionModel]: with get_db() as db: if active_only: @@ -141,7 +141,7 @@ class FunctionsTable: def get_functions_by_type( self, type: str, active_only=False - ) -> list[FunctionModel]: + ) -> List[FunctionModel]: with get_db() as db: if active_only: @@ -157,7 +157,7 @@ class FunctionsTable: for function in db.query(Function).filter_by(type=type).all() ] - def get_global_filter_functions(self) -> list[FunctionModel]: + def get_global_filter_functions(self) -> List[FunctionModel]: with get_db() as db: return [ @@ -167,7 +167,7 @@ class FunctionsTable: .all() ] - def get_global_action_functions(self) -> list[FunctionModel]: + def get_global_action_functions(self) -> List[FunctionModel]: with get_db() as db: return [ FunctionModel.model_validate(function) @@ -198,7 +198,7 @@ class FunctionsTable: db.commit() db.refresh(function) return self.get_function_by_id(id) - except Exception: + except: return None def get_user_valves_by_id_and_user_id( @@ -256,7 +256,7 @@ class FunctionsTable: ) db.commit() return self.get_function_by_id(id) - except Exception: + except: return None def deactivate_all_functions(self) -> Optional[bool]: @@ -271,7 +271,7 @@ class FunctionsTable: ) db.commit() return True - except Exception: + except: return None def delete_function_by_id(self, id: str) -> bool: @@ -281,7 +281,7 @@ class FunctionsTable: db.commit() return True - except Exception: + except: return False diff --git a/backend/apps/webui/models/memories.py b/backend/apps/webui/models/memories.py index 41bb11ccf47396436cea64405ccd5e2e4a723b36..02d4b6924986465612fd2d32be0499ffd3ff3f93 100644 --- a/backend/apps/webui/models/memories.py +++ b/backend/apps/webui/models/memories.py @@ -1,5 +1,5 @@ from pydantic import BaseModel, ConfigDict -from typing import Union, Optional +from typing import List, Union, Optional from sqlalchemy import Column, String, BigInteger, Text @@ -80,25 +80,25 @@ class MemoriesTable: ) db.commit() return self.get_memory_by_id(id) - except Exception: + except: return None - def get_memories(self) -> list[MemoryModel]: + def get_memories(self) -> List[MemoryModel]: with get_db() as db: try: memories = db.query(Memory).all() return [MemoryModel.model_validate(memory) for memory in memories] - except Exception: + except: return None - def get_memories_by_user_id(self, user_id: str) -> list[MemoryModel]: + def get_memories_by_user_id(self, user_id: str) -> List[MemoryModel]: with get_db() as db: try: memories = db.query(Memory).filter_by(user_id=user_id).all() return [MemoryModel.model_validate(memory) for memory in memories] - except Exception: + except: return None def get_memory_by_id(self, id: str) -> Optional[MemoryModel]: @@ -107,7 +107,7 @@ class MemoriesTable: try: memory = db.get(Memory, id) return MemoryModel.model_validate(memory) - except Exception: + except: return None def delete_memory_by_id(self, id: str) -> bool: @@ -119,7 +119,7 @@ class MemoriesTable: return True - except Exception: + except: return False def delete_memories_by_user_id(self, user_id: str) -> bool: @@ -130,7 +130,7 @@ class MemoriesTable: db.commit() return True - except Exception: + except: return False def delete_memory_by_id_and_user_id(self, id: str, user_id: str) -> bool: @@ -141,7 +141,7 @@ class MemoriesTable: db.commit() return True - except Exception: + except: return False diff --git a/backend/apps/webui/models/models.py b/backend/apps/webui/models/models.py index 616beb2a9bbfde18bb019581dedcbfa86d929de1..8277d1d0bace4a4aacb30c7c689668ab22035764 100644 --- a/backend/apps/webui/models/models.py +++ b/backend/apps/webui/models/models.py @@ -137,7 +137,7 @@ class ModelsTable: print(e) return None - def get_all_models(self) -> list[ModelModel]: + def get_all_models(self) -> List[ModelModel]: with get_db() as db: return [ModelModel.model_validate(model) for model in db.query(Model).all()] @@ -146,7 +146,7 @@ class ModelsTable: with get_db() as db: model = db.get(Model, id) return ModelModel.model_validate(model) - except Exception: + except: return None def update_model_by_id(self, id: str, model: ModelForm) -> Optional[ModelModel]: @@ -175,7 +175,7 @@ class ModelsTable: db.commit() return True - except Exception: + except: return False diff --git a/backend/apps/webui/models/prompts.py b/backend/apps/webui/models/prompts.py index 942f64a43567bee4003e8c928065b91529824412..b8467b63164f537a6e669c5c078a95eb2d162339 100644 --- a/backend/apps/webui/models/prompts.py +++ b/backend/apps/webui/models/prompts.py @@ -1,5 +1,5 @@ from pydantic import BaseModel, ConfigDict -from typing import Optional +from typing import List, Optional import time from sqlalchemy import String, Column, BigInteger, Text @@ -79,10 +79,10 @@ class PromptsTable: prompt = db.query(Prompt).filter_by(command=command).first() return PromptModel.model_validate(prompt) - except Exception: + except: return None - def get_prompts(self) -> list[PromptModel]: + def get_prompts(self) -> List[PromptModel]: with get_db() as db: return [ @@ -101,7 +101,7 @@ class PromptsTable: prompt.timestamp = int(time.time()) db.commit() return PromptModel.model_validate(prompt) - except Exception: + except: return None def delete_prompt_by_command(self, command: str) -> bool: @@ -112,7 +112,7 @@ class PromptsTable: db.commit() return True - except Exception: + except: return False diff --git a/backend/apps/webui/models/tags.py b/backend/apps/webui/models/tags.py index 7ce06cb60b257b18560231aff3eca11814e39425..7285b6fe245fc39099040d0a4f568017eee09797 100644 --- a/backend/apps/webui/models/tags.py +++ b/backend/apps/webui/models/tags.py @@ -1,5 +1,5 @@ from pydantic import BaseModel, ConfigDict -from typing import Optional +from typing import List, Optional import json import uuid @@ -69,11 +69,11 @@ class ChatIdTagForm(BaseModel): class TagChatIdsResponse(BaseModel): - chat_ids: list[str] + chat_ids: List[str] class ChatTagsResponse(BaseModel): - tags: list[str] + tags: List[str] class TagTable: @@ -109,7 +109,7 @@ class TagTable: self, user_id: str, form_data: ChatIdTagForm ) -> Optional[ChatIdTagModel]: tag = self.get_tag_by_name_and_user_id(form_data.tag_name, user_id) - if tag is None: + if tag == None: tag = self.insert_new_tag(form_data.tag_name, user_id) id = str(uuid.uuid4()) @@ -132,10 +132,10 @@ class TagTable: return ChatIdTagModel.model_validate(result) else: return None - except Exception: + except: return None - def get_tags_by_user_id(self, user_id: str) -> list[TagModel]: + def get_tags_by_user_id(self, user_id: str) -> List[TagModel]: with get_db() as db: tag_names = [ chat_id_tag.tag_name @@ -159,7 +159,7 @@ class TagTable: def get_tags_by_chat_id_and_user_id( self, chat_id: str, user_id: str - ) -> list[TagModel]: + ) -> List[TagModel]: with get_db() as db: tag_names = [ @@ -184,7 +184,7 @@ class TagTable: def get_chat_ids_by_tag_name_and_user_id( self, tag_name: str, user_id: str - ) -> list[ChatIdTagModel]: + ) -> List[ChatIdTagModel]: with get_db() as db: return [ diff --git a/backend/apps/webui/models/tools.py b/backend/apps/webui/models/tools.py index c8c56fb9740098998b4177a5e3e241903ff7daa0..685ce6fcfbd3b721482a4bf62888402fc73a9137 100644 --- a/backend/apps/webui/models/tools.py +++ b/backend/apps/webui/models/tools.py @@ -1,5 +1,5 @@ from pydantic import BaseModel, ConfigDict -from typing import Optional +from typing import List, Optional import time import logging from sqlalchemy import String, Column, BigInteger, Text @@ -45,7 +45,7 @@ class ToolModel(BaseModel): user_id: str name: str content: str - specs: list[dict] + specs: List[dict] meta: ToolMeta updated_at: int # timestamp in epoch created_at: int # timestamp in epoch @@ -81,7 +81,7 @@ class ToolValves(BaseModel): class ToolsTable: def insert_new_tool( - self, user_id: str, form_data: ToolForm, specs: list[dict] + self, user_id: str, form_data: ToolForm, specs: List[dict] ) -> Optional[ToolModel]: with get_db() as db: @@ -115,10 +115,10 @@ class ToolsTable: tool = db.get(Tool, id) return ToolModel.model_validate(tool) - except Exception: + except: return None - def get_tools(self) -> list[ToolModel]: + def get_tools(self) -> List[ToolModel]: with get_db() as db: return [ToolModel.model_validate(tool) for tool in db.query(Tool).all()] @@ -141,7 +141,7 @@ class ToolsTable: ) db.commit() return self.get_tool_by_id(id) - except Exception: + except: return None def get_user_valves_by_id_and_user_id( @@ -196,7 +196,7 @@ class ToolsTable: tool = db.query(Tool).get(id) db.refresh(tool) return ToolModel.model_validate(tool) - except Exception: + except: return None def delete_tool_by_id(self, id: str) -> bool: @@ -206,7 +206,7 @@ class ToolsTable: db.commit() return True - except Exception: + except: return False diff --git a/backend/apps/webui/models/users.py b/backend/apps/webui/models/users.py index 36dfa4f85573d8cab45ba2cd1ef37402cac92eab..2f30cda0230292c86ab1a6fb89010ae9d419b610 100644 --- a/backend/apps/webui/models/users.py +++ b/backend/apps/webui/models/users.py @@ -1,5 +1,5 @@ from pydantic import BaseModel, ConfigDict, parse_obj_as -from typing import Union, Optional +from typing import List, Union, Optional import time from sqlalchemy import String, Column, BigInteger, Text @@ -125,7 +125,7 @@ class UsersTable: user = db.query(User).filter_by(api_key=api_key).first() return UserModel.model_validate(user) - except Exception: + except: return None def get_user_by_email(self, email: str) -> Optional[UserModel]: @@ -134,7 +134,7 @@ class UsersTable: user = db.query(User).filter_by(email=email).first() return UserModel.model_validate(user) - except Exception: + except: return None def get_user_by_oauth_sub(self, sub: str) -> Optional[UserModel]: @@ -143,10 +143,10 @@ class UsersTable: user = db.query(User).filter_by(oauth_sub=sub).first() return UserModel.model_validate(user) - except Exception: + except: return None - def get_users(self, skip: int = 0, limit: int = 50) -> list[UserModel]: + def get_users(self, skip: int = 0, limit: int = 50) -> List[UserModel]: with get_db() as db: users = ( db.query(User) @@ -164,7 +164,7 @@ class UsersTable: with get_db() as db: user = db.query(User).order_by(User.created_at).first() return UserModel.model_validate(user) - except Exception: + except: return None def update_user_role_by_id(self, id: str, role: str) -> Optional[UserModel]: @@ -174,7 +174,7 @@ class UsersTable: db.commit() user = db.query(User).filter_by(id=id).first() return UserModel.model_validate(user) - except Exception: + except: return None def update_user_profile_image_url_by_id( @@ -189,7 +189,7 @@ class UsersTable: user = db.query(User).filter_by(id=id).first() return UserModel.model_validate(user) - except Exception: + except: return None def update_user_last_active_by_id(self, id: str) -> Optional[UserModel]: @@ -203,7 +203,7 @@ class UsersTable: user = db.query(User).filter_by(id=id).first() return UserModel.model_validate(user) - except Exception: + except: return None def update_user_oauth_sub_by_id( @@ -216,7 +216,7 @@ class UsersTable: user = db.query(User).filter_by(id=id).first() return UserModel.model_validate(user) - except Exception: + except: return None def update_user_by_id(self, id: str, updated: dict) -> Optional[UserModel]: @@ -245,7 +245,7 @@ class UsersTable: return True else: return False - except Exception: + except: return False def update_user_api_key_by_id(self, id: str, api_key: str) -> str: @@ -254,7 +254,7 @@ class UsersTable: result = db.query(User).filter_by(id=id).update({"api_key": api_key}) db.commit() return True if result == 1 else False - except Exception: + except: return False def get_user_api_key_by_id(self, id: str) -> Optional[str]: diff --git a/backend/apps/webui/routers/chats.py b/backend/apps/webui/routers/chats.py index 6621e73372bf2e5623366dae4d4a4a028553c670..6e89722d354af49d629ddc03662c820076bf7d20 100644 --- a/backend/apps/webui/routers/chats.py +++ b/backend/apps/webui/routers/chats.py @@ -1,6 +1,6 @@ from fastapi import Depends, Request, HTTPException, status from datetime import datetime, timedelta -from typing import Union, Optional +from typing import List, Union, Optional from utils.utils import get_verified_user, get_admin_user from fastapi import APIRouter from pydantic import BaseModel @@ -40,8 +40,8 @@ router = APIRouter() ############################ -@router.get("/", response_model=list[ChatTitleIdResponse]) -@router.get("/list", response_model=list[ChatTitleIdResponse]) +@router.get("/", response_model=List[ChatTitleIdResponse]) +@router.get("/list", response_model=List[ChatTitleIdResponse]) async def get_session_user_chat_list( user=Depends(get_verified_user), page: Optional[int] = None ): @@ -80,7 +80,7 @@ async def delete_all_user_chats(request: Request, user=Depends(get_verified_user ############################ -@router.get("/list/user/{user_id}", response_model=list[ChatTitleIdResponse]) +@router.get("/list/user/{user_id}", response_model=List[ChatTitleIdResponse]) async def get_user_chat_list_by_user_id( user_id: str, user=Depends(get_admin_user), @@ -119,7 +119,7 @@ async def create_new_chat(form_data: ChatForm, user=Depends(get_verified_user)): ############################ -@router.get("/all", response_model=list[ChatResponse]) +@router.get("/all", response_model=List[ChatResponse]) async def get_user_chats(user=Depends(get_verified_user)): return [ ChatResponse(**{**chat.model_dump(), "chat": json.loads(chat.chat)}) @@ -132,7 +132,7 @@ async def get_user_chats(user=Depends(get_verified_user)): ############################ -@router.get("/all/archived", response_model=list[ChatResponse]) +@router.get("/all/archived", response_model=List[ChatResponse]) async def get_user_archived_chats(user=Depends(get_verified_user)): return [ ChatResponse(**{**chat.model_dump(), "chat": json.loads(chat.chat)}) @@ -145,7 +145,7 @@ async def get_user_archived_chats(user=Depends(get_verified_user)): ############################ -@router.get("/all/db", response_model=list[ChatResponse]) +@router.get("/all/db", response_model=List[ChatResponse]) async def get_all_user_chats_in_db(user=Depends(get_admin_user)): if not ENABLE_ADMIN_EXPORT: raise HTTPException( @@ -163,7 +163,7 @@ async def get_all_user_chats_in_db(user=Depends(get_admin_user)): ############################ -@router.get("/archived", response_model=list[ChatTitleIdResponse]) +@router.get("/archived", response_model=List[ChatTitleIdResponse]) async def get_archived_session_user_chat_list( user=Depends(get_verified_user), skip: int = 0, limit: int = 50 ): @@ -216,7 +216,7 @@ class TagNameForm(BaseModel): limit: Optional[int] = 50 -@router.post("/tags", response_model=list[ChatTitleIdResponse]) +@router.post("/tags", response_model=List[ChatTitleIdResponse]) async def get_user_chat_list_by_tag_name( form_data: TagNameForm, user=Depends(get_verified_user) ): @@ -241,7 +241,7 @@ async def get_user_chat_list_by_tag_name( ############################ -@router.get("/tags/all", response_model=list[TagModel]) +@router.get("/tags/all", response_model=List[TagModel]) async def get_all_tags(user=Depends(get_verified_user)): try: tags = Tags.get_tags_by_user_id(user.id) @@ -417,7 +417,7 @@ async def delete_shared_chat_by_id(id: str, user=Depends(get_verified_user)): ############################ -@router.get("/{id}/tags", response_model=list[TagModel]) +@router.get("/{id}/tags", response_model=List[TagModel]) async def get_chat_tags_by_id(id: str, user=Depends(get_verified_user)): tags = Tags.get_tags_by_chat_id_and_user_id(id, user.id) diff --git a/backend/apps/webui/routers/configs.py b/backend/apps/webui/routers/configs.py index 68c6873742e5e7c9b1ab53aff542fba4184cb5fe..39e435013541d40c1f058be8b783595d08515bf4 100644 --- a/backend/apps/webui/routers/configs.py +++ b/backend/apps/webui/routers/configs.py @@ -1,7 +1,7 @@ from fastapi import Response, Request from fastapi import Depends, FastAPI, HTTPException, status from datetime import datetime, timedelta -from typing import Union +from typing import List, Union from fastapi import APIRouter from pydantic import BaseModel @@ -29,12 +29,12 @@ class SetDefaultModelsForm(BaseModel): class PromptSuggestion(BaseModel): - title: list[str] + title: List[str] content: str class SetDefaultSuggestionsForm(BaseModel): - suggestions: list[PromptSuggestion] + suggestions: List[PromptSuggestion] ############################ @@ -50,7 +50,7 @@ async def set_global_default_models( return request.app.state.config.DEFAULT_MODELS -@router.post("/default/suggestions", response_model=list[PromptSuggestion]) +@router.post("/default/suggestions", response_model=List[PromptSuggestion]) async def set_global_default_suggestions( request: Request, form_data: SetDefaultSuggestionsForm, @@ -67,10 +67,10 @@ async def set_global_default_suggestions( class SetBannersForm(BaseModel): - banners: list[BannerModel] + banners: List[BannerModel] -@router.post("/banners", response_model=list[BannerModel]) +@router.post("/banners", response_model=List[BannerModel]) async def set_banners( request: Request, form_data: SetBannersForm, @@ -81,7 +81,7 @@ async def set_banners( return request.app.state.config.BANNERS -@router.get("/banners", response_model=list[BannerModel]) +@router.get("/banners", response_model=List[BannerModel]) async def get_banners( request: Request, user=Depends(get_verified_user), diff --git a/backend/apps/webui/routers/documents.py b/backend/apps/webui/routers/documents.py index 3bb2aa15b520c00565e37536c4f7ce47e4c7fdb8..2299b2fee3d5fd8e9a65c15ab564e05f2c256039 100644 --- a/backend/apps/webui/routers/documents.py +++ b/backend/apps/webui/routers/documents.py @@ -1,6 +1,6 @@ from fastapi import Depends, FastAPI, HTTPException, status from datetime import datetime, timedelta -from typing import Union, Optional +from typing import List, Union, Optional from fastapi import APIRouter from pydantic import BaseModel @@ -24,7 +24,7 @@ router = APIRouter() ############################ -@router.get("/", response_model=list[DocumentResponse]) +@router.get("/", response_model=List[DocumentResponse]) async def get_documents(user=Depends(get_verified_user)): docs = [ DocumentResponse( @@ -46,7 +46,7 @@ async def get_documents(user=Depends(get_verified_user)): @router.post("/create", response_model=Optional[DocumentResponse]) async def create_new_doc(form_data: DocumentForm, user=Depends(get_admin_user)): doc = Documents.get_doc_by_name(form_data.name) - if doc is None: + if doc == None: doc = Documents.insert_new_doc(user.id, form_data) if doc: @@ -102,7 +102,7 @@ class TagItem(BaseModel): class TagDocumentForm(BaseModel): name: str - tags: list[dict] + tags: List[dict] @router.post("/doc/tags", response_model=Optional[DocumentResponse]) diff --git a/backend/apps/webui/routers/files.py b/backend/apps/webui/routers/files.py index ba571fc71385a37c5993a5d78950548b357d6fde..99fb923a12ccbb034c80979dc28f8fceec323a51 100644 --- a/backend/apps/webui/routers/files.py +++ b/backend/apps/webui/routers/files.py @@ -11,7 +11,7 @@ from fastapi import ( from datetime import datetime, timedelta -from typing import Union, Optional +from typing import List, Union, Optional from pathlib import Path from fastapi import APIRouter @@ -104,7 +104,7 @@ def upload_file(file: UploadFile = File(...), user=Depends(get_verified_user)): ############################ -@router.get("/", response_model=list[FileModel]) +@router.get("/", response_model=List[FileModel]) async def list_files(user=Depends(get_verified_user)): files = Files.get_files() return files diff --git a/backend/apps/webui/routers/functions.py b/backend/apps/webui/routers/functions.py index f40d28264544fa06f9f3f2ec36dc0194abaae647..eb5216b202b0858b87cfcda16fc1ed9e4c3cd96c 100644 --- a/backend/apps/webui/routers/functions.py +++ b/backend/apps/webui/routers/functions.py @@ -1,6 +1,6 @@ from fastapi import Depends, FastAPI, HTTPException, status, Request from datetime import datetime, timedelta -from typing import Union, Optional +from typing import List, Union, Optional from fastapi import APIRouter from pydantic import BaseModel @@ -30,7 +30,7 @@ router = APIRouter() ############################ -@router.get("/", response_model=list[FunctionResponse]) +@router.get("/", response_model=List[FunctionResponse]) async def get_functions(user=Depends(get_verified_user)): return Functions.get_functions() @@ -40,7 +40,7 @@ async def get_functions(user=Depends(get_verified_user)): ############################ -@router.get("/export", response_model=list[FunctionModel]) +@router.get("/export", response_model=List[FunctionModel]) async def get_functions(user=Depends(get_admin_user)): return Functions.get_functions() @@ -63,7 +63,7 @@ async def create_new_function( form_data.id = form_data.id.lower() function = Functions.get_function_by_id(form_data.id) - if function is None: + if function == None: function_path = os.path.join(FUNCTIONS_DIR, f"{form_data.id}.py") try: with open(function_path, "w") as function_file: @@ -235,7 +235,7 @@ async def delete_function_by_id( function_path = os.path.join(FUNCTIONS_DIR, f"{id}.py") try: os.remove(function_path) - except Exception: + except: pass return result diff --git a/backend/apps/webui/routers/memories.py b/backend/apps/webui/routers/memories.py index a7b5474f0adb8e825bf5614633064e4b317735e7..2c473ebe8f6389f3512841f0020abab5d4dc9187 100644 --- a/backend/apps/webui/routers/memories.py +++ b/backend/apps/webui/routers/memories.py @@ -1,7 +1,7 @@ from fastapi import Response, Request from fastapi import Depends, FastAPI, HTTPException, status from datetime import datetime, timedelta -from typing import Union, Optional +from typing import List, Union, Optional from fastapi import APIRouter from pydantic import BaseModel @@ -30,7 +30,7 @@ async def get_embeddings(request: Request): ############################ -@router.get("/", response_model=list[MemoryModel]) +@router.get("/", response_model=List[MemoryModel]) async def get_memories(user=Depends(get_verified_user)): return Memories.get_memories_by_user_id(user.id) diff --git a/backend/apps/webui/routers/models.py b/backend/apps/webui/routers/models.py index 8faeed7a64779a70ed40471799367088df2b651c..eeae9e1c41a7608b5fb256bb46d9e5de25af1738 100644 --- a/backend/apps/webui/routers/models.py +++ b/backend/apps/webui/routers/models.py @@ -1,6 +1,6 @@ from fastapi import Depends, FastAPI, HTTPException, status, Request from datetime import datetime, timedelta -from typing import Union, Optional +from typing import List, Union, Optional from fastapi import APIRouter from pydantic import BaseModel @@ -18,7 +18,7 @@ router = APIRouter() ########################### -@router.get("/", response_model=list[ModelResponse]) +@router.get("/", response_model=List[ModelResponse]) async def get_models(user=Depends(get_verified_user)): return Models.get_all_models() diff --git a/backend/apps/webui/routers/prompts.py b/backend/apps/webui/routers/prompts.py index 39d79362af53542bdec9205c1bbcb8ae7713e13d..c674590e95998979f8f7749901fa9a699b9cb8f6 100644 --- a/backend/apps/webui/routers/prompts.py +++ b/backend/apps/webui/routers/prompts.py @@ -1,6 +1,6 @@ from fastapi import Depends, FastAPI, HTTPException, status from datetime import datetime, timedelta -from typing import Union, Optional +from typing import List, Union, Optional from fastapi import APIRouter from pydantic import BaseModel @@ -18,7 +18,7 @@ router = APIRouter() ############################ -@router.get("/", response_model=list[PromptModel]) +@router.get("/", response_model=List[PromptModel]) async def get_prompts(user=Depends(get_verified_user)): return Prompts.get_prompts() @@ -31,7 +31,7 @@ async def get_prompts(user=Depends(get_verified_user)): @router.post("/create", response_model=Optional[PromptModel]) async def create_new_prompt(form_data: PromptForm, user=Depends(get_admin_user)): prompt = Prompts.get_prompt_by_command(form_data.command) - if prompt is None: + if prompt == None: prompt = Prompts.insert_new_prompt(user.id, form_data) if prompt: diff --git a/backend/apps/webui/routers/tools.py b/backend/apps/webui/routers/tools.py index d6da7ae92289ac4ed18d113af57fee5116dcf320..7e60fe4d1ec52d1eaee9c9d62e0417a677ea913f 100644 --- a/backend/apps/webui/routers/tools.py +++ b/backend/apps/webui/routers/tools.py @@ -1,5 +1,5 @@ from fastapi import Depends, HTTPException, status, Request -from typing import Optional +from typing import List, Optional from fastapi import APIRouter @@ -27,7 +27,7 @@ router = APIRouter() ############################ -@router.get("/", response_model=list[ToolResponse]) +@router.get("/", response_model=List[ToolResponse]) async def get_toolkits(user=Depends(get_verified_user)): toolkits = [toolkit for toolkit in Tools.get_tools()] return toolkits @@ -38,7 +38,7 @@ async def get_toolkits(user=Depends(get_verified_user)): ############################ -@router.get("/export", response_model=list[ToolModel]) +@router.get("/export", response_model=List[ToolModel]) async def get_toolkits(user=Depends(get_admin_user)): toolkits = [toolkit for toolkit in Tools.get_tools()] return toolkits diff --git a/backend/apps/webui/routers/users.py b/backend/apps/webui/routers/users.py index 543757275a9b46626564f320980473cce2eeeadc..9627f0b06779bd2486ee41cb846583ec613ae3c1 100644 --- a/backend/apps/webui/routers/users.py +++ b/backend/apps/webui/routers/users.py @@ -1,7 +1,7 @@ from fastapi import Response, Request from fastapi import Depends, FastAPI, HTTPException, status from datetime import datetime, timedelta -from typing import Union, Optional +from typing import List, Union, Optional from fastapi import APIRouter from pydantic import BaseModel @@ -39,7 +39,7 @@ router = APIRouter() ############################ -@router.get("/", response_model=list[UserModel]) +@router.get("/", response_model=List[UserModel]) async def get_users(skip: int = 0, limit: int = 50, user=Depends(get_admin_user)): return Users.get_users(skip, limit) diff --git a/backend/apps/webui/routers/utils.py b/backend/apps/webui/routers/utils.py index 7a3c3393248b363929d92d55631013c2b8efe4e8..4ffe748b0bebc1a02c2a77f3c379abb347a9a612 100644 --- a/backend/apps/webui/routers/utils.py +++ b/backend/apps/webui/routers/utils.py @@ -17,7 +17,7 @@ from utils.misc import calculate_sha256, get_gravatar_url from config import OLLAMA_BASE_URLS, DATA_DIR, UPLOAD_DIR, ENABLE_ADMIN_EXPORT from constants import ERROR_MESSAGES - +from typing import List router = APIRouter() @@ -57,7 +57,7 @@ async def get_html_from_markdown( class ChatForm(BaseModel): title: str - messages: list[dict] + messages: List[dict] @router.post("/pdf") diff --git a/backend/apps/webui/utils.py b/backend/apps/webui/utils.py index bf5ebedeb7bf3fc87838f56a8faf77c63cac759a..96d2b29ebfa67a5d2d27feb43b8434041cbc04e2 100644 --- a/backend/apps/webui/utils.py +++ b/backend/apps/webui/utils.py @@ -1,8 +1,6 @@ from importlib import util import os import re -import sys -import subprocess from config import TOOLS_DIR, FUNCTIONS_DIR @@ -54,7 +52,6 @@ def load_toolkit_module_by_id(toolkit_id): frontmatter = extract_frontmatter(toolkit_path) try: - install_frontmatter_requirements(frontmatter.get("requirements", "")) spec.loader.exec_module(module) print(f"Loaded module: {module.__name__}") if hasattr(module, "Tools"): @@ -76,7 +73,6 @@ def load_function_module_by_id(function_id): frontmatter = extract_frontmatter(function_path) try: - install_frontmatter_requirements(frontmatter.get("requirements", "")) spec.loader.exec_module(module) print(f"Loaded module: {module.__name__}") if hasattr(module, "Pipe"): @@ -92,13 +88,3 @@ def load_function_module_by_id(function_id): # Move the file to the error folder os.rename(function_path, f"{function_path}.error") raise e - - -def install_frontmatter_requirements(requirements): - if requirements: - req_list = [req.strip() for req in requirements.split(",")] - for req in req_list: - print(f"Installing requirement: {req}") - subprocess.check_call([sys.executable, "-m", "pip", "install", req]) - else: - print("No requirements found in frontmatter.") diff --git a/backend/config.py b/backend/config.py index 07ee06a58c2895857f4232cc2a7623eec84ac69f..7d6c0bd7c99f31241c6e72fcdad88fb7ab8f8f71 100644 --- a/backend/config.py +++ b/backend/config.py @@ -104,7 +104,7 @@ ENV = os.environ.get("ENV", "dev") try: PACKAGE_DATA = json.loads((BASE_DIR / "package.json").read_text()) -except Exception: +except: try: PACKAGE_DATA = {"version": importlib.metadata.version("open-webui")} except importlib.metadata.PackageNotFoundError: @@ -137,7 +137,7 @@ try: with open(str(changelog_path.absolute()), "r", encoding="utf8") as file: changelog_content = file.read() -except Exception: +except: changelog_content = (pkgutil.get_data("open_webui", "CHANGELOG.md") or b"").decode() @@ -202,12 +202,12 @@ if RESET_CONFIG_ON_START: os.remove(f"{DATA_DIR}/config.json") with open(f"{DATA_DIR}/config.json", "w") as f: f.write("{}") - except Exception: + except: pass try: CONFIG_DATA = json.loads((DATA_DIR / "config.json").read_text()) -except Exception: +except: CONFIG_DATA = {} @@ -647,7 +647,7 @@ if AIOHTTP_CLIENT_TIMEOUT == "": else: try: AIOHTTP_CLIENT_TIMEOUT = int(AIOHTTP_CLIENT_TIMEOUT) - except Exception: + except: AIOHTTP_CLIENT_TIMEOUT = 300 @@ -727,7 +727,7 @@ try: OPENAI_API_KEY = OPENAI_API_KEYS.value[ OPENAI_API_BASE_URLS.value.index("https://api.openai.com/v1") ] -except Exception: +except: pass OPENAI_API_BASE_URL = "https://api.openai.com/v1" @@ -1043,7 +1043,7 @@ RAG_EMBEDDING_MODEL = PersistentConfig( "rag.embedding_model", os.environ.get("RAG_EMBEDDING_MODEL", "sentence-transformers/all-MiniLM-L6-v2"), ) -log.info(f"Embedding model set: {RAG_EMBEDDING_MODEL.value}") +log.info(f"Embedding model set: {RAG_EMBEDDING_MODEL.value}"), RAG_EMBEDDING_MODEL_AUTO_UPDATE = ( os.environ.get("RAG_EMBEDDING_MODEL_AUTO_UPDATE", "").lower() == "true" @@ -1065,7 +1065,7 @@ RAG_RERANKING_MODEL = PersistentConfig( os.environ.get("RAG_RERANKING_MODEL", ""), ) if RAG_RERANKING_MODEL.value != "": - log.info(f"Reranking model set: {RAG_RERANKING_MODEL.value}") + log.info(f"Reranking model set: {RAG_RERANKING_MODEL.value}"), RAG_RERANKING_MODEL_AUTO_UPDATE = ( os.environ.get("RAG_RERANKING_MODEL_AUTO_UPDATE", "").lower() == "true" diff --git a/backend/main.py b/backend/main.py index d8ce5f5d7879db9331c6a36f74b3dd9476fe0767..6e4265a5ca9b77f62e7b66e1267fb0dabeaab21f 100644 --- a/backend/main.py +++ b/backend/main.py @@ -51,7 +51,7 @@ from apps.webui.internal.db import Session from pydantic import BaseModel -from typing import Optional +from typing import List, Optional from apps.webui.models.auths import Auths from apps.webui.models.models import Models @@ -1883,7 +1883,7 @@ async def get_pipeline_valves( res = r.json() if "detail" in res: detail = res["detail"] - except Exception: + except: pass raise HTTPException( @@ -2027,7 +2027,7 @@ async def get_model_filter_config(user=Depends(get_admin_user)): class ModelFilterConfigForm(BaseModel): enabled: bool - models: list[str] + models: List[str] @app.post("/api/config/model/filter") diff --git a/backend/start.sh b/backend/start.sh index 0a5c48e8c424de1a14e1dd3124aa08cf38179e7c..16a004e45c266413787def1f731ea36da996247f 100755 --- a/backend/start.sh +++ b/backend/start.sh @@ -30,6 +30,7 @@ if [[ "${USE_CUDA_DOCKER,,}" == "true" ]]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib/python3.11/site-packages/torch/lib:/usr/local/lib/python3.11/site-packages/nvidia/cudnn/lib" fi + # Check if SPACE_ID is set, if so, configure for space if [ -n "$SPACE_ID" ]; then echo "Configuring for HuggingFace Space deployment" diff --git a/backend/utils/misc.py b/backend/utils/misc.py index 2eed58f41eba362cc736bad30bf7750624313c6b..05830568b49ca03b9b4352cb6aecc196f491dfbb 100644 --- a/backend/utils/misc.py +++ b/backend/utils/misc.py @@ -2,14 +2,14 @@ from pathlib import Path import hashlib import re from datetime import timedelta -from typing import Optional, Callable +from typing import Optional, List, Tuple, Callable import uuid import time from utils.task import prompt_template -def get_last_user_message_item(messages: list[dict]) -> Optional[dict]: +def get_last_user_message_item(messages: List[dict]) -> Optional[dict]: for message in reversed(messages): if message["role"] == "user": return message @@ -26,7 +26,7 @@ def get_content_from_message(message: dict) -> Optional[str]: return None -def get_last_user_message(messages: list[dict]) -> Optional[str]: +def get_last_user_message(messages: List[dict]) -> Optional[str]: message = get_last_user_message_item(messages) if message is None: return None @@ -34,31 +34,31 @@ def get_last_user_message(messages: list[dict]) -> Optional[str]: return get_content_from_message(message) -def get_last_assistant_message(messages: list[dict]) -> Optional[str]: +def get_last_assistant_message(messages: List[dict]) -> Optional[str]: for message in reversed(messages): if message["role"] == "assistant": return get_content_from_message(message) return None -def get_system_message(messages: list[dict]) -> Optional[dict]: +def get_system_message(messages: List[dict]) -> Optional[dict]: for message in messages: if message["role"] == "system": return message return None -def remove_system_message(messages: list[dict]) -> list[dict]: +def remove_system_message(messages: List[dict]) -> List[dict]: return [message for message in messages if message["role"] != "system"] -def pop_system_message(messages: list[dict]) -> tuple[Optional[dict], list[dict]]: +def pop_system_message(messages: List[dict]) -> Tuple[Optional[dict], List[dict]]: return get_system_message(messages), remove_system_message(messages) def prepend_to_first_user_message_content( - content: str, messages: list[dict] -) -> list[dict]: + content: str, messages: List[dict] +) -> List[dict]: for message in messages: if message["role"] == "user": if isinstance(message["content"], list): @@ -71,7 +71,7 @@ def prepend_to_first_user_message_content( return messages -def add_or_update_system_message(content: str, messages: list[dict]): +def add_or_update_system_message(content: str, messages: List[dict]): """ Adds a new system message at the beginning of the messages list or updates the existing system message at the beginning. diff --git a/backend/utils/tools.py b/backend/utils/tools.py index eac36b5d90bdfc85f4a492c96b864e7d6df2993e..3e5d82fd6d15255e1f89faab2ec91b037eb88116 100644 --- a/backend/utils/tools.py +++ b/backend/utils/tools.py @@ -1,5 +1,5 @@ import inspect -from typing import get_type_hints +from typing import get_type_hints, List, Dict, Any def doc_to_dict(docstring): @@ -16,7 +16,7 @@ def doc_to_dict(docstring): return ret_dict -def get_tools_specs(tools) -> list[dict]: +def get_tools_specs(tools) -> List[dict]: function_list = [ {"name": func, "function": getattr(tools, func)} for func in dir(tools) diff --git a/package-lock.json b/package-lock.json index aa813a4dbbbfc02c8b5a950b8714dea63331f821..2006a3fd30123eb954d5ee729134d1ae30403e91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "open-webui", - "version": "0.3.13", + "version": "0.3.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "open-webui", - "version": "0.3.13", + "version": "0.3.12", "dependencies": { "@codemirror/lang-javascript": "^6.2.2", "@codemirror/lang-python": "^6.1.6", @@ -18,7 +18,6 @@ "codemirror": "^6.0.1", "crc-32": "^1.2.2", "dayjs": "^1.11.10", - "dompurify": "^3.1.6", "eventsource-parser": "^1.1.2", "file-saver": "^2.0.5", "fuse.js": "^7.0.0", @@ -3919,9 +3918,9 @@ } }, "node_modules/dompurify": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz", - "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==" + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.5.tgz", + "integrity": "sha512-lwG+n5h8QNpxtyrJW/gJWckL+1/DQiYMX8f7t8Z2AZTPw1esVrqjI63i7Zc2Gz0aKzLVMYC1V1PL/ky+aY/NgA==" }, "node_modules/domutils": { "version": "3.1.0", diff --git a/package.json b/package.json index fef2cbaef675bc662d6f2cdc0804dc1914209bfe..bd2b173bf89cffa0ef0c6999307af97b05cab418 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "open-webui", - "version": "0.3.13", + "version": "0.3.12", "private": true, "scripts": { "dev": "npm run pyodide:fetch && vite dev --host", @@ -59,7 +59,6 @@ "codemirror": "^6.0.1", "crc-32": "^1.2.2", "dayjs": "^1.11.10", - "dompurify": "^3.1.6", "eventsource-parser": "^1.1.2", "file-saver": "^2.0.5", "fuse.js": "^7.0.0", diff --git a/pyproject.toml b/pyproject.toml index 159bce0727fff0052b84639fb75d6f636bc1dd0f..1784a9b4472e5cf5443392008ed83df77aee7182 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "open-webui" -description = "Open WebUI" +description = "Open WebUI (Formerly Ollama WebUI)" authors = [ { name = "Timothy Jaeryang Baek", email = "tim@openwebui.com" } ] @@ -41,12 +41,12 @@ dependencies = [ "google-generativeai==0.7.2", "tiktoken", - "langchain==0.2.12", + "langchain==0.2.11", "langchain-community==0.2.10", "langchain-chroma==0.1.2", "fake-useragent==1.5.1", - "chromadb==0.5.5", + "chromadb==0.5.4", "sentence-transformers==3.0.1", "pypdf==4.3.1", "docx2txt==0.8", @@ -69,11 +69,11 @@ dependencies = [ "faster-whisper==1.0.2", - "PyJWT[crypto]==2.9.0", + "PyJWT[crypto]==2.8.0", "authlib==1.3.1", "black==24.8.0", - "langfuse==2.43.3", + "langfuse==2.39.2", "youtube-transcript-api==0.6.2", "pytube==15.0.0", diff --git a/requirements-dev.lock b/requirements-dev.lock index 6b3f5185127ebf08015779e19e086016b8496f19..da1f66fccea4ba3e51950f0ce4630b349bde6f56 100644 --- a/requirements-dev.lock +++ b/requirements-dev.lock @@ -10,9 +10,7 @@ # universal: false -e file:. -aiohappyeyeballs==2.3.5 - # via aiohttp -aiohttp==3.10.2 +aiohttp==3.9.5 # via langchain # via langchain-community # via open-webui @@ -86,9 +84,9 @@ chardet==5.2.0 charset-normalizer==3.3.2 # via requests # via unstructured-client -chroma-hnswlib==0.7.6 +chroma-hnswlib==0.7.5 # via chromadb -chromadb==0.5.5 +chromadb==0.5.4 # via langchain-chroma # via open-webui click==8.1.7 @@ -271,7 +269,7 @@ jsonpointer==2.4 # via jsonpatch kubernetes==29.0.0 # via chromadb -langchain==0.2.12 +langchain==0.2.11 # via langchain-community # via open-webui langchain-chroma==0.1.2 @@ -287,7 +285,7 @@ langchain-text-splitters==0.2.0 # via langchain langdetect==1.0.9 # via unstructured -langfuse==2.43.3 +langfuse==2.39.2 # via open-webui langsmith==0.1.96 # via langchain @@ -493,7 +491,7 @@ pydub==0.25.1 # via open-webui pygments==2.18.0 # via rich -pyjwt==2.9.0 +pyjwt==2.8.0 # via open-webui pymongo==4.8.0 # via open-webui diff --git a/requirements.lock b/requirements.lock index 6b3f5185127ebf08015779e19e086016b8496f19..da1f66fccea4ba3e51950f0ce4630b349bde6f56 100644 --- a/requirements.lock +++ b/requirements.lock @@ -10,9 +10,7 @@ # universal: false -e file:. -aiohappyeyeballs==2.3.5 - # via aiohttp -aiohttp==3.10.2 +aiohttp==3.9.5 # via langchain # via langchain-community # via open-webui @@ -86,9 +84,9 @@ chardet==5.2.0 charset-normalizer==3.3.2 # via requests # via unstructured-client -chroma-hnswlib==0.7.6 +chroma-hnswlib==0.7.5 # via chromadb -chromadb==0.5.5 +chromadb==0.5.4 # via langchain-chroma # via open-webui click==8.1.7 @@ -271,7 +269,7 @@ jsonpointer==2.4 # via jsonpatch kubernetes==29.0.0 # via chromadb -langchain==0.2.12 +langchain==0.2.11 # via langchain-community # via open-webui langchain-chroma==0.1.2 @@ -287,7 +285,7 @@ langchain-text-splitters==0.2.0 # via langchain langdetect==1.0.9 # via unstructured -langfuse==2.43.3 +langfuse==2.39.2 # via open-webui langsmith==0.1.96 # via langchain @@ -493,7 +491,7 @@ pydub==0.25.1 # via open-webui pygments==2.18.0 # via rich -pyjwt==2.9.0 +pyjwt==2.8.0 # via open-webui pymongo==4.8.0 # via open-webui diff --git a/src/lib/apis/ollama/index.ts b/src/lib/apis/ollama/index.ts index c4c449156c1a6c1a9058329c7488e5967bdb3e7f..084d2d5f18a54dc11d73da5beba5c2dd93f700c5 100644 --- a/src/lib/apis/ollama/index.ts +++ b/src/lib/apis/ollama/index.ts @@ -1,4 +1,5 @@ import { OLLAMA_API_BASE_URL } from '$lib/constants'; +import { titleGenerationTemplate } from '$lib/utils'; export const getOllamaConfig = async (token: string = '') => { let error = null; @@ -202,6 +203,55 @@ export const getOllamaModels = async (token: string = '') => { }); }; +// TODO: migrate to backend +export const generateTitle = async ( + token: string = '', + template: string, + model: string, + prompt: string +) => { + let error = null; + + template = titleGenerationTemplate(template, prompt); + + console.log(template); + + const res = await fetch(`${OLLAMA_API_BASE_URL}/api/generate`, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: `Bearer ${token}` + }, + body: JSON.stringify({ + model: model, + prompt: template, + stream: false, + options: { + // Restrict the number of tokens generated to 50 + num_predict: 50 + } + }) + }) + .then(async (res) => { + if (!res.ok) throw await res.json(); + return res.json(); + }) + .catch((err) => { + console.log(err); + if ('detail' in err) { + error = err.detail; + } + return null; + }); + + if (error) { + throw error; + } + + return res?.response.replace(/["']/g, '') ?? 'New Chat'; +}; + export const generatePrompt = async (token: string = '', model: string, conversation: string) => { let error = null; diff --git a/src/lib/apis/openai/index.ts b/src/lib/apis/openai/index.ts index 2bb11d12a74e48933536509d9fb16800d2efc53b..b075d634b85853cca36387f00e5bd34edb8c3ec0 100644 --- a/src/lib/apis/openai/index.ts +++ b/src/lib/apis/openai/index.ts @@ -1,4 +1,6 @@ import { OPENAI_API_BASE_URL } from '$lib/constants'; +import { titleGenerationTemplate } from '$lib/utils'; +import { type Model, models, settings } from '$lib/stores'; export const getOpenAIConfig = async (token: string = '') => { let error = null; @@ -328,3 +330,126 @@ export const synthesizeOpenAISpeech = async ( return res; }; + +export const generateTitle = async ( + token: string = '', + template: string, + model: string, + prompt: string, + chat_id?: string, + url: string = OPENAI_API_BASE_URL +) => { + let error = null; + + template = titleGenerationTemplate(template, prompt); + + console.log(template); + + const res = await fetch(`${url}/chat/completions`, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: `Bearer ${token}` + }, + body: JSON.stringify({ + model: model, + messages: [ + { + role: 'user', + content: template + } + ], + stream: false, + // Restricting the max tokens to 50 to avoid long titles + max_tokens: 50, + ...(chat_id && { chat_id: chat_id }), + title: true + }) + }) + .then(async (res) => { + if (!res.ok) throw await res.json(); + return res.json(); + }) + .catch((err) => { + console.log(err); + if ('detail' in err) { + error = err.detail; + } + return null; + }); + + if (error) { + throw error; + } + + return res?.choices[0]?.message?.content.replace(/["']/g, '') ?? 'New Chat'; +}; + +export const generateSearchQuery = async ( + token: string = '', + model: string, + previousMessages: string[], + prompt: string, + url: string = OPENAI_API_BASE_URL +): Promise => { + let error = null; + + // TODO: Allow users to specify the prompt + // Get the current date in the format "January 20, 2024" + const currentDate = new Intl.DateTimeFormat('en-US', { + year: 'numeric', + month: 'long', + day: '2-digit' + }).format(new Date()); + + const res = await fetch(`${url}/chat/completions`, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: `Bearer ${token}` + }, + body: JSON.stringify({ + model: model, + // Few shot prompting + messages: [ + { + role: 'assistant', + content: `You are tasked with generating web search queries. Give me an appropriate query to answer my question for google search. Answer with only the query. Today is ${currentDate}.` + }, + { + role: 'user', + content: prompt + } + // { + // role: 'user', + // content: + // (previousMessages.length > 0 + // ? `Previous Questions:\n${previousMessages.join('\n')}\n\n` + // : '') + `Current Question: ${prompt}` + // } + ], + stream: false, + // Restricting the max tokens to 30 to avoid long search queries + max_tokens: 30 + }) + }) + .then(async (res) => { + if (!res.ok) throw await res.json(); + return res.json(); + }) + .catch((err) => { + console.log(err); + if ('detail' in err) { + error = err.detail; + } + return undefined; + }); + + if (error) { + throw error; + } + + return res?.choices[0]?.message?.content.replace(/["']/g, '') ?? undefined; +}; diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte index 64b51be96c5910c008af20067103df9ec250fb98..a290d5d3d398e0b7908d8bd0faaf3cad83f6d492 100644 --- a/src/lib/components/chat/Chat.svelte +++ b/src/lib/components/chat/Chat.svelte @@ -877,10 +877,6 @@ } else { responseMessage.content += data.message.content; - if (navigator.vibrate && ($settings?.hapticFeedback ?? false)) { - navigator.vibrate(5); - } - const sentences = extractSentencesForAudio(responseMessage.content); sentences.pop(); @@ -1181,10 +1177,6 @@ } else { responseMessage.content += value; - if (navigator.vibrate && ($settings?.hapticFeedback ?? false)) { - navigator.vibrate(5); - } - const sentences = extractSentencesForAudio(responseMessage.content); sentences.pop(); diff --git a/src/lib/components/chat/Messages/CodeBlock.svelte b/src/lib/components/chat/Messages/CodeBlock.svelte index f368c84591909ddc45dc10f20c28572e60386869..5fa4299eaf7bdbdb4fbf22481c82c34a717844f2 100644 --- a/src/lib/components/chat/Messages/CodeBlock.svelte +++ b/src/lib/components/chat/Messages/CodeBlock.svelte @@ -1,9 +1,7 @@
- {#if lang === 'mermaid'} - {#if mermaidHtml} - {@html mermaidHtml} - {:else} - 
{code}
- {/if} - {:else} -
-
{lang}
- -
- {#if lang.toLowerCase() === 'python' || lang.toLowerCase() === 'py' || (lang === '' && checkPythonCode(code))} - {#if executing} -
Running
- {:else} - - {/if} +
+
{@html lang}
+ +
+ {#if lang.toLowerCase() === 'python' || lang.toLowerCase() === 'py' || (lang === '' && checkPythonCode(code))} + {#if executing} +
Running
+ {:else} + {/if} - -
+ {/if} + +
+
+ + 
{#if highlightedCode}{@html highlightedCode}{:else}{code}{/if}
+ +
+ + {#if executing} +
+
STDOUT/STDERR
+
Running...
+
+ {:else if stdout || stderr || result} +
+
STDOUT/STDERR
+
{stdout || stderr || result}
- - 
{#if highlightedCode}{@html highlightedCode}{:else}{code}{/if}
- -
- - {#if executing} -
-
STDOUT/STDERR
-
Running...
-
- {:else if stdout || stderr || result} -
-
STDOUT/STDERR
-
{stdout || stderr || result}
-
- {/if} {/if}
diff --git a/src/lib/components/chat/Messages/MarkdownInlineTokens.svelte b/src/lib/components/chat/Messages/MarkdownInlineTokens.svelte index 8ca6fa37d697f3b0d5d1d1532085401cd163266a..170429f4be4276949577274417b7fc11e1e29c50 100644 --- a/src/lib/components/chat/Messages/MarkdownInlineTokens.svelte +++ b/src/lib/components/chat/Messages/MarkdownInlineTokens.svelte @@ -1,5 +1,4 @@ diff --git a/src/lib/components/chat/Settings/Interface.svelte b/src/lib/components/chat/Settings/Interface.svelte index 58de9be4c8d23965fe1eed9821bcd6e7a53952e3..d5e198890b820e3eec70ce16f24c617e6896a797 100644 --- a/src/lib/components/chat/Settings/Interface.svelte +++ b/src/lib/components/chat/Settings/Interface.svelte @@ -34,7 +34,6 @@ let showEmojiInCall = false; let voiceInterruption = false; - let hapticFeedback = false; const toggleSplitLargeChunks = async () => { splitLargeChunks = !splitLargeChunks; @@ -71,11 +70,6 @@ saveSettings({ voiceInterruption: voiceInterruption }); }; - const toggleHapticFeedback = async () => { - hapticFeedback = !hapticFeedback; - saveSettings({ hapticFeedback: hapticFeedback }); - }; - const toggleUserLocation = async () => { userLocation = !userLocation; @@ -157,8 +151,6 @@ chatDirection = $settings.chatDirection ?? 'LTR'; userLocation = $settings.userLocation ?? false; - hapticFeedback = $settings.hapticFeedback ?? false; - defaultModelId = $settings?.models?.at(0) ?? ''; if ($config?.default_models) { defaultModelId = $config.default_models.split(',')[0]; @@ -446,26 +438,6 @@
-
-
-
{$i18n.t('Haptic Feedback')}
- - -
-
-
{$i18n.t('Voice')}
diff --git a/src/lib/components/workspace/Functions.svelte b/src/lib/components/workspace/Functions.svelte index 25a8a85406638abdf319e313638bd1bece44abea..0b03f414079a6153fe16df10a4cf4aed7de8ae6c 100644 --- a/src/lib/components/workspace/Functions.svelte +++ b/src/lib/components/workspace/Functions.svelte @@ -29,12 +29,9 @@ import ManifestModal from './common/ManifestModal.svelte'; import Heart from '../icons/Heart.svelte'; import DeleteConfirmDialog from '$lib/components/common/ConfirmDialog.svelte'; - import GarbageBin from '../icons/GarbageBin.svelte'; const i18n = getContext('i18n'); - let shiftKey = false; - let functionsImportInputElement: HTMLInputElement; let importFiles; @@ -138,34 +135,6 @@ models.set(await getModels(localStorage.token)); } }; - - onMount(() => { - const onKeyDown = (event) => { - if (event.key === 'Shift') { - shiftKey = true; - } - }; - - const onKeyUp = (event) => { - if (event.key === 'Shift') { - shiftKey = false; - } - }; - - const onBlur = () => { - shiftKey = false; - }; - - window.addEventListener('keydown', onKeyDown); - window.addEventListener('keyup', onKeyUp); - window.addEventListener('blur', onBlur); - - return () => { - window.removeEventListener('keydown', onKeyDown); - window.removeEventListener('keyup', onKeyUp); - window.removeEventListener('blur', onBlur); - }; - }); @@ -265,98 +234,84 @@
- {#if shiftKey} - - - - {:else} - {#if func?.meta?.manifest?.funding_url ?? false} - - - - {/if} - - + {#if func?.meta?.manifest?.funding_url ?? false} + + {/if} - { - goto(`/workspace/functions/edit?id=${encodeURIComponent(func.id)}`); - }} - shareHandler={() => { - shareHandler(func); - }} - cloneHandler={() => { - cloneHandler(func); - }} - exportHandler={() => { - exportHandler(func); - }} - deleteHandler={async () => { + + - - {/if} + + + + + + + { + goto(`/workspace/functions/edit?id=${encodeURIComponent(func.id)}`); + }} + shareHandler={() => { + shareHandler(func); + }} + cloneHandler={() => { + cloneHandler(func); + }} + exportHandler={() => { + exportHandler(func); + }} + deleteHandler={async () => { + selectedFunction = func; + showDeleteConfirm = true; + }} + toggleGlobalHandler={() => { + if (['filter', 'action'].includes(func.type)) { + toggleGlobalHandler(func); + } + }} + onClose={() => {}} + > + +
diff --git a/src/lib/components/workspace/Tools.svelte b/src/lib/components/workspace/Tools.svelte index fbbaa8878f90c014e85c88eb54faa3aaad6b1a50..8ea5ec582e086ed74bffcbe70fb3fde5e808f63b 100644 --- a/src/lib/components/workspace/Tools.svelte +++ b/src/lib/components/workspace/Tools.svelte @@ -24,12 +24,9 @@ import ManifestModal from './common/ManifestModal.svelte'; import Heart from '../icons/Heart.svelte'; import DeleteConfirmDialog from '$lib/components/common/ConfirmDialog.svelte'; - import GarbageBin from '../icons/GarbageBin.svelte'; const i18n = getContext('i18n'); - let shiftKey = false; - let toolsImportInputElement: HTMLInputElement; let importFiles; @@ -110,34 +107,6 @@ tools.set(await getTools(localStorage.token)); } }; - - onMount(() => { - const onKeyDown = (event) => { - if (event.key === 'Shift') { - shiftKey = true; - } - }; - - const onKeyUp = (event) => { - if (event.key === 'Shift') { - shiftKey = false; - } - }; - - const onBlur = () => { - shiftKey = false; - }; - - window.addEventListener('keydown', onKeyDown); - window.addEventListener('keyup', onKeyUp); - window.addEventListener('blur', onBlur); - - return () => { - window.removeEventListener('keydown', onKeyDown); - window.removeEventListener('keyup', onKeyUp); - window.removeEventListener('blur', onBlur); - }; - }); @@ -237,92 +206,78 @@
- {#if shiftKey} - - - - {:else} - {#if tool?.meta?.manifest?.funding_url ?? false} - - - - {/if} - - + {#if tool?.meta?.manifest?.funding_url ?? false} + + {/if} - { - goto(`/workspace/tools/edit?id=${encodeURIComponent(tool.id)}`); - }} - shareHandler={() => { - shareHandler(tool); - }} - cloneHandler={() => { - cloneHandler(tool); - }} - exportHandler={() => { - exportHandler(tool); - }} - deleteHandler={async () => { + + - - {/if} + + + + + + + { + goto(`/workspace/tools/edit?id=${encodeURIComponent(tool.id)}`); + }} + shareHandler={() => { + shareHandler(tool); + }} + cloneHandler={() => { + cloneHandler(tool); + }} + exportHandler={() => { + exportHandler(tool); + }} + deleteHandler={async () => { + selectedTool = tool; + showDeleteConfirm = true; + }} + onClose={() => {}} + > + +
{/each} diff --git a/src/lib/i18n/locales/ar-BH/translation.json b/src/lib/i18n/locales/ar-BH/translation.json index b46cead0b26c9dd33ea5172d704b52dd90fa6644..b06fdbc34b5acdb077491acdfd200ae434b6cd58 100644 --- a/src/lib/i18n/locales/ar-BH/translation.json +++ b/src/lib/i18n/locales/ar-BH/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "مفتاح واجهة برمجة تطبيقات PSE من Google", "Google PSE Engine Id": "معرف محرك PSE من Google", "h:mm a": "الساعة:الدقائق صباحا/مساء", - "Haptic Feedback": "", "has no conversations.": "ليس لديه محادثات.", "Hello, {{name}}": " {{name}} مرحبا", "Help": "مساعدة", diff --git a/src/lib/i18n/locales/bg-BG/translation.json b/src/lib/i18n/locales/bg-BG/translation.json index bce098db399f10388c29d93cd7a57823a7e9e603..f1c97729b35b03c17da342a414dba3496da245a6 100644 --- a/src/lib/i18n/locales/bg-BG/translation.json +++ b/src/lib/i18n/locales/bg-BG/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API ключ", "Google PSE Engine Id": "Идентификатор на двигателя на Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "няма разговори.", "Hello, {{name}}": "Здравей, {{name}}", "Help": "Помощ", diff --git a/src/lib/i18n/locales/bn-BD/translation.json b/src/lib/i18n/locales/bn-BD/translation.json index 6852eda77a0d3472f3d11faf93188bd30bf5f5cc..53f84215e2da1ecc6104bfd7e3f933f65cf66d0f 100644 --- a/src/lib/i18n/locales/bn-BD/translation.json +++ b/src/lib/i18n/locales/bn-BD/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "গুগল পিএসই এপিআই কী", "Google PSE Engine Id": "গুগল পিএসই ইঞ্জিন আইডি", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "কোন কনভার্সেশন আছে না।", "Hello, {{name}}": "হ্যালো, {{name}}", "Help": "সহায়তা", diff --git a/src/lib/i18n/locales/ca-ES/translation.json b/src/lib/i18n/locales/ca-ES/translation.json index b96a3e5e361e30f6d81c60f307c1f4081d383539..38ca0874707562d4866a3777d0a5ad386480d0e8 100644 --- a/src/lib/i18n/locales/ca-ES/translation.json +++ b/src/lib/i18n/locales/ca-ES/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Clau API PSE de Google", "Google PSE Engine Id": "Identificador del motor PSE de Google", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "no té converses.", "Hello, {{name}}": "Hola, {{name}}", "Help": "Ajuda", diff --git a/src/lib/i18n/locales/ceb-PH/translation.json b/src/lib/i18n/locales/ceb-PH/translation.json index 2e19d2afb4e45901facf63a3a0205638266683ea..1c3c1ebad5dbbdb7c85f72db936c22722f48b01f 100644 --- a/src/lib/i18n/locales/ceb-PH/translation.json +++ b/src/lib/i18n/locales/ceb-PH/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "", "Google PSE Engine Id": "", "h:mm a": "", - "Haptic Feedback": "", "has no conversations.": "", "Hello, {{name}}": "Maayong buntag, {{name}}", "Help": "", diff --git a/src/lib/i18n/locales/de-DE/translation.json b/src/lib/i18n/locales/de-DE/translation.json index 2cff4ab67cfb50e38616d3ce0271d3afa71dd81f..04f19d995d494e9a0ecd1810d74c0372a38e4856 100644 --- a/src/lib/i18n/locales/de-DE/translation.json +++ b/src/lib/i18n/locales/de-DE/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE-API-Schlüssel", "Google PSE Engine Id": "Google PSE-Engine-ID", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "hat keine Unterhaltungen.", "Hello, {{name}}": "Hallo, {{name}}", "Help": "Hilfe", diff --git a/src/lib/i18n/locales/dg-DG/translation.json b/src/lib/i18n/locales/dg-DG/translation.json index 4617186d19f247e4e3519b91315e0638c0f0adb2..f8ab13929b991a5c6383e5b3849776d264030640 100644 --- a/src/lib/i18n/locales/dg-DG/translation.json +++ b/src/lib/i18n/locales/dg-DG/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "", "Google PSE Engine Id": "", "h:mm a": "", - "Haptic Feedback": "", "has no conversations.": "", "Hello, {{name}}": "Much helo, {{name}}", "Help": "", diff --git a/src/lib/i18n/locales/en-GB/translation.json b/src/lib/i18n/locales/en-GB/translation.json index d4d131c1167ea6922190ba7331d98fc7dd15e339..b5459f0d3b878d313b5024ceee2292b95b7075f5 100644 --- a/src/lib/i18n/locales/en-GB/translation.json +++ b/src/lib/i18n/locales/en-GB/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "", "Google PSE Engine Id": "", "h:mm a": "", - "Haptic Feedback": "", "has no conversations.": "", "Hello, {{name}}": "", "Help": "", diff --git a/src/lib/i18n/locales/en-US/translation.json b/src/lib/i18n/locales/en-US/translation.json index d4d131c1167ea6922190ba7331d98fc7dd15e339..b5459f0d3b878d313b5024ceee2292b95b7075f5 100644 --- a/src/lib/i18n/locales/en-US/translation.json +++ b/src/lib/i18n/locales/en-US/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "", "Google PSE Engine Id": "", "h:mm a": "", - "Haptic Feedback": "", "has no conversations.": "", "Hello, {{name}}": "", "Help": "", diff --git a/src/lib/i18n/locales/es-ES/translation.json b/src/lib/i18n/locales/es-ES/translation.json index 4c922efc401f6751d7102a983461ce3bbf53ed3b..8dbedbc11584214f6afd8ae44e6429fd96117375 100644 --- a/src/lib/i18n/locales/es-ES/translation.json +++ b/src/lib/i18n/locales/es-ES/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Clave API de Google PSE", "Google PSE Engine Id": "ID del motor PSE de Google", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "no tiene conversaciones.", "Hello, {{name}}": "Hola, {{name}}", "Help": "Ayuda", diff --git a/src/lib/i18n/locales/fa-IR/translation.json b/src/lib/i18n/locales/fa-IR/translation.json index ad9f3f11a6e19529c39252579f98bed168700175..c0b36aed4c96ae0df2eecc059cad8b7b5b1bff36 100644 --- a/src/lib/i18n/locales/fa-IR/translation.json +++ b/src/lib/i18n/locales/fa-IR/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "گوگل PSE API کلید", "Google PSE Engine Id": "شناسه موتور PSE گوگل", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "ندارد.", "Hello, {{name}}": "سلام، {{name}}", "Help": "کمک", diff --git a/src/lib/i18n/locales/fi-FI/translation.json b/src/lib/i18n/locales/fi-FI/translation.json index b606da3bcb5348526044666aa978d6f79e7403c8..0c05fb2eb5db52f9127ec7630929d3d310259f14 100644 --- a/src/lib/i18n/locales/fi-FI/translation.json +++ b/src/lib/i18n/locales/fi-FI/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API -avain", "Google PSE Engine Id": "Google PSE -moduulin tunnus", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "ei ole keskusteluja.", "Hello, {{name}}": "Terve, {{name}}", "Help": "Apua", diff --git a/src/lib/i18n/locales/fr-CA/translation.json b/src/lib/i18n/locales/fr-CA/translation.json index 911a9561d31fb3d9ebd9c399500982617bb0b5d8..6f1b57352f42ce4ea3ae0b34f885c79b25b78354 100644 --- a/src/lib/i18n/locales/fr-CA/translation.json +++ b/src/lib/i18n/locales/fr-CA/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Clé API Google PSE", "Google PSE Engine Id": "ID du moteur de recherche personnalisé de Google", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "n'a aucune conversation.", "Hello, {{name}}": "Bonjour, {{name}}.", "Help": "Aide", diff --git a/src/lib/i18n/locales/fr-FR/translation.json b/src/lib/i18n/locales/fr-FR/translation.json index c3cb2c210463d6cc2de8693eefc80f0e1dda24f6..2898e7114c7e9d3e3094cce7328ef1565e838329 100644 --- a/src/lib/i18n/locales/fr-FR/translation.json +++ b/src/lib/i18n/locales/fr-FR/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Clé API Google PSE", "Google PSE Engine Id": "ID du moteur de recherche personnalisé de Google", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "n'a aucune conversation.", "Hello, {{name}}": "Bonjour, {{name}}.", "Help": "Aide", diff --git a/src/lib/i18n/locales/he-IL/translation.json b/src/lib/i18n/locales/he-IL/translation.json index 8c1f0c3a39682ce46a01a80eb15cfef4edae6ec7..b46a7ac76045ac8fbf49b2e3718f5e8b39db597e 100644 --- a/src/lib/i18n/locales/he-IL/translation.json +++ b/src/lib/i18n/locales/he-IL/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "מפתח API של Google PSE", "Google PSE Engine Id": "מזהה מנוע PSE של Google", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "אין שיחות.", "Hello, {{name}}": "שלום, {{name}}", "Help": "עזרה", diff --git a/src/lib/i18n/locales/hi-IN/translation.json b/src/lib/i18n/locales/hi-IN/translation.json index 1bf914e99209fdc7afa4a50ecb1c7cd8d5b4b971..2086c071689eb138e990effb00091b284cc5e3c3 100644 --- a/src/lib/i18n/locales/hi-IN/translation.json +++ b/src/lib/i18n/locales/hi-IN/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API कुंजी", "Google PSE Engine Id": "Google PSE इंजन आईडी", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "कोई बातचीत नहीं है", "Hello, {{name}}": "नमस्ते, {{name}}", "Help": "मदद", diff --git a/src/lib/i18n/locales/hr-HR/translation.json b/src/lib/i18n/locales/hr-HR/translation.json index ec8260a33eb289e3f9de3baf7d6b83ab37010c96..10b717ba09525ab5568bd9c4a47c3644282a5ff9 100644 --- a/src/lib/i18n/locales/hr-HR/translation.json +++ b/src/lib/i18n/locales/hr-HR/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API ključ", "Google PSE Engine Id": "ID Google PSE modula", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "nema razgovora.", "Hello, {{name}}": "Bok, {{name}}", "Help": "Pomoć", diff --git a/src/lib/i18n/locales/id-ID/translation.json b/src/lib/i18n/locales/id-ID/translation.json index 9a8a3939b1ce58b54beca15e319bbb4e651f4fb8..c08c9d5d30c852cee7729954cc3230b6cebb024c 100644 --- a/src/lib/i18n/locales/id-ID/translation.json +++ b/src/lib/i18n/locales/id-ID/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Kunci API Google PSE", "Google PSE Engine Id": "Id Mesin Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "tidak memiliki percakapan.", "Hello, {{name}}": "Halo, {{name}}", "Help": "Bantuan", diff --git a/src/lib/i18n/locales/it-IT/translation.json b/src/lib/i18n/locales/it-IT/translation.json index 301f9ab8c7e17e9c28c1888df5a5fb47591eed6e..46b47d73ab638826840c005ff9fffa84bbb87ecd 100644 --- a/src/lib/i18n/locales/it-IT/translation.json +++ b/src/lib/i18n/locales/it-IT/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Chiave API PSE di Google", "Google PSE Engine Id": "ID motore PSE di Google", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "non ha conversazioni.", "Hello, {{name}}": "Ciao, {{name}}", "Help": "Aiuto", diff --git a/src/lib/i18n/locales/ja-JP/translation.json b/src/lib/i18n/locales/ja-JP/translation.json index 73c53e8b8eeb161f5885b7db378a0d80d223bba8..694d49bccdff1e92ddb8458dccf04565d49734ca 100644 --- a/src/lib/i18n/locales/ja-JP/translation.json +++ b/src/lib/i18n/locales/ja-JP/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE APIキー", "Google PSE Engine Id": "Google PSE エンジン ID", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "対話はありません。", "Hello, {{name}}": "こんにちは、{{name}} さん", "Help": "ヘルプ", diff --git a/src/lib/i18n/locales/ka-GE/translation.json b/src/lib/i18n/locales/ka-GE/translation.json index aad8428f1fed1b7ad6d73d5c9a15e81ed864afa4..dda79a24cad4deb3bf36354ad05bde6dc0f0f2a6 100644 --- a/src/lib/i18n/locales/ka-GE/translation.json +++ b/src/lib/i18n/locales/ka-GE/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API გასაღები", "Google PSE Engine Id": "Google PSE ძრავის Id", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "არა უფლება ჩაწერა", "Hello, {{name}}": "გამარჯობა, {{name}}", "Help": "დახმარება", diff --git a/src/lib/i18n/locales/ko-KR/translation.json b/src/lib/i18n/locales/ko-KR/translation.json index 4bacd34f67bfc3f2c25700e8f5ccf5a12ec94125..5ba7589a3fad8ae65d272dab85348b2b888a5b57 100644 --- a/src/lib/i18n/locales/ko-KR/translation.json +++ b/src/lib/i18n/locales/ko-KR/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API 키", "Google PSE Engine Id": "Google PSE 엔진 ID", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "대화가 없습니다.", "Hello, {{name}}": "안녕하세요, {{name}}", "Help": "도움말", diff --git a/src/lib/i18n/locales/lt-LT/translation.json b/src/lib/i18n/locales/lt-LT/translation.json index 988001b088dbf87da032415d8448e16e16c5daf9..474cfd3ca9de0e2e0e499532dc6cbae5fc48e544 100644 --- a/src/lib/i18n/locales/lt-LT/translation.json +++ b/src/lib/i18n/locales/lt-LT/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API raktas", "Google PSE Engine Id": "Google PSE variklio ID", "h:mm a": "valanda:mėnesis:metai", - "Haptic Feedback": "", "has no conversations.": "neturi pokalbių", "Hello, {{name}}": "Sveiki, {{name}}", "Help": "Pagalba", diff --git a/src/lib/i18n/locales/ms-MY/translation.json b/src/lib/i18n/locales/ms-MY/translation.json index 61af48326510242598716eabb6bb95952d6f1ac2..31430338ffe96f2dcd71e598a0c56b07a81b4ac6 100644 --- a/src/lib/i18n/locales/ms-MY/translation.json +++ b/src/lib/i18n/locales/ms-MY/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Kunci API Google PSE", "Google PSE Engine Id": "ID Enjin Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "tidak mempunyai perbualan.", "Hello, {{name}}": "Hello, {{name}}", "Help": "Bantuan", diff --git a/src/lib/i18n/locales/nb-NO/translation.json b/src/lib/i18n/locales/nb-NO/translation.json index 0c30242f7349c450755a9fe4ddd6c2f021eb8f14..895605757da54f0c4b3e18f9184dbde537488c1e 100644 --- a/src/lib/i18n/locales/nb-NO/translation.json +++ b/src/lib/i18n/locales/nb-NO/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API-nøkkel", "Google PSE Engine Id": "Google PSE Motor-ID", "h:mm a": "t:mm a", - "Haptic Feedback": "", "has no conversations.": "har ingen samtaler.", "Hello, {{name}}": "Hei, {{name}}", "Help": "Hjelp", diff --git a/src/lib/i18n/locales/nl-NL/translation.json b/src/lib/i18n/locales/nl-NL/translation.json index 76fcc5cd550bac0dc4f11c2344ded2597bbe670a..3dcfd254c699d143b9d1e65c3d8e4a6eed11e828 100644 --- a/src/lib/i18n/locales/nl-NL/translation.json +++ b/src/lib/i18n/locales/nl-NL/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API-sleutel", "Google PSE Engine Id": "Google PSE-engine-ID", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "heeft geen gesprekken.", "Hello, {{name}}": "Hallo, {{name}}", "Help": "Help", diff --git a/src/lib/i18n/locales/pa-IN/translation.json b/src/lib/i18n/locales/pa-IN/translation.json index 3bcc3857acb73b046cc8aa2fa2ddb26542357a9c..cd5e801bbba054b2cbb35cf3204ada9b29c4f900 100644 --- a/src/lib/i18n/locales/pa-IN/translation.json +++ b/src/lib/i18n/locales/pa-IN/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API ਕੁੰਜੀ", "Google PSE Engine Id": "ਗੂਗਲ PSE ਇੰਜਣ ID", "h:mm a": "ਹ:ਮਿੰਟ ਪੂਃ", - "Haptic Feedback": "", "has no conversations.": "ਕੋਈ ਗੱਲਬਾਤ ਨਹੀਂ ਹੈ।", "Hello, {{name}}": "ਸਤ ਸ੍ਰੀ ਅਕਾਲ, {{name}}", "Help": "ਮਦਦ", diff --git a/src/lib/i18n/locales/pl-PL/translation.json b/src/lib/i18n/locales/pl-PL/translation.json index 30f24f0c0616a3d18e584ffc9d7b62cece13febe..f847fcb3d5c6f17fdcdfc4cbd630a0188bc73a4e 100644 --- a/src/lib/i18n/locales/pl-PL/translation.json +++ b/src/lib/i18n/locales/pl-PL/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Klucz API Google PSE", "Google PSE Engine Id": "Identyfikator silnika Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "nie ma rozmów.", "Hello, {{name}}": "Witaj, {{name}}", "Help": "Pomoc", diff --git a/src/lib/i18n/locales/pt-BR/translation.json b/src/lib/i18n/locales/pt-BR/translation.json index 8613335e82300603af62c5bc62ba26ed3a5812e2..4fc717d46f46967e6d507b0b87663bc71f8e186c 100644 --- a/src/lib/i18n/locales/pt-BR/translation.json +++ b/src/lib/i18n/locales/pt-BR/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Chave API do Google PSE", "Google PSE Engine Id": "ID do Motor do Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "não tem conversas.", "Hello, {{name}}": "Olá, {{name}}", "Help": "Ajuda", diff --git a/src/lib/i18n/locales/pt-PT/translation.json b/src/lib/i18n/locales/pt-PT/translation.json index ec93606edfdb0f8fc919c9903c644028aca598b0..3b132a14592f2ae3485868fee44595f628ede9b6 100644 --- a/src/lib/i18n/locales/pt-PT/translation.json +++ b/src/lib/i18n/locales/pt-PT/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Chave da API PSE do Google", "Google PSE Engine Id": "ID do mecanismo PSE do Google", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "não possui conversas.", "Hello, {{name}}": "Olá, {{name}}", "Help": "Ajuda", diff --git a/src/lib/i18n/locales/ro-RO/translation.json b/src/lib/i18n/locales/ro-RO/translation.json index 48ba05958061c0e12a93b10aa5e6eb2266dc2deb..d3c35a96f118e5c6bbdaa320213178104cfb8d02 100644 --- a/src/lib/i18n/locales/ro-RO/translation.json +++ b/src/lib/i18n/locales/ro-RO/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Cheie API Google PSE", "Google PSE Engine Id": "ID Motor Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "nu are conversații.", "Hello, {{name}}": "Salut, {{name}}", "Help": "Ajutor", diff --git a/src/lib/i18n/locales/ru-RU/translation.json b/src/lib/i18n/locales/ru-RU/translation.json index 5e7bd0a76f9e71bb1db99a9f38b771af96a58d65..7242a49d706a285a80ec7a9f15b0c1235f480898 100644 --- a/src/lib/i18n/locales/ru-RU/translation.json +++ b/src/lib/i18n/locales/ru-RU/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Ключ API Google PSE", "Google PSE Engine Id": "Идентификатор движка Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "не имеет разговоров.", "Hello, {{name}}": "Привет, {{name}}", "Help": "Помощь", diff --git a/src/lib/i18n/locales/sr-RS/translation.json b/src/lib/i18n/locales/sr-RS/translation.json index 509f394fd0d828f8a55849d51022a6b621ef4cd9..f303d8ddfde66e85d125ab961ce546058051dd93 100644 --- a/src/lib/i18n/locales/sr-RS/translation.json +++ b/src/lib/i18n/locales/sr-RS/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Гоогле ПСЕ АПИ кључ", "Google PSE Engine Id": "Гоогле ПСЕ ИД мотора", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "нема разговора.", "Hello, {{name}}": "Здраво, {{name}}", "Help": "Помоћ", diff --git a/src/lib/i18n/locales/sv-SE/translation.json b/src/lib/i18n/locales/sv-SE/translation.json index c2cce40746510f86e9937e776f8829904493f572..c36b467c0eda58b9479ba336d0b733dfc1534447 100644 --- a/src/lib/i18n/locales/sv-SE/translation.json +++ b/src/lib/i18n/locales/sv-SE/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API-nyckel", "Google PSE Engine Id": "Google PSE Engine Id", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "har inga samtal.", "Hello, {{name}}": "Hej, {{name}}", "Help": "Hjälp", diff --git a/src/lib/i18n/locales/th-TH/translation.json b/src/lib/i18n/locales/th-TH/translation.json index 0529daadd80e7dca7fce56ff70b2159be6660e2d..4aa557390dc062a9b666a3c3bf283b1cd643c43a 100644 --- a/src/lib/i18n/locales/th-TH/translation.json +++ b/src/lib/i18n/locales/th-TH/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "คีย์ API ของ Google PSE", "Google PSE Engine Id": "รหัสเครื่องยนต์ของ Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "ไม่มีการสนทนา", "Hello, {{name}}": "สวัสดี, {{name}}", "Help": "ช่วยเหลือ", diff --git a/src/lib/i18n/locales/tk-TW/translation.json b/src/lib/i18n/locales/tk-TW/translation.json index d4d131c1167ea6922190ba7331d98fc7dd15e339..b5459f0d3b878d313b5024ceee2292b95b7075f5 100644 --- a/src/lib/i18n/locales/tk-TW/translation.json +++ b/src/lib/i18n/locales/tk-TW/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "", "Google PSE Engine Id": "", "h:mm a": "", - "Haptic Feedback": "", "has no conversations.": "", "Hello, {{name}}": "", "Help": "", diff --git a/src/lib/i18n/locales/tr-TR/translation.json b/src/lib/i18n/locales/tr-TR/translation.json index 39eca84f8a2d9de483161b12a19b512c327c7bd2..e03b900a8d928b7e018e2facfa4d480ffa37d0d5 100644 --- a/src/lib/i18n/locales/tr-TR/translation.json +++ b/src/lib/i18n/locales/tr-TR/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API Anahtarı", "Google PSE Engine Id": "Google PSE Engine Id", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "hiç konuşması yok.", "Hello, {{name}}": "Merhaba, {{name}}", "Help": "Yardım", diff --git a/src/lib/i18n/locales/uk-UA/translation.json b/src/lib/i18n/locales/uk-UA/translation.json index b28b844c442539ac41a05ef199f8f842ba0bbf38..3434339051c3627ba0559af44ef67644f888aaa8 100644 --- a/src/lib/i18n/locales/uk-UA/translation.json +++ b/src/lib/i18n/locales/uk-UA/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Ключ API Google PSE", "Google PSE Engine Id": "Id рушія Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "не має розмов.", "Hello, {{name}}": "Привіт, {{name}}", "Help": "Допоможіть", diff --git a/src/lib/i18n/locales/vi-VN/translation.json b/src/lib/i18n/locales/vi-VN/translation.json index f58ed97865b2be9305ff6eea8670316f79250842..3fa692228c30b75e200d8429e7be15535d3e7a43 100644 --- a/src/lib/i18n/locales/vi-VN/translation.json +++ b/src/lib/i18n/locales/vi-VN/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Khóa API Google PSE", "Google PSE Engine Id": "ID công cụ Google PSE", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "không có hội thoại", "Hello, {{name}}": "Xin chào {{name}}", "Help": "Trợ giúp", diff --git a/src/lib/i18n/locales/zh-CN/translation.json b/src/lib/i18n/locales/zh-CN/translation.json index db002826efc7f4ed75648e170147710307a92717..2b61966aaa4bb5100d9e620b977d84807b193990 100644 --- a/src/lib/i18n/locales/zh-CN/translation.json +++ b/src/lib/i18n/locales/zh-CN/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API 密钥", "Google PSE Engine Id": "Google PSE 引擎 ID", "h:mm a": "HH:mm", - "Haptic Feedback": "", "has no conversations.": "没有对话。", "Hello, {{name}}": "您好，{{name}}", "Help": "帮助", diff --git a/src/lib/i18n/locales/zh-TW/translation.json b/src/lib/i18n/locales/zh-TW/translation.json index 241ffa6088d5bb4bdbbd0b535359dde9d5961695..fa917a657cbea68fa5f6acbe08864f4b5e802c04 100644 --- a/src/lib/i18n/locales/zh-TW/translation.json +++ b/src/lib/i18n/locales/zh-TW/translation.json @@ -314,7 +314,6 @@ "Google PSE API Key": "Google PSE API 金鑰", "Google PSE Engine Id": "Google PSE 引擎 ID", "h:mm a": "h:mm a", - "Haptic Feedback": "", "has no conversations.": "沒有對話。", "Hello, {{name}}": "您好，{{name}}", "Help": "說明", diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts index f3532773cf3d32bb0336c7d8e7f080ee281d4dc9..92c6acd8f6d2aac7a8d92da6da8d7d8c86bc63fb 100644 --- a/src/lib/utils/index.ts +++ b/src/lib/utils/index.ts @@ -23,6 +23,39 @@ const convertLatexToSingleLine = (content) => { return content; }; +export const sanitizeResponseContent = (content: string) => { + // replace single backslash with double backslash + content = content.replace(/\\\\/g, '\\\\\\\\'); + + content = convertLatexToSingleLine(content); + + // First, temporarily replace valid