[PR] 프록시 설정, 웹검색 부분 수정

backend/open_webui/config.py

@@ -822,6 +822,61 @@ def oidc_oauth_register(client):
     {},
 )
 
+####################################
+# UPSTAGE_API
+####################################
+
+ENABLE_UPSTAGE_API = PersistentConfig(
+    "ENABLE_UPSTAGE_API",
+    "upstage.enable",
+    os.environ.get("ENABLE_UPSTAGE_API", "True").lower() == "true",
+)
+
+UPSTAGE_API_KEY = os.environ.get("UPSTAGE_API_KEY", "")
+UPSTAGE_API_BASE_URL = os.environ.get("UPSTAGE_API_BASE_URL", "")
+
+
+if UPSTAGE_API_BASE_URL == "":
+    UPSTAGE_API_BASE_URL = "https://api.upstage.ai/v1"
+
+UPSTAGE_API_KEYS = os.environ.get("UPSTAGE_API_KEYS", "")
+UPSTAGE_API_KEYS = UPSTAGE_API_KEYS if UPSTAGE_API_KEYS != "" else UPSTAGE_API_KEY
+
+UPSTAGE_API_KEYS = [url.strip() for url in UPSTAGE_API_KEYS.split(";")]
+UPSTAGE_API_KEYS = PersistentConfig(
+    "UPSTAGE_API_KEYS", "upstage.api_keys", UPSTAGE_API_KEYS
+)
+
+UPSTAGE_API_BASE_URLS = os.environ.get("UPSTAGE_API_BASE_URLS", "")
+UPSTAGE_API_BASE_URLS = (
+    UPSTAGE_API_BASE_URLS if UPSTAGE_API_BASE_URLS != "" else UPSTAGE_API_BASE_URL
+)
+
+UPSTAGE_API_BASE_URLS = [
+    url.strip() if url != "" else "https://api.upstage.ai/v1"
+    for url in UPSTAGE_API_BASE_URLS.split(";")
+]
+UPSTAGE_API_BASE_URLS = PersistentConfig(
+    "UPSTAGE_API_BASE_URLS", "upstage.api_base_urls", UPSTAGE_API_BASE_URLS
+)
+
+UPSTAGE_API_CONFIGS = PersistentConfig(
+    "UPSTAGE_API_CONFIGS",
+    "upstage.api_configs",
+    {},
+)
+
+# Get the actual OpenAI API key based on the base URL
+UPSTAGE_API_KEY = ""
+try:
+    UPSTAGE_API_KEY = UPSTAGE_API_KEYS.value[
+        UPSTAGE_API_BASE_URLS.value.index("https://api.upstage.ai/v1")
+    ]
+except Exception:
+    pass
+UPSTAGE_API_BASE_URL = "https://api.upstage.ai/v1"
+
+
 ####################################
 # OPENAI_API
 ####################################
@@ -1827,7 +1882,8 @@ class BannerModel(BaseModel):
 RAG_EMBEDDING_MODEL = PersistentConfig(
     "RAG_EMBEDDING_MODEL",
     "rag.embedding_model",
-    os.environ.get("RAG_EMBEDDING_MODEL", "sentence-transformers/all-MiniLM-L6-v2"),
+    # os.environ.get("RAG_EMBEDDING_MODEL", "sentence-transformers/all-MiniLM-L6-v2"),
+    os.environ.get("RAG_EMBEDDING_MODEL", "embedding-passage"),
 )
 log.info(f"Embedding model set: {RAG_EMBEDDING_MODEL.value}")
 
@@ -1946,6 +2002,18 @@ class BannerModel(BaseModel):
     os.getenv("RAG_OPENAI_API_KEY", OPENAI_API_KEY),
 )
 
+
+RAG_UPSTAGE_API_BASE_URL = PersistentConfig(
+    "RAG_UPSTAGE_API_BASE_URL",
+    "rag.upstage_api_base_url",
+    os.getenv("RAG_UPSTAGE_API_BASE_URL", UPSTAGE_API_BASE_URL),
+)
+RAG_UPSTAGE_API_KEY = PersistentConfig(
+    "RAG_UPSTAGE_API_KEY",
+    "rag.upstage_api_key",
+    os.getenv("RAG_UPSTAGE_API_KEY", UPSTAGE_API_KEY),
+)
+
 RAG_OLLAMA_BASE_URL = PersistentConfig(
     "RAG_OLLAMA_BASE_URL",
     "rag.ollama.url",
@@ -2141,6 +2209,12 @@ class BannerModel(BaseModel):
     os.getenv("PERPLEXITY_API_KEY", ""),
 )
 
+DAUM_API_KEY = PersistentConfig(
+    "DAUM_API_KEY",
+    "rag.web.search.daum_api_key",
+    os.getenv("DAUM_API_KEY", ""),
+)
+
 RAG_WEB_SEARCH_RESULT_COUNT = PersistentConfig(
     "RAG_WEB_SEARCH_RESULT_COUNT",
     "rag.web.search.result_count",

backend/open_webui/env.py

@@ -88,6 +88,7 @@
     "MODELS",
     "OLLAMA",
     "OPENAI",
+    "UPSTAGE",
     "RAG",
     "WEBHOOK",
     "SOCKET",

backend/open_webui/main.py

@@ -76,6 +76,7 @@
     tools,
     users,
     utils,
+    upstage,
 )
 
 from open_webui.routers.retrieval import (
@@ -103,6 +104,11 @@
     OPENAI_API_BASE_URLS,
     OPENAI_API_KEYS,
     OPENAI_API_CONFIGS,
+    # Upstage
+    ENABLE_UPSTAGE_API,
+    UPSTAGE_API_KEYS,
+    UPSTAGE_API_BASE_URLS,
+    UPSTAGE_API_CONFIGS,
     # Direct Connections
     ENABLE_DIRECT_CONNECTIONS,
     # Tool Server Configs
@@ -184,6 +190,8 @@
     RAG_FILE_MAX_SIZE,
     RAG_OPENAI_API_BASE_URL,
     RAG_OPENAI_API_KEY,
+    RAG_UPSTAGE_API_BASE_URL,
+    RAG_UPSTAGE_API_KEY,
     RAG_OLLAMA_BASE_URL,
     RAG_OLLAMA_API_KEY,
     CHUNK_OVERLAP,
@@ -225,6 +233,7 @@
     BRAVE_SEARCH_API_KEY,
     EXA_API_KEY,
     PERPLEXITY_API_KEY,
+    DAUM_API_KEY,
     KAGI_SEARCH_API_KEY,
     MOJEEK_SEARCH_API_KEY,
     BOCHA_SEARCH_API_KEY,
@@ -481,6 +490,20 @@ async def lifespan(app: FastAPI):
 
 app.state.OPENAI_MODELS = {}
 
+
+########################################
+#
+# UPSTAGE
+#
+########################################
+
+app.state.config.ENABLE_UPSTAGE_API = ENABLE_UPSTAGE_API
+app.state.config.UPSTAGE_API_BASE_URLS = UPSTAGE_API_BASE_URLS
+app.state.config.UPSTAGE_API_KEYS = UPSTAGE_API_KEYS
+app.state.config.UPSTAGE_API_CONFIGS = UPSTAGE_API_CONFIGS
+
+app.state.UPSTAGE_MODELS = {}
+
 ########################################
 #
 # TOOL SERVERS
@@ -612,6 +635,9 @@ async def lifespan(app: FastAPI):
 app.state.config.RAG_OPENAI_API_BASE_URL = RAG_OPENAI_API_BASE_URL
 app.state.config.RAG_OPENAI_API_KEY = RAG_OPENAI_API_KEY
 
+app.state.config.RAG_UPSTAGE_API_BASE_URL = RAG_UPSTAGE_API_BASE_URL
+app.state.config.RAG_UPSTAGE_API_KEY = RAG_UPSTAGE_API_KEY
+
 app.state.config.RAG_OLLAMA_BASE_URL = RAG_OLLAMA_BASE_URL
 app.state.config.RAG_OLLAMA_API_KEY = RAG_OLLAMA_API_KEY
 
@@ -651,6 +677,7 @@ async def lifespan(app: FastAPI):
 app.state.config.BING_SEARCH_V7_SUBSCRIPTION_KEY = BING_SEARCH_V7_SUBSCRIPTION_KEY
 app.state.config.EXA_API_KEY = EXA_API_KEY
 app.state.config.PERPLEXITY_API_KEY = PERPLEXITY_API_KEY
+app.state.config.DAUM_API_KEY = DAUM_API_KEY
 
 app.state.config.RAG_WEB_SEARCH_RESULT_COUNT = RAG_WEB_SEARCH_RESULT_COUNT
 app.state.config.RAG_WEB_SEARCH_CONCURRENT_REQUESTS = RAG_WEB_SEARCH_CONCURRENT_REQUESTS
@@ -693,11 +720,15 @@ async def lifespan(app: FastAPI):
         app.state.config.RAG_OPENAI_API_BASE_URL
         if app.state.config.RAG_EMBEDDING_ENGINE == "openai"
         else app.state.config.RAG_OLLAMA_BASE_URL
+        if app.state.config.RAG_EMBEDDING_ENGINE == "ollama"
+        else app.state.config.RAG_UPSTAGE_API_BASE_URL
     ),
     (
         app.state.config.RAG_OPENAI_API_KEY
         if app.state.config.RAG_EMBEDDING_ENGINE == "openai"
         else app.state.config.RAG_OLLAMA_API_KEY
+        if app.state.config.RAG_EMBEDDING_ENGINE == "ollama"
+        else app.state.config.RAG_UPSTAGE_API_KEY
     ),
     app.state.config.RAG_EMBEDDING_BATCH_SIZE,
 )
@@ -917,6 +948,7 @@ async def inspect_websocket(request: Request, call_next):
 app.mount("/ws", socket_app)
 
 
+app.include_router(upstage.router, prefix="/upstage", tags=["upstage"])
 app.include_router(ollama.router, prefix="/ollama", tags=["ollama"])
 app.include_router(openai.router, prefix="/openai", tags=["openai"])
 

backend/open_webui/models/files.py

@@ -61,6 +61,7 @@ class FileMeta(BaseModel):
     name: Optional[str] = None
     content_type: Optional[str] = None
     size: Optional[int] = None
+    request_id: Optional[str] = None
 
     model_config = ConfigDict(extra="allow")