mccode-plumber 0.10.0__tar.gz → 0.11.1__tar.gz

{mccode_plumber-0.10.0/src/mccode_plumber.egg-info → mccode_plumber-0.11.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: mccode-plumber
-Version: 0.10.0
+Version: 0.11.1
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 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.7.0
+Requires-Dist: restage>=0.7.1
 Requires-Dist: mccode-to-kafka>=0.2.2
 Requires-Dist: moreniius>=0.4.0
 Requires-Dist: icecream

{mccode_plumber-0.10.0 → mccode_plumber-0.11.1}/pyproject.toml

@@ -8,7 +8,7 @@ dependencies = [
     'p4p',
     'kafka-python>=2.2.11',
     'ess-streaming-data-types>=0.14.0',
-    'restage>=0.7.0',
+    'restage>=0.7.1',
     'mccode-to-kafka>=0.2.2',
     'moreniius>=0.4.0',
     'icecream',

{mccode_plumber-0.10.0 → mccode_plumber-0.11.1}/src/mccode_plumber/forwarder.py

@@ -31,30 +31,30 @@ def normalise_pvs(pvs: list[dict], config=None, prefix=None, topic=None):
 
 
 def streams(pvs: list[dict]):
-    from streaming_data_types.forwarder_config_update_rf5k import StreamInfo, Protocol
-    return [StreamInfo(pv['source'], pv['module'], pv['topic'], Protocol.Protocol.PVA) for pv in pvs]
+    from streaming_data_types.forwarder_config_update_fc00 import StreamInfo, Protocol
+    return [StreamInfo(pv['source'], pv['module'], pv['topic'], Protocol.Protocol.PVA, periodic=False) for pv in pvs]
 
 
 def configure_forwarder(pvs: list[dict], config=None, prefix=None, topic=None):
     from confluent_kafka import Producer
-    from streaming_data_types.forwarder_config_update_rf5k import serialise_rf5k, StreamInfo, Protocol
-    from streaming_data_types.fbschemas.forwarder_config_update_rf5k.UpdateType import UpdateType
+    from streaming_data_types.forwarder_config_update_fc00 import serialise_fc00 as serialise
+    from streaming_data_types.fbschemas.forwarder_config_update_fc00.UpdateType import UpdateType
 
     cfg_broker, cfg_topic, pvs = normalise_pvs(pvs, config, prefix, topic)
     producer = Producer({"bootstrap.servers": cfg_broker})
-    producer.produce(cfg_topic, serialise_rf5k(UpdateType.ADD, streams(pvs)))
+    producer.produce(cfg_topic, serialise(UpdateType.ADD, streams(pvs)))
     producer.flush()
     return pvs
 
 
 def reset_forwarder(pvs: list[dict], config=None, prefix=None, topic=None):
     from confluent_kafka import Producer
-    from streaming_data_types.forwarder_config_update_rf5k import serialise_rf5k
-    from streaming_data_types.fbschemas.forwarder_config_update_rf5k.UpdateType import UpdateType
+    from streaming_data_types.forwarder_config_update_fc00 import serialise_fc00 as serialise
+    from streaming_data_types.fbschemas.forwarder_config_update_fc00.UpdateType import UpdateType
 
     cfg_broker, cfg_topic, pvs = normalise_pvs(pvs, config, prefix, topic)
     producer = Producer({"bootstrap.servers": cfg_broker})
-    producer.produce(cfg_topic, serialise_rf5k(UpdateType.REMOVE, streams(pvs)))
+    producer.produce(cfg_topic, serialise(UpdateType.REMOVE, streams(pvs)))
     producer.flush()
     return pvs
 

{mccode_plumber-0.10.0 → mccode_plumber-0.11.1/src/mccode_plumber.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: mccode-plumber
-Version: 0.10.0
+Version: 0.11.1
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 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.7.0
+Requires-Dist: restage>=0.7.1
 Requires-Dist: mccode-to-kafka>=0.2.2
 Requires-Dist: moreniius>=0.4.0
 Requires-Dist: icecream

{mccode_plumber-0.10.0 → mccode_plumber-0.11.1}/src/mccode_plumber.egg-info/requires.txt

@@ -1,7 +1,7 @@
 p4p
 kafka-python>=2.2.11
 ess-streaming-data-types>=0.14.0
-restage>=0.7.0
+restage>=0.7.1
 mccode-to-kafka>=0.2.2
 moreniius>=0.4.0
 icecream