mcsmapi 0.1.2__tar.gz → 0.1.3__tar.gz

{mcsmapi-0.1.2 → mcsmapi-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mcsmapi
-Version: 0.1.2
+Version: 0.1.3
 Summary: Shortcut the pypi package of MCSM./快捷操作MCSM的pypi包
 Author-email: molanp <molanpp@outlook.com>
 Project-URL: Source, https://github.com/molanp/mcsmapi

{mcsmapi-0.1.2 → mcsmapi-0.1.3}/mcsmapi/__init__.py

@@ -7,7 +7,7 @@ from .apis.image import Image
 from .apis.daemon import Daemon
 from .apis.instance import Instance
 from .apis.overview import Overview
-from .request import Request, send
+from .request import Request
 
 
 class MCSMAPI:
@@ -21,7 +21,7 @@ class MCSMAPI:
 
     def login(self, username: str, password: str) -> "MCSMAPI":
         Request.set_token(
-            send(
+            Request.send(
                 "POST",
                 f"{ApiPool.AUTH}/login",
                 data={"username": username, "password": password},

{mcsmapi-0.1.2 → mcsmapi-0.1.3}/mcsmapi/models/daemon.py

@@ -43,7 +43,7 @@ class DaemonModel(BaseModel):
     cpuMemChart: List[CpuMemChart] = []
     uuid: str = ""
     ip: str = ""
-    port: str = ""
+    port: int = 24444
     prefix: str = ""
     available: bool = False
     remarks: str = ""

{mcsmapi-0.1.2 → mcsmapi-0.1.3}/mcsmapi/models/overview.py

@@ -23,7 +23,7 @@ class SystemInfo(BaseModel):
     loadavg: List[float] = []
     platform: str = ""
     release: str = ""
-    uptime: int = 0
+    uptime: float = 0
     cpu: float = 0
 
 

{mcsmapi-0.1.2 → mcsmapi-0.1.3}/mcsmapi/request.py

@@ -11,32 +11,34 @@ class Request:
     apikey = None
     token = None
 
-    @staticmethod
-    def set_mcsm_url(url):
+    @classmethod
+    def set_mcsm_url(cls, url):
         """设置类级别的 mcsm_url"""
-        Request.mcsm_url = url
+        cls.mcsm_url = url
 
-    @staticmethod
-    def set_timeout(timeout):
+    @classmethod
+    def set_timeout(cls, timeout):
         """设置类级别的 timeout"""
-        Request.timeout = timeout
+        cls.timeout = timeout
 
-    @staticmethod
-    def set_apikey(apikey):
+    @classmethod
+    def set_apikey(cls, apikey):
         """设置类级别的 apikey"""
-        Request.apikey = apikey
+        cls.apikey = apikey
 
-    @staticmethod
-    def set_token(token):
+    @classmethod
+    def set_token(cls, token):
         """设置类级别的 token"""
-        Request.token = token
+        cls.token = token
 
-    def __init__(self, mcsm_url=None, timeout=None):
+    @classmethod
+    def __init__(cls, mcsm_url=None, timeout=None):
         """初始化时使用类变量，或者使用传入的参数覆盖默认值"""
-        self.mcsm_url = mcsm_url or Request.mcsm_url
-        self.timeout = timeout or Request.timeout
+        cls.mcsm_url = mcsm_url or cls.mcsm_url
+        cls.timeout = timeout or cls.timeout
 
-    def send(self, method: str, endpoint: Any, params=None, data=None) -> Any:
+    @classmethod
+    def send(cls, method: str, endpoint: Any, params=None, data=None) -> Any:
         """发送 HTTP 请求"""
         if params is None:
             params = {}
@@ -45,20 +47,20 @@ class Request:
         if not isinstance(endpoint, str):
             endpoint = str(endpoint)
 
-        url = urllib.parse.urljoin(self.mcsm_url, endpoint)
-        if Request.apikey is not None:
-            params["apikey"] = Request.apikey
-            data["apikey"] = Request.apikey
-        if Request.token is not None:
-            params["token"] = Request.token
-            data["token"] = Request.token
+        url = urllib.parse.urljoin(cls.mcsm_url, endpoint)
+        if cls.apikey is not None:
+            params["apikey"] = cls.apikey
+            data["apikey"] = cls.apikey
+        if cls.token is not None:
+            params["token"] = cls.token
+            data["token"] = cls.token
 
-        response = Request.session.request(
+        response = cls.session.request(
             method.upper(),
             url,
             params=params,
             data=data,
-            timeout=self.timeout,
+            timeout=cls.timeout,
         )
         try:
             response.raise_for_status()
@@ -68,15 +70,16 @@ class Request:
                 response.status_code, response.json().get("data", response.text)
             ) from e
 
-    async def upload(self, url: str, file: bytes) -> bool:
+    @classmethod
+    async def upload(cls, url: str, file: bytes) -> bool:
         """上传文件"""
 
-        response = Request.session.request(
+        response = cls.session.request(
             "POST",
             url,
             headers={"Content-Type": "multipart/form-data"},
             files={"file": file},
-            timeout=self.timeout,
+            timeout=cls.timeout,
         )
         try:
             response.raise_for_status()

{mcsmapi-0.1.2 → mcsmapi-0.1.3}/mcsmapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mcsmapi
-Version: 0.1.2
+Version: 0.1.3
 Summary: Shortcut the pypi package of MCSM./快捷操作MCSM的pypi包
 Author-email: molanp <molanpp@outlook.com>
 Project-URL: Source, https://github.com/molanp/mcsmapi

{mcsmapi-0.1.2 → mcsmapi-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mcsmapi"
-version = "0.1.2"
+version = "0.1.3"
 description = "Shortcut the pypi package of MCSM./快捷操作MCSM的pypi包"
 readme = "README.md"
 authors = [

{mcsmapi-0.1.2 → mcsmapi-0.1.3}/test/test_overview_model.py

@@ -32,7 +32,7 @@ class TestOverviewModel(unittest.TestCase):
                 "loadavg": [0, 0, 0],
                 "platform": "win32",
                 "release": "10.0.22631",
-                "uptime": 905020,
+                "uptime": 905020.0,
                 "cpu": 0.11684482123110951,
             },
             "chart": {
@@ -67,7 +67,7 @@ class TestOverviewModel(unittest.TestCase):
                     "cpuMemChart": [{"cpu": 0, "mem": 13}],
                     "uuid": "957c6bddf379445c82bac5edf7684bbc",
                     "ip": "s1.example.com",
-                    "port": "24444",
+                    "port": 24444,
                     "prefix": "",
                     "available": True,
                     "remarks": "CN-ZJ-DEV-01",