essreduce 24.11.2__py3-none-any.whl → 24.11.3__py3-none-any.whl

ess/reduce/nexus/types.py

@@ -91,6 +91,8 @@ Monitor4 = NewType('Monitor4', int)
 """Identifier for an arbitrary monitor"""
 Monitor5 = NewType('Monitor5', int)
 """Identifier for an arbitrary monitor"""
+Monitor6 = NewType('Monitor6', int)
+"""Identifier for an arbitrary monitor"""
 IncidentMonitor = NewType('IncidentMonitor', int)
 """Incident monitor"""
 TransmissionMonitor = NewType('TransmissionMonitor', int)
@@ -102,6 +104,7 @@ MonitorType = TypeVar(
     Monitor3,
     Monitor4,
     Monitor5,
+    Monitor6,
     IncidentMonitor,
     TransmissionMonitor,
 )
@@ -119,6 +122,7 @@ Component = TypeVar(
     Monitor3,
     Monitor4,
     Monitor5,
+    Monitor6,
     IncidentMonitor,
     TransmissionMonitor,
 )

ess/reduce/parameter.py

@@ -126,6 +126,11 @@ class StringParameter(Parameter[str]):
     pass
 
 
+@dataclass
+class MultiStringParameter(Parameter[tuple[str, ...]]):
+    """Widget for entering multiple strings."""
+
+
 @dataclass(kw_only=True)
 class ParamWithBounds(Parameter[T]):
     bounds: tuple[T, T]

ess/reduce/widgets/__init__.py

@@ -10,6 +10,7 @@ from ..parameter import (
     BooleanParameter,
     FilenameParameter,
     MultiFilenameParameter,
+    MultiStringParameter,
     ParamWithOptions,
     StringParameter,
     Parameter,
@@ -21,9 +22,11 @@ from ..parameter import (
 from ._config import default_layout, default_style
 
 from ._binedges_widget import BinEdgesWidget
+from ._filename_widget import FilenameWidget, MultiFilenameWidget
 from ._linspace_widget import LinspaceWidget
 from ._vector_widget import VectorWidget
 from ._bounds_widget import BoundsWidget
+from ._string_widget import MultiStringWidget, StringWidget
 from ._switchable_widget import SwitchWidget
 from ._optional_widget import OptionalWidget
 
@@ -101,42 +104,41 @@ def boolean_parameter_widget(param: BooleanParameter):
 
 @create_parameter_widget.register(StringParameter)
 def string_parameter_widget(param: StringParameter):
-    name = param.name
-    description = param.description
-    if param.switchable:
-        return widgets.Text(
-            description=name,
-            tooltip=description,
-            layout=default_layout,
-            style=default_style,
-        )
-    else:
-        return widgets.Text(
-            value=param.default,
-            description=name,
-            tooltip=description,
-            layout=default_layout,
-            style=default_style,
-        )
+    return StringWidget(
+        description=param.name,
+        value=param.default,
+        layout=default_layout,
+        style=default_style,
+    )
+
+
+@create_parameter_widget.register(MultiStringParameter)
+def multi_string_parameter_widget(param: MultiStringParameter):
+    return MultiStringWidget(
+        description=param.name,
+        value=param.default,
+        layout=default_layout,
+        style=default_style,
+    )
 
 
 @create_parameter_widget.register(FilenameParameter)
 def filename_parameter_widget(param: FilenameParameter):
-    return widgets.Text(
+    return FilenameWidget(
         description=param.name,
+        value=param.default,
         layout=default_layout,
         style=default_style,
-        value=param.default,
     )
 
 
 @create_parameter_widget.register(MultiFilenameParameter)
 def multi_filename_parameter_widget(param: MultiFilenameParameter):
-    return widgets.Text(
+    return MultiFilenameWidget(
         description=param.name,
+        value=param.default,
         layout=default_layout,
         style=default_style,
-        value=param.default,
     )
 
 
@@ -182,7 +184,9 @@ __all__ = [
     'BinEdgesWidget',
     'BoundsWidget',
     'EssWidget',
+    'FilenameWidget',
     'LinspaceWidget',
+    'MultiFilenameWidget',
     'OptionalWidget',
     'SwitchWidget',
     'VectorWidget',

ess/reduce/widgets/_filename_widget.py

@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
+
+from ._string_widget import MultiStringWidget, StringWidget
+
+
+class FilenameWidget(StringWidget): ...
+
+
+class MultiFilenameWidget(MultiStringWidget): ...

ess/reduce/widgets/_string_widget.py

@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
+from ipywidgets import HBox, Text, ValueWidget
+
+from ._config import default_layout
+
+
+class StringWidget(HBox, ValueWidget):
+    def __init__(self, description: str, value: str | None = None, **kwargs):
+        super().__init__(layout=default_layout)
+        self.text_widget = Text(description=description, value=value, **kwargs)
+        self.children = [self.text_widget]
+
+    @property
+    def value(self) -> str | None:
+        v = self.text_widget.value.strip()
+        if not v:
+            return None
+        return v
+
+    @value.setter
+    def value(self, value: str | None):
+        if value is None:
+            self.text_widget.value = ''
+        else:
+            self.text_widget.value = value
+
+
+class MultiStringWidget(StringWidget):
+    @property
+    def value(self) -> tuple[str, ...]:
+        v = super().value
+        if v is None:
+            return ()
+        return tuple(s.strip() for s in v.split(','))
+
+    @value.setter
+    def value(self, value: tuple[str, ...]):
+        self.text_widget.value = ', '.join(value)

ess/reduce/workflow.py

@@ -86,10 +86,7 @@ def assign_parameter_values(pipeline: Pipeline, values: dict[Key, Any]) -> Pipel
     """Set a value for a parameter in the pipeline."""
     pipeline = pipeline.copy()
     for key, value in values.items():
-        if (
-            isinstance(value, tuple)
-            and (mapper := parameter_mappers.get(key)) is not None
-        ):
+        if (mapper := parameter_mappers.get(key)) is not None:
             pipeline = mapper(pipeline, value)
         else:
             pipeline[key] = value

{essreduce-24.11.2.dist-info → essreduce-24.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: essreduce
-Version: 24.11.2
+Version: 24.11.3
 Summary: Common data reduction tools for the ESS facility
 Author: Scipp contributors
 License: BSD 3-Clause License

{essreduce-24.11.2.dist-info → essreduce-24.11.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
 ess/reduce/__init__.py,sha256=-8a2I4mbJdBgNqKxZJe0lAEQJb-lRjX1xmZvGUWCmmU,382
 ess/reduce/data.py,sha256=vaoeAJ6EpK1YghOiAALLdWiW17TgUnnnt0H-RGiGzXk,3756
 ess/reduce/logging.py,sha256=6n8Czq4LZ3OK9ENlKsWSI1M3KvKv6_HSoUiV4__IUlU,357
-ess/reduce/parameter.py,sha256=9glQk8UgsPDIdxq007bRi3xTKNe24nuAcNDYzYyTydk,4443
+ess/reduce/parameter.py,sha256=R3y2SMk9EIHWfT7_89Sx6Km2mtni5qCWLVGRi8hVO7A,4560
 ess/reduce/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ess/reduce/streaming.py,sha256=nEO1Xg6LbQ36F44UaVmSNe2MSWmpwz97y9tnlc-z0zA,7493
 ess/reduce/ui.py,sha256=EjzyMUODHn-5-aHRXE3DDWUsaPbsQRiUP2F4o1Hq260,8427
 ess/reduce/uncertainty.py,sha256=UrS7wB2aK8QoLD3qG2Ud-XmjDl7Y9dANY31k83-cZKs,6982
-ess/reduce/workflow.py,sha256=v0_QlTEub9FLeZAbbZMV_NrLJUT61jTRCFa9Wjli7sE,3125
+ess/reduce/workflow.py,sha256=sL34T_2Cjl_8iFlegujxI9VyOUwo6erVC8pOXnfWgYw,3060
 ess/reduce/live/__init__.py,sha256=jPQVhihRVNtEDrE20PoKkclKV2aBF1lS7cCHootgFgI,204
 ess/reduce/live/raw.py,sha256=w-h-G-rXIFxwJ9rxIlCLQepGxLmUjtF2rbXtAUxDgZs,18849
 ess/reduce/live/workflow.py,sha256=bsbwvTqPhRO6mC__3b7MgU7DWwAnOvGvG-t2n22EKq8,4285
@@ -14,20 +14,22 @@ ess/reduce/nexus/__init__.py,sha256=PxJkhlGcFRzVU4SICBhymK5_5FjM5oXPZ8YUpd0v1pE,
 ess/reduce/nexus/_nexus_loader.py,sha256=-chpzKcZGr2cXmvSYlGiKdKV591mMG-0BsBusGWTer4,16119
 ess/reduce/nexus/json_generator.py,sha256=ME2Xn8L7Oi3uHJk9ZZdCRQTRX-OV_wh9-DJn07Alplk,2529
 ess/reduce/nexus/json_nexus.py,sha256=QrVc0p424nZ5dHX9gebAJppTw6lGZq9404P_OFl1giA,10282
-ess/reduce/nexus/types.py,sha256=Bthjg4T2qXYF1rjU9i0DRAEqkCuYXbV3qF2zWPl_s-Q,8571
+ess/reduce/nexus/types.py,sha256=YIXECk-bctwexCvimLrlv97GMLj1UnGHLV3C95IcBOw,8677
 ess/reduce/nexus/workflow.py,sha256=xcOjfJRECQ_CAxPbc0nr-BbGXe3rUISEDcu3g7D87Nk,22868
 ess/reduce/scripts/grow_nexus.py,sha256=hET3h06M0xlJd62E3palNLFvJMyNax2kK4XyJcOhl-I,3387
-ess/reduce/widgets/__init__.py,sha256=f5-wlyiUQtUFe2bi_DTTpTSx8jGF50snLdhoawZfLgE,5106
+ess/reduce/widgets/__init__.py,sha256=cjRJp4qhzCQgXZFtiZgHNmHFJVLo2Z2MozVG_LZYKlI,5281
 ess/reduce/widgets/_binedges_widget.py,sha256=09VXYAWJammkzyRYvfFpjzn0E2-BSaDco3osnTUuv8c,2720
 ess/reduce/widgets/_bounds_widget.py,sha256=p5hADiSGfHKMfvEILQqpcqggu_G3bLf5vNrW5rYTA0s,1020
 ess/reduce/widgets/_config.py,sha256=LywjxYau1hsBZ-c2W1_DQ4CRMaaai3anjA8Q8Hn0Y6Y,222
+ess/reduce/widgets/_filename_widget.py,sha256=jlDZOvECJBBjsmfBHjhn8-ig_DQxp3C-Uy07DITs_nI,262
 ess/reduce/widgets/_linspace_widget.py,sha256=73nPfNSinxfuHN5-kkBoo2oTuGygbLVXPvxaw35xsaU,1175
 ess/reduce/widgets/_optional_widget.py,sha256=A7vwcVwykj7CIyHSPVh6XL5o-8Z1uJTuzha8TR09Zlc,2216
+ess/reduce/widgets/_string_widget.py,sha256=r0PrFP4OOU_UTmwlHYDWcaFMlnYS_NUp7iCic9ehBAU,1148
 ess/reduce/widgets/_switchable_widget.py,sha256=SZi65C1iShTi5Xhh7W0A7uwA-12AVaH5xmiIWOkc27o,1726
 ess/reduce/widgets/_vector_widget.py,sha256=BvuTtc-NGFTkMKIiZS0Elnl34Hi_3A4rthdNLoDI5fM,1138
-essreduce-24.11.2.dist-info/LICENSE,sha256=nVEiume4Qj6jMYfSRjHTM2jtJ4FGu0g-5Sdh7osfEYw,1553
-essreduce-24.11.2.dist-info/METADATA,sha256=Lv30Wx2xHZw6RqkkkRTcPX3FyLlk1BYtpDVddaKTNmQ,3619
-essreduce-24.11.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-essreduce-24.11.2.dist-info/entry_points.txt,sha256=PMZOIYzCifHMTe4pK3HbhxUwxjFaZizYlLD0td4Isb0,66
-essreduce-24.11.2.dist-info/top_level.txt,sha256=0JxTCgMKPLKtp14wb1-RKisQPQWX7i96innZNvHBr-s,4
-essreduce-24.11.2.dist-info/RECORD,,
+essreduce-24.11.3.dist-info/LICENSE,sha256=nVEiume4Qj6jMYfSRjHTM2jtJ4FGu0g-5Sdh7osfEYw,1553
+essreduce-24.11.3.dist-info/METADATA,sha256=wpqZdOA7tOrAlGWLiDPzN3E9Nh8-6B6Pk3CFOSSdr-Y,3619
+essreduce-24.11.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+essreduce-24.11.3.dist-info/entry_points.txt,sha256=PMZOIYzCifHMTe4pK3HbhxUwxjFaZizYlLD0td4Isb0,66
+essreduce-24.11.3.dist-info/top_level.txt,sha256=0JxTCgMKPLKtp14wb1-RKisQPQWX7i96innZNvHBr-s,4
+essreduce-24.11.3.dist-info/RECORD,,