From 227ec0cb74491d7b3fdb4981f31a9a54341642fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E9=B8=BF=E5=AE=87?= Date: Wed, 19 Feb 2025 17:58:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20ServicePool=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E7=BB=93=E6=9E=84=E3=80=81?= =?UTF-8?q?=E8=A1=A5=E5=85=A8=20API=20=E7=BC=BA=E5=A4=B1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史鸿宇 --- apps/entities/pool.py | 9 ++++----- apps/entities/response_data.py | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/entities/pool.py b/apps/entities/pool.py index b2f1e09a..9e2aece7 100644 --- a/apps/entities/pool.py +++ b/apps/entities/pool.py @@ -36,11 +36,10 @@ 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 文件哈希") class CallPool(PoolBase): diff --git a/apps/entities/response_data.py b/apps/entities/response_data.py index f7eff33b..733ee7c4 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="解析后的服务列表") -- Gitee From 01d882f13899faf802a10584a9e5dc54b557bba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E9=B8=BF=E5=AE=87?= Date: Thu, 20 Feb 2025 15:56:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=B8=B4=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A02=E4=B8=AA=E5=AD=97=E6=AE=B5=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史鸿宇 --- apps/entities/pool.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/entities/pool.py b/apps/entities/pool.py index 9e2aece7..750c7387 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 @@ -40,6 +40,7 @@ class ServicePool(PoolBase): 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): @@ -67,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={}) -- Gitee