fix(wokwi): support wokwi-client 0.4.0

Author: hfudev

pytest-embedded-wokwi/pyproject.toml

@@ -32,7 +32,7 @@ requires-python = ">=3.10"
 
 dependencies = [
     "pytest-embedded~=2.6.0",
-    "wokwi-client>=0.2.0",
+    "wokwi-client>=0.4.0",
 ]
 
 [project.optional-dependencies]

pytest-embedded-wokwi/pytest_embedded_wokwi/__init__.py

@@ -1,12 +1,9 @@
 """Make pytest-embedded plugin work with the Wokwi CLI."""
 
-WOKWI_CLI_MINIMUM_VERSION = '0.10.1'
-
-from .dut import WokwiDut  # noqa
-from .wokwi import Wokwi  # noqa
+from .dut import WokwiDut
+from .wokwi import Wokwi
 
 __all__ = [
-    'WOKWI_CLI_MINIMUM_VERSION',
     'Wokwi',
     'WokwiDut',
 ]

pytest-embedded-wokwi/pytest_embedded_wokwi/wokwi.py

@@ -4,13 +4,10 @@
 import typing as t
 from pathlib import Path
 
-from packaging.version import Version
 from pytest_embedded.log import DuplicateStdoutPopen, MessageQueue
 from pytest_embedded.utils import Meta
 from wokwi_client import GET_TOKEN_URL, WokwiClientSync
 
-from pytest_embedded_wokwi import WOKWI_CLI_MINIMUM_VERSION
-
 from .idf import IDFFirmwareResolver
 
 if t.TYPE_CHECKING:  # pragma: no cover
@@ -61,24 +58,14 @@ def __init__(
         # Initialize synchronous Wokwi client
         self.client = WokwiClientSync(token)
 
-        # Check version compatibility
-        if Version(self.client.version) < Version(WOKWI_CLI_MINIMUM_VERSION):
-            logging.warning(
-                'Wokwi client version %s < required %s (compatibility not guaranteed)',
-                self.client.version,
-                WOKWI_CLI_MINIMUM_VERSION,
-            )
-        logging.info('Wokwi client library version: %s', self.client.version)
-
         # Prepare diagram file if not supplied
         if wokwi_diagram is None:
             self.create_diagram_json()
             wokwi_diagram = os.path.join(self.app.app_path, 'diagram.json')
 
         # Connect and start simulation
         try:
-            flasher_args = firmware_resolver.resolve_firmware(app)
-            firmware_path = Path(flasher_args).as_posix()
+            firmware_path = Path(firmware_resolver.resolve_firmware(app)).as_posix()
             elf_path = Path(app.elf_file).as_posix()
 
             self._setup_simulation(wokwi_diagram, firmware_path, elf_path)
@@ -93,16 +80,17 @@ def _setup_simulation(self, diagram: str, firmware_path: str, elf_path: str):
         logging.info('Connected to Wokwi Simulator, server version: %s', hello.get('version', 'unknown'))
 
         # Upload files
-        self.client.upload_file('diagram.json', diagram)
-        firmware = self.client.upload_file('pytest.bin', firmware_path)
-
-        self.client.upload_file('pytest.elf', elf_path)
+        self.client.upload_file('diagram.json', Path(diagram))
+        self.client.upload_file('pytest.elf', Path(elf_path))
+        if firmware_path.endswith('flasher_args.json'):
+            firmware = self.client.upload_idf_firmware(firmware_path)
+            self.client.start_simulation(firmware.firmware, elf='pytest.elf')
+        else:
+            firmware = self.client.upload_file('pytest.bin', Path(firmware_path))
+            self.client.start_simulation(firmware, elf='pytest.elf')
 
         logging.info('Uploaded diagram and firmware to Wokwi. Starting simulation...')
 
-        # Start simulation
-        self.client.start_simulation(firmware, elf='pytest.elf')
-
     def _start_serial_monitoring(self):
         """Start monitoring serial output and forward to stdout and message queue."""