Merge branch 'main' into feat/tool-plugin-oauth

# Conflicts:
#	api/core/plugin/impl/oauth.py
#	api/services/plugin/oauth_service.py
This commit is contained in:
Harry
2025-06-25 14:31:15 +08:00
44 changed files with 1620 additions and 219 deletions

View File

@ -1,6 +1,3 @@
import json
import uuid
from core.plugin.impl.base import BasePluginClient
from extensions.ext_redis import redis_client
@ -41,7 +38,6 @@ class OAuthProxyService(BasePluginClient):
)
return context_id
@staticmethod
def use_proxy_context(context_id, max_age=__MAX_AGE__):
"""