mirror of
https://github.com/langgenius/dify.git
synced 2026-03-18 21:29:53 +08:00
Signed-off-by: majiayu000 <1835304752@qq.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com> Signed-off-by: -LAN- <laipz8200@outlook.com> Signed-off-by: yihong0618 <zouzou0208@gmail.com> Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com> Co-authored-by: 盐粒 Yanli <yanli@dify.ai> Co-authored-by: wangxiaolei <fatelei@gmail.com> Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Cursx <33718736+Cursx@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: lif <1835304752@qq.com> Co-authored-by: 非法操作 <hjlarry@163.com> Co-authored-by: Asuka Minato <i@asukaminato.eu.org> Co-authored-by: fenglin <790872612@qq.com> Co-authored-by: qiaofenglin <qiaofenglin@baidu.com> Co-authored-by: -LAN- <laipz8200@outlook.com> Co-authored-by: TomoOkuyama <49631611+TomoOkuyama@users.noreply.github.com> Co-authored-by: Tomo Okuyama <tomo.okuyama@intersystems.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: zyssyz123 <916125788@qq.com> Co-authored-by: hj24 <mambahj24@gmail.com> Co-authored-by: Coding On Star <447357187@qq.com> Co-authored-by: CodingOnStar <hanxujiang@dify.ai> Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com> Co-authored-by: Xiangxuan Qu <fghpdf@outlook.com> Co-authored-by: fghpdf <fghpdf@users.noreply.github.com> Co-authored-by: coopercoder <whitetiger0127@163.com> Co-authored-by: zhaiguangpeng <zhaiguangpeng@didiglobal.com> Co-authored-by: Junyan Qin (Chin) <rockchinq@gmail.com> Co-authored-by: E.G <146701565+GlobalStar117@users.noreply.github.com> Co-authored-by: GlobalStar117 <GlobalStar117@users.noreply.github.com> Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com> Co-authored-by: CodingOnStar <hanxujiang@dify.com> Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> Co-authored-by: heyszt <270985384@qq.com> Co-authored-by: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com> Co-authored-by: Yeuoly <45712896+Yeuoly@users.noreply.github.com> Co-authored-by: zxhlyh <jasonapring2015@outlook.com> Co-authored-by: moonpanda <chuanzegao@163.com> Co-authored-by: warlocgao <warlocgao@tencent.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: KVOJJJin <jzongcode@gmail.com> Co-authored-by: eux <euxx@users.noreply.github.com> Co-authored-by: bangjiehan <bangjiehan@gmail.com> Co-authored-by: FFXN <31929997+FFXN@users.noreply.github.com> Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com> Co-authored-by: Nie Ronghua <nieronghua@sf-express.com> Co-authored-by: JQSevenMiao <141806521+JQSevenMiao@users.noreply.github.com> Co-authored-by: jiasiqi <jiasiqi3@tal.com> Co-authored-by: Seokrin Taron Sung <sungsjade@gmail.com> Co-authored-by: CrabSAMA <40541269+CrabSAMA@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: yihong <zouzou0208@gmail.com> Co-authored-by: Joel <iamjoel007@gmail.com> Co-authored-by: Wu Tianwei <30284043+WTW0313@users.noreply.github.com> Co-authored-by: yessenia <yessenia.contact@gmail.com> Co-authored-by: Jax <anobaka@qq.com> Co-authored-by: niveshdandyan <155956228+niveshdandyan@users.noreply.github.com> Co-authored-by: OSS Contributor <oss-contributor@example.com> Co-authored-by: niveshdandyan <niveshdandyan@users.noreply.github.com> Co-authored-by: Sean Kenneth Doherty <Smaster7772@gmail.com>
142 lines
5.2 KiB
Python
142 lines
5.2 KiB
Python
from flask_restx import Resource, fields, marshal_with
|
|
from pydantic import BaseModel, Field
|
|
from sqlalchemy.orm import Session
|
|
|
|
from controllers.console.app.wraps import get_app_model
|
|
from controllers.console.wraps import (
|
|
account_initialization_required,
|
|
cloud_edition_billing_resource_check,
|
|
edit_permission_required,
|
|
setup_required,
|
|
)
|
|
from extensions.ext_database import db
|
|
from fields.app_fields import (
|
|
app_import_check_dependencies_fields,
|
|
app_import_fields,
|
|
leaked_dependency_fields,
|
|
)
|
|
from libs.login import current_account_with_tenant, login_required
|
|
from models.model import App
|
|
from services.app_dsl_service import AppDslService, ImportStatus
|
|
from services.enterprise.enterprise_service import EnterpriseService
|
|
from services.feature_service import FeatureService
|
|
|
|
from .. import console_ns
|
|
|
|
# Register models for flask_restx to avoid dict type issues in Swagger
|
|
# Register base model first
|
|
leaked_dependency_model = console_ns.model("LeakedDependency", leaked_dependency_fields)
|
|
|
|
app_import_model = console_ns.model("AppImport", app_import_fields)
|
|
|
|
# For nested models, need to replace nested dict with registered model
|
|
app_import_check_dependencies_fields_copy = app_import_check_dependencies_fields.copy()
|
|
app_import_check_dependencies_fields_copy["leaked_dependencies"] = fields.List(fields.Nested(leaked_dependency_model))
|
|
app_import_check_dependencies_model = console_ns.model(
|
|
"AppImportCheckDependencies", app_import_check_dependencies_fields_copy
|
|
)
|
|
|
|
DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
|
|
|
|
|
|
class AppImportPayload(BaseModel):
|
|
mode: str = Field(..., description="Import mode")
|
|
yaml_content: str | None = Field(None)
|
|
yaml_url: str | None = Field(None)
|
|
name: str | None = Field(None)
|
|
description: str | None = Field(None)
|
|
icon_type: str | None = Field(None)
|
|
icon: str | None = Field(None)
|
|
icon_background: str | None = Field(None)
|
|
app_id: str | None = Field(None)
|
|
|
|
|
|
console_ns.schema_model(
|
|
AppImportPayload.__name__, AppImportPayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
|
|
)
|
|
|
|
|
|
@console_ns.route("/apps/imports")
|
|
class AppImportApi(Resource):
|
|
@console_ns.expect(console_ns.models[AppImportPayload.__name__])
|
|
@setup_required
|
|
@login_required
|
|
@account_initialization_required
|
|
@marshal_with(app_import_model)
|
|
@cloud_edition_billing_resource_check("apps")
|
|
@edit_permission_required
|
|
def post(self):
|
|
# Check user role first
|
|
current_user, _ = current_account_with_tenant()
|
|
args = AppImportPayload.model_validate(console_ns.payload)
|
|
|
|
# Create service with session
|
|
with Session(db.engine) as session:
|
|
import_service = AppDslService(session)
|
|
# Import app
|
|
account = current_user
|
|
result = import_service.import_app(
|
|
account=account,
|
|
import_mode=args.mode,
|
|
yaml_content=args.yaml_content,
|
|
yaml_url=args.yaml_url,
|
|
name=args.name,
|
|
description=args.description,
|
|
icon_type=args.icon_type,
|
|
icon=args.icon,
|
|
icon_background=args.icon_background,
|
|
app_id=args.app_id,
|
|
)
|
|
session.commit()
|
|
if result.app_id and FeatureService.get_system_features().webapp_auth.enabled:
|
|
# update web app setting as private
|
|
EnterpriseService.WebAppAuth.update_app_access_mode(result.app_id, "private")
|
|
# Return appropriate status code based on result
|
|
status = result.status
|
|
if status == ImportStatus.FAILED:
|
|
return result.model_dump(mode="json"), 400
|
|
elif status == ImportStatus.PENDING:
|
|
return result.model_dump(mode="json"), 202
|
|
return result.model_dump(mode="json"), 200
|
|
|
|
|
|
@console_ns.route("/apps/imports/<string:import_id>/confirm")
|
|
class AppImportConfirmApi(Resource):
|
|
@setup_required
|
|
@login_required
|
|
@account_initialization_required
|
|
@marshal_with(app_import_model)
|
|
@edit_permission_required
|
|
def post(self, import_id):
|
|
# Check user role first
|
|
current_user, _ = current_account_with_tenant()
|
|
|
|
# Create service with session
|
|
with Session(db.engine) as session:
|
|
import_service = AppDslService(session)
|
|
# Confirm import
|
|
account = current_user
|
|
result = import_service.confirm_import(import_id=import_id, account=account)
|
|
session.commit()
|
|
|
|
# Return appropriate status code based on result
|
|
if result.status == ImportStatus.FAILED:
|
|
return result.model_dump(mode="json"), 400
|
|
return result.model_dump(mode="json"), 200
|
|
|
|
|
|
@console_ns.route("/apps/imports/<string:app_id>/check-dependencies")
|
|
class AppImportCheckDependenciesApi(Resource):
|
|
@setup_required
|
|
@login_required
|
|
@get_app_model
|
|
@account_initialization_required
|
|
@marshal_with(app_import_check_dependencies_model)
|
|
@edit_permission_required
|
|
def get(self, app_model: App):
|
|
with Session(db.engine) as session:
|
|
import_service = AppDslService(session)
|
|
result = import_service.check_dependencies(app_model=app_model)
|
|
|
|
return result.model_dump(mode="json"), 200
|