mcsmapi 0.1.8b2__tar.gz → 0.1.8b3__tar.gz

{mcsmapi-0.1.8b2 → mcsmapi-0.1.8b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcsmapi
-Version: 0.1.8b2
+Version: 0.1.8b3
 Summary: Shortcut the pypi package of MCSM./快捷操作MCSM的pypi包
 Author-email: molanp <molanpp@outlook.com>
 License-Expression: MIT
@@ -32,7 +32,7 @@ The documentation is not yet complete, if you need it, please visit [deepwiki-mc
 
 You can also find:  
 
-📄 Work-in-progress docs: [docs](https://mcsmapi.awkchan.top/en/)
+📄 Docs: [docs](https://mcsmapi.awkchan.top/en/)
 
 💡 Example: [example](example)
 

{mcsmapi-0.1.8b2 → mcsmapi-0.1.8b3}/README.md

@@ -16,7 +16,7 @@ The documentation is not yet complete, if you need it, please visit [deepwiki-mc
 
 You can also find:  
 
-📄 Work-in-progress docs: [docs](https://mcsmapi.awkchan.top/en/)
+📄 Docs: [docs](https://mcsmapi.awkchan.top/en/)
 
 💡 Example: [example](example)
 

{mcsmapi-0.1.8b2 → mcsmapi-0.1.8b3}/mcsmapi/apis/user.py

@@ -1,7 +1,7 @@
 from typing import Any, Literal
 from mcsmapi.pool import ApiPool
 from mcsmapi.request import send
-from mcsmapi.models.user import SearchUserModel, UserConfig, UserCreateResult
+from mcsmapi.models.user import SearchUserModel, UserCreateResult, UserModel
 
 
 class User:
@@ -60,14 +60,14 @@ class User:
         **不建议直接使用此函数，建议调用search后使用用户对象的update方法按需更新**
 
         :params uuid: 用户的UUID
-        :params config: 新的用户信息，以字典形式提供，缺失内容由 UserConfig 模型提供默认值
+        :params config: 新的用户信息，以字典形式提供，缺失内容由 UserModel 模型提供默认值
 
         :returns: 成功时返回True
         """
         return send(
             "PUT",
             ApiPool.AUTH,
-            data={"uuid": uuid, "config": UserConfig(**config).model_dump()},
+            data={"uuid": uuid, "config": UserModel(**config).model_dump()},
         )
 
     @staticmethod

{mcsmapi-0.1.8b2 → mcsmapi-0.1.8b3}/mcsmapi/models/daemon.py

@@ -29,10 +29,6 @@ class SystemInfo(BaseModel):
     """内存使用率"""
     totalmem: int
     """内存总量(单位: byte)"""
-    processCpu: int
-    """未知"""
-    processMem: int
-    """未知"""
 
 
 class DaemonSetting(BaseModel):
@@ -68,6 +64,7 @@ class DaemonSystemInfo(BaseModel):
     cpuMemChart: list[CpuMemChart] | None = None
     """cpu和内存使用趋势"""
     config: DaemonSetting
+    """节点系统配置信息"""
 
 
 class DaemonOperation(BaseModel):
@@ -155,6 +152,7 @@ class DaemonConfig(BaseModel):
 
 class DaemonStatus(DaemonOperation):
     """节点状态信息"""
+
     ip: str = "localhost"
     """远程节点的ip"""
     port: int = 24444
@@ -169,9 +167,13 @@ class DaemonStatus(DaemonOperation):
 
 class DaemonInfo(DaemonStatus):
     """节点信息"""
+
     instances: list[InstanceDetail]
+    """节点实例列表"""
 
 
 class DaemonUpdateConfig(DaemonConfig):
     """节点更新配置信息"""
+
     setting: DaemonSetting
+    """节点系统配置"""

{mcsmapi-0.1.8b2 → mcsmapi-0.1.8b3}/mcsmapi/models/instance.py

@@ -306,12 +306,3 @@ class InstanceSearchList(BaseModel):
                     if isinstance(instance, dict):
                         instance["daemonId"] = daemon_id
         return v
-
-
-class UserInstancesList(BaseModel):
-    """用户实例列表"""
-
-    instanceUuid: str = ""
-    """实例UUID"""
-    daemonId: str = ""
-    """所属的节点UUID"""

{mcsmapi-0.1.8b2 → mcsmapi-0.1.8b3}/mcsmapi/models/user.py

@@ -1,7 +1,6 @@
 from enum import IntEnum
 from typing import Any
 from pydantic import BaseModel
-from mcsmapi.models.instance import InstanceDetail, UserInstancesList
 
 
 class UserPermission(IntEnum):
@@ -12,6 +11,15 @@ class UserPermission(IntEnum):
     ADMIN = 10
 
 
+class UserInstances(BaseModel):
+    """用户实例信息"""
+
+    instanceUuid: str
+    """实例UUID"""
+    daemonId: str
+    """节点ID"""
+
+
 class UserCreateResult(BaseModel):
     """用户创建结果"""
 
@@ -26,32 +34,32 @@ class UserCreateResult(BaseModel):
 class UserModel(BaseModel):
     """用户信息模型"""
 
-    uuid: str
+    uuid: str = ""
     """用户UUID"""
-    userName: str
+    userName: str = ""
     """用户名"""
-    permission: UserPermission
+    loginTime: str = ""
+    """最后登录时间 (YYYY/M/D hh:mm:ss)"""
+    registerTime: str = ""
+    """注册时间 (YYYY/M/D hh:mm:ss)"""
+    instances: list[UserInstances] = []
+    """用户拥有的实例列表"""
+    permission: UserPermission = UserPermission.USER
     """用户权限级别"""
-    registerTime: str
-    """用户注册时间 (YYYY/M/D hh:mm:ss)"""
-    loginTime: str
-    """用户最后登录时间 (YYYY/M/D hh:mm:ss)"""
-    apiKey: str
-    """用户 API 密钥"""
-    open2FA: bool
+    passWord: str = ""
+    """用户密码"""
+    open2FA: bool = False
     """是否启用双因素认证 (2FA)"""
-    instances: list[UserInstancesList]
-    """用户关联的实例列表"""
-    isInit: bool
+    apiKey: str = ""
+    """用户 API 密钥"""
+    passWordType: int = 1
+    """密码类型 (已弃用)"""
+    isInit: bool = False
     """是否为初始化用户 (已弃用)"""
-    secret: str
+    secret: str = ""
     """用户安全密钥 (已弃用)"""
-    passWord: str
-    """用户密码 (已弃用)"""
-    passWordType: int
-    """密码类型 (已弃用)"""
-    salt: str
-    """密码盐值 (已弃用)"""
+    salt: str = ""
+    """用户密码盐值 (已弃用)"""
 
     def delete(self):
         """
@@ -73,9 +81,8 @@ class UserModel(BaseModel):
         """
         from mcsmapi.apis.user import User
 
-        updated_config = self.model_dump()
-        updated_config.update(config)
-        user_config = UserConfig(**updated_config).model_dump()
+        user_config = self.model_dump()
+        user_config.update(config)
 
         return User().update(self.uuid, user_config)
 
@@ -93,34 +100,3 @@ class SearchUserModel(BaseModel):
     """最大可用页数"""
     data: list[UserModel]
     """用户信息列表"""
-
-
-class UserConfig(BaseModel):
-    """用户配置信息"""
-
-    uuid: str = ""
-    """用户UUID"""
-    userName: str = ""
-    """用户名"""
-    loginTime: str = ""
-    """最后登录时间"""
-    registerTime: str = ""
-    """注册时间"""
-    instances: list[InstanceDetail] = []
-    """用户拥有的实例列表"""
-    permission: UserPermission = UserPermission.USER
-    """用户权限级别"""
-    passWord: str = ""
-    """用户密码"""
-    open2FA: bool = False
-    """是否启用双因素认证 (2FA)"""
-    apiKey: str = ""
-    """用户 API 密钥"""
-    passWordType: int = 1
-    """密码类型 (已弃用)"""
-    isInit: bool = False
-    """是否为初始化用户 (已弃用)"""
-    secret: str = ""
-    """用户安全密钥 (已弃用)"""
-    salt: str = ""
-    """用户密码盐值 (已弃用)"""

{mcsmapi-0.1.8b2 → mcsmapi-0.1.8b3}/mcsmapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcsmapi
-Version: 0.1.8b2
+Version: 0.1.8b3
 Summary: Shortcut the pypi package of MCSM./快捷操作MCSM的pypi包
 Author-email: molanp <molanpp@outlook.com>
 License-Expression: MIT
@@ -32,7 +32,7 @@ The documentation is not yet complete, if you need it, please visit [deepwiki-mc
 
 You can also find:  
 
-📄 Work-in-progress docs: [docs](https://mcsmapi.awkchan.top/en/)
+📄 Docs: [docs](https://mcsmapi.awkchan.top/en/)
 
 💡 Example: [example](example)
 

{mcsmapi-0.1.8b2 → mcsmapi-0.1.8b3}/pyproject.toml

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