project-chip
diff --git a/‎.version_information‎
Lines changed: 1 addition & 1 deletion b/‎.version_information‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Dockerfile‎
Lines changed: 0 additions & 6 deletions b/‎Dockerfile‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎app/api/api_v1/endpoints/test_run_executions.py‎
Lines changed: 0 additions & 91 deletions b/‎app/api/api_v1/endpoints/test_run_executions.py‎
Lines changed: 0 additions & 91 deletions
diff --git a/‎app/container_manager/container_manager.py‎
Lines changed: 53 additions & 6 deletions b/‎app/container_manager/container_manager.py‎
Lines changed: 53 additions & 6 deletions
diff --git a/‎app/container_manager/docker_shell_commands.py‎
Lines changed: 24 additions & 4 deletions b/‎app/container_manager/docker_shell_commands.py‎
Lines changed: 24 additions & 4 deletions
diff --git a/‎app/main.py‎
Lines changed: 7 additions & 1 deletion b/‎app/main.py‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎app/pics_applicable_test_cases.py‎
Lines changed: 0 additions & 6 deletions b/‎app/pics_applicable_test_cases.py‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎app/schemas/test_environment_config.py‎
Lines changed: 1 addition & 0 deletions b/‎app/schemas/test_environment_config.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/socket_connection_manager.py‎
Lines changed: 20 additions & 4 deletions b/‎app/socket_connection_manager.py‎
Lines changed: 20 additions & 4 deletions
@@ -1 +1 @@
-v2.15+spring2026
+v2.15.1+summer2026
@@ -61,12 +61,6 @@ RUN curl -sSL https://install.python-poetry.org | python3 - && \
 # Install Docker
 RUN curl -sSL https://get.docker.com/ | sh
 
-# Install nodejs, npm and spell checker
-RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
-RUN apt-get install -y nodejs
-RUN npm install -g npm@latest
-RUN npm install -g cspell@latest
-
 # Allow installing dev dependencies to run tests
 # Copy poetry dependecy files and install dependencies
 # We copy install dependencies before copying all app source to reuse the dependency install step in docker.
 
@@ -14,12 +14,9 @@
 # limitations under the License.
 #
 import json
-import os
-from datetime import datetime
 from http import HTTPStatus
 from typing import Any
 
-import requests
 from fastapi import APIRouter, BackgroundTasks, Depends, File, HTTPException, UploadFile
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import JSONResponse, StreamingResponse
@@ -45,10 +42,6 @@
 )
 from app.version import version_information
 from test_collections.matter.sdk_tests.support.chip.chip_server import ChipServer
-from test_collections.matter.sdk_tests.support.performance_tests.utils import (
-    create_summary_report,
-)
-from test_collections.matter.test_environment_config import TestEnvironmentConfigMatter
 
 router = APIRouter()
 
@@ -655,87 +648,3 @@ def import_test_run_execution(
             status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
             detail=str(error),
         )
-
-
-date_pattern_out_file = "%Y_%m_%d_%H_%M_%S"
-
-
-@router.post("/{id}/performance_summary")
-def generate_summary_log(
-    *,
-    db: Session = Depends(get_db),
-    id: int,
-    project_id: int,
-) -> JSONResponse:
-    """
-    Imports a test run execution to the the given project_id.
-    """
-
-    project = crud.project.get(db=db, id=project_id)
-
-    if not project:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Project not found"
-        )
-
-    project_config = TestEnvironmentConfigMatter(**project.config)
-    matter_qa_url = None
-    LOGS_FOLDER = "/test_collections/logs"
-    HOST_BACKEND = os.getenv("BACKEND_FILEPATH_ON_HOST") or ""
-    HOST_OUT_FOLDER = HOST_BACKEND + LOGS_FOLDER
-
-    if (
-        project_config.test_parameters
-        and "matter_qa_url" in project_config.test_parameters
-    ):
-        matter_qa_url = project_config.test_parameters["matter_qa_url"]
-    else:
-        raise HTTPException(
-            status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
-            detail="matter_qa_url must be configured",
-        )
-
-    page = requests.get(f"{matter_qa_url}/home")
-    if page.status_code is not int(HTTPStatus.OK):
-        raise HTTPException(
-            status_code=page.status_code,
-            detail=(
-                "The LogDisplay server is not responding.\n"
-                "Verify if the tool was installed, configured and initiated properly"
-            ),
-        )
-
-    commissioning_method = project_config.dut_config.pairing_mode
-
-    test_run_execution = crud.test_run_execution.get(db=db, id=id)
-    if not test_run_execution:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Test Run Execution not found"
-        )
-
-    log_lines_list = log_utils.convert_execution_log_to_list(
-        log=test_run_execution.log, json_entries=False
-    )
-
-    timestamp = ""
-    if test_run_execution.started_at:
-        timestamp = test_run_execution.started_at.strftime(date_pattern_out_file)
-    else:
-        timestamp = datetime.now().strftime(date_pattern_out_file)
-
-    tc_name, execution_time_folder = create_summary_report(
-        timestamp, log_lines_list, commissioning_method
-    )
-
-    target_dir = f"{HOST_OUT_FOLDER}/{execution_time_folder}/{tc_name}"
-    url_report = f"{matter_qa_url}/home/displayLogFolder?dir_path={target_dir}"
-
-    summary_report: dict = {}
-    summary_report["url"] = url_report
-
-    options: dict = {"media_type": "application/json"}
-
-    return JSONResponse(
-        jsonable_encoder(summary_report),
-        **options,
-    )
@@ -31,6 +31,7 @@
     docker_kill_command,
     docker_rm_command,
     docker_run_command,
+    docker_stop_command,
 )
 from app.core.config import settings
 from app.singleton import Singleton
@@ -55,13 +56,35 @@ async def create_container(
 
         return container
 
-    def destroy(self, container: Container) -> None:
+    def destroy(self, container: Container, graceful: bool = False) -> None:
+        """Stop and remove a container.
+
+        By default this kills the container immediately (existing behavior, used by
+        most callers that don't need the process inside to shut down cleanly).
+        Pass `graceful=True` to try a normal stop (SIGTERM, falling back to SIGKILL
+        after Docker's stop timeout) first, so the process inside has a chance to
+        release any host resources it holds (e.g. a serial device) before removal.
+        """
         if self.is_running(container):
-            # Log equivalent shell command for kill
-            if settings.ENABLE_CONTAINER_LOGS:
-                shell_cmd = docker_kill_command(container.name)
-                logger.info(f"{SHELL_CMD_LOG_PREFIX}{shell_cmd}")
-            container.kill()
+            if graceful:
+                if settings.ENABLE_CONTAINER_LOGS:
+                    shell_cmd = docker_stop_command(container.name)
+                    logger.info(f"{SHELL_CMD_LOG_PREFIX}{shell_cmd}")
+                try:
+                    container.stop()
+                except docker.errors.APIError as error:
+                    logger.warning(
+                        f"Graceful stop failed for container '{container.name}', "
+                        f"falling back to kill: {error}"
+                    )
+                    graceful = False
+
+            if not graceful:
+                # Log equivalent shell command for kill
+                if settings.ENABLE_CONTAINER_LOGS:
+                    shell_cmd = docker_kill_command(container.name)
+                    logger.info(f"{SHELL_CMD_LOG_PREFIX}{shell_cmd}")
+                container.kill()
 
         # Log equivalent shell command for remove
         if settings.ENABLE_CONTAINER_LOGS:
@@ -76,6 +99,30 @@ def get_container(self, id_or_name: str) -> Optional[Container]:
             logger.info(f"Did not find container by id or name: {id_or_name}.")
             return None
 
+    def remove_containers_for_image(self, docker_image_tag: str) -> None:
+        """Gracefully stop and remove any (running or stopped) container created
+        from the given image.
+
+        Used to clear out containers that a previous, no-longer-tracked instance of
+        this process left behind (e.g. after a crash or a failed start_device()
+        call), which would otherwise hold onto host resources (like an RCP serial
+        device) and block a new container from starting.
+
+        Note: this matches ANY container built from this image, host-wide, not just
+        ones this process created — acceptable here because these OTBR images are
+        dedicated to Test Harness use, but worth keeping in mind if this is ever
+        reused for a shared/general-purpose image.
+        """
+        stale_containers = self.__client.containers.list(
+            all=True, filters={"ancestor": docker_image_tag}
+        )
+        for container in stale_containers:
+            logger.warning(
+                f"Removing leftover container '{container.name}' "
+                f"({container.short_id}) for image {docker_image_tag}."
+            )
+            self.destroy(container, graceful=True)
+
     def is_running(self, container: Container) -> bool:
         # NOTE: we need to get a new container reference to get updated status.
         if c := self.get_container(container.id):
 
@@ -18,7 +18,7 @@
 Useful for debugging and understanding what Docker operations are being performed.
 """
 from pathlib import Path
-from typing import Dict, List, Union
+from typing import Dict, List, Optional, Union
 
 # Log message constants
 SHELL_CMD_LOG_PREFIX = "Docker API call equivalent shell command:\n"
@@ -42,18 +42,25 @@
 ]
 
 
-def escape_shell_arg(arg: str) -> str:
+def escape_shell_arg(arg: Optional[str]) -> str:
     """
     Escape shell argument if it contains spaces or special characters.
 
     Uses single-quote wrapping for safety. Any single quotes in the argument
     are escaped using the pattern: ' becomes '\''
     (close quote, escaped quote, open quote).
 
+    Args:
+        arg: The argument to escape. Docker container/image names can be None
+            (e.g. a Container whose attrs have no "Name" key), so this is
+            tolerated and rendered as an empty string rather than raising.
+
     Returns:
         The argument wrapped in single quotes if it contains special characters,
         otherwise returns the argument unchanged.
     """
+    if arg is None:
+        return ""
     if any(c in arg for c in SHELL_SPECIAL_CHARS):
         # Escape any single quotes: ' becomes '\''
         escaped_arg = arg.replace("'", "'\\''")
@@ -193,7 +200,7 @@ def docker_exec_command(
     return " ".join(cmd_parts)
 
 
-def docker_kill_command(container_name: str) -> str:
+def docker_kill_command(container_name: Optional[str]) -> str:
     """
     Generate docker kill command.
 
@@ -206,7 +213,20 @@ def docker_kill_command(container_name: str) -> str:
     return f"docker kill {escape_shell_arg(container_name)}"
 
 
-def docker_rm_command(container_name: str, force: bool = False) -> str:
+def docker_stop_command(container_name: Optional[str]) -> str:
+    """
+    Generate docker stop command.
+
+    Args:
+        container_name: Name or ID of the container
+
+    Returns:
+        String representation of equivalent shell command
+    """
+    return f"docker stop {escape_shell_arg(container_name)}"
+
+
+def docker_rm_command(container_name: Optional[str], force: bool = False) -> str:
     """
     Generate docker rm command.
 
 
@@ -20,6 +20,7 @@
 from app.api.api_v1.api import api_router
 from app.core.config import settings
 from app.test_engine.test_script_manager import test_script_manager
+from app.uvicorn_worker import WS_PING_TIMEOUT_S
 
 app = FastAPI(
     title=settings.PROJECT_NAME, openapi_url=f"{settings.API_V1_STR}/openapi.json"
@@ -51,4 +52,9 @@ async def startup_event() -> None:
 
 
 if __name__ == "__main__":
-    uvicorn.run(app, host="0.0.0.0", port=80, log_config=None)
+    # ws_ping_timeout raised from uvicorn's 20s default: a large log flush can
+    # keep the event loop busy long enough to miss the keepalive pong and get
+    # the websocket dropped mid-broadcast (see app.uvicorn_worker).
+    uvicorn.run(
+        app, host="0.0.0.0", port=80, log_config=None, ws_ping_timeout=WS_PING_TIMEOUT_S
+    )
@@ -25,9 +25,6 @@
     TestCollectionDeclaration,
 )
 from app.test_engine.test_script_manager import test_script_manager
-from test_collections.matter.sdk_tests.support.performance_tests.utils import (
-    STRESS_TEST_COLLECTION,
-)
 
 PICS_PLAT_CERT = "PLAT.CERT"
 PICS_PLAT_CERT_DERIVED = "PLAT.CERT.TESTS.DONE"
@@ -168,9 +165,6 @@ def __applicable_test_cases(
     """
     applicable_tests: set = set()
 
-    # The 'Performance Tests' Collection should not be considered for the PICS tests.
-    test_collections.pop(STRESS_TEST_COLLECTION, None)
-
     for test_collection in test_collections.values():
         # If mandatory is None, consider both mandatory and non-mandatory tests
         if mandatory is None or test_collection.mandatory == mandatory:
 
@@ -36,6 +36,7 @@ class ThreadAutoConfig(BaseModel):
     otbr_docker_image: Optional[str]
     ba_host: Optional[str] = None
     ba_port: Optional[int] = None
+    operational_dataset_hex: Optional[str] = None
 
 
 class TestEnvironmentConfigError(Exception):
 
@@ -24,7 +24,7 @@
 from fastapi.websockets import WebSocketDisconnect
 from loguru import logger
 from starlette.websockets import WebSocketState
-from websockets.exceptions import ConnectionClosedOK
+from websockets.exceptions import ConnectionClosedError, ConnectionClosedOK
 
 from app.constants.shared_constants import MessageKeysEnum, MessageTypeEnum
 from app.constants.websockets_constants import (
@@ -129,17 +129,33 @@ async def broadcast(self, message: Union[str, dict, list]) -> None:
         # Convert dictionaries and lists to string using json
         if isinstance(message, dict) or isinstance(message, list):
             message = json.dumps(message, default=pydantic.json.pydantic_encoder)
-        for connection in self.active_connections:
+        # Iterate over a copy: disconnect() below mutates active_connections.
+        for connection in list(self.active_connections):
             if connection.type == WebSocketTypeEnum.MAIN:
                 websocket = connection.websocket
                 try:
                     await websocket.send_text(message)
                 # Starlette raises websockets.exceptions.ConnectionClosedOK
                 # when trying to send to a closed websocket.
                 # https://github.com/encode/starlette/issues/759
-                except ConnectionClosedOK:
+                # ConnectionClosedError is raised on an abrupt drop (e.g. a
+                # missed websocket keepalive pong) rather than a graceful
+                # close - treat it the same way so a dead connection doesn't
+                # keep being retried for the rest of the process's life.
+                except (ConnectionClosedOK, ConnectionClosedError):
                     if websocket.application_state != WebSocketState.DISCONNECTED:
-                        await websocket.close()
+                        try:
+                            await websocket.close()
+                        except Exception as close_error:
+                            # The transport can already be gone by this point
+                            # (that's the whole reason we're here) - closing
+                            # an already-dead socket failing is expected and
+                            # uninteresting, but must not prevent the
+                            # cleanup below from running.
+                            logger.debug(
+                                f"Error closing already-dead websocket: {close_error}"
+                            )
+                    self.disconnect(connection)
                     logger.warning(
                         f'Failed to send message: "{message}"'
                         f' to websocket: "{websocket}", connection closed."'