diff --git a/apps/entities/pool.py b/apps/entities/pool.py index b2f1e09a315ea4975c1286d2e921e8313bf02c1c..750c7387ec7b467c73fd45bc94603b04482e70dd 100644 --- a/apps/entities/pool.py +++ b/apps/entities/pool.py @@ -4,7 +4,7 @@ Copyright (c) Huawei Technologies Co., Ltd. 2023-2024. All rights reserved. """ import uuid from datetime import datetime, timezone -from typing import Any +from typing import Any, Optional from pydantic import BaseModel, Field @@ -36,11 +36,11 @@ class ServicePool(PoolBase): collection: service """ - author: str - api: list[ServiceApiInfo] = Field(description="API信息列表", default=[]) - permission: Permission = Field(description="用户与服务的权限关系", default=Permission()) - favorites: list[str] = Field(description="收藏此应用的用户列表", default=[]) - hashes: dict[str, str] = Field(description="关联文件的hash值;Service作为整体更新或删除", default={}) + author: str = Field(description="作者的用户ID") + permission: Permission = Field(description="服务可见性配置", default=Permission()) + favorites: list[str] = Field(description="收藏此服务的用户列表", default=[]) + openapi_hash: str = Field(description="服务关联的 OpenAPI YAML 文件哈希") + openapi_spec: dict = Field(description="服务关联的 OpenAPI 文件内容") class CallPool(PoolBase): @@ -68,6 +68,7 @@ class NodePool(PoolBase): id: str = Field(description="Node的ID", default_factory=lambda: str(uuid.uuid4()), alias="_id") service_id: str = Field(description="Node所属的Service ID") call_id: str = Field(description="所使用的Call的ID") + api_path: Optional[str] = Field(description="Call的API路径", default=None) params_schema: dict[str, Any] = Field(description="Node的参数schema;只包含用户可以改变的参数", default={}) output_schema: dict[str, Any] = Field(description="Node的输出schema;做输出的展示用", default={}) diff --git a/apps/entities/response_data.py b/apps/entities/response_data.py index f7eff33b51e4cf20e35edfff022dbc04117eeaff..733ee7c41a67b4643b11803778e509705b615f0b 100644 --- a/apps/entities/response_data.py +++ b/apps/entities/response_data.py @@ -347,6 +347,8 @@ class BaseServiceOperationMsg(BaseModel): class GetServiceListMsg(BaseModel): """GET /api/service Result数据结构""" + current_page: int = Field(..., alias="currentPage", description="当前页码") + total_count: int = Field(..., alias="totalCount", description="总服务数") services: list[ServiceCardItem] = Field(..., description="解析后的服务列表")