opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-10 14:14:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

pub

Browse Source
This commit is contained in:
Asuka Minato 2026-05-08 20:50:11 +09:00
parent e3259a4ec2
commit 5a9143d572
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/dev/generate_fastopenapi_specs.py
View File

@ -13,7 +13,7 @@ API_ROOT = Path(__file__).resolve().parents[1]
if str(API_ROOT) not in sys.path:
sys.path.insert(0, str(API_ROOT))
from dev.generate_swagger_specs import _apply_runtime_defaults, _drop_null_values, _sort_swagger_arrays
from dev.generate_swagger_specs import apply_runtime_defaults, drop_null_values, sort_openapi_arrays
logger = logging.getLogger(__name__)
@ -32,7 +32,7 @@ FASTOPENAPI_SPEC_TARGETS: tuple[FastOpenApiSpecTarget, ...] = (
def create_fastopenapi_spec_app():
"""Build a minimal Flask app that only mounts FastOpenAPI docs routes."""
_apply_runtime_defaults()
apply_runtime_defaults()
from app_factory import create_flask_app_with_configs
from extensions import ext_fastopenapi
@ -59,8 +59,8 @@ def generate_fastopenapi_specs(output_dir: Path) -> list[Path]:
payload = response.get_json()
if not isinstance(payload, dict):
raise RuntimeError(f"unexpected response payload for {target.route}")
payload = _drop_null_values(payload)
payload = _sort_swagger_arrays(payload)
payload = drop_null_values(payload)
payload = sort_openapi_arrays(payload)
output_path = output_dir / target.filename
output_path.write_text(json.dumps(payload, indent=2, sort_keys=True) + "\n", encoding="utf-8")

20
api/dev/generate_swagger_specs.py
View File

@ -136,7 +136,7 @@ def _inline_model_name(nested_fields: dict[object, object]) -> str:
return f"_AnonymousInlineModel_{digest}"
def _apply_runtime_defaults() -> None:
def apply_runtime_defaults() -> None:
"""Force the small config surface required for Swagger generation."""
os.environ.setdefault("SECRET_KEY", "spec-export")
@ -200,7 +200,7 @@ def _patch_swagger_for_inline_nested_dicts() -> None:
def create_spec_app() -> Flask:
"""Build a minimal Flask app that only mounts the Swagger-producing blueprints."""
_apply_runtime_defaults()
apply_runtime_defaults()
_patch_swagger_for_inline_nested_dicts()
app = Flask(__name__)
@ -313,25 +313,25 @@ def _materialize_inline_model_definitions(api: RestxApi) -> None:
materialize_field(field)
def _drop_null_values(value: object) -> object:
def drop_null_values(value: object) -> object:
"""Remove JSON null values that make the Markdown converter crash."""
if isinstance(value, dict):
return {key: _drop_null_values(item) for key, item in value.items() if item is not None}
return {key: drop_null_values(item) for key, item in value.items() if item is not None}
if isinstance(value, list):
return [_drop_null_values(item) for item in value]
return [drop_null_values(item) for item in value]
return value
def _sort_swagger_arrays(value: object, *, parent_key: str | None = None) -> object:
def sort_openapi_arrays(value: object, *, parent_key: str | None = None) -> object:
"""Sort order-insensitive Swagger arrays so generated Markdown is stable."""
if isinstance(value, dict):
return {key: _sort_swagger_arrays(item, parent_key=key) for key, item in value.items()}
return {key: sort_openapi_arrays(item, parent_key=key) for key, item in value.items()}
if not isinstance(value, list):
return value
sorted_items = [_sort_swagger_arrays(item, parent_key=parent_key) for item in value]
sorted_items = [sort_openapi_arrays(item, parent_key=parent_key) for item in value]
if parent_key == "parameters":
return sorted(
sorted_items,
@ -381,8 +381,8 @@ def generate_specs(output_dir: Path) -> list[Path]:
if not isinstance(payload, dict):
raise RuntimeError(f"unexpected response payload for {target.route}")
payload = _merge_registered_definitions(payload, target.namespace)
payload = _drop_null_values(payload)
payload = _sort_swagger_arrays(payload)
payload = drop_null_values(payload)
payload = sort_openapi_arrays(payload)
output_path = output_dir / target.filename
output_path.write_text(json.dumps(payload, indent=2, sort_keys=True) + "\n", encoding="utf-8")