mcsmapi 0.2.0__tar.gz → 0.2.1__tar.gz

{mcsmapi-0.2.0 → mcsmapi-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcsmapi
-Version: 0.2.0
+Version: 0.2.1
 Summary: Shortcut the pypi package of MCSM./快捷操作MCSM的pypi包
 Author-email: sokoko-org <contact@sokoko.org>
 License-Expression: MIT

{mcsmapi-0.2.0 → mcsmapi-0.2.1}/mcsmapi/apis/instance.py

@@ -9,6 +9,7 @@ from mcsmapi.models.instance import (
     InstanceConfig,
     InstanceDeleteResult,
     BatchOperationDetail,
+    Status,
 )
 from mcsmapi.models.file import StreamChannelResult
 
@@ -26,7 +27,7 @@ class Instance:
         page: int = 1,
         page_size: int = 20,
         instance_name: str = "",
-        status: Literal[-1, 0, 1, 2, 3, ""] = "",
+        status: Status | Literal[""] = "",
         tag: list[str] | None = None,
     ) -> InstanceSearchList:
         """
@@ -60,7 +61,7 @@ class Instance:
         page: int = 1,
         page_size: int = 20,
         instance_name: str = "",
-        status: Literal[-1, 0, 1, 2, 3, ""] = "",
+        status: Status | Literal[""] = "",
     ) -> dict[str, Any]:
         """
         跨所有节点搜索实例

{mcsmapi-0.2.0 → mcsmapi-0.2.1}/mcsmapi/apis/overview.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import urllib.parse
 from typing import TYPE_CHECKING, Any
 from mcsmapi.pool import ApiPool
-from mcsmapi.models.overview import OverviewModel, LogDetail
+from mcsmapi.models.overview import OverviewModel, LogDetail, LogType, LogLevel, LogSearchResult
 
 if TYPE_CHECKING:
     from mcsmapi.request import Request
@@ -30,13 +30,13 @@ class Overview:
         self,
         page: int = 1,
         page_size: int = 20,
-        type: str | None = None,
-        level: str | None = None,
+        type: LogType | None = None,
+        level: LogLevel | None = None,
         operator_name: str | None = None,
         start_time: int | None = None,
         end_time: int | None = None,
         keyword: str | None = None,
-    ) -> dict[str, Any]:
+    ) -> LogSearchResult:
         """
         分页搜索操作日志
 
@@ -51,9 +51,9 @@ class Overview:
         """
         params: dict[str, Any] = {"page": page, "page_size": page_size}
         if type is not None:
-            params["type"] = type
+            params["type"] = type.value if isinstance(type, LogType) else type
         if level is not None:
-            params["level"] = level
+            params["level"] = level.value if isinstance(level, LogLevel) else level
         if operator_name is not None:
             params["operator_name"] = operator_name
         if start_time is not None:
@@ -62,7 +62,8 @@ class Overview:
             params["end_time"] = end_time
         if keyword is not None:
             params["keyword"] = keyword
-        return await self._req.send("GET", f"{ApiPool.LOG}/search", params=params)
+        result = await self._req.send("GET", f"{ApiPool.LOG}/search", params=params)
+        return LogSearchResult(**result)
 
     async def setting(self) -> dict[str, Any]:
         """获取面板配置项（管理员）"""

{mcsmapi-0.2.0 → mcsmapi-0.2.1}/mcsmapi/apis/user.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Literal
 from mcsmapi.pool import ApiPool
-from mcsmapi.models.user import SearchUserModel, UserCreateResult, UserInfo, LoginInfo, PanelStatus, UserOverviewItem
+from mcsmapi.models.user import SearchUserModel, UserCreateResult, UserInfo, LoginInfo, PanelStatus, UserOverviewItem, UserPermission
 
 if TYPE_CHECKING:
     from mcsmapi.request import Request
@@ -29,7 +29,7 @@ class User:
         username: str = "",
         page: int = 1,
         page_size: int = 20,
-        role: Literal[-1, 1, 10, ""] = "",
+        role: UserPermission | Literal[""] = "",
     ) -> SearchUserModel:
         """
         搜索用户（管理员）

{mcsmapi-0.2.0 → mcsmapi-0.2.1}/mcsmapi/models/daemon.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Literal
 from pydantic import BaseModel, ConfigDict, PrivateAttr
-from mcsmapi.models.instance import InstanceCreateResult, InstanceDetail, InstanceDeleteResult
+from mcsmapi.models.instance import InstanceCreateResult, InstanceDetail, InstanceDeleteResult, Status
 
 
 if TYPE_CHECKING:
@@ -28,7 +28,7 @@ class DaemonOperation(BaseModel):
         page: int = 1,
         page_size: int = 20,
         instance_name: str = "",
-        status: Literal[-1, 0, 1, 2, 3, ""] = "",
+        status: Status | Literal[""] = "",
     ) -> InstanceSearchList:
         """
         搜索当前节点的实例列表

{mcsmapi-0.2.0 → mcsmapi-0.2.1}/mcsmapi/models/overview.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Literal
 from pydantic import BaseModel
 from mcsmapi.models.common import CpuMemChart, InstanceStat, ProcessInfo
 
@@ -275,6 +274,18 @@ class LogType(Enum):
     """SSO 解绑"""
 
 
+
+class LogLevel(str, Enum):
+    """日志等级"""
+
+    INFO = "info"
+    """信息"""
+    WARNING = "warning"
+    """警告"""
+    ERROR = "error"
+    """错误"""
+
+
 class LogDetail(BaseModel):
     """操作日志详情"""
 
@@ -286,7 +297,7 @@ class LogDetail(BaseModel):
     """操作时间戳"""
     operator_ip: str
     """操作者IP"""
-    operation_level: Literal["info", "warning", "error", "unknown"]
+    operation_level: LogLevel
     """日志等级"""
     type: LogType
     """操作类型"""
@@ -302,3 +313,19 @@ class LogDetail(BaseModel):
     """被操作的文件"""
     task_name: str | None = None
     """任务名称"""
+
+
+class LogSearchResult(BaseModel):
+    """操作日志搜索结果"""
+
+    page: int
+    """当前页码"""
+    pageSize: int
+    """每页条数"""
+    maxPage: int
+    """最大页码"""
+    total: int
+    """总记录数"""
+    data: list[LogDetail]
+    """日志详情列表"""
+

{mcsmapi-0.2.0 → mcsmapi-0.2.1}/mcsmapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcsmapi
-Version: 0.2.0
+Version: 0.2.1
 Summary: Shortcut the pypi package of MCSM./快捷操作MCSM的pypi包
 Author-email: sokoko-org <contact@sokoko.org>
 License-Expression: MIT

{mcsmapi-0.2.0 → mcsmapi-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "mcsmapi"
-version = "0.2.0"
+version = "0.2.1"
 description = "Shortcut the pypi package of MCSM./快捷操作MCSM的pypi包"
 readme = "README.md"
 authors = [