hardpy 0.14.0__py3-none-any.whl → 0.15.0__py3-none-any.whl

hardpy/__init__.py

@@ -3,23 +3,37 @@
 
 from hardpy.common.stand_cloud import StandCloudConnector, StandCloudError
 from hardpy.pytest_hardpy.pytest_call import (
+    ErrorCode,
     clear_operator_message,
     get_current_attempt,
     get_current_report,
     run_dialog_box,
+    set_batch_serial_number,
     set_case_artifact,
+    set_case_chart,
+    set_case_measurement,
     set_driver_info,
     set_dut_info,
+    set_dut_name,
     set_dut_part_number,
+    set_dut_revision,
     set_dut_serial_number,
+    set_dut_sub_unit,
+    set_dut_type,
+    set_instrument,
     set_message,
     set_module_artifact,
     set_operator_message,
+    set_process_info,
+    set_process_name,
+    set_process_number,
     set_run_artifact,
     set_stand_info,
     set_stand_location,
     set_stand_name,
     set_stand_number,
+    set_stand_revision,
+    set_user_name,
 )
 from hardpy.pytest_hardpy.result import (
     CouchdbLoader,
@@ -29,61 +43,82 @@ from hardpy.pytest_hardpy.result import (
 from hardpy.pytest_hardpy.result.couchdb_config import CouchdbConfig
 from hardpy.pytest_hardpy.utils import (
     BaseWidget,
+    Chart,
+    ChartType,
     CheckboxWidget,
+    ComparisonOperation,
     DialogBox,
-    DuplicatePartNumberError,
-    DuplicateSerialNumberError,
-    DuplicateTestStandLocationError,
-    DuplicateTestStandNameError,
-    DuplicateTestStandNumberError,
+    DuplicateParameterError,
     HTMLComponent,
     ImageComponent,
+    Instrument,
     MultistepWidget,
     NumericInputWidget,
+    NumericMeasurement,
     RadiobuttonWidget,
     StepWidget,
+    StringMeasurement,
+    SubUnit,
     TestStandNumberError,
     TextInputWidget,
 )
 
 __all__ = [
     "BaseWidget",
+    "Chart",
+    "ChartType",
     "CheckboxWidget",
+    "ComparisonOperation",
     "CouchdbConfig",
     "CouchdbLoader",
     "DialogBox",
-    "DuplicatePartNumberError",
-    "DuplicateSerialNumberError",
-    "DuplicateTestStandLocationError",
-    "DuplicateTestStandNameError",
-    "DuplicateTestStandNumberError",
+    "DuplicateParameterError",
+    "ErrorCode",
     "HTMLComponent",
     "ImageComponent",
+    "Instrument",
     "MultistepWidget",
     "NumericInputWidget",
+    "NumericMeasurement",
     "RadiobuttonWidget",
     "StandCloudConnector",
     "StandCloudError",
     "StandCloudLoader",
     "StandCloudReader",
     "StepWidget",
+    "StringMeasurement",
+    "SubUnit",
     "TestStandNumberError",
     "TextInputWidget",
     "clear_operator_message",
     "get_current_attempt",
     "get_current_report",
     "run_dialog_box",
+    "set_batch_serial_number",
     "set_case_artifact",
+    "set_case_chart",
+    "set_case_measurement",
     "set_driver_info",
+    "set_dut",
     "set_dut_info",
+    "set_dut_name",
     "set_dut_part_number",
+    "set_dut_revision",
     "set_dut_serial_number",
+    "set_dut_sub_unit",
+    "set_dut_type",
+    "set_instrument",
     "set_message",
     "set_module_artifact",
     "set_operator_message",
+    "set_process_info",
+    "set_process_name",
+    "set_process_number",
     "set_run_artifact",
     "set_stand_info",
     "set_stand_location",
     "set_stand_name",
     "set_stand_number",
+    "set_stand_revision",
+    "set_user_name",
 ]

hardpy/cli/cli.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import socket
 import sys
+import urllib
 from pathlib import Path
 from typing import Annotated, Optional
 
@@ -90,11 +91,9 @@ def init(  # noqa: PLR0913
         sc_address (str): StandCloud address
         sc_connection_only (bool): Flag to check StandCloud service availability
     """
-    _tests_dir = tests_dir if tests_dir else default_config.tests_dir
-    _tests_name = tests_name if tests_name else default_config.tests_name
+    dir_path = Path(Path.cwd() / tests_dir if tests_dir else "tests")
     ConfigManager().init_config(
-        tests_dir=str(_tests_dir),
-        tests_name=_tests_name,
+        tests_name=tests_name if tests_name else dir_path.name,
         database_user=database_user,
         database_password=database_password,
         database_host=database_host,
@@ -106,7 +105,6 @@ def init(  # noqa: PLR0913
         sc_connection_only=sc_connection_only,
     )
     # create tests directory
-    dir_path = Path(Path.cwd() / _tests_dir)
     Path.mkdir(dir_path, exist_ok=True, parents=True)
 
     if create_database:
@@ -115,11 +113,8 @@ def init(  # noqa: PLR0913
 
     # create hardpy.toml
     ConfigManager().create_config(dir_path)
-    config = ConfigManager().read_config(dir_path)
-    if not config:
-        print(f"hardpy.toml config by path {dir_path} not detected.")
-        sys.exit()
 
+    config = _get_config(dir_path)
     template = TemplateGenerator(config)
 
     files = {}
@@ -145,12 +140,7 @@ def run(tests_dir: Annotated[Optional[str], typer.Argument()] = None) -> None:
     Args:
         tests_dir (Optional[str]): Test directory. Current directory by default
     """
-    dir_path = Path.cwd() / tests_dir if tests_dir else Path.cwd()
-    config = ConfigManager().read_config(dir_path)
-
-    if not config:
-        print(f"Config at path {dir_path} not found.")
-        sys.exit()
+    config = _get_config(tests_dir)
 
     print("\nLaunch the HardPy operator panel...")
 
@@ -170,16 +160,29 @@ def run(tests_dir: Annotated[Optional[str], typer.Argument()] = None) -> None:
 
 
 @cli.command()
-def start(tests_dir: Annotated[Optional[str], typer.Argument()] = None) -> None:
+def start(
+    ctx: typer.Context,
+    tests_dir: Annotated[Optional[str], typer.Argument()] = None,
+    arg: list[str] = typer.Option(  # noqa: B008
+        [],
+        "--arg",
+        "-a",
+        help="Dynamic start arguments (format: key=value)",
+    ),
+) -> None:
     """Start HardPy tests.
 
     Args:
+        ctx: Typer context for accessing arguments from other sources
         tests_dir (Optional[str]): Test directory. Current directory by default
+        arg (list[str]): Dynamic arguments for test execution
     """
-    config = _get_config(tests_dir)
-    _check_config(config)
+    context_args = getattr(ctx, "hardpy_args", [])
+    all_args = arg + context_args
 
-    url = f"http://{config.frontend.host}:{config.frontend.port}/api/start"
+    config = _get_config(tests_dir, validate=True)
+    query_args = "&".join([f"args={urllib.parse.quote(a)}" for a in all_args])
+    url = f"http://{config.frontend.host}:{config.frontend.port}/api/start?{query_args}"
     _request_hardpy(url)
 
 
@@ -190,9 +193,7 @@ def stop(tests_dir: Annotated[Optional[str], typer.Argument()] = None) -> None:
     Args:
         tests_dir (Optional[str]): Test directory. Current directory by default
     """
-    config = _get_config(tests_dir)
-    _check_config(config)
-
+    config = _get_config(tests_dir, validate=True)
     url = f"http://{config.frontend.host}:{config.frontend.port}/api/stop"
     _request_hardpy(url)
 
@@ -204,9 +205,7 @@ def status(tests_dir: Annotated[Optional[str], typer.Argument()] = None) -> None
     Args:
         tests_dir (Optional[str]): Test directory. Current directory by default
     """
-    config = _get_config(tests_dir)
-    _check_config(config)
-
+    config = _get_config(tests_dir, validate=True)
     url = f"http://{config.frontend.host}:{config.frontend.port}/api/status"
     _request_hardpy(url)
 
@@ -259,7 +258,7 @@ def sc_logout(address: Annotated[str, typer.Argument()]) -> None:
         print(f"HardPy logout failed from {address}")
 
 
-def _get_config(tests_dir: str | None = None) -> HardpyConfig:
+def _get_config(tests_dir: str | None = None, validate: bool = False) -> HardpyConfig:
     dir_path = Path.cwd() / tests_dir if tests_dir else Path.cwd()
     config = ConfigManager().read_config(dir_path)
 
@@ -267,12 +266,15 @@ def _get_config(tests_dir: str | None = None) -> HardpyConfig:
         print(f"Config at path {dir_path} not found.")
         sys.exit()
 
+    if validate:
+        _validate_config(config, dir_path)
+
     return config
 
 
-def _check_config(config: HardpyConfig) -> None:
+def _validate_config(config: HardpyConfig, tests_dir: str) -> None:
     url = f"http://{config.frontend.host}:{config.frontend.port}/api/hardpy_config"
-    error_msg = f"HardPy in directory {config.tests_dir} does not run."
+    error_msg = f"HardPy in directory {tests_dir} does not run."
     try:
         response = requests.get(url, timeout=2)
     except Exception:

hardpy/common/config.py

@@ -58,7 +58,6 @@ class HardpyConfig(BaseModel, extra="allow"):
     model_config = ConfigDict(extra="forbid")
 
     title: str = "HardPy TOML config"
-    tests_dir: str = "tests"
     tests_name: str = ""
     database: DatabaseConfig = DatabaseConfig()
     frontend: FrontendConfig = FrontendConfig()
@@ -74,7 +73,6 @@ class ConfigManager:
     @classmethod
     def init_config(  # noqa: PLR0913
         cls,
-        tests_dir: str,
         tests_name: str,
         database_user: str,
         database_password: str,
@@ -89,7 +87,6 @@ class ConfigManager:
         """Initialize HardPy configuration.
 
         Args:
-            tests_dir (str): Tests directory.
             tests_name (str): Tests suite name.
             database_user (str): Database user name.
             database_password (str): Database password.
@@ -101,7 +98,6 @@ class ConfigManager:
             sc_address (str): StandCloud address.
             sc_connection_only (bool): StandCloud check availability.
         """
-        cls.obj.tests_dir = str(tests_dir)
         cls.obj.tests_name = tests_name
         cls.obj.database.user = database_user
         cls.obj.database.password = database_password

hardpy/common/stand_cloud/connector.py

@@ -96,7 +96,6 @@ class StandCloudConnector:
             return False
         return True
 
-
     def get_access_token(self) -> BearerToken | None:
         """Read access token from token store.
 
@@ -125,7 +124,8 @@ class StandCloudConnector:
             timeout=10,
         )
         if req.status_code != HTTPStatus.OK:
-            raise StandCloudError(req.text)
+            msg = f"status code {req.status_code}, {req.reason}, {req.text}"
+            raise StandCloudError(msg)
         return json.loads(req.content)
 
     def get_api(self, endpoint: str) -> ApiClient:

hardpy/hardpy_panel/api.py

@@ -1,13 +1,15 @@
 # Copyright (c) 2024 Everypin
 # GNU General Public License v3.0 (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
+from __future__ import annotations
 
 import os
 import re
 from enum import Enum
 from pathlib import Path
+from typing import Annotated
 from urllib.parse import unquote
 
-from fastapi import FastAPI
+from fastapi import FastAPI, Query
 from fastapi.staticfiles import StaticFiles
 
 from hardpy.common.config import ConfigManager
@@ -42,13 +44,21 @@ def hardpy_config() -> dict:
 
 
 @app.get("/api/start")
-def start_pytest() -> dict:
+def start_pytest(args: Annotated[list[str] | None, Query()] = None) -> dict:
     """Start pytest subprocess.
 
+    Args:
+        args: List of arguments in key=value format
+
     Returns:
         dict[str, RunStatus]: run status
     """
-    if app.state.pytest_wrp.start():
+    if args is None:
+        args_dict = []
+    else:
+        args_dict = dict(arg.split("=", 1) for arg in args if "=" in arg)
+
+    if app.state.pytest_wrp.start(start_args=args_dict):
         return {"status": Status.STARTED}
     return {"status": Status.BUSY}
 

hardpy/pytest_hardpy/db/base_store.py

@@ -91,19 +91,30 @@ class BaseStore(BaseConnector):
                 "_id": self._doc_id,
                 DF.MODULES: {},
                 DF.DUT: {
+                    DF.TYPE: None,
+                    DF.NAME: None,
+                    DF.REVISION: None,
                     DF.SERIAL_NUMBER: None,
                     DF.PART_NUMBER: None,
+                    DF.SUB_UNITS: [],
                     DF.INFO: {},
                 },
                 DF.TEST_STAND: {
                     DF.HW_ID: None,
                     DF.NAME: None,
+                    DF.REVISION: None,
                     DF.TIMEZONE: None,
                     DF.LOCATION: None,
                     DF.NUMBER: None,
+                    DF.INSTRUMENTS: [],
                     DF.DRIVERS: {},
                     DF.INFO: {},
                 },
+                DF.PROCESS: {
+                    DF.NAME: None,
+                    DF.NUMBER: None,
+                    DF.INFO: {},
+                },
             }
 
         # init document
@@ -111,19 +122,31 @@ class BaseStore(BaseConnector):
             doc[DF.MODULES] = {}
 
         doc[DF.DUT] = {
+            DF.TYPE: None,
+            DF.NAME: None,
+            DF.REVISION: None,
             DF.SERIAL_NUMBER: None,
             DF.PART_NUMBER: None,
+            DF.SUB_UNITS: [],
             DF.INFO: {},
         }
 
         doc[DF.TEST_STAND] = {
             DF.HW_ID: None,
             DF.NAME: None,
+            DF.REVISION: None,
             DF.TIMEZONE: None,
             DF.LOCATION: None,
             DF.NUMBER: None,
+            DF.INSTRUMENTS: [],
             DF.DRIVERS: {},
             DF.INFO: {},
         }
 
+        doc[DF.PROCESS] = {
+            DF.NAME: None,
+            DF.NUMBER: None,
+            DF.INFO: {},
+        }
+
         return doc

hardpy/pytest_hardpy/db/const.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Everypin
+# Copyright (c) 2025 Everypin
 # GNU General Public License v3.0 (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from enum import Enum
@@ -7,35 +7,56 @@ from enum import Enum
 class DatabaseField(str, Enum):
     """Database field."""
 
+    # common
     NAME = "name"
+    USER = "user"
+    BATCH_SN = "batch_serial_number"
+    CAUSED_DUT_FAILURE_ID = "caused_dut_failure_id"
+    GROUP = "group"
+    ERROR_CODE = "error_code"
     STATUS = "status"
     START_TIME = "start_time"
     STOP_TIME = "stop_time"
-    ASSERTION_MSG = "assertion_msg"
-    MSG = "msg"
-    MODULES = "modules"
-    CASES = "cases"
+    NUMBER = "number"
+    REVISION = "revision"
+    INFO = "info"
     TIMEZONE = "timezone"
-    PROGRESS = "progress"
-    ARTIFACT = "artifact"
-    DUT = "dut"
+    MSG = "msg"
+    ASSERTION_MSG = "assertion_msg"
     PART_NUMBER = "part_number"
-    INFO = "info"
-    TEST_STAND = "test_stand"
     SERIAL_NUMBER = "serial_number"
-    DRIVERS = "drivers"
-    DIALOG_BOX = "dialog_box"
-    OPERATOR_MSG = "operator_msg"
+    SUB_UNITS = "sub_units"
     ATTEMPT = "attempt"
     LOCATION = "location"
     HW_ID = "hw_id"
-    TITLE = "title"
-    VISIBLE = "visible"
-    IMAGE = "image"
-    HTML = "html"
-    ID = "id"
+    DRIVERS = "drivers"
+    TYPE = "type"
+    CHART = "chart"
+
+    # table name
+    DUT = "dut"
+    TEST_STAND = "test_stand"
+    PROCESS = "process"
+
+    # collection
+    MODULES = "modules"
+    CASES = "cases"
+    INSTRUMENTS = "instruments"
+    MEASUREMENTS = "measurements"
+
+    # statestore
+    PROGRESS = "progress"
+    DIALOG_BOX = "dialog_box"
+    OPERATOR_MSG = "operator_msg"
     FONT_SIZE = "font_size"
     ALERT = "alert"
     OPERATOR_DATA = "operator_data"
     DIALOG = "dialog"
-    NUMBER = "number"
+    VISIBLE = "visible"
+    TITLE = "title"
+    IMAGE = "image"
+    HTML = "html"
+    ID = "id"
+
+    # runstore
+    ARTIFACT = "artifact"