intellif-aihub 0.1.18__tar.gz → 0.1.20__tar.gz

{intellif_aihub-0.1.18 → intellif_aihub-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intellif-aihub
-Version: 0.1.18
+Version: 0.1.20
 Summary: Intellif AI-hub SDK.
 Author-email: Platform Team <aihub@example.com>
 License-Expression: Apache-2.0

{intellif_aihub-0.1.18 → intellif_aihub-0.1.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name            = "intellif-aihub"
-version = "0.1.18"
+version = "0.1.20"
 description     = "Intellif AI-hub SDK."
 readme          = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.9"

intellif_aihub-0.1.20/src/aihub/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.20"

intellif_aihub-0.1.20/src/aihub/models/eval.py

@@ -0,0 +1,68 @@
+# !/usr/bin/env python
+# -*-coding:utf-8 -*-
+from typing import Dict, List, Optional
+
+from pydantic import BaseModel, Field
+
+
+class CreateEvalReq(BaseModel):
+    """创建评测任务"""
+    dataset_id: int = Field(description="数据集ID")
+    dataset_version_id: int = Field(description="数据集版本ID")
+    prediction_artifact_path: str = Field(description="推理产物的路径")
+    evaled_artifact_path: str = Field(description="评测结果产物的路径")
+    run_id: str = Field(description="运行ID")
+    user_id: int = Field(0, description="用户ID")
+    report: Dict = Field(default_factory=dict, description="评测报告")
+
+
+class EvalRun(BaseModel):
+    """评测任务的运行实体"""
+    id: int = Field(description="评测的运行ID")
+    name: str = Field(description="评测名称")
+    description: str = Field(description="评测描述")
+    user_id: int = Field(description="用户ID")
+    model_id: int = Field(description="模型ID")
+    model_name: str = Field(description="模型名称")
+    dataset_id: int = Field(description="数据集ID")
+    dataset_version_id: int = Field(description="数据集版本ID")
+    dataset_name: str = Field(description="数据集名称")
+    status: str = Field(description="状态")
+    prediction_artifact_path: str = Field(description="推理产物路径")
+    evaled_artifact_path: str = Field(description="评测结果产物路径")
+    run_id: str = Field(description="运行ID")
+    dataset_summary: Dict = Field(default_factory=dict, description="数据集摘要")
+    metrics_summary: Dict = Field(default_factory=dict, description="指标摘要")
+    viz_summary: Dict = Field(default_factory=dict, description="可视化摘要")
+    eval_config: Optional[Dict] = Field(default=None, description="评测配置")
+    created_at: int = Field(description="创建时间")
+    updated_at: int = Field(description="更新时间")
+
+
+class CreateEvalResp(BaseModel):
+    """创建评测任务的返回结果"""
+    eval_run: EvalRun = Field(alias="eval_run", description="评测运行信息")
+
+
+class ListEvalReq(BaseModel):
+    """列出评测任务请求"""
+    page_size: int = Field(20, description="页面大小")
+    page_num: int = Field(1, description="页码")
+    status: Optional[str] = Field(None, description="状态过滤")
+    name: Optional[str] = Field(None, description="名称过滤")
+    model_id: Optional[int] = Field(None, description="模型ID过滤")
+    dataset_id: Optional[int] = Field(None, description="数据集ID过滤")
+    dataset_version_id: Optional[int] = Field(None, description="数据集版本ID过滤")
+    run_id: Optional[str] = Field(None, description="运行ID过滤")
+    user_id: Optional[int] = Field(None, description="用户ID过滤")
+    model_ids: Optional[str] = Field(None, description="模型ID列表过滤")
+    dataset_ids: Optional[str] = Field(None, description="数据集ID列表过滤")
+    dataset_version_ids: Optional[str] = Field(None, description="数据集版本ID列表过滤")
+
+
+class ListEvalResp(BaseModel):
+    """列出评测任务响应"""
+    total: int = Field(description="总数")
+    page_size: int = Field(description="页面大小")
+    page_num: int = Field(description="页码")
+    data: List[EvalRun] = Field(description="评测运行列表")

{intellif_aihub-0.1.18 → intellif_aihub-0.1.20}/src/aihub/models/labelfree.py

@@ -1,12 +1,29 @@
 from __future__ import annotations
 
+from enum import Enum
 from typing import Optional
 
 from pydantic import BaseModel, Field
 
 
+class LabelProjectStatus(Enum):
+    """标注状态"""
+
+    Pending = "pending"
+    """未开始"""
+    Loading = "loading"
+    """数据读取中"""
+    Error = "failed"
+    """数据读取异常"""
+    In_Progress = "ready"
+    """进行中"""
+    Finished = "finished"
+    """标注完成"""
+
+
 class Stats(BaseModel):
     """标注统计信息"""
+
     total_annotations: int = Field(alias="total_annotations", description="总数据量")
     labeled_annotations: int = Field(alias="labeled_annotations", description="已标注数据量")
     total_labels: int = Field(alias="total_labels", description="总标签量")
@@ -19,9 +36,12 @@ class Stats(BaseModel):
 
 class GetGlobalStatsResponse(BaseModel):
     """标注统计概况"""
+
     global_stats: Stats = Field(alias="global_stats")
     valid_ten_percent: bool = Field(alias="valid_ten_percent", description="是否完成验收10%")
     valid_fifty_percent: bool = Field(alias="valid_fifty_percent", description="是否完成验收50%")
     valid_hundred_percent: bool = Field(alias="valid_hundred_percent", description="是否完成验收100%")
     data_exported_count: int = Field(alias="data_exported_count", description="已导出数据次数")
     exported_dataset_name: str = Field(alias="exported_dataset_name", description="最新数据集名称")
+    status: LabelProjectStatus = Field(description="状态")
+    model_config = {"use_enum_values": True}

{intellif_aihub-0.1.18 → intellif_aihub-0.1.20}/src/aihub/models/task_center.py

@@ -138,8 +138,8 @@ class LabelValidateStage(Enum):
     """10%阶段"""
     FIFTY_PERCENT = "标注阶段（50%）"
     """50%阶段"""
-    HUNDRED_PERCENT = "标注阶段（100%）"
-    """100%阶段（已交付）"""
+    LABEL_FINISHED = "标注阶段（100%）"
+    """标注完成"""
 
 
 class LabelValidateReq(BaseModel):

intellif_aihub-0.1.20/src/aihub/services/eval.py

@@ -0,0 +1,140 @@
+# !/usr/bin/env python
+# -*- coding:utf-8 -*-
+"""评测平台服务模块
+
+本模块围绕 **“模型评测（Run → Report）”** 提供能力：
+
+- **创建评测任务 / 评测报告**
+- **获取评测任务列表**
+"""
+
+import httpx
+
+from ..exceptions import APIError
+from ..models.common import APIWrapper
+from ..models.eval import CreateEvalReq, CreateEvalResp, ListEvalReq, ListEvalResp
+
+_BASE = "/eval-platform/api/v1"
+
+
+class EvalService:
+    """评测服务"""
+
+    def __init__(self, http: httpx.Client):
+        self._http = http
+        self._eval = _Eval(http)
+
+    def create(
+        self,
+        dataset_version_name: str,
+        prediction_artifact_path: str,
+        evaled_artifact_path: str,
+        report_json: dict,
+        run_id,
+    ) -> int:
+        """创建评测报告
+
+        Args:
+            run_id (str): RUN ID
+            report_json (dict): 报告内容
+            evaled_artifact_path:   评测结果制品路径
+            prediction_artifact_path: 推理结果制品路径
+            dataset_version_name (str): 数据集名称
+
+
+        Returns:
+            id (int): 评测报告id
+
+        """
+        from .dataset_management import DatasetManagementService
+
+        dataset_service = DatasetManagementService(self._http)
+        dataset_version = dataset_service.get_dataset_version_by_name(
+            dataset_version_name
+        )
+        payload = CreateEvalReq(
+            dataset_id=dataset_version.dataset_id,
+            dataset_version_id=dataset_version.id,
+            evaled_artifact_path=evaled_artifact_path,
+            prediction_artifact_path=prediction_artifact_path,
+            report=report_json,
+            run_id=run_id,
+        )
+
+        return self._eval.create(payload)
+
+    def list(
+        self,
+        page_size: int = 20,
+        page_num: int = 1,
+        status: str = None,
+        name: str = None,
+        model_id: int = None,
+        dataset_id: int = None,
+        dataset_version_id: int = None,
+        run_id: str = None,
+        user_id: int = None,
+        model_ids: str = None,
+        dataset_ids: str = None,
+        dataset_version_ids: str = None,
+    ) -> ListEvalResp:
+        """列出评测结果
+
+        Args:
+            page_size (int): 页面大小，默认为20
+            page_num (int): 页码，默认为1
+            status (str, optional): 状态过滤
+            name (str, optional): 名称过滤
+            model_id (int, optional): 模型ID过滤
+            dataset_id (int, optional): 数据集ID过滤
+            dataset_version_id (int, optional): 数据集版本ID过滤
+            run_id (str, optional): 运行ID过滤
+            user_id (int, optional): 用户ID过滤
+            model_ids (str, optional): 模型ID列表过滤（逗号分隔）
+            dataset_ids (str, optional): 数据集ID列表过滤（逗号分隔）
+            dataset_version_ids (str, optional): 数据集版本ID列表过滤（逗号分隔）
+
+        Returns:
+            ListEvalResp: 评测结果列表响应
+        """
+        payload = ListEvalReq(
+            page_size=page_size,
+            page_num=page_num,
+            status=status,
+            name=name,
+            model_id=model_id,
+            dataset_id=dataset_id,
+            dataset_version_id=dataset_version_id,
+            run_id=run_id,
+            user_id=user_id,
+            model_ids=model_ids,
+            dataset_ids=dataset_ids,
+            dataset_version_ids=dataset_version_ids,
+        )
+
+        return self._eval.list(payload)
+
+
+class _Eval:
+    def __init__(self, http: httpx.Client):
+        self._http = http
+
+    def create(self, payload: CreateEvalReq) -> int:
+        resp = self._http.post(f"{_BASE}/run/", 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.eval_run.id
+
+    def list(self, payload: ListEvalReq) -> ListEvalResp:
+        # Build query parameters, excluding None values
+        params = {}
+        for field, value in payload.model_dump().items():
+            if value is not None:
+                params[field] = value
+
+        resp = self._http.get(f"{_BASE}/run/", params=params)
+        wrapper = APIWrapper[ListEvalResp].model_validate(resp.json())
+        if wrapper.code != 0:
+            raise APIError(f"backend code {wrapper.code}: {wrapper.msg}")
+        return wrapper.data

{intellif_aihub-0.1.18 → intellif_aihub-0.1.20}/src/intellif_aihub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intellif-aihub
-Version: 0.1.18
+Version: 0.1.20
 Summary: Intellif AI-hub SDK.
 Author-email: Platform Team <aihub@example.com>
 License-Expression: Apache-2.0

{intellif_aihub-0.1.18 → intellif_aihub-0.1.20}/src/intellif_aihub.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ tests/test_data_warehouse.py
 tests/test_dataset_management.py
 tests/test_di.py
 tests/test_document_center.py
+tests/test_eval.py
 tests/test_labelfree.py
 tests/test_model_center.py
 tests/test_model_training_platform.py

intellif_aihub-0.1.20/tests/test_eval.py

@@ -0,0 +1,184 @@
+# !/usr/bin/env python
+# -*-coding:utf-8 -*-
+import unittest
+import uuid
+from unittest.mock import Mock, patch
+
+import httpx
+
+from aihub.services.eval import EvalService
+from aihub.models.eval import ListEvalResp, EvalRun
+from aihub.models.common import APIWrapper
+
+BASE_URL = "http://192.168.13.160:30052"
+TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTI1NDQwNDksImlhdCI6MTc1MVkzOTI0OSwidWlkIjoyfQ.MfB_7LK5oR3RAhga3jtgcvJqYESeUPLbz8Bc_y3fouc"
+
+
+class TestEvalService(unittest.TestCase):
+
+    def setUp(self):
+        self.http_client = Mock(spec=httpx.Client)
+        self.eval_service = EvalService(self.http_client)
+
+    def test_list_eval_runs_default(self):
+        mock_eval_run = {
+            "id": 1,
+            "name": "test_eval",
+            "description": "Test evaluation",
+            "user_id": 1,
+            "model_id": 1,
+            "model_name": "test_model",
+            "dataset_id": 1,
+            "dataset_version_id": 1,
+            "dataset_name": "test_dataset",
+            "status": "completed",
+            "prediction_artifact_path": "/path/to/prediction",
+            "evaled_artifact_path": "/path/to/eval",
+            "run_id": "test_run_123",
+            "dataset_summary": {},
+            "metrics_summary": {"accuracy": 0.95},
+            "viz_summary": {},
+            "eval_config": {"metric": "accuracy"},
+            "created_at": 1640995200,
+            "updated_at": 1640995200
+        }
+
+        mock_response = {
+            "code": 0,
+            "msg": None,
+            "data": {
+                "total": 1,
+                "page_size": 20,
+                "page_num": 1,
+                "data": [mock_eval_run]
+            }
+        }
+
+        mock_resp = Mock()
+        mock_resp.json.return_value = mock_response
+        self.http_client.get.return_value = mock_resp
+
+        result = self.eval_service.list()
+
+        self.assertIsInstance(result, ListEvalResp)
+        self.assertEqual(result.total, 1)
+        self.assertEqual(result.page_size, 20)
+        self.assertEqual(result.page_num, 1)
+        self.assertEqual(len(result.data), 1)
+        self.assertEqual(result.data[0].id, 1)
+        self.assertEqual(result.data[0].name, "test_eval")
+
+        self.http_client.get.assert_called_once_with(
+            "/eval-platform/api/v1/run/",
+            params={"page_size": 20, "page_num": 1}
+        )
+
+    def test_list_eval_runs_with_filters(self):
+        mock_response = {
+            "code": 0,
+            "msg": None,
+            "data": {
+                "total": 0,
+                "page_size": 10,
+                "page_num": 1,
+                "data": []
+            }
+        }
+
+        mock_resp = Mock()
+        mock_resp.json.return_value = mock_response
+        self.http_client.get.return_value = mock_resp
+
+        # 带过滤参数
+        result = self.eval_service.list(
+            page_size=10,
+            page_num=1,
+            status="completed",
+            name="test",
+            model_id=1,
+            dataset_id=2,
+            dataset_version_id=3,
+            run_id="test_run",
+            user_id=1,
+            model_ids="1,2,3",
+            dataset_ids="2,3,4",
+            dataset_version_ids="3,4,5"
+        )
+
+        self.assertIsInstance(result, ListEvalResp)
+        self.assertEqual(result.total, 0)
+        self.assertEqual(len(result.data), 0)
+
+        expected_params = {
+            "page_size": 10,
+            "page_num": 1,
+            "status": "completed",
+            "name": "test",
+            "model_id": 1,
+            "dataset_id": 2,
+            "dataset_version_id": 3,
+            "run_id": "test_run",
+            "user_id": 1,
+            "model_ids": "1,2,3",
+            "dataset_ids": "2,3,4",
+            "dataset_version_ids": "3,4,5"
+        }
+        self.http_client.get.assert_called_once_with(
+            "/eval-platform/api/v1/run/",
+            params=expected_params
+        )
+
+    def test_list_eval_runs_api_error(self):
+        """测试列出评测运行 - API错误"""
+        # 模拟 API 错误
+        mock_response = {
+            "code": 1001,
+            "msg": "Database connection failed",
+            "data": None
+        }
+
+        mock_resp = Mock()
+        mock_resp.json.return_value = mock_response
+        self.http_client.get.return_value = mock_resp
+
+        with self.assertRaises(Exception) as context:
+            self.eval_service.list()
+
+        self.assertIn("backend code 1001", str(context.exception))
+        self.assertIn("Database connection failed", str(context.exception))
+
+    def test_list_eval_runs_only_specified_filters(self):
+        mock_response = {
+            "code": 0,
+            "msg": None,
+            "data": {
+                "total": 0,
+                "page_size": 20,
+                "page_num": 1,
+                "data": []
+            }
+        }
+
+        mock_resp = Mock()
+        mock_resp.json.return_value = mock_response
+        self.http_client.get.return_value = mock_resp
+
+        result = self.eval_service.list(
+            status="completed",
+            model_id=1
+        )
+
+        expected_params = {
+            "page_size": 20,
+            "page_num": 1,
+            "status": "completed",
+            "model_id": 1
+        }
+        self.http_client.get.assert_called_once_with(
+            "/eval-platform/api/v1/run/",
+            params=expected_params
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

{intellif_aihub-0.1.18 → intellif_aihub-0.1.20}/tests/test_task_center.py

@@ -12,14 +12,16 @@ TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjQ5MDY2ODUwODAsImlhdCI6MT
 
 class TestTaskCenter(unittest.TestCase):
     def test_create_label_task(self):
-        from src.aihub.models.task_center import LabelProjectTypeEnum
+        from src.aihub.models.task_center import LabelProjectTypeEnum, LabelValidateStage
         from src.aihub.client import Client
         from src.aihub.models.task_center import TaskCenterPriorityEnum
+        from src.aihub.models.labelfree import LabelProjectStatus
+        import time
 
         # 创建任务
         client = Client(base_url=BASE_URL, token=TOKEN)
         task_id = client.task_center.create_label_task(
-            name="test_task",
+            name="test_tas2k232",
             dataset_version_name="re/V1",
             feishu_doc_name="人脸质量人脸照片分类",
             task_receiver_name="hyc",
@@ -34,18 +36,24 @@ class TestTaskCenter(unittest.TestCase):
             # 获取任务信息
             task_item = client.task_center.get(task_id)
             # 使用sdkl
+            if not task_item.other_info.label_projects:
+                print("任务未完成，请稍后...")
+                time.sleep(5)
+                continue
             p = task_item.other_info.label_projects[0]
             label_stats = client.labelfree.get_project_global_stats(p.label_project_name)
             # 等待标注完成、完成100%验收、存在数据导出
-            if (
-                    (label_stats.global_stats.total_annotations == label_stats.global_stats.labeled_annotations)
-                and (label_stats.valid_hundred_percent)
-                and label_stats.data_exported_count != 0
-            ):
+            if label_stats.status == LabelProjectStatus.Finished and label_stats.data_exported_count != 0:
                 exported_dataset_name = label_stats.exported_dataset_name
+                client.task_center.validate_label_project(
+                    task_id, p.label_project_name, LabelValidateStage.LABEL_FINISHED, True
+                )
 
-                client.task_center.validate_label_project(task_id, {})
                 break
+            else:
+                print("任务未完成，请稍后...")
+                time.sleep(5)
+                continue
 
         # 下载数据
         client.dataset_management.run_download(exported_dataset_name, local_dir="./output")
@@ -56,4 +64,10 @@ class TestTaskCenter(unittest.TestCase):
         from src.aihub.models.task_center import LabelValidateStage
 
         client = Client(base_url=BASE_URL, token=TOKEN)
-        client.task_center.validate_label_project(1923, "project_893437", LabelValidateStage.HUNDRED_PERCENT, True)
+        client.task_center.validate_label_project(1923, "project_893437", LabelValidateStage.LABEL_FINISHED, True)
+
+    def test_get_label_project(self):
+        from src.aihub.client import Client
+
+        client = Client(base_url=BASE_URL, token=TOKEN)
+        client.labelfree.get_project_global_stats("project_889552")

intellif_aihub-0.1.18/src/aihub/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.18"

intellif_aihub-0.1.18/src/aihub/models/eval.py

@@ -1,26 +0,0 @@
-# !/usr/bin/env python
-# -*-coding:utf-8 -*-
-from typing import Dict
-
-from pydantic import BaseModel, Field
-
-
-class CreateEvalReq(BaseModel):
-    """创建评测任务"""
-    dataset_id: int = Field(description="数据集ID")
-    dataset_version_id: int = Field(description="数据集版本ID")
-    prediction_artifact_path: str = Field(description="推理产物的路径")
-    evaled_artifact_path: str = Field(description="评测结果产物的路径")
-    run_id: str = Field(description="运行ID")
-    user_id: int = Field(0, description="用户ID")
-    report: Dict = Field(default_factory=dict, description="评测报告")
-
-
-class EvalRun(BaseModel):
-    """评测任务的运行实体"""
-    id: int = Field(description="评测的运行ID")
-
-
-class CreateEvalResp(BaseModel):
-    """创建评测任务的返回结果"""
-    eval_run: EvalRun = Field(alias="eval_run", description="评测运行信息")

intellif_aihub-0.1.18/src/aihub/services/eval.py

@@ -1,75 +0,0 @@
-# !/usr/bin/env python
-# -*- coding:utf-8 -*-
-"""评测平台服务模块
-
-本模块围绕 **“模型评测（Run → Report）”** 提供能力：
-
-- **创建评测任务 / 评测报告**
-"""
-
-import httpx
-
-from ..exceptions import APIError
-from ..models.common import APIWrapper
-from ..models.eval import CreateEvalReq, CreateEvalResp
-
-_BASE = "/eval-platform/api/v1"
-
-
-class EvalService:
-    """评测服务"""
-
-    def __init__(self, http: httpx.Client):
-        self._http = http
-        self._eval = _Eval(http)
-
-    def create(
-        self,
-        dataset_version_name: str,
-        prediction_artifact_path: str,
-        evaled_artifact_path: str,
-        report_json: dict,
-        run_id,
-    ) -> int:
-        """创建评测报告
-
-        Args:
-            run_id (str): RUN ID
-            report_json (dict): 报告内容
-            evaled_artifact_path:   评测结果制品路径
-            prediction_artifact_path: 推理结果制品路径
-            dataset_version_name (str): 数据集名称
-
-
-        Returns:
-            id (int): 评测报告id
-
-        """
-        from .dataset_management import DatasetManagementService
-
-        dataset_service = DatasetManagementService(self._http)
-        dataset_version = dataset_service.get_dataset_version_by_name(
-            dataset_version_name
-        )
-        payload = CreateEvalReq(
-            dataset_id=dataset_version.dataset_id,
-            dataset_version_id=dataset_version.id,
-            evaled_artifact_path=evaled_artifact_path,
-            prediction_artifact_path=prediction_artifact_path,
-            report=report_json,
-            run_id=run_id,
-        )
-
-        return self._eval.create(payload)
-
-
-class _Eval:
-    def __init__(self, http: httpx.Client):
-        self._http = http
-
-    def create(self, payload: CreateEvalReq) -> int:
-        resp = self._http.post(f"{_BASE}/run/", 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.eval_run.id