Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/api/v1/admin_api/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from app.core.auth import verify_app_key
from app.core.config import config
from app.core.storage import get_storage, LocalStorage, RedisStorage, SQLStorage
from app.core.storage import get_storage as resolve_storage, LocalStorage, RedisStorage, SQLStorage

router = APIRouter()

Expand Down Expand Up @@ -33,11 +33,11 @@ async def update_config(data: dict):


@router.get("/storage", dependencies=[Depends(verify_app_key)])
async def get_storage():
async def get_storage_mode():
"""获取当前存储模式"""
storage_type = os.getenv("SERVER_STORAGE_TYPE", "").lower()
if not storage_type:
storage = get_storage()
storage = resolve_storage()
if isinstance(storage, LocalStorage):
storage_type = "local"
elif isinstance(storage, RedisStorage):
Expand Down
7 changes: 7 additions & 0 deletions app/services/grok/services/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,13 @@ async def completions(
continue

if transient_upstream(e):
has_alternative_token = False
for pool_name in ModelService.pool_candidates_for_model(model):
if token_mgr.get_token(pool_name, exclude=tried_tokens):
has_alternative_token = True
break
if not has_alternative_token:
raise
logger.warning(
f"Transient upstream error for token {token[:10]}..., "
f"trying next token (attempt {attempt + 1}/{max_token_retries}): {e}"
Expand Down
Loading