youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-04 09:28:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(cli_api): implement CLI API for external sandbox interactions, including session management and request handling

Browse Source
This commit is contained in:
Harry
2026-01-12 20:57:07 +08:00
parent 42fd0a0a62
commit 16f26c4f99
21 changed files with 457 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/controllers/inner_api/plugin/wraps.py
View File

@ -7,7 +7,6 @@ from flask_login import user_logged_in
from pydantic import BaseModel
from sqlalchemy.orm import Session
from core.session.inner_api import InnerApiSession, InnerApiSessionManager
from extensions.ext_database import db
from libs.login import current_user
from models.account import Tenant
@ -75,18 +74,9 @@ def get_user(tenant_id: str, user_id: str | None) -> EndUser:
def get_user_tenant(view_func: Callable[P, R]):
@wraps(view_func)
def decorated_view(*args: P.args, **kwargs: P.kwargs):
session_id = request.headers.get("X-Inner-Api-Session-Id")
if session_id:
session: InnerApiSession | None = InnerApiSessionManager().get(session_id)
if not session:
raise ValueError("session not found")
user_id = session.user_id
tenant_id = session.tenant_id
else:
payload = TenantUserPayload.model_validate(request.get_json(silent=True) or {})
user_id = payload.user_id
tenant_id = payload.tenant_id
payload = TenantUserPayload.model_validate(request.get_json(silent=True) or {})
user_id = payload.user_id
tenant_id = payload.tenant_id
if not tenant_id:
raise ValueError("tenant_id is required")

16
api/controllers/inner_api/wraps.py
View File

@ -5,16 +5,15 @@ from hashlib import sha1
from hmac import new as hmac_new
from typing import ParamSpec, TypeVar
from core.session.inner_api import InnerApiSessionManager
P = ParamSpec("P")
R = TypeVar("R")
from flask import abort, request
from configs import dify_config
from extensions.ext_database import db
from models.model import EndUser
P = ParamSpec("P")
R = TypeVar("R")
def billing_inner_api_only(view: Callable[P, R]):
@wraps(view)
@ -87,19 +86,14 @@ def enterprise_inner_api_user_auth(view: Callable[P, R]):
def plugin_inner_api_only(view: Callable[P, R]):
@wraps(view)
def decorated(*args: P.args, **kwargs: P.kwargs):
# if session id is provided, using session id to validate
session_id = request.headers.get("X-Inner-Api-Session-Id")
if session_id and InnerApiSessionManager().exists(session_id):
return view(*args, **kwargs)
if not dify_config.PLUGIN_DAEMON_KEY:
abort(404)
# if inner api key is provided, using inner api key to validate
# validate using inner api key
inner_api_key = request.headers.get("X-Inner-Api-Key")
if inner_api_key and inner_api_key == dify_config.INNER_API_KEY_FOR_PLUGIN:
return view(*args, **kwargs)
abort(404)
abort(401)
return decorated