hardpy 0.10.0__tar.gz → 0.11.0__tar.gz

{hardpy-0.10.0 → hardpy-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hardpy
-Version: 0.10.0
+Version: 0.11.0
 Summary: HardPy library for device testing
 Project-URL: Homepage, https://github.com/everypinio/hardpy/
 Project-URL: Documentation, https://everypinio.github.io/hardpy/

{hardpy-0.10.0 → hardpy-0.11.0}/hardpy/__init__.py

@@ -30,6 +30,7 @@ from hardpy.pytest_hardpy.utils import (
     DuplicateSerialNumberError,
     DuplicateTestStandLocationError,
     DuplicateTestStandNameError,
+    HTMLComponent,
     ImageComponent,
     MultistepWidget,
     NumericInputWidget,
@@ -48,6 +49,7 @@ __all__ = [
     "DuplicateSerialNumberError",
     "DuplicateTestStandLocationError",
     "DuplicateTestStandNameError",
+    "HTMLComponent",
     "ImageComponent",
     "MultistepWidget",
     "NumericInputWidget",

{hardpy-0.10.0 → hardpy-0.11.0}/hardpy/cli/cli.py

@@ -59,14 +59,6 @@ def init(  # noqa: PLR0913
         default=default_config.frontend.port,
         help="Specify a frontend port.",
     ),
-    socket_host: str = typer.Option(
-        default=default_config.socket.host,
-        help="Specify a socket host.",
-    ),
-    socket_port: int = typer.Option(
-        default=default_config.socket.port,
-        help="Specify a socket port.",
-    ),
     sc_address: str = typer.Option(
         default="",
         help="Specify a StandCloud address.",
@@ -87,8 +79,6 @@ def init(  # noqa: PLR0913
         database_port (int): Database port
         frontend_host (str): Panel operator host
         frontend_port (int): Panel operator port
-        socket_host (str): Socket host
-        socket_port (int): Socket port
         sc_address (str): StandCloud address
         sc_connection_only (bool): Flag to check StandCloud service availability
     """
@@ -101,8 +91,6 @@ def init(  # noqa: PLR0913
         database_port=database_port,
         frontend_host=frontend_host,
         frontend_port=frontend_port,
-        socket_host=socket_host,
-        socket_port=socket_port,
         sc_address=sc_address,
         sc_connection_only=sc_connection_only,
     )

{hardpy-0.10.0 → hardpy-0.11.0}/hardpy/cli/template.py

@@ -138,8 +138,6 @@ log_cli_format = %%(asctime)s [%%(levelname)s] %%(message)s
 log_cli_date_format = %H:%M:%S
 addopts = --hardpy-pt
           --hardpy-db-url http://{}:{}@{}:{}/
-          --hardpy-sh {}
-          --hardpy-sp {}
 """
 
 test_1_py = """import pytest
@@ -207,8 +205,6 @@ class TemplateGenerator:
             self._config.database.password,
             self._config.database.host,
             self._config.database.port,
-            self._config.socket.host,
-            self._config.socket.port,
         )
 
     @property

{hardpy-0.10.0 → hardpy-0.11.0}/hardpy/common/config.py

@@ -42,14 +42,6 @@ class FrontendConfig(BaseModel):
     port: int = 8000
 
 
-class SocketConfig(BaseModel):
-    """Socket configuration."""
-
-    model_config = ConfigDict(extra="forbid")
-
-    host: str = "localhost"
-    port: int = 6525
-
 class StandCloudConfig(BaseModel):
     """StandCloud configuration."""
 
@@ -58,7 +50,7 @@ class StandCloudConfig(BaseModel):
     address: str = ""
     connection_only: bool = False
 
-class HardpyConfig(BaseModel):
+class HardpyConfig(BaseModel, extra="allow"):
     """HardPy configuration."""
 
     model_config = ConfigDict(extra="forbid")
@@ -67,7 +59,6 @@ class HardpyConfig(BaseModel):
     tests_dir: str = "tests"
     database: DatabaseConfig = DatabaseConfig()
     frontend: FrontendConfig = FrontendConfig()
-    socket: SocketConfig = SocketConfig()
     stand_cloud: StandCloudConfig = StandCloudConfig()
 
 
@@ -87,8 +78,6 @@ class ConfigManager:
         database_port: int,
         frontend_host: str,
         frontend_port: int,
-        socket_host: str,
-        socket_port: int,
         sc_address: str = "",
         sc_connection_only: bool = False,
     ) -> None:
@@ -102,8 +91,6 @@ class ConfigManager:
             database_port (int): Database port.
             frontend_host (str): Operator panel host.
             frontend_port (int): Operator panel port.
-            socket_host (str): Socket host.
-            socket_port (int): Socket port.
             sc_address (str): StandCloud address.
             sc_connection_only (bool): StandCloud check availability.
         """
@@ -114,8 +101,6 @@ class ConfigManager:
         cls.obj.database.port = database_port
         cls.obj.frontend.host = frontend_host
         cls.obj.frontend.port = frontend_port
-        cls.obj.socket.host = socket_host
-        cls.obj.socket.port = socket_port
         cls.obj.stand_cloud.address = sc_address
         cls.obj.stand_cloud.connection_only = sc_connection_only
 
@@ -149,13 +134,18 @@ class ConfigManager:
             return None
         try:
             with Path.open(toml_path / "hardpy.toml", "rb") as f:
-                cls.obj = HardpyConfig(**tomli.load(f))
-            return cls.obj  # noqa: TRY300
-        except tomli.TOMLDecodeError:
-            logger.exception("Error parsing TOML")
+                toml_data = tomli.load(f)
+        except tomli.TOMLDecodeError as exc:
+            msg = f"Error parsing TOML: {exc}"
+            logger.exception(msg)
+            return None
+
+        try:
+            cls.obj = HardpyConfig(**toml_data)
         except ValidationError:
             logger.exception("Error parsing TOML")
-        return None
+            return None
+        return cls.obj
 
     @classmethod
     def get_config(cls) -> HardpyConfig:

{hardpy-0.10.0 → hardpy-0.11.0}/hardpy/common/stand_cloud/registration.py

@@ -12,6 +12,8 @@ import secrets
 import socket
 import subprocess
 import sys
+from contextlib import suppress
+from platform import system
 from time import sleep
 from typing import TYPE_CHECKING
 from urllib.parse import urlencode
@@ -109,6 +111,12 @@ def logout() -> bool:
             delete_password(service_name, cred.username)
     except KeyringError:
         return False
+    # TODO(xorialexandrov): fix keyring clearing
+    # Windows does not clear refresh token by itself
+    if system() == "Windows":
+        storage_keyring, _ = get_token_store()
+        with suppress(KeyringError):
+            storage_keyring.delete_password(service_name, "refresh_token")
     return True
 
 
@@ -147,6 +155,18 @@ def _create_callback_process(port: str) -> subprocess.Popen:
         "--log-level=error",
     ]
 
+    if system() == "Windows":
+        env = os.environ.copy()
+        env["PYTHONUNBUFFERED"] = "1"
+
+        return subprocess.Popen(  # noqa: S603
+            args,
+            stdout=subprocess.PIPE,
+            bufsize=1,
+            universal_newlines=True,
+            env=env,
+            creationflags=subprocess.CREATE_NEW_PROCESS_GROUP,  # type: ignore
+        )
     return subprocess.Popen(  # noqa: S603
         args,
         stdout=subprocess.PIPE,
@@ -187,7 +207,14 @@ def _check_incorrect_response(response: dict, state: str) -> None:
         print(f"{error}: {error_description}")
         sys.exit(1)
 
-def _par_data(code_verifier: str, client_id: str, port: str, state: str, api_url: str) -> dict:
+
+def _par_data(
+    code_verifier: str,
+    client_id: str,
+    port: str,
+    state: str,
+    api_url: str,
+) -> dict:
     """Create pushed authorization request data.
 
     Returns:

{hardpy-0.10.0 → hardpy-0.11.0}/hardpy/common/stand_cloud/token_storage.py

@@ -2,6 +2,7 @@
 # GNU General Public License v3.0 (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 from __future__ import annotations
 
+from platform import system
 from typing import TYPE_CHECKING
 
 from keyring.core import load_keyring
@@ -16,7 +17,10 @@ def get_token_store() -> tuple[KeyringBackend, KeyringBackend]:
     Returns:
         tuple[KeyringBackend, KeyringBackend]: token store
     """
-    storage_keyring = load_keyring("keyring.backends.SecretService.Keyring")
+    if system() == "Linux":
+        storage_keyring = load_keyring("keyring.backends.SecretService.Keyring")
+    elif system() == "Windows":
+        storage_keyring = load_keyring("keyring.backends.Windows.WinVaultKeyring")
     # TODO(xorialexandrov): add memory keyring or other store
     mem_keyring = storage_keyring
 

{hardpy-0.10.0 → hardpy-0.11.0}/hardpy/hardpy_panel/frontend/dist/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.e8a862f1.css",
-    "main.js": "/static/js/main.8a7d8f7d.js",
+    "main.js": "/static/js/main.114c5914.js",
     "blueprint-icons-all-paths-loader.js": "/static/js/blueprint-icons-all-paths-loader.0aa89747.chunk.js",
     "blueprint-icons-split-paths-by-size-loader.js": "/static/js/blueprint-icons-split-paths-by-size-loader.52a072d3.chunk.js",
     "static/js/808.ce070002.chunk.js": "/static/js/808.ce070002.chunk.js",
@@ -21,7 +21,7 @@
     "static/media/logo_smol.png": "/static/media/logo_smol.5b16f92447a4a9e80331.png",
     "index.html": "/index.html",
     "main.e8a862f1.css.map": "/static/css/main.e8a862f1.css.map",
-    "main.8a7d8f7d.js.map": "/static/js/main.8a7d8f7d.js.map",
+    "main.114c5914.js.map": "/static/js/main.114c5914.js.map",
     "blueprint-icons-all-paths-loader.0aa89747.chunk.js.map": "/static/js/blueprint-icons-all-paths-loader.0aa89747.chunk.js.map",
     "blueprint-icons-split-paths-by-size-loader.52a072d3.chunk.js.map": "/static/js/blueprint-icons-split-paths-by-size-loader.52a072d3.chunk.js.map",
     "808.ce070002.chunk.js.map": "/static/js/808.ce070002.chunk.js.map",
@@ -31,6 +31,6 @@
   },
   "entrypoints": [
     "static/css/main.e8a862f1.css",
-    "static/js/main.8a7d8f7d.js"
+    "static/js/main.114c5914.js"
   ]
 }

{hardpy-0.10.0 → hardpy-0.11.0}/hardpy/hardpy_panel/frontend/dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>HardPy Operator Panel</title><script defer="defer" src="/static/js/main.8a7d8f7d.js"></script><link href="/static/css/main.e8a862f1.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>HardPy Operator Panel</title><script defer="defer" src="/static/js/main.114c5914.js"></script><link href="/static/css/main.e8a862f1.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>