bec-lib 4.3.0__tar.gz → 4.3.1__tar.gz

{bec_lib-4.3.0 → bec_lib-4.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bec_lib
-Version: 4.3.0
+Version: 4.3.1
 Summary: BEC library
 Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
 Project-URL: Homepage, https://github.com/bec-project/bec

{bec_lib-4.3.0 → bec_lib-4.3.1}/bec_lib/bec_service.py

@@ -83,8 +83,8 @@ def parse_cmdline_args(parser=None, config_name: Literal["client", "server"] | s
     parser.add_argument(
         "--use-subprocess-proc-worker",
         action="store_true",
-        default=False,
-        help="Use the in process procedure worker for local testing",
+        default=None,
+        help="Use the subprocess procedure worker for local testing",
     )
 
     args, extra_args = parser.parse_known_args()

{bec_lib-4.3.0 → bec_lib-4.3.1}/bec_lib/service_config.py

@@ -7,7 +7,7 @@ import os
 import re
 from getpass import getuser
 from pathlib import Path
-from typing import Any, ClassVar, Self
+from typing import Any, ClassVar
 
 import yaml
 from pydantic import BaseModel, Field, model_validator
@@ -114,21 +114,20 @@ class ServiceConfigModel(BaseModel):
     procedures: ProcedureConfig = Field(default_factory=ProcedureConfig)
 
     @model_validator(mode="before")
-    def apply_cmdline_args(self, data: Any) -> Self:
-        if isinstance(data, dict):
-            if cmdline_args := data.get("cmdline_args"):
-                for arg in cmdline_args.items():
-                    self._update_data_for_arg(arg, data)
-        return self
-
-    def _update_data_for_arg(self, arg: tuple[str, Any], data: dict):
-        argname, argval = arg
-        if argname not in self._CMDLINE_ARGS:
+    @classmethod
+    def apply_cmdline_args(cls, data: Any) -> Any:
+        """Apply supplied CLI overrides before validating the configuration."""
+        if not isinstance(data, dict):
             return data
-        subconfig, variable = self._CMDLINE_ARGS[argname]
-        if subconfig not in data:
-            data[subconfig] = {}
-        data[subconfig][variable] = argval
+        data = data.copy()
+        for argname, argval in (data.get("cmdline_args") or {}).items():
+            if argname not in cls._CMDLINE_ARGS or argval is None:
+                continue
+            subconfig, variable = cls._CMDLINE_ARGS[argname]
+            values = data.get(subconfig, {})
+            if isinstance(values, BaseModel):
+                values = values.model_dump()
+            data[subconfig] = {**values, variable: argval}
         return data
 
 

{bec_lib-4.3.0 → bec_lib-4.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_lib"
-version = "4.3.0"
+version = "4.3.1"
 description = "BEC library"
 requires-python = ">=3.11"
 classifiers = [

{bec_lib-4.3.0 → bec_lib-4.3.1}/tests/test_bec_service.py

@@ -408,7 +408,7 @@ def test_parse_cmdline_args_with_config():
                     "file_log_level": None,
                     "redis_log_level": None,
                     "bec_server": None,
-                    "use_subprocess_proc_worker": False,
+                    "use_subprocess_proc_worker": None,
                 },
                 config_name="server",
             )
@@ -429,7 +429,7 @@ def test_parse_cmdline_args_with_user():
                     "file_log_level": None,
                     "redis_log_level": None,
                     "bec_server": None,
-                    "use_subprocess_proc_worker": False,
+                    "use_subprocess_proc_worker": None,
                 },
                 acl={"user": "admin"},
                 config_name="server",

bec_lib-4.3.1/tests/test_service_config.py

@@ -0,0 +1,55 @@
+"""Regression tests for service configuration CLI overrides."""
+
+from __future__ import annotations
+
+import sys
+
+import pytest
+
+from bec_lib.bec_service import parse_cmdline_args
+from bec_lib.service_config import ProcedureConfig, ServiceConfig, ServiceConfigModel
+
+
+@pytest.mark.parametrize("configured", [True, False])
+@pytest.mark.parametrize("override", [True, False, None])
+def test_procedure_cli_override(configured, override):
+    config = ServiceConfig(
+        config={"procedures": {"use_subprocess_worker": configured}},
+        cmdline_args={"use_subprocess_proc_worker": override},
+    )
+    assert config.model.procedures.use_subprocess_worker is (
+        configured if override is None else override
+    )
+
+
+def test_cli_override_preserves_config_input():
+    data = {"procedures": {"enable_procedures": False, "use_subprocess_worker": False}}
+    model = ServiceConfigModel.model_validate(
+        data | {"cmdline_args": {"use_subprocess_proc_worker": True, "unknown": True}}
+    )
+    assert model.procedures.use_subprocess_worker
+    assert not model.procedures.enable_procedures
+    assert data["procedures"]["use_subprocess_worker"] is False
+
+
+def test_cli_override_without_procedure_section():
+    config = ServiceConfigModel(cmdline_args={"use_subprocess_proc_worker": True})
+    assert config.procedures.use_subprocess_worker
+
+
+def test_cli_override_with_model_section():
+    config = ServiceConfigModel(
+        procedures=ProcedureConfig(enable_procedures=False),
+        cmdline_args={"use_subprocess_proc_worker": True},
+    )
+    assert config.procedures.use_subprocess_worker
+    assert not config.procedures.enable_procedures
+
+
+@pytest.mark.parametrize("flag", [[], ["--use-subprocess-proc-worker"]])
+def test_procedure_worker_cli_selection(monkeypatch, tmp_path, flag):
+    path = tmp_path / "server.yaml"
+    path.write_text("procedures:\n  use_subprocess_worker: true\n")
+    monkeypatch.setattr(sys, "argv", ["scan-server", "--config", str(path), *flag])
+    _, _, config = parse_cmdline_args()
+    assert config.model.procedures.use_subprocess_worker