nullpol 0.2.3__tar.gz → 0.2.4__tar.gz

{nullpol-0.2.3 → nullpol-0.2.4}/.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
                   persist-credentials: false
 
             - name: Install uv
-              uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+              uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
               with:
                   python-version: ${{ matrix.python-version }}
                   enable-cache: 'true'
@@ -50,7 +50,7 @@ jobs:
                   persist-credentials: false
 
             - name: Install uv
-              uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+              uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
               with:
                   python-version: '3.13'
                   enable-cache: 'true'

{nullpol-0.2.3 → nullpol-0.2.4}/.github/workflows/codeql.yml

@@ -18,12 +18,12 @@ jobs:
             - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
 
             - name: Initialize CodeQL
-              uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4
+              uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4
               with:
                   languages: python
 
             - name: Autobuild
-              uses: github/codeql-action/autobuild@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4
+              uses: github/codeql-action/autobuild@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4
 
             - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4
+              uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4

{nullpol-0.2.3 → nullpol-0.2.4}/.github/workflows/scheduled-release.yml

@@ -20,7 +20,7 @@ jobs:
 
             - name: Check for new commits
               id: check_commits
-              uses: isaac-cf-wong/detect-git-changes-action@ecc6bf915a7987eb27f70d560c8067a69b943cb5 # v0.0.14
+              uses: isaac-cf-wong/detect-git-changes-action@c49bec37fa3496222c70649af3a09e2c2612310e # v0.0.15
               with:
                   use-latest-tag: true
 

{nullpol-0.2.3 → nullpol-0.2.4}/.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
           - id: check-json
 
     - repo: https://github.com/astral-sh/ruff-pre-commit
-      rev: v0.15.20
+      rev: v0.15.21
       hooks:
           - id: ruff
             args: [--fix, --config=pyproject.toml]
@@ -35,7 +35,7 @@ repos:
             args: []
 
     - repo: https://github.com/rbubley/mirrors-prettier
-      rev: v3.9.4
+      rev: v3.9.5
       hooks:
           - id: prettier
 
@@ -48,7 +48,7 @@ repos:
                 - .markdownlint.yaml
 
     - repo: https://github.com/astral-sh/uv-pre-commit
-      rev: 0.11.26
+      rev: 0.11.28
       hooks:
           # Update the uv lockfile
           - id: uv-lock

{nullpol-0.2.3 → nullpol-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nullpol
-Version: 0.2.3
+Version: 0.2.4
 Summary: A package to perform model-independent polarization test of gravitational-wave signals.
 Project-URL: Documentation, https://isaac-cf-wong.github.io/nullpol/
 Project-URL: Source, https://github.com/isaac-cf-wong/nullpol

{nullpol-0.2.3 → nullpol-0.2.4}/src/nullpol/cli/input.py

@@ -113,22 +113,32 @@ class Input(BilbyInput):
             "time_frequency_filter": self.meta_data["time_frequency_filter"],  # pylint: disable=no-member
             "priors": self.search_priors,
         }
+        extra_likelihood_kwargs = self.extra_likelihood_kwargs
         if self.likelihood_type == "Chi2TimeFrequencyLikelihood":
             Likelihood = Chi2TimeFrequencyLikelihood
-            likelihood_kwargs.update(self.extra_likelihood_kwargs)
+            likelihood_kwargs.update(extra_likelihood_kwargs)
         elif "." in self.likelihood_type:
             split_path = self.likelihood_type.split(".")
             module = ".".join(split_path[:-1])
             likelihood_class = split_path[-1]
             Likelihood = getattr(import_module(module), likelihood_class)
-            likelihood_kwargs.update(self.extra_likelihood_kwargs)
+            likelihood_kwargs.update(extra_likelihood_kwargs)
         else:
             raise ValueError(f"Unknown Likelihood class {self.likelihood_type}")
 
+        likelihood_signature = inspect.signature(Likelihood.__init__)
+        accepted_keyword_names = {
+            name
+            for name, parameter in likelihood_signature.parameters.items()
+            if parameter.kind in (inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.KEYWORD_ONLY)
+        }
+        accepts_extra_kwargs = any(
+            parameter.kind == inspect.Parameter.VAR_KEYWORD for parameter in likelihood_signature.parameters.values()
+        )
         likelihood_kwargs = {
             key: value
             for key, value in likelihood_kwargs.items()
-            if key in inspect.getfullargspec(Likelihood.__init__).args
+            if key in accepted_keyword_names or (accepts_extra_kwargs and key in extra_likelihood_kwargs)
         }
 
         logger.debug(f"Initialise likelihood {Likelihood} with kwargs: \n{likelihood_kwargs}")

nullpol-0.2.4/tests/cli/test_input.py

@@ -0,0 +1,179 @@
+"""Tests for likelihood construction from CLI input."""
+
+from __future__ import annotations
+
+import types
+
+from bilby_pipe.main import parse_args
+
+from nullpol.cli import input as input_module
+from nullpol.cli.data_analysis import DataAnalysisInput
+from nullpol.cli.parser import create_nullpol_parser
+
+
+class _KeywordOnlyLikelihood:
+    """Capture the arguments supplied by :attr:`Input.likelihood`."""
+
+    def __init__(
+        self,
+        interferometers,
+        wavelet_frequency_resolution,
+        wavelet_nx,
+        polarization_modes,
+        *args,
+        polarization_basis=None,
+        time_frequency_filter=None,
+        **kwargs,
+    ):
+        self.interferometers = interferometers
+        self.wavelet_frequency_resolution = wavelet_frequency_resolution
+        self.wavelet_nx = wavelet_nx
+        self.polarization_modes = polarization_modes
+        self.polarization_basis = polarization_basis
+        self.time_frequency_filter = time_frequency_filter
+        self.extra_kwargs = kwargs
+
+
+class _StrictLikelihood:
+    """Likelihood without ``**kwargs``; unknown extras must be dropped, not forwarded."""
+
+    def __init__(
+        self,
+        interferometers,
+        wavelet_frequency_resolution,
+        wavelet_nx,
+        polarization_modes,
+        polarization_basis=None,
+        time_frequency_filter=None,
+        priors=None,
+    ):
+        self.interferometers = interferometers
+        self.wavelet_frequency_resolution = wavelet_frequency_resolution
+        self.wavelet_nx = wavelet_nx
+        self.polarization_modes = polarization_modes
+        self.polarization_basis = polarization_basis
+        self.time_frequency_filter = time_frequency_filter
+        self.priors = priors
+
+
+def _build_inputs(args, *, interferometers, time_frequency_filter, priors, likelihood_type=None):
+    """Assemble a :class:`DataAnalysisInput` wired for :attr:`Input.likelihood`."""
+    inputs = object.__new__(DataAnalysisInput)
+    inputs._interferometers = interferometers
+    inputs.search_priors = priors
+    inputs.wavelet_frequency_resolution = 16.0
+    inputs.wavelet_nx = 4.0
+    inputs.polarization_modes = args.polarization_modes
+    inputs.polarization_basis = args.polarization_basis
+    inputs.meta_data = {"time_frequency_filter": time_frequency_filter}
+    inputs.likelihood_type = likelihood_type if likelihood_type is not None else args.likelihood_type
+    inputs.extra_likelihood_kwargs = args.extra_likelihood_kwargs
+    return inputs
+
+
+def _parse_config(tmp_path, body):
+    config_file = tmp_path / "analysis.ini"
+    config_file.write_text(body, encoding="utf-8")
+    args, unknown_args = parse_args([str(config_file)], create_nullpol_parser(top_level=False))
+    assert unknown_args == []
+    return args
+
+
+def test_analysis_config_forwards_keyword_only_parameters(monkeypatch, tmp_path):
+    """A configured analysis forwards its normalized basis to the likelihood."""
+    args = _parse_config(
+        tmp_path,
+        "polarization-modes = pc\n"
+        "polarization-basis = p\n"
+        "extra-likelihood-kwargs = {'regularization_constant': 0.99}\n",
+    )
+
+    assert args.polarization_modes == ["pc"]
+    assert args.polarization_basis == ["p"]
+
+    interferometers = object()
+    time_frequency_filter = object()
+    priors = object()
+    inputs = _build_inputs(
+        args,
+        interferometers=interferometers,
+        time_frequency_filter=time_frequency_filter,
+        priors=priors,
+    )
+
+    assert inputs.polarization_modes == "pc"
+    assert inputs.polarization_basis == "p"
+
+    monkeypatch.setattr(input_module, "Chi2TimeFrequencyLikelihood", _KeywordOnlyLikelihood)
+
+    likelihood = input_module.Input.likelihood.fget(inputs)
+
+    assert likelihood.interferometers is interferometers
+    assert likelihood.wavelet_frequency_resolution == 16.0
+    assert likelihood.wavelet_nx == 4.0
+    assert likelihood.polarization_modes == "pc"
+    assert likelihood.polarization_basis == "p"
+    assert likelihood.time_frequency_filter is time_frequency_filter
+    assert likelihood.extra_kwargs == {"regularization_constant": 0.99}
+
+
+def test_extra_kwargs_dropped_when_likelihood_rejects_variadic(monkeypatch, tmp_path):
+    """A likelihood without ``**kwargs`` must not receive unknown extras (no TypeError)."""
+    args = _parse_config(
+        tmp_path,
+        "polarization-modes = pc\n"
+        "polarization-basis = p\n"
+        "extra-likelihood-kwargs = {'regularization_constant': 0.99}\n",
+    )
+
+    interferometers = object()
+    time_frequency_filter = object()
+    priors = object()
+    inputs = _build_inputs(
+        args,
+        interferometers=interferometers,
+        time_frequency_filter=time_frequency_filter,
+        priors=priors,
+    )
+
+    monkeypatch.setattr(input_module, "Chi2TimeFrequencyLikelihood", _StrictLikelihood)
+
+    # Would raise ``TypeError: unexpected keyword argument 'regularization_constant'``
+    # if the unknown extra were forwarded to a signature without ``**kwargs``.
+    likelihood = input_module.Input.likelihood.fget(inputs)
+
+    assert likelihood.interferometers is interferometers
+    assert likelihood.polarization_basis == "p"
+    assert likelihood.time_frequency_filter is time_frequency_filter
+    assert likelihood.priors is priors
+
+
+def test_dotted_path_forwards_keyword_only_parameters(monkeypatch, tmp_path):
+    """The ``module.Class`` likelihood_type branch also forwards keyword-only params."""
+    args = _parse_config(
+        tmp_path,
+        "polarization-modes = pc\n"
+        "polarization-basis = p\n"
+        "extra-likelihood-kwargs = {'regularization_constant': 0.99}\n",
+    )
+
+    interferometers = object()
+    time_frequency_filter = object()
+    priors = object()
+    inputs = _build_inputs(
+        args,
+        interferometers=interferometers,
+        time_frequency_filter=time_frequency_filter,
+        priors=priors,
+        likelihood_type="my_pkg.CustomLikelihood",
+    )
+
+    fake_module = types.ModuleType("my_pkg")
+    fake_module.CustomLikelihood = _KeywordOnlyLikelihood
+    monkeypatch.setattr(input_module, "import_module", lambda name: fake_module)
+
+    likelihood = input_module.Input.likelihood.fget(inputs)
+
+    assert likelihood.polarization_basis == "p"
+    assert likelihood.time_frequency_filter is time_frequency_filter
+    assert likelihood.extra_kwargs == {"regularization_constant": 0.99}