mccode-plumber 0.15.0__py3-none-any.whl → 0.16.0__py3-none-any.whl

mccode_plumber/forwarder.py

@@ -7,6 +7,7 @@ list of EPICS PVs to monitor.
 Alternatively, the same functionality can be accessed from Python using the configure_forwarder and reset_forwarder
 functions. Which take PV information and Forwarder/Kafka configuration as arguments.
 """
+from mccode_antlr.common import InstrumentParameter
 
 
 def normalise_pvs(pvs: list[dict], config=None, prefix=None, topic=None):
@@ -59,10 +60,19 @@ def reset_forwarder(pvs: list[dict], config=None, prefix=None, topic=None):
     return pvs
 
 
-def forwarder_partial_streams(prefix, topic, parameters):
-    names = [p.name for p in parameters]
-    if 'mcpl_filename' not in names:
-        names.append("mcpl_filename")
+def forwarder_partial_streams(prefix: str, topic: str, parameters: list[InstrumentParameter]):
+    from mccode_antlr.common import DataType
+    # The streaming-data-type f144 only supports numeric data, so we need to
+    # filter out string-valued data types to avoid annoying error messages in the
+    # forwarder's log output.
+    names = [p.name for p in parameters if p.value.data_type is not DataType.str]
+
+    # splitrun adds an instrument parameter named 'mcpl_filename', but we also
+    # can not forward this since it is a string-valued parameter.
+    #
+    #if 'mcpl_filename' not in names:
+    #    names.append("mcpl_filename")
+
     # Minimal information used by the forwarder for stream setup:
     partial = [dict(source=f'{prefix}{n}', module='f144', topic=topic) for n in names]
     return partial

mccode_plumber/writer.py

@@ -311,8 +311,16 @@ def construct_writer_pv_dicts(instr: Path | str, prefix: str, topic: str):
 
 
 def construct_writer_pv_dicts_from_parameters(parameters, prefix: str, topic: str):
+    from mccode_antlr.common import DataType
+
     def strip_quotes(s):
         return s[1:-1] if s is not None and len(s) > 2 and (s[0] == s[-1] == '"' or s[0] == s[-1] == "'") else s
+
+    # Remove string-valued parameters from the provided list since they are not
+    # supported by streaming-data-type f144. In the future we could specify a different
+    # module for them instead.
+    parameters = [p for p in parameters if p.value.data_type is not DataType.str]
+
     return [dict(name=p.name, dtype=p.value.data_type.name, source=f'{prefix}{p.name}', topic=topic,
                  description=parameter_description(p), module='f144', unit=strip_quotes(p.unit)) for p in parameters]
 

{mccode_plumber-0.15.0.dist-info → mccode_plumber-0.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mccode-plumber
-Version: 0.15.0
+Version: 0.16.0
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
@@ -12,9 +12,9 @@ Description-Content-Type: text/markdown
 Requires-Dist: p4p
 Requires-Dist: kafka-python>=2.2.11
 Requires-Dist: ess-streaming-data-types>=0.14.0
-Requires-Dist: restage>=0.10.0
+Requires-Dist: restage>=0.10.1
 Requires-Dist: mccode-to-kafka>=0.3.1
-Requires-Dist: moreniius>=0.6.2
+Requires-Dist: moreniius>=0.6.3
 Requires-Dist: icecream
 Requires-Dist: ephemeral-port-reserve
 Provides-Extra: test

{mccode_plumber-0.15.0.dist-info → mccode_plumber-0.16.0.dist-info}/RECORD

@@ -2,12 +2,12 @@ mccode_plumber/__init__.py,sha256=ZQMwyPQ6GyoEkKXj7aWETPqhXfwUbDOD5EpvlXj1c18,14
 mccode_plumber/conductor.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mccode_plumber/epics.py,sha256=BqkT4A0i1VRMshZU-L0NlJy3BoVDcpHkoKm6gnVB4C8,6217
 mccode_plumber/epics_watcher.py,sha256=Jiz761A5NfoUzJ6ZzBGg8_BewFTmHDo5qYgh_DZHx_4,3973
-mccode_plumber/forwarder.py,sha256=yzjb--r8M6vNSsWvvOi5IjXqpRn8MvT13cv89ezNEeU,3994
+mccode_plumber/forwarder.py,sha256=Nccjof4GydaZLFyk_Ij9xBXy8QUpGigOV6lOPGw0PAQ,4513
 mccode_plumber/kafka.py,sha256=1BVTsGmiFJPkl-5RVJbkLm68AKRCp2NyngPjMcSutBs,2501
 mccode_plumber/mccode.py,sha256=vc4Gb5WhdOfuDRjEejU3Flps0C2A60sfFbMrxmKLhn0,2189
 mccode_plumber/splitrun.py,sha256=E9O88_GnoZ6vdmtgqW2kcHhg0ytJ_FH-oQDtMbSzbAI,2067
 mccode_plumber/utils.py,sha256=E8NoGo_3Z-pPEpzicVGSWfQOX8p3eR-GxElT33-kX5U,2167
-mccode_plumber/writer.py,sha256=10Y6r6s9oXWM76HYJcBSW_a0em-l_E9WJ8y22vn_-JA,21240
+mccode_plumber/writer.py,sha256=uNU1nICANNbB-gTa2WKptfls6tzmoHkUIdzmIeaFWXE,21569
 mccode_plumber/file_writer_control/CommandChannel.py,sha256=Ge5O71tZqpPmgcyYVcQe6XnxkE9r71Tf3he1ndvOFlQ,9038
 mccode_plumber/file_writer_control/CommandHandler.py,sha256=LAmr6SpriPfVJd6C38XZ2TsSoO2Dh0iSIzyo8Q3gfrc,2376
 mccode_plumber/file_writer_control/CommandStatus.py,sha256=acvS-KTH4hYD4xNw3i3FX0d4IukheWvKBmZ--rh1aj0,4536
@@ -29,8 +29,8 @@ mccode_plumber/manage/forwarder.py,sha256=stDKEVVfepCOqs5vBCVepaO3d63KJT-6okxooI
 mccode_plumber/manage/manager.py,sha256=hkvtH-brtn1IXQB6vN9VB1UF95nSrs48uiIebS48wJI,3876
 mccode_plumber/manage/orchestrate.py,sha256=Xqu0mm1eBzwf_pRYJzomk0YtnRtlBeQE5dvw78IuqiE,17985
 mccode_plumber/manage/writer.py,sha256=SEv1U14L01Y9-BcaJKPei4Ah2LFfwexDy9FTjpvtSEs,2245
-mccode_plumber-0.15.0.dist-info/METADATA,sha256=tfUoyk7jDp64bf8zP7x-NXjda-ybU7RZYJa6Dkstzj0,957
-mccode_plumber-0.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mccode_plumber-0.15.0.dist-info/entry_points.txt,sha256=k3LDo_9HG2v4-IgMYlNukphdMmaAT6zkJZYaB1zJh3c,900
-mccode_plumber-0.15.0.dist-info/top_level.txt,sha256=kCCIpYtKHCKWxiPEqX9J1UaGEm-ze0Qb-cemBCEPhDA,15
-mccode_plumber-0.15.0.dist-info/RECORD,,
+mccode_plumber-0.16.0.dist-info/METADATA,sha256=fRIadyUywJuKm7sw9etWeJLdFCHA89IzpPFjlBK4ncM,957
+mccode_plumber-0.16.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mccode_plumber-0.16.0.dist-info/entry_points.txt,sha256=k3LDo_9HG2v4-IgMYlNukphdMmaAT6zkJZYaB1zJh3c,900
+mccode_plumber-0.16.0.dist-info/top_level.txt,sha256=kCCIpYtKHCKWxiPEqX9J1UaGEm-ze0Qb-cemBCEPhDA,15
+mccode_plumber-0.16.0.dist-info/RECORD,,