mccode-plumber 0.12.0__py3-none-any.whl → 0.13.0__py3-none-any.whl

mccode_plumber/manage/efu.py

@@ -51,11 +51,20 @@ class EventFormationUnitConfig:
 
     def to_cli_str(self):
         from json import dumps
-        return dumps(self.to_dict()).translate(str.maketrans(',',';',' {}"'))
+        return dumps(self.to_dict()).translate(str.maketrans('','',' {}"'))
 
     @classmethod
     def from_cli_str(cls, cli_str: str):
-        data ={k: v for k, v in [z.split(':') for z in [x for x in cli_str.split(';')]]}
+        """Split a command-line argument string into a EventFormationUnitConfig
+
+        Note
+        ----
+        A command-line argument string is expected to have the following format:
+            "arg1:value1,arg2:value2,...,argN:valueN"
+        That is, key-value pairs separated from each other by commas and internally
+        by a colon. This allows for _values_ which contain colons, but not keys.
+        """
+        data =dict(z.split(':', maxsplit=1) for z in [x for x in cli_str.split(',')])
         return cls.from_dict(data)
 
 

mccode_plumber/manage/orchestrate.py

@@ -170,6 +170,11 @@ def get_instr_name_and_parameters(file: str | Path):
         from mccode_antlr.loader import load_mcstas_instr
         instr = load_mcstas_instr(file)
         return instr.name, instr.parameters
+    elif file.suffix.lower() == '.json':
+        # No shortcuts, but much faster
+        from mccode_antlr.io.json import load_json
+        instr = load_json(file)
+        return instr.name, instr.parameters
 
     raise ValueError('Unsupported file extension')
 
@@ -177,17 +182,17 @@ def get_instr_name_and_parameters(file: str | Path):
 def efu_parameter(s: str):
     if ':' in s:
         # with any ':' we require fully specified
-        #  name:{name};binary:{binary};config:{config_path};calibration:{calibration_path};topic:{topic};port:{port}
+        #  name:{name},binary:{binary},config:{config_path},calibration:{calibration_path},topic:{topic},port:{port}
         # what about spaces? or windows-style paths with C:/...
         return EventFormationUnitConfig.from_cli_str(s)
     # otherwise, allow an abbreviated format utilizing guesses
     # Expected format is now:
-    #       {efu_binary}[;{calibration/file}[;{config/file}]][;{port}]
+    #       {efu_binary}[,{calibration/file}[,{config/file}]][,{port}]
     # That is, if you specify --efu, you must give its binary path and should
     # give its port. The calibration/file determines pixel calculations, so is more
     # likely to be needed. Finally, the config file can also be supplied to change, e.g.,
     # number of pixels or rings, etc.
-    parts = s.split(';')
+    parts = s.split(',')
     data = {'topic': TOPICS['event'], 'port': 9000, 'binary': ensure_executable(parts[0]),}
     data['name'] = data['binary'].stem
 
@@ -214,7 +219,7 @@ def make_services_parser():
     a('-v', '--version', action='version', version=__version__)
     # No need to specify the broker, or monitor source or topic names
     a('-b', '--broker', type=str, default=None, help='Kafka broker for all services', metavar='address:port')
-    a('--efu', type=efu_parameter, action='append', default=None, help='Configuration of one EFU, repeatable', metavar='name;calibration;config;port')
+    a('--efu', type=efu_parameter, action='append', default=None, help='Configuration of one EFU, repeatable', metavar='name,calibration,config,port')
     a('--writer-working-dir', type=str, default=None, help='Working directory for kafka-to-nexus')
     a('--writer-verbosity', type=str, default=None, help='Verbose output type (trace, debug, warning, error, critical)')
     a('--forwarder-verbosity', type=str, default=None,  help='Verbose output type (trace, debug, warning, error, critical)')

{mccode_plumber-0.12.0.dist-info → mccode_plumber-0.13.0.dist-info}/METADATA

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: mccode-plumber
-Version: 0.12.0
+Version: 0.13.0
 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.2
+Requires-Dist: restage>=0.8.0
 Requires-Dist: mccode-to-kafka>=0.2.2
-Requires-Dist: moreniius>=0.4.0
+Requires-Dist: moreniius>=0.5.0
 Requires-Dist: icecream
 Requires-Dist: ephemeral-port-reserve
 

{mccode_plumber-0.12.0.dist-info → mccode_plumber-0.13.0.dist-info}/RECORD

@@ -21,15 +21,15 @@ mccode_plumber/file_writer_control/WorkerStatus.py,sha256=uw1q-Pvf1o2hxpMIPVwdtn
 mccode_plumber/file_writer_control/WriteJob.py,sha256=-2tQvfajctf6Bn19c9hT9N1lOP0uTo7SZRMnXV1A-aA,2721
 mccode_plumber/file_writer_control/__init__.py,sha256=Wp8A7JOB0vgpwAbvI9ik5cBlZa6lY-cq8dxYGRTRs0M,285
 mccode_plumber/manage/__init__.py,sha256=l-ZiKPjvahBP1oG-iwLHWU5m5YbZbyWVtmiZst5Wluo,693
-mccode_plumber/manage/efu.py,sha256=NuDwTh3KTlgBcUNSNtLVILQu34oRFIVwE1nMnPVP9WQ,5158
+mccode_plumber/manage/efu.py,sha256=yzsQ4cpsIvh2GbrQ9rwL_cGAW3SEoEBAdWOTnj2ia74,5572
 mccode_plumber/manage/ensure.py,sha256=0HaxcHYzvcDs6hBvBI39EZsIDt_rVA9CjHm5_yvOZcs,2601
 mccode_plumber/manage/epics.py,sha256=oQt_hL-7KgtI9Kmwyw8L7a7RxQe7YJWRbmHnKIqMLpQ,1310
 mccode_plumber/manage/forwarder.py,sha256=YYvHaOJ4djBXM7PFF2NBbnNDO6nnrwNOfSHaVOh16Ro,2876
 mccode_plumber/manage/manager.py,sha256=zzrduroUL-jwQ9BrPTdAm1IW4dGv5bi8-ieIQ6qiQ6M,4141
-mccode_plumber/manage/orchestrate.py,sha256=bGhjbEaiUR__3CtqTGuSyFF5vb4RwvxpznOvJ9cK77k,17460
+mccode_plumber/manage/orchestrate.py,sha256=CH1on_ea7T9xg8dr8E8bwU1Iervuc_5N6X7bsW7mhM0,17668
 mccode_plumber/manage/writer.py,sha256=SEv1U14L01Y9-BcaJKPei4Ah2LFfwexDy9FTjpvtSEs,2245
-mccode_plumber-0.12.0.dist-info/METADATA,sha256=3OT7yTz4EQFQrVzRe5cTT3KoA5ZcO93wByGkz1UKxhE,594
-mccode_plumber-0.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mccode_plumber-0.12.0.dist-info/entry_points.txt,sha256=JiuAHxI6YuGgJ4682TCyeBEJnS0ygDWpErrLaKgAicI,844
-mccode_plumber-0.12.0.dist-info/top_level.txt,sha256=kCCIpYtKHCKWxiPEqX9J1UaGEm-ze0Qb-cemBCEPhDA,15
-mccode_plumber-0.12.0.dist-info/RECORD,,
+mccode_plumber-0.13.0.dist-info/METADATA,sha256=6LM5ZEl7-VXVKTSsI_FKNLAd8hVReLD3s_X1LqOaJtI,594
+mccode_plumber-0.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mccode_plumber-0.13.0.dist-info/entry_points.txt,sha256=JiuAHxI6YuGgJ4682TCyeBEJnS0ygDWpErrLaKgAicI,844
+mccode_plumber-0.13.0.dist-info/top_level.txt,sha256=kCCIpYtKHCKWxiPEqX9J1UaGEm-ze0Qb-cemBCEPhDA,15
+mccode_plumber-0.13.0.dist-info/RECORD,,