gridfleet-testkit 0.8.0__tar.gz → 0.9.1__tar.gz

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to the GridFleet testkit (`gridfleet-testkit` on PyPI) are documented here.
 
+## [0.9.1](https://github.com/quidow/gridfleet/compare/gridfleet-testkit-v0.9.0...gridfleet-testkit-v0.9.1) (2026-05-13)
+
+
+### Bug Fixes
+
+* **testkit:** align release policy with commitlint ([5dd8220](https://github.com/quidow/gridfleet/commit/5dd822010460e994f2e3c5b6676a69bed05678ed))
+
+## [0.9.0](https://github.com/quidow/gridfleet/compare/gridfleet-testkit-v0.8.0...gridfleet-testkit-v0.9.0) (2026-05-12)
+
+
+### Features
+
+* **testkit:** add run detail client helper ([c80a8cc](https://github.com/quidow/gridfleet/commit/c80a8cc95093c2f46a7e714c96ff0b33018af5ba))
+* **testkit:** expose allocation device tags ([0bf5e2e](https://github.com/quidow/gridfleet/commit/0bf5e2e04b806fadd0afcd3c95073828d0c2414e))
+* **testkit:** support tag-based device targeting ([db0d0e3](https://github.com/quidow/gridfleet/commit/db0d0e3d3d1231828bb22a707d3bdcab6c0ec717))
+
+
+### Documentation
+
+* **testkit:** document tag-based device targeting ([096841b](https://github.com/quidow/gridfleet/commit/096841b737dec71524d0edfa4c538d9cc69e7c2c))
+
 ## [0.8.0](https://github.com/quidow/gridfleet/compare/gridfleet-testkit-v0.7.0...gridfleet-testkit-v0.8.0) (2026-05-12)
 
 

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gridfleet-testkit
-Version: 0.8.0
+Version: 0.9.1
 Summary: Supported pytest and run-orchestration helpers for GridFleet integrations
 Project-URL: Homepage, https://github.com/quidow/gridfleet
 Project-URL: Repository, https://github.com/quidow/gridfleet
@@ -22,10 +22,9 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Typing :: Typed
 Requires-Python: <3.15,>=3.10
+Requires-Dist: appium-python-client<6,>=4.5
 Requires-Dist: httpx<1,>=0.27
 Requires-Dist: pytest<10,>=9.0.3
-Provides-Extra: appium
-Requires-Dist: appium-python-client<6,>=4.5; extra == 'appium'
 Provides-Extra: dev
 Requires-Dist: mypy<3,>=1.20.2; extra == 'dev'
 Requires-Dist: pytest<10,>=9.0.3; extra == 'dev'
@@ -81,19 +80,19 @@ The supported contract is the installable package and documented import pattern.
 From PyPI:
 
 ```bash
-pip install "gridfleet-testkit[appium]"
+pip install "gridfleet-testkit"
 ```
 
 From a local checkout:
 
 ```bash
-uv pip install -e ./testkit[appium]
+uv pip install -e ./testkit
 ```
 
 From a copied `testkit/` directory inside another repository:
 
 ```bash
-uv pip install -e ./testkit[appium]
+uv pip install -e ./testkit
 ```
 
 From a Git checkout or VCS URL that contains this package:
@@ -103,6 +102,7 @@ uv pip install "git+https://github.com/<org>/<repo>.git#subdirectory=testkit"
 ```
 
 The package supports Python 3.10 and newer.
+`Appium-Python-Client` is installed as a runtime dependency because the pytest fixtures create real Appium sessions.
 
 ## Environment
 
@@ -192,6 +192,7 @@ finally:
 | `GridFleetClient.get_device_by_connection_target(connection_target)` | Fetch one device detail row by runtime connection target |
 | `GridFleetClient.get_device_capabilities(device_id)` | Fetch current Appium capability metadata for a device |
 | `GridFleetClient.get_device_test_data(device_id)` | Fetch operator-attached free-form test_data for a device |
+| `GridFleetClient.get_run(run_id)` | Fetch one run detail row by backend run id |
 | `GridFleetClient.replace_device_test_data(device_id, body)` | Replace test_data with the supplied object |
 | `GridFleetClient.merge_device_test_data(device_id, body)` | Deep-merge into device test_data |
 | `GridFleetClient.resolve_device_id_by_connection_target(connection_target)` | Resolve the backend device id for a runtime connection target |
@@ -216,6 +217,38 @@ finally:
 | `get_device_test_data_for_driver(driver, gridfleet_client=None)` | Fetch test_data for a live Appium driver |
 | `register_run_cleanup(client, run_id, heartbeat_thread=None)` | Register `atexit` cleanup callable and return it; stops the heartbeat thread on exit but does not complete or cancel the run by default |
 
+### Targeting Devices by Tag
+
+GridFleet injects device tags into Grid node stereotypes as `appium:gridfleet:tag:<key>` capabilities, so Selenium Grid can route sessions to devices matching specific tags.
+
+```python
+@pytest.mark.parametrize(
+    "appium_driver",
+    [
+        {
+            "pack_id": "appium-uiautomator2",
+            "platform_id": "android_mobile",
+            "appium:gridfleet:tag:screen_type": "4k",
+        }
+    ],
+    indirect=True,
+)
+def test_4k_display(appium_driver):
+    ...
+```
+
+The same capability works for free sessions:
+
+```python
+driver = create_appium_driver(
+    pack_id="appium-uiautomator2",
+    platform_id="android_mobile",
+    capabilities={"appium:gridfleet:tag:screen_type": "4k"},
+)
+```
+
+When an operator edits device tags, GridFleet marks the device for re-verification. The next verification restarts the Appium node and re-registers it with the updated Grid stereotype.
+
 ### Worker Identity
 
 `worker_id` is an arbitrary string used for reservation telemetry and run attribution. For pytest-xdist, pass `request.config.workerinput["workerid"]` from worker processes; values are normally `gw0`, `gw1`, and so on. For controller-only flows, use `"controller"` or a stable hostname. For custom schedulers, use a UUID or job-specific worker name.

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/README.md

@@ -47,19 +47,19 @@ The supported contract is the installable package and documented import pattern.
 From PyPI:
 
 ```bash
-pip install "gridfleet-testkit[appium]"
+pip install "gridfleet-testkit"
 ```
 
 From a local checkout:
 
 ```bash
-uv pip install -e ./testkit[appium]
+uv pip install -e ./testkit
 ```
 
 From a copied `testkit/` directory inside another repository:
 
 ```bash
-uv pip install -e ./testkit[appium]
+uv pip install -e ./testkit
 ```
 
 From a Git checkout or VCS URL that contains this package:
@@ -69,6 +69,7 @@ uv pip install "git+https://github.com/<org>/<repo>.git#subdirectory=testkit"
 ```
 
 The package supports Python 3.10 and newer.
+`Appium-Python-Client` is installed as a runtime dependency because the pytest fixtures create real Appium sessions.
 
 ## Environment
 
@@ -158,6 +159,7 @@ finally:
 | `GridFleetClient.get_device_by_connection_target(connection_target)` | Fetch one device detail row by runtime connection target |
 | `GridFleetClient.get_device_capabilities(device_id)` | Fetch current Appium capability metadata for a device |
 | `GridFleetClient.get_device_test_data(device_id)` | Fetch operator-attached free-form test_data for a device |
+| `GridFleetClient.get_run(run_id)` | Fetch one run detail row by backend run id |
 | `GridFleetClient.replace_device_test_data(device_id, body)` | Replace test_data with the supplied object |
 | `GridFleetClient.merge_device_test_data(device_id, body)` | Deep-merge into device test_data |
 | `GridFleetClient.resolve_device_id_by_connection_target(connection_target)` | Resolve the backend device id for a runtime connection target |
@@ -182,6 +184,38 @@ finally:
 | `get_device_test_data_for_driver(driver, gridfleet_client=None)` | Fetch test_data for a live Appium driver |
 | `register_run_cleanup(client, run_id, heartbeat_thread=None)` | Register `atexit` cleanup callable and return it; stops the heartbeat thread on exit but does not complete or cancel the run by default |
 
+### Targeting Devices by Tag
+
+GridFleet injects device tags into Grid node stereotypes as `appium:gridfleet:tag:<key>` capabilities, so Selenium Grid can route sessions to devices matching specific tags.
+
+```python
+@pytest.mark.parametrize(
+    "appium_driver",
+    [
+        {
+            "pack_id": "appium-uiautomator2",
+            "platform_id": "android_mobile",
+            "appium:gridfleet:tag:screen_type": "4k",
+        }
+    ],
+    indirect=True,
+)
+def test_4k_display(appium_driver):
+    ...
+```
+
+The same capability works for free sessions:
+
+```python
+driver = create_appium_driver(
+    pack_id="appium-uiautomator2",
+    platform_id="android_mobile",
+    capabilities={"appium:gridfleet:tag:screen_type": "4k"},
+)
+```
+
+When an operator edits device tags, GridFleet marks the device for re-verification. The next verification restarts the Appium node and re-registers it with the updated Grid stereotype.
+
 ### Worker Identity
 
 `worker_id` is an arbitrary string used for reservation telemetry and run attribution. For pytest-xdist, pass `request.config.workerinput["workerid"]` from worker processes; values are normally `gw0`, `gw1`, and so on. For controller-only flows, use `"controller"` or a stable hostname. For custom schedulers, use a UUID or job-specific worker name.

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/examples/_example_helpers.py

@@ -3,13 +3,18 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
+    from appium.webdriver.webdriver import WebDriver
 
 SCREENSHOT_DIR = Path(__file__).parent / "screenshots"
 ROKU_HELLO_WORLD_APP = Path(__file__).parent / "assets" / "hello-world.zip"
 
 
-def _resolved_connection_target(capabilities: dict[str, Any]) -> str:
+def _resolved_connection_target(capabilities: Mapping[str, object]) -> str:
     value = capabilities.get("appium:udid")
     if isinstance(value, str) and value:
         return value
@@ -19,7 +24,7 @@ def _resolved_connection_target(capabilities: dict[str, Any]) -> str:
     return "session"
 
 
-def print_connection_context(driver: Any) -> str:
+def print_connection_context(driver: WebDriver) -> str:
     """Print the resolved session context and return the connection target string."""
     caps = driver.capabilities
     connection_target = _resolved_connection_target(caps)
@@ -35,7 +40,7 @@ def print_connection_context(driver: Any) -> str:
     return connection_target
 
 
-def save_and_assert_screenshot(driver: Any, example_name: str) -> Path:
+def save_and_assert_screenshot(driver: WebDriver, example_name: str) -> Path:
     """Save a screenshot and assert that the written file is non-empty."""
     caps = driver.capabilities
     connection_target = _resolved_connection_target(caps).replace(":", "_")
@@ -51,7 +56,7 @@ def save_and_assert_screenshot(driver: Any, example_name: str) -> Path:
     return screenshot_path
 
 
-def install_and_activate_roku_dev_app(driver: Any) -> None:
+def install_and_activate_roku_dev_app(driver: WebDriver) -> None:
     """Install and activate the bundled Roku dev app used by screenshot examples."""
     assert ROKU_HELLO_WORLD_APP.exists(), f"App package not found: {ROKU_HELLO_WORLD_APP}"
     driver.install_app(str(ROKU_HELLO_WORLD_APP.resolve()))

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/examples/test_android_mobile_screenshot.py

@@ -5,15 +5,14 @@ Requires:
     - Selenium Grid hub running on localhost:4444
     - An Android mobile device registered and its Appium node running
     - The supported GridFleet testkit installed
-    - Appium-Python-Client installed (`uv pip install -e ./testkit[appium]`)
+    - Appium-Python-Client installed (`uv pip install -e ./testkit`)
 
 Run:
     cd testkit && python -m pytest examples/test_android_mobile_screenshot.py -v -s
 """
 
-from typing import Any
-
 import pytest
+from appium.webdriver.webdriver import WebDriver
 
 from examples._example_helpers import print_connection_context, save_and_assert_screenshot
 
@@ -30,7 +29,7 @@ pytest_plugins = ["gridfleet_testkit.pytest_plugin"]
     ],
     indirect=True,
 )
-def test_android_mobile_take_screenshot(appium_driver: Any) -> None:
+def test_android_mobile_take_screenshot(appium_driver: WebDriver) -> None:
     """Connect to an Android mobile device through the Grid and take a screenshot."""
     driver = appium_driver
 

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/examples/test_android_tv_screenshot.py

@@ -5,15 +5,14 @@ Requires:
     - Selenium Grid hub running on localhost:4444
     - An Android TV device registered and its Appium node running
     - The supported GridFleet testkit installed
-    - Appium-Python-Client installed (`uv pip install -e ./testkit[appium]`)
+    - Appium-Python-Client installed (`uv pip install -e ./testkit`)
 
 Run:
     cd testkit && python -m pytest examples/test_android_tv_screenshot.py -v -s
 """
 
-from typing import Any
-
 import pytest
+from appium.webdriver.webdriver import WebDriver
 
 from examples._example_helpers import print_connection_context, save_and_assert_screenshot
 
@@ -30,7 +29,7 @@ pytest_plugins = ["gridfleet_testkit.pytest_plugin"]
     ],
     indirect=True,
 )
-def test_android_tv_take_screenshot(appium_driver: Any) -> None:
+def test_android_tv_take_screenshot(appium_driver: WebDriver) -> None:
     """Connect to an Android TV device through the Grid and take a screenshot."""
     driver = appium_driver
 

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/examples/test_firetv_screenshot.py

@@ -5,15 +5,14 @@ Requires:
     - Selenium Grid hub running on localhost:4444
     - A Fire TV device registered and its Appium node running
     - The supported GridFleet testkit installed
-    - Appium-Python-Client installed (`uv pip install -e ./testkit[appium]`)
+    - Appium-Python-Client installed (`uv pip install -e ./testkit`)
 
 Run:
     cd testkit && python -m pytest examples/test_firetv_screenshot.py -v -s
 """
 
-from typing import Any
-
 import pytest
+from appium.webdriver.webdriver import WebDriver
 
 from examples._example_helpers import print_connection_context, save_and_assert_screenshot
 
@@ -32,7 +31,7 @@ pytest_plugins = ["gridfleet_testkit.pytest_plugin"]
     ],
     indirect=True,
 )
-def test_firetv_take_screenshot(appium_driver: Any) -> None:
+def test_firetv_take_screenshot(appium_driver: WebDriver) -> None:
     """Connect to a Fire TV device through the Grid and take a screenshot."""
     driver = appium_driver
 

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/examples/test_ios_simulator_screenshot.py

@@ -6,15 +6,14 @@ Requires:
     - An iOS simulator registered and its Appium node running
     - The supported GridFleet testkit installed
     - Appium with the XCUITest driver installed (`appium driver install xcuitest`)
-    - Appium-Python-Client installed (`uv pip install -e ./testkit[appium]`)
+    - Appium-Python-Client installed (`uv pip install -e ./testkit`)
 
 Run:
     cd testkit && python -m pytest examples/test_ios_simulator_screenshot.py -v -s
 """
 
-from typing import Any
-
 import pytest
+from appium.webdriver.webdriver import WebDriver
 
 from examples._example_helpers import print_connection_context, save_and_assert_screenshot
 
@@ -32,7 +31,7 @@ pytest_plugins = ["gridfleet_testkit.pytest_plugin"]
     ],
     indirect=True,
 )
-def test_ios_take_screenshot(appium_driver: Any) -> None:
+def test_ios_take_screenshot(appium_driver: WebDriver) -> None:
     """Connect to an iOS simulator through the Grid and take a screenshot."""
     driver = appium_driver
 

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/examples/test_roku_screenshot.py

@@ -6,15 +6,14 @@ Requires:
     - A Roku device registered with Roku dev credentials in device config
     - Appium with the Roku driver installed (`appium driver install roku`)
     - The supported GridFleet testkit installed
-    - Appium-Python-Client installed (`uv pip install -e ./testkit[appium]`)
+    - Appium-Python-Client installed (`uv pip install -e ./testkit`)
 
 Run:
     cd testkit && python -m pytest examples/test_roku_screenshot.py -v -s
 """
 
-from typing import Any
-
 import pytest
+from appium.webdriver.webdriver import WebDriver
 
 from examples._example_helpers import (
     install_and_activate_roku_dev_app,
@@ -35,7 +34,7 @@ pytest_plugins = ["gridfleet_testkit.pytest_plugin"]
     ],
     indirect=True,
 )
-def test_roku_take_screenshot(appium_driver: Any) -> None:
+def test_roku_take_screenshot(appium_driver: WebDriver) -> None:
     """Connect to a Roku device through the Grid and take a screenshot."""
     driver = appium_driver
 

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/examples/test_roku_sideload_screenshot.py

@@ -6,15 +6,14 @@ Requires:
     - A Roku device registered with Roku dev credentials in device config
     - Appium with the Roku driver installed (`appium driver install roku`)
     - The supported GridFleet testkit installed
-    - Appium-Python-Client installed (`uv pip install -e ./testkit[appium]`)
+    - Appium-Python-Client installed (`uv pip install -e ./testkit`)
 
 Run:
     cd testkit && python -m pytest examples/test_roku_sideload_screenshot.py -v -s
 """
 
-from typing import Any
-
 import pytest
+from appium.webdriver.webdriver import WebDriver
 
 from examples._example_helpers import (
     ROKU_HELLO_WORLD_APP,
@@ -36,7 +35,7 @@ pytest_plugins = ["gridfleet_testkit.pytest_plugin"]
     ],
     indirect=True,
 )
-def test_roku_install_app_and_take_screenshot(appium_driver: Any) -> None:
+def test_roku_install_app_and_take_screenshot(appium_driver: WebDriver) -> None:
     """Connect to a Roku device, sideload an app, and take a screenshot."""
     driver = appium_driver
 

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/examples/test_tvos_screenshot.py

@@ -7,15 +7,14 @@ Requires:
     - The supported GridFleet testkit installed
     - Appium with the XCUITest driver installed (`appium driver install xcuitest`)
     - tvOS real-device prerequisites already configured on the host, including WebDriverAgent/XCUITest setup
-    - Appium-Python-Client installed (`uv pip install -e ./testkit[appium]`)
+    - Appium-Python-Client installed (`uv pip install -e ./testkit`)
 
 Run:
     cd testkit && python -m pytest examples/test_tvos_screenshot.py -v -s
 """
 
-from typing import Any
-
 import pytest
+from appium.webdriver.webdriver import WebDriver
 
 from examples._example_helpers import print_connection_context, save_and_assert_screenshot
 
@@ -32,7 +31,7 @@ pytest_plugins = ["gridfleet_testkit.pytest_plugin"]
     ],
     indirect=True,
 )
-def test_tvos_take_screenshot(appium_driver: Any) -> None:
+def test_tvos_take_screenshot(appium_driver: WebDriver) -> None:
     """Connect to a tvOS real device through the Grid and take a screenshot."""
     driver = appium_driver
 

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/gridfleet_testkit/__init__.py

@@ -47,7 +47,7 @@ from .sessions import build_error_session_payload, resolve_device_handle_from_dr
 try:
     __version__ = version("gridfleet-testkit")
 except PackageNotFoundError:
-    __version__ = "0.8.0"
+    __version__ = "0.9.1"
 
 __all__ = [
     "GRIDFLEET_API_URL",

{gridfleet_testkit-0.8.0 → gridfleet_testkit-0.9.1}/gridfleet_testkit/allocation.py

@@ -3,10 +3,13 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, replace
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, cast
 
 if TYPE_CHECKING:
+    from appium.webdriver.webdriver import WebDriver
+
     from .client import GridFleetClient
+    from .types import JsonObject
 
 
 @dataclass(frozen=True)
@@ -35,10 +38,11 @@ class AllocatedDevice:
     connection_type: str
     manufacturer: str | None
     model: str | None
-    config: dict[str, Any] | None
-    live_capabilities: dict[str, Any] | None
-    test_data: dict[str, Any] | None = None
+    config: JsonObject | None
+    live_capabilities: JsonObject | None
+    test_data: JsonObject | None = None
     unavailable_includes: tuple[UnavailableInclude, ...] = ()
+    tags: dict[str, str] | None = None
 
     @property
     def is_real_device(self) -> bool:
@@ -71,23 +75,23 @@ class AllocatedDevice:
         return self.platform_label or self.platform_id
 
 
-def _string_value(payload: dict[str, Any], key: str, *, default: str | None = None) -> str:
+def _string_value(payload: JsonObject, key: str, *, default: str | None = None) -> str:
     value = payload.get(key, default)
     if isinstance(value, str) and value:
         return value
     raise ValueError(f"Allocated device payload is missing {key}")
 
 
-def _optional_string_value(payload: dict[str, Any], key: str) -> str | None:
+def _optional_string_value(payload: JsonObject, key: str) -> str | None:
     value = payload.get(key)
     return value if isinstance(value, str) and value else None
 
 
-def _needs_device_detail(payload: dict[str, Any]) -> bool:
+def _needs_device_detail(payload: JsonObject) -> bool:
     return any(payload.get(key) is None for key in ("name", "device_type", "connection_type", "manufacturer", "model"))
 
 
-def _merge_device_detail(payload: dict[str, Any], detail: dict[str, Any]) -> dict[str, Any]:
+def _merge_device_detail(payload: JsonObject, detail: JsonObject) -> JsonObject:
     merged = dict(payload)
     for key in ("name", "device_type", "connection_type", "manufacturer", "model"):
         if merged.get(key) is None and detail.get(key) is not None:
@@ -97,7 +101,7 @@ def _merge_device_detail(payload: dict[str, Any], detail: dict[str, Any]) -> dic
     return merged
 
 
-def _parse_unavailable_includes(payload: dict[str, Any]) -> tuple[UnavailableInclude, ...]:
+def _parse_unavailable_includes(payload: JsonObject) -> tuple[UnavailableInclude, ...]:
     raw = payload.get("unavailable_includes")
     if not isinstance(raw, list):
         return ()
@@ -113,7 +117,7 @@ def _parse_unavailable_includes(payload: dict[str, Any]) -> tuple[UnavailableInc
 
 
 def hydrate_allocated_device(
-    device_handle: dict[str, Any],
+    device_handle: JsonObject,
     *,
     run_id: str,
     client: GridFleetClient,
@@ -133,14 +137,14 @@ def hydrate_allocated_device(
     connection_target = _optional_string_value(payload, "connection_target")
     inline_config = payload.get("config")
     if isinstance(inline_config, dict):
-        config: dict[str, Any] | None = inline_config
+        config: JsonObject | None = cast("JsonObject", inline_config)
     elif fetch_config and connection_target and "config" not in unavailable_set:
         config = client.get_device_config(connection_target)
     else:
         config = None
     inline_capabilities = payload.get("live_capabilities")
     if isinstance(inline_capabilities, dict):
-        live_capabilities: dict[str, Any] | None = inline_capabilities
+        live_capabilities: JsonObject | None = cast("JsonObject", inline_capabilities)
     elif fetch_capabilities and "capabilities" not in unavailable_set:
         live_capabilities = client.get_device_capabilities(device_id)
     else:
@@ -148,11 +152,16 @@ def hydrate_allocated_device(
 
     inline_test_data = payload.get("test_data")
     if isinstance(inline_test_data, dict):
-        test_data: dict[str, Any] | None = inline_test_data
+        test_data: JsonObject | None = cast("JsonObject", inline_test_data)
     elif fetch_test_data and "test_data" not in unavailable_set:
         test_data = client.get_device_test_data(device_id)
     else:
         test_data = None
+    inline_tags = payload.get("tags")
+    if isinstance(inline_tags, dict):
+        tags: dict[str, str] | None = inline_tags
+    else:
+        tags = None
 
     return AllocatedDevice(
         run_id=run_id,
@@ -173,19 +182,20 @@ def hydrate_allocated_device(
         live_capabilities=live_capabilities,
         test_data=test_data,
         unavailable_includes=unavailable_includes,
+        tags=tags,
     )
 
 
 def hydrate_allocated_device_from_driver(
     allocated: AllocatedDevice,
-    driver: Any,
+    driver: WebDriver,
     *,
     client: GridFleetClient,
 ) -> AllocatedDevice:
     """Refresh live capabilities from a running Appium driver session."""
     capabilities = getattr(driver, "capabilities", None)
     if isinstance(capabilities, dict):
-        live_capabilities = dict(capabilities)
+        live_capabilities = cast("JsonObject", dict(capabilities))
     else:
         live_capabilities = client.get_device_capabilities(allocated.device_id)
     return replace(allocated, live_capabilities=live_capabilities)