intellif-aihub 0.1.21__py3-none-any.whl → 0.1.23__py3-none-any.whl

aihub/models/model_center.py

@@ -1,112 +1,74 @@
 from __future__ import annotations
 
-from enum import IntEnum
 from typing import List, Optional
 
-from pydantic import BaseModel, Field, ConfigDict
+from pydantic import BaseModel, Field, ConfigDict, field_validator
 
 
-class User(BaseModel):
-    """用户"""
+class ListModelCard(BaseModel):
+    """模型卡片"""
 
-    id: int = Field(description="用户ID")
-    name: str = Field(description="用户名")
+    id: int = Field(alias="id", description="模型ID")
+    name: str = Field(alias="name", description="名称")
+    description: str = Field(alias="description", description="描述")
+    creator_id: int = Field(alias="creator_id", description="创建人ID")
+    creator_name: str = Field(alias="creator_name", description="创建人名称")
+    created_at: int = Field(alias="created_at", description="创建时间戳")
+    updated_at: int = Field(alias="updated_at", description="更新时间戳")
+    tags: List[int] = Field(default_factory=list, alias="tags", description="标签ID集合")
+    status: str = Field(alias="status", description="状态")
+    is_public: bool = Field(alias="is_public", description="是否公开")
 
+    @field_validator("tags", mode="before")
+    @classmethod
+    def _none_to_empty_list(cls, v):
+        return [] if v is None else v
 
-class ModelType(BaseModel):
-    """模型类型"""
-
-    id: int = Field(description="类型ID")
-    name: str = Field(description="类型名称")
+    model_config = ConfigDict(protected_namespaces=())
 
 
-class DeployPlatform(BaseModel):
-    """部署平台"""
+class ModelTreeNode(BaseModel):
+    """模型树节点"""
 
-    id: int = Field(description="部署平台ID")
-    name: str = Field(description="部署平台名称")
+    model_id: int = Field(alias="model_id", description="模型ID")
+    name: str = Field(alias="name", description="名称")
+    relationship: str = Field(alias="relationship", description="与基模型关系")
 
+    model_config = ConfigDict(protected_namespaces=())
 
-class QuantLevel(BaseModel):
-    """量化等级"""
 
-    id: int = Field(description="量化等级ID")
-    name: str = Field(description="量化等级名称")
+class ModelCardDetail(ListModelCard):
+    """模型卡片详情"""
 
+    readme_content: str = Field(alias="readme_content", description="README 内容")
+    model_tree: Optional[List[ModelTreeNode]] = Field(default=None, alias="model_tree", description="模型树")
+    base_model: Optional[ModelTreeNode] = Field(default=None, alias="base_model", description="基模型")
+    file_storage_path: Optional[str] = Field(alias="file_storage_path", description="文件存储路径")
 
-class ModelStatus(IntEnum):
-    """模型状态：1-Waiting；2-Creating；3-Success；4-Fail"""
-    Waiting = 1
-    Creating = 2
-    Success = 3
-    Fail = 4
+    model_config = ConfigDict(protected_namespaces=())
 
 
-class Model(BaseModel):
-    """模型详情"""
+class ModelDb(BaseModel):
+    """模型"""
 
-    id: int = Field(description="模型ID")
-    name: str = Field(description="模型名称")
+    id: int = Field(description="ID")
+    name: str = Field(description="名称")
     description: str = Field(description="描述")
-    model_type: ModelType = Field(alias="model_type", description="模型类型")
-    model_path: str = Field(alias="model_path", description="模型路径")
-    deploy_platform: DeployPlatform = Field(alias="deploy_platform", description="部署平台")
-    param_cnt: str = Field(alias="param_cnt", description="参数量")
-    quant_level: QuantLevel = Field(alias="quant_level", description="量化等级")
-    creator: User = Field(description="创建人")
-    status: ModelStatus = Field(description="模型状态")
-    created_at: int = Field(alias="created_at", description="创建时间戳 (ms)")
-    updated_at: int = Field(alias="updated_at", description="更新时间戳 (ms)")
-
-    model_config = ConfigDict(protected_namespaces=(), use_enum_values=True)
-
-
-class ListModelTypesRequest(BaseModel):
-    """查询模型类型列表请求"""
-
-    page_size: int = Field(999, alias="page_size", description="每页数量")
-    page_num: int = Field(1, alias="page_num", description="当前页码")
-
-
-class ListModelTypesResponse(BaseModel):
-    """查询模型类型列表返回"""
-
-    total: int = Field(description="总条数")
-    page_size: int = Field(alias="page_size", description="每页数量")
-    page_num: int = Field(alias="page_num", description="当前页码")
-    data: List[ModelType] = Field(default_factory=list, description="类型列表")
-
-
-class ListDeployPlatformsRequest(BaseModel):
-    """查询部署平台列表请求"""
-
-    page_size: int = Field(999, alias="page_size", description="每页数量")
-    page_num: int = Field(1, alias="page_num", description="当前页码")
-
-
-class ListDeployPlatformsResponse(BaseModel):
-    """查询部署平台列表返回"""
-
-    total: int = Field(description="总条数")
-    page_size: int = Field(alias="page_size", description="每页数量")
-    page_num: int = Field(alias="page_num", description="当前页码")
-    data: List[DeployPlatform] = Field(default_factory=list, description="平台列表")
-
-
-class ListQuantLevelsRequest(BaseModel):
-    """查询量化等级列表请求"""
-
-    page_size: int = Field(999, alias="page_size", description="每页数量")
-    page_num: int = Field(1, alias="page_num", description="当前页码")
-
-
-class ListQuantLevelsResponse(BaseModel):
-    """查询量化等级列表返回"""
-
-    total: int = Field(description="总条数")
-    page_size: int = Field(alias="page_size", description="每页数量")
-    page_num: int = Field(alias="page_num", description="当前页码")
-    data: List[QuantLevel] = Field(default_factory=list, description="量化等级列表")
+    readme_content: str = Field(alias="readme_content", description="README")
+    user_id: int = Field(alias="user_id", description="创建人ID")
+    status: str = Field(description="状态")
+    is_public: bool = Field(alias="is_public", description="是否公开")
+    base_model_id: int = Field(alias="base_model_id", description="基模型ID")
+    relation: str = Field(description="与基模型关系")
+    object_cnt: int = Field(alias="object_cnt", description="对象数量")
+    data_size: int = Field(alias="data_size", description="数据大小")
+    object_storage_path: str = Field(alias="object_storage_path", description="对象存储路径")
+    file_storage_path: str = Field(alias="file_storage_path", description="文件存储路径")
+    parquet_index_path: str = Field(alias="parquet_index_path", description="Parquet 索引路径")
+    csv_file_path: str = Field(alias="csv_file_path", description="CSV 文件路径")
+    task_status_s3_path: str = Field(alias="task_status_s3_path", description="任务状态S3路径")
+    created_at: int = Field(alias="created_at", description="创建时间戳")
+    updated_at: int = Field(alias="updated_at", description="更新时间戳")
 
 
 class ListModelsRequest(BaseModel):
@@ -114,46 +76,53 @@ class ListModelsRequest(BaseModel):
 
     page_size: int = Field(20, alias="page_size", description="每页数量")
     page_num: int = Field(1, alias="page_num", description="当前页码")
-    name: Optional[str] = Field(None, description="名称过滤")
+    name: Optional[str] = Field(default=None, alias="name", description="名称过滤")
+    tags: Optional[str] = Field(default=None, alias="tags", description="标签过滤")
+    model_ids: Optional[str] = Field(default=None, alias="model_ids", description="模型ID过滤")
+
+    model_config = ConfigDict(protected_namespaces=())
 
 
 class ListModelsResponse(BaseModel):
     """查询模型列表返回"""
 
-    total: int = Field(description="总条数")
+    total: int = Field(alias="total", description="总条数")
     page_size: int = Field(alias="page_size", description="每页数量")
     page_num: int = Field(alias="page_num", description="当前页码")
-    data: List[Model] = Field(default_factory=list, description="模型列表")
+    data: List[ListModelCard] = Field(default_factory=list, alias="data", description="模型卡片列表")
+
+    model_config = ConfigDict(protected_namespaces=())
+
+
+class GetModelRequest(BaseModel):
+    """查询模型详情请求"""
+
+    id: int = Field(alias="id", description="模型ID")
 
 
 class CreateModelRequest(BaseModel):
     """创建模型请求"""
 
-    name: str = Field(description="模型名称")
-    description: Optional[str] = Field(None, description="描述")
-    model_type_id: int = Field(alias="model_type_id", description="模型类型ID")
-    model_path: Optional[str] = Field(None, alias="model_path", description="模型路径")
-    deploy_platform_id: Optional[int] = Field(None, alias="deploy_platform_id", description="部署平台ID")
-    param_cnt: Optional[str] = Field(None, alias="param_cnt", description="参数量")
-    quant_level_id: Optional[int] = Field(None, alias="quant_level_id", description="量化等级ID")
-    model_config = ConfigDict(protected_namespaces=())
+    name: str = Field(alias="name", description="名称")
+    description: Optional[str] = Field(default=None, alias="description", description="描述")
+    tags: Optional[str] = Field(default=None, alias="tags", description="标签")
+    is_public: bool = Field(alias="is_public", description="是否公开")
+    readme_content: Optional[str] = Field(default=None, description="README 文本内容")
 
 
 class CreateModelResponse(BaseModel):
-    """创建模型返回"""
-
-    id: int = Field(description="模型ID")
+    id: int = Field(alias="id", description="模型ID")
 
 
 class EditModelRequest(BaseModel):
     """编辑模型请求"""
 
-    id: int = Field(description="模型ID")
-    name: str = Field(description="模型名称")
-    description: Optional[str] = Field(None, description="描述")
-    model_type_id: int = Field(alias="model_type_id", description="模型类型ID")
-    model_path: Optional[str] = Field(None, alias="model_path", description="模型路径")
-    deploy_platform_id: Optional[int] = Field(None, alias="deploy_platform_id", description="部署平台ID")
-    param_cnt: Optional[str] = Field(None, alias="param_cnt", description="参数量")
-    quant_level_id: Optional[int] = Field(None, alias="quant_level_id", description="量化等级ID")
-    model_config = ConfigDict(protected_namespaces=())
+    name: Optional[str] = Field(default=None, alias="name", description="名称")
+    description: Optional[str] = Field(default=None, alias="description", description="描述")
+    is_public: Optional[bool] = Field(default=None, alias="is_public", description="是否公开")
+
+
+class EditModelResponse(BaseModel):
+    """编辑模型返回"""
+
+    pass

aihub/models/task_center.py

@@ -42,6 +42,7 @@ class CreateTaskOtherInfo(BaseModel):
     doc_type: str = Field(alias="doc_type", default="doc_center", description="文档类型")
 
     model_config = {"use_enum_values": True}
+    auto_valid_interval: int = Field(3, description="自动验收间隔")
 
 
 class ProjectInfo(BaseModel):

aihub/models/user_system.py

@@ -328,7 +328,7 @@ class SearchUsersResponse(BaseModel):
     total: int = Field(description="总数")
     page_size: int = Field(alias="page_size", description="单页条数")
     page_num: int = Field(alias="page_num", description="当前页")
-    data: List[User] = Field(description="用户列表")
+    data: Optional[List[User]] = Field(description="用户列表")
 
 
 # 此行放在文件末尾，否则序列化报错

aihub/services/eval.py

@@ -7,12 +7,21 @@
 - **创建评测任务 / 评测报告**
 - **获取评测任务列表**
 """
+from typing import List
 
 import httpx
 
 from ..exceptions import APIError
 from ..models.common import APIWrapper
-from ..models.eval import CreateLLMEvalReq, CreateCVEvalReq, CreateEvalResp, ListEvalReq, ListEvalResp
+from ..models.eval import (
+    CreateLLMEvalReq,
+    CreateCVEvalReq,
+    CreateEvalResp,
+    ListEvalReq,
+    ListEvalResp,
+    GrantPermissionReq,
+    ClientType,
+)
 
 _BASE = "/eval-platform/api/v1"
 
@@ -32,16 +41,20 @@ class EvalService:
         report_json: dict,
         run_id,
         user_id: int = 0,
+        is_public: bool = False,
+        access_user_ids: List[int] = None,
     ) -> int:
         """创建评测报告
 
         Args:
+            is_public (bool): 是否公开
             run_id (str): RUN ID
             report_json (dict): 报告内容
             evaled_artifact_path:   评测结果制品路径
             prediction_artifact_path: 推理结果制品路径
             dataset_version_name (str): 数据集名称
             user_id (int, optional): 用户ID，默认为0
+            access_user_ids (list): 授权访问的用户id
 
         Returns:
             id (int): 评测报告id
@@ -50,9 +63,7 @@ class EvalService:
         from .dataset_management import DatasetManagementService
 
         dataset_service = DatasetManagementService(self._http)
-        dataset_version = dataset_service.get_dataset_version_by_name(
-            dataset_version_name
-        )
+        dataset_version = dataset_service.get_dataset_version_by_name(dataset_version_name)
         payload = CreateLLMEvalReq(
             dataset_id=dataset_version.dataset_id,
             dataset_version_id=dataset_version.id,
@@ -61,9 +72,15 @@ class EvalService:
             report=report_json,
             run_id=run_id,
             user_id=user_id,
+            is_public=is_public,
+            type="llm",
+            client_type=ClientType.Workflow,
         )
+        resp = self._eval.create(payload)
+        if is_public is False and access_user_ids:
+            self.grant_permission(user_ids=access_user_ids, run_id=resp)
 
-        return self._eval.create(payload)
+        return resp
 
     def create_cv_run(
         self,
@@ -72,16 +89,21 @@ class EvalService:
         metrics_artifact_path: str,
         ground_truth_artifact_path: str,
         user_id: int = 0,
+        is_public: bool = False,
+        access_user_ids: List[int] = None,
     ) -> int:
         """创建 CV 类型评测运行
-        
+
         Args:
+            access_user_ids: 授权访问的用户ID
+            is_public (bool): 是否公开
             run_id (str): 运行ID
             prediction_artifact_path (str): 推理产物的路径
             metrics_artifact_path (str): 指标产物的路径
             ground_truth_artifact_path (str): 真实标签产物的路径
             user_id (int, optional): 用户ID，默认为0
-            
+            access_user_ids (list): 授权访问的用户id
+
         Returns:
             id (int): 评测运行id
         """
@@ -91,9 +113,15 @@ class EvalService:
             metrics_artifact_path=metrics_artifact_path,
             ground_truth_artifact_path=ground_truth_artifact_path,
             user_id=user_id,
+            is_public=is_public,
+            type="cv",
+            client_type=ClientType.Workflow,
         )
-        
-        return self._eval.create(payload)
+        resp = self._eval.create(payload)
+        if is_public is False and access_user_ids:
+            self.grant_permission(user_ids=access_user_ids, run_id=resp)
+
+        return resp
 
     def list(
         self,
@@ -146,6 +174,21 @@ class EvalService:
 
         return self._eval.list(payload)
 
+    def grant_permission(self, user_ids: List[int], run_id: int):
+        """授权访问
+
+        Args:
+            user_ids (list): 授权信息
+            run_id (int): 任务ID
+
+        Returns:
+            dict: 授权信息
+        """
+        req = GrantPermissionReq(
+            user_ids=user_ids,
+        )
+        return self._eval.grant_permission(req, run_id)
+
 
 class _Eval:
     def __init__(self, http: httpx.Client):
@@ -158,6 +201,13 @@ class _Eval:
             raise APIError(f"backend code {wrapper.code}: {wrapper.msg}")
         return wrapper.data.eval_run.id
 
+    def grant_permission(self, payload, task_id):
+        resp = self._http.post(f"{_BASE}/run/{task_id}/permissions", json=payload.model_dump())
+        wrapper = APIWrapper[CreateEvalResp].model_validate(resp.json())
+        if wrapper.code != 0:
+            raise APIError(f"backend code {wrapper.code}: {wrapper.msg}")
+        return wrapper.data
+
     def list(self, payload: ListEvalReq) -> ListEvalResp:
         # Build query parameters, excluding None values
         params = {}