tinytoolslib 0.3.4__tar.gz → 0.4.1__tar.gz

{tinytoolslib-0.3.4 → tinytoolslib-0.4.1}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: tinytoolslib
-Version: 0.3.4
+Version: 0.4.1
 Summary: Set of tools for use with Tinycontrol devices like LK2.X, LK3.X, LK4.X or tcPDU.
 Author-email: Bartek Barszczewski <tinycontrol.software@gmail.com>
+License-Expression: Apache-2.0
 Keywords: tinycontrol,lk,tcpdu
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: aiohttp<4,>=3.9.3

{tinytoolslib-0.3.4 → tinytoolslib-0.4.1}/pyproject.toml

@@ -4,16 +4,16 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tinytoolslib"
-version = "0.3.4"
+version = "0.4.1"
 authors = [
     { name="Bartek Barszczewski", email="tinycontrol.software@gmail.com" },
 ]
+license = "Apache-2.0"
 description = "Set of tools for use with Tinycontrol devices like LK2.X, LK3.X, LK4.X or tcPDU."
 requires-python = ">=3.7"
 classifiers = [
    "Programming Language :: Python :: 3",
    "Operating System :: OS Independent",
-   "License :: OSI Approved :: Apache Software License",
 ]
 dependencies = [
    "aiohttp >= 3.9.3, < 4",

tinytoolslib-0.4.1/tinytoolslib/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.4.1'

{tinytoolslib-0.3.4 → tinytoolslib-0.4.1}/tinytoolslib/flash.py

@@ -276,9 +276,10 @@ class Flasher:
         self,
         firmware_path: str,
         host: str,
-        username: str,
-        password: str,
         port: int = 80,
+        schema: str = "http",
+        username: str = "",
+        password: str = "",
         callback_progress: Union[Callable[[int, int, float, str], None], None] = None,
         callback_cancel: Union[Callable[[], bool], None] = None,
     ) -> bool:
@@ -295,17 +296,14 @@ class Flasher:
             and os.path.isfile(firmware_path)
         ):
             with self._session:
-                # Try to check what device type are we working with. For now,
-                # assume that lk4/tcpdu always respond via HTTP.
-                version_info = get_version(host, port, username, password)
-                if (
-                    version_info
-                    and version_info["network_info"].get("schema") == "https"
-                ):
-                    schema = "https"
-                    port = 443
-                else:
-                    schema = "http"
+                # Try to get device version. Note that get_version may return
+                # different port and schema than given ones, eg. for http:80,
+                # may return http:80 or https:443.
+                # It also assumes that lk4/tcpdu always respond via HTTP.
+                version_info = get_version(host, port, schema, username, password)
+                if version_info and "network_info" in version_info:
+                    schema = version_info["network_info"]["schema"]
+                    port = version_info["network_info"]["port"]
                 if (
                     version_info
                     and version_info.get("fw_update_method") == FWUpdateMethod.HTTP
@@ -347,7 +345,12 @@ def check_for_latest_firmware(fw_url: str) -> Tuple[bool, Union[Dict[str, Any],
 
 
 def get_latest_firmware(
-    host: str, username: str, password: str, firmware_directory: str
+    host: str,
+    port: int,
+    schema: str,
+    username: str,
+    password: str,
+    firmware_directory: str,
 ) -> Tuple[bool, Union[Dict[str, Any], str]]:
     """Get latest firmware for device.
 
@@ -355,7 +358,7 @@ def get_latest_firmware(
         (True, {**get_version(), path: str, new_sw: str})
         (False, str) - str is an error message
     """
-    version_info = get_version(host, username=username, password=password)
+    version_info = get_version(host, port, schema, username=username, password=password)
     if version_info:
         latest_version = check_for_latest_firmware(version_info.get("fw_url"))
         if latest_version[0]:
@@ -398,9 +401,10 @@ def download_firmware(download_url: str, save_location: str) -> bool:
 def run_flash(
     firmware_path: str,
     host: str,
-    username: str,
-    password: str,
     port: int = 80,
+    schema: str = "http",
+    username: str = "",
+    password: str = "",
     callback_progress: Union[Callable[[int, int, float, str], None], None] = None,
     callback_cancel: Union[Callable[[], bool], None] = None,
 ) -> bool:
@@ -409,9 +413,10 @@ def run_flash(
     return flasher.run(
         firmware_path,
         host,
+        port,
+        schema,
         username,
         password,
-        port,
         callback_progress,
         callback_cancel,
     )

{tinytoolslib-0.3.4 → tinytoolslib-0.4.1}/tinytoolslib/models.py

@@ -1242,6 +1242,10 @@ class LK_HW_40(DeviceModel):
         "netMac": {"name": "mac", "format": str},
         "softwareVersion": {"name": "software_version", "format": str},
         "hardwareVersion": {"name": "hardware_version", "format": str},
+        "pm1": {"name": "pm1.0", "format": float},
+        "pm2": {"name": "pm2.5", "format": float},
+        "pm4": {"name": "pm4.0", "format": float},
+        "pm10": {"name": "pm10.0", "format": float},
     }
     parsers: ClassVar[List[str]] = ["_parse_outs"]
 
@@ -1630,7 +1634,7 @@ def _get_version_initial(
     exc: Exception, schema: str, port: int, silent: bool
 ) -> Tuple[str, str, int]:
     """Handle first response in get_version - prepare data for second request."""
-    schema, path = "http", ""
+    path = ""
     try:
         raise exc
     except TinyToolsRequestNotFound:
@@ -1658,6 +1662,7 @@ def _get_version_initial(
 def get_version(
     host: str,
     port: int = 80,
+    schema: str = "http",
     username: str = "",
     password: str = "",
     with_info: bool = True,
@@ -1666,15 +1671,14 @@ def get_version(
 ) -> Union[Dict[str, Any], None]:
     """Query device for version and optionally device model.
 
-    NOTE: Might not work properly with https and port different than 443,
-    eg. proxy, as LK always uses 443 for https.
-    TODO: Might add schema parameter so it would work to handle proxy.
+    To work with https on port different than 443, schema has to be set to https.
+    Normally LK always uses port 443 for https.
     """
     response = None
     try:
-        response = get(host, "/st2.xml", "http", port, username, password)
+        response = get(host, "/st2.xml", schema, port, username, password)
     except TinyToolsRequestError as exc:
-        path, schema, port = _get_version_initial(exc, "http", port, silent)
+        path, schema, port = _get_version_initial(exc, schema, port, silent)
         if path:
             response = get(host, path, schema, port, username, password, silent=silent)
     return _get_version(
@@ -1685,6 +1689,7 @@ def get_version(
 async def async_get_version(
     host: str,
     port: int = 80,
+    schema: str = "http",
     username: str = "",
     password: str = "",
     with_info: bool = True,
@@ -1695,10 +1700,10 @@ async def async_get_version(
     response = None
     try:
         response = await async_get(
-            host, "/st2.xml", "http", port, username, password, session=session
+            host, "/st2.xml", schema, port, username, password, session=session
         )
     except TinyToolsRequestError as exc:
-        path, schema, port = _get_version_initial(exc, "http", port, silent)
+        path, schema, port = _get_version_initial(exc, schema, port, silent)
         if path:
             response = await async_get(
                 host,

{tinytoolslib-0.3.4 → tinytoolslib-0.4.1}/tinytoolslib.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: tinytoolslib
-Version: 0.3.4
+Version: 0.4.1
 Summary: Set of tools for use with Tinycontrol devices like LK2.X, LK3.X, LK4.X or tcPDU.
 Author-email: Bartek Barszczewski <tinycontrol.software@gmail.com>
+License-Expression: Apache-2.0
 Keywords: tinycontrol,lk,tcpdu
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: aiohttp<4,>=3.9.3

{tinytoolslib-0.3.4 → tinytoolslib-0.4.1}/tinytoolslib.egg-info/top_level.txt

@@ -1,4 +1,5 @@
 dist
 docs
+fws
 public
 tinytoolslib

tinytoolslib-0.3.4/tinytoolslib/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.3.4'