Merge branch 'main' into pytest-timeout

Author: ZohebShaikh

.github/workflows/asyncapi.yml

@@ -9,6 +9,8 @@ on:
     tags:
       - '*'
   pull_request:
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   validate:

.github/workflows/backstage.yml

@@ -7,6 +7,8 @@ on:
     tags:
       - '*'
   pull_request:
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   validate:

.github/workflows/ci.yml

@@ -7,6 +7,8 @@ on:
     tags:
       - "*"
   pull_request:
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   lint:

.github/workflows/codeql.yml

@@ -18,7 +18,8 @@ on:
     tags:
       - '*'
   pull_request:
-
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   analyze:
@@ -61,7 +62,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c793b717bc78562f491db7b0e93a3a178b099162 # v4
+        uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -88,6 +89,6 @@ jobs:
           echo '  make release'
           exit 1
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c793b717bc78562f491db7b0e93a3a178b099162 # v4
+        uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/pr.yml

@@ -3,13 +3,15 @@ name: PR Conventional Commit Validation
 on:
   pull_request:
     types: [opened, synchronize, reopened, edited]
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   validate-pr-title:
     runs-on: ubuntu-latest
     steps:
       - name: PR Conventional Commit Validation
-        uses:  ytanikin/[email protected].1
+        uses: ytanikin/[email protected].2
         with:
           task_types: '["feat","fix","docs","test","ci","refactor","perf","chore","revert", "depr"]'
-          add_label: 'false'
+          add_label: "false"

Dockerfile

@@ -64,7 +64,7 @@ COPY --from=build /python /python
 
 # Copy the environment, but not the source code
 COPY --chown=1000:1000 --from=build /app/.venv /app/.venv
-RUN chmod o+wrX /app/.venv
+RUN chmod -R 777 /app
 ENV PATH=/app/.venv/bin:$PATH
 
 # Add copy of blueapi source to container for debugging

docs/tutorials/scripting-plans.md

@@ -160,6 +160,8 @@ This will be one of `WorkerEvent`, `ProgressEvent` or `DataEvent`.
 An example that prints data for each point could be something like
 
 ```python
+from blueapi.core.bluesky_types import DataEvent
+
 def feedback(evt):
     match evt:
         case DataEvent(name="start"):

helm/blueapi/templates/statefulset.yaml

@@ -83,6 +83,10 @@ spec:
       {{- if .Values.initContainer.enabled }}
       initContainers:
       - name: setup-scratch
+        {{- with .Values.securityContext }}
+        securityContext:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         resources:

src/blueapi/cli/cli.py

@@ -26,6 +26,7 @@
 from blueapi.client.rest import (
     BlueskyRemoteControlError,
     InvalidParametersError,
+    NonJsonResponseError,
     ServiceUnavailableError,
     UnauthorisedAccessError,
     UnknownPlanError,
@@ -83,8 +84,24 @@ def is_str_dict(val: Any) -> TypeGuard[TaskParameters]:
 @click.option(
     "-c", "--config", type=Path, help="Path to configuration YAML file", multiple=True
 )
+@click.option(
+    "-v",
+    "--verbose",
+    "log_level",
+    flag_value="DEBUG",
+    help="Include DEBUG level logging output",
+)
+@click.option(
+    "-q",
+    "--quiet",
+    "log_level",
+    flag_value="ERROR",
+    help="Reduce logging noise to only show errors",
+)
 @click.pass_context
-def main(ctx: click.Context, config: tuple[Path, ...]) -> None:
+def main(
+    ctx: click.Context, config: tuple[Path, ...], log_level: str | None = None
+) -> None:
     # if no command is supplied, run with the options passed
 
     # Set umask to DLS standard
@@ -96,6 +113,9 @@ def main(ctx: click.Context, config: tuple[Path, ...]) -> None:
     except FileNotFoundError as fnfe:
         raise ClickException(f"Config file not found: {fnfe.filename}") from fnfe
 
+    if log_level:
+        config_loader.use_values({"logging": {"level": log_level}})
+
     loaded_config: ApplicationConfig = config_loader.load()
 
     set_up_logging(loaded_config.logging)
@@ -494,13 +514,16 @@ def login(obj: dict) -> None:
         print("Logged in")
     except Exception:
         client = BlueapiClient.from_config(config)
-        if oidc := client.oidc_config:
-            auth = SessionManager(
-                oidc, cache_manager=SessionCacheManager(config.auth_token_path)
-            )
-            auth.start_device_flow()
-        else:
-            print("Server is not configured to use authentication!")
+        try:
+            if oidc := client.oidc_config:
+                auth = SessionManager(
+                    oidc, cache_manager=SessionCacheManager(config.auth_token_path)
+                )
+                auth.start_device_flow()
+            else:
+                print("Server is not configured to use authentication!")
+        except NonJsonResponseError as e:
+            print(str(e))
 
 
 @main.command(name="logout")

src/blueapi/client/rest.py

@@ -1,3 +1,5 @@
+import json
+import logging
 from collections.abc import Callable, Mapping
 from typing import Any, Literal, TypeVar
 
@@ -10,6 +12,7 @@
 )
 from pydantic import BaseModel, TypeAdapter, ValidationError
 
+from blueapi import __version__
 from blueapi.config import RestConfig
 from blueapi.service.authentication import JWTAuth, SessionManager
 from blueapi.service.model import (
@@ -32,6 +35,8 @@
 
 TRACER = get_tracer("rest")
 
+LOGGER = logging.getLogger(__name__)
+
 
 class UnauthorisedAccessError(Exception):
     pass
@@ -41,6 +46,10 @@ class BlueskyRemoteControlError(Exception):
     pass
 
 
+class NonJsonResponseError(Exception):
+    pass
+
+
 class BlueskyRequestError(Exception):
     def __init__(self, code: int, message: str) -> None:
         super().__init__(message, code)
@@ -105,7 +114,7 @@ def _exception(response: requests.Response) -> Exception | None:
     if code < 400:
         return None
     elif code == 404:
-        return KeyError(str(response.json()))
+        return KeyError(str(_response_json(response)))
     else:
         return BlueskyRemoteControlError(code, str(response))
 
@@ -120,7 +129,7 @@ def _create_task_exceptions(response: requests.Response) -> Exception | None:
         return UnknownPlanError()
     elif code == 422:
         try:
-            content = response.json()
+            content = _response_json(response)
             return InvalidParametersError(
                 TypeAdapter(list[ParameterError]).validate_python(
                     content.get("detail", [])
@@ -134,6 +143,18 @@ def _create_task_exceptions(response: requests.Response) -> Exception | None:
         return BlueskyRequestError(code, response.text)
 
 
+def _response_json(response: requests.Response) -> Any:
+    try:
+        return response.json()
+    except json.decoder.JSONDecodeError as exc:
+        LOGGER.debug(
+            f"Invalid json response from <{response.request.url}>: <{response.content}>"
+        )
+        raise NonJsonResponseError(
+            "Response does not contain a valid JSON object"
+        ) from exc
+
+
 class BlueapiRestClient:
     _config: RestConfig
     _session_manager: SessionManager | None
@@ -271,7 +292,20 @@ def _request_and_deserialize(
             raise exception
         if response.status_code == status.HTTP_204_NO_CONTENT:
             raise NoContentError(target_type)
-        deserialized = TypeAdapter(target_type).validate_python(response.json())
+        if (server_version := response.headers.get("x-blueapi-version")) is not None:
+            from packaging.version import Version
+
+            if (server_version := Version(server_version).base_version) != (
+                client_version := Version(__version__).base_version
+            ):
+                LOGGER.warning(
+                    f"Version mismatch: Blueapi server version is {server_version} "
+                    f"but client version is {client_version}. "
+                    f"Some features may not work as expected."
+                )
+        deserialized = TypeAdapter(target_type).validate_python(
+            _response_json(response)
+        )
         return deserialized