mccode-plumber 0.8.0__tar.gz → 0.8.2__tar.gz

{mccode_plumber-0.8.0/src/mccode_plumber.egg-info → mccode_plumber-0.8.2}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: mccode-plumber
-Version: 0.8.0
+Version: 0.8.2
 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.0
 Requires-Dist: ess-streaming-data-types>=0.14.0
-Requires-Dist: restage>=0.4.0
+Requires-Dist: restage>=0.5.0
 Requires-Dist: mccode-to-kafka>=0.2.2
 Requires-Dist: moreniius>=0.2.3
 Requires-Dist: icecream

{mccode_plumber-0.8.0 → mccode_plumber-0.8.2}/pyproject.toml

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

mccode_plumber-0.8.2/src/mccode_plumber/__init__.py

@@ -0,0 +1,6 @@
+from importlib.metadata import version, PackageNotFoundError
+
+try:
+    __version__ = version('mccode-plumber')
+except PackageNotFoundError:
+    pass

{mccode_plumber-0.8.0 → mccode_plumber-0.8.2}/src/mccode_plumber/epics.py

@@ -53,9 +53,11 @@ class MailboxHandler:
 
 def get_parser():
     from argparse import ArgumentParser
+    from mccode_plumber import __version__
     p = ArgumentParser()
     p.add_argument('instr', type=str, help='The instrument file to read')
     p.add_argument('-p', '--prefix', type=str, help='The EPICS PV prefix to use', default='mcstas:')
+    p.add_argument('-v', '--version', action='version', version=__version__)
     return p
 
 

{mccode_plumber-0.8.0 → mccode_plumber-0.8.2}/src/mccode_plumber/forwarder.py

@@ -62,12 +62,14 @@ def reset_forwarder(pvs: list[dict], config=None, prefix=None, topic=None):
 def parse_registrar_args():
     from argparse import ArgumentParser
     from .mccode import get_mccode_instr_parameters
+    from mccode_plumber import __version__
 
     parser = ArgumentParser(description="Discover EPICS PVs and inform a forwarder about them")
     parser.add_argument('-p', '--prefix', type=str, default='mcstas:')
     parser.add_argument('instrument', type=str, help="The mcstas instrument with EPICS PVs")
     parser.add_argument('-c', '--config', type=str, help="The Kafka server and topic for configuring the Forwarder")
     parser.add_argument('-t', '--topic', type=str, help="The Kafka topic to instruct the Forwarder to send data to")
+    parser.add_argument('-v', '--version', action='version', version=__version__)
 
     args = parser.parse_args()
     parameter_names = [p.name for p in get_mccode_instr_parameters(args.instrument)]

{mccode_plumber-0.8.0 → mccode_plumber-0.8.2}/src/mccode_plumber/kafka.py

@@ -1,9 +1,11 @@
 def parse_kafka_topic_args():
     from argparse import ArgumentParser
+    from mccode_plumber import __version__
     parser = ArgumentParser(description="Prepare the named Kafka broker to host one or more topics")
     parser.add_argument('-b', '--broker', type=str, help='The Kafka broker server to interact with')
     parser.add_argument('topic', nargs="+", type=str, help='The Kafka topic(s) to register')
     parser.add_argument('-q', '--quiet', action='store_true', help='Quiet (positive) failure')
+    parser.add_argument('-v', '--version', action='version', version=__version__)
 
     args = parser.parse_args()
     return args

{mccode_plumber-0.8.0 → mccode_plumber-0.8.2}/src/mccode_plumber/mccode.py

@@ -1,15 +1,13 @@
 from pathlib import Path
 from typing import Union
-from mccode_antlr.instr import Instr
-from mccode_antlr.common import InstrumentParameter
 
 
-def get_mcstas_instr(filename: Union[Path, str]) -> Instr:
+def get_mcstas_instr(filename: Union[Path, str]):
     from restage.instr import load_instr
     return load_instr(filename)
 
 
-def get_mccode_instr_parameters(filename: Union[Path, str]) -> tuple[InstrumentParameter]:
+def get_mccode_instr_parameters(filename: Union[Path, str]):
     from mccode_antlr.loader.loader import parse_mccode_instr_parameters
     if not isinstance(filename, Path):
         filename = Path(filename)
@@ -42,12 +40,14 @@ def insert_mcstas_hdf5(filename: Union[Path, str], outfile: Union[Path, str], pa
 
 def get_arg_parser():
     from argparse import ArgumentParser
+    from mccode_plumber import __version__
     from .utils import is_readable, is_appendable
     parser = ArgumentParser(description="Copy a Instr HDF5 representation to a NeXus HDF5 file")
     a = parser.add_argument
     a('instrument', type=is_readable, default=None, help="The mcstas instrument file")
     a('-p', '--parent', type=str, default='mcstas')
     a('-o', '--outfile', type=is_appendable, default=None, help='Base NeXus structure, will be extended')
+    a('-v', '--version', action='version', version=__version__)
     return parser
 
 

{mccode_plumber-0.8.0 → mccode_plumber-0.8.2}/src/mccode_plumber/splitrun.py

@@ -1,10 +1,12 @@
 def make_parser():
+    from mccode_plumber import __version__
     from restage.splitrun import make_splitrun_parser
     parser = make_splitrun_parser()
     parser.prog = 'mp-splitrun'
     parser.add_argument('--broker', type=str, help='The Kafka broker to send monitors to', default=None)
     parser.add_argument('--source', type=str, help='The Kafka source name to use for monitors', default=None)
     parser.add_argument('--topic', type=str, help='The Kafka topic name(s) to use for monitors', default=None, action='append')
+    parser.add_argument('-v', '--version', action='version', version=__version__)
     return parser
 
 

{mccode_plumber-0.8.0 → mccode_plumber-0.8.2}/src/mccode_plumber/writer.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Union, Callable
-from mccode_antlr.instr import Instr
 
 from .file_writer_control import WorkerJobPool
 
@@ -145,28 +143,39 @@ def get_writer_pool(broker: str = None, job: str = None, command: str = None):
     return pool
 
 
-def define_nexus_structure(instr: Union[Path, str], pvs: list[dict], title: str = None, event_stream: dict[str, str] = None,
-                           file: Union[Path, None] = None, func: Union[Callable[[Instr], dict], None] = None,
-                           binary: Union[Path, None] = None, origin: str = None):
-    import json
-    from .mccode import get_mcstas_instr
-    if file is not None and file.exists():
-        with open(file, 'r') as file:
-            nexus_structure = json.load(file)
-    elif func is not None:
-        nexus_structure = func(get_mcstas_instr(instr))
-    elif binary is not None and binary.exists():
-        from subprocess import run, PIPE
-        result = run([binary, str(instr)], stdout=PIPE, stderr=PIPE)
-        if result.returncode != 0:
-            raise RuntimeError(f"Failed to execute {binary} {instr} due to error {result.stderr.decode()}")
-        nexus_structure = json.loads(result.stdout.decode())
-    else:
-        nexus_structure = default_nexus_structure(get_mcstas_instr(instr), origin=origin)
-    nexus_structure = add_pvs_to_nexus_structure(nexus_structure, pvs)
-    nexus_structure = add_title_to_nexus_structure(nexus_structure, title)
-    # nexus_structure = insert_events_in_nexus_structure(nexus_structure, event_stream)
-    return nexus_structure
+def make_define_nexus_structure():
+    from typing import Union, Callable
+    from mccode_antlr.instr import Instr
+
+    def define_nexus_structure(
+            instr: Union[Path, str],
+            pvs: list[dict],
+            title: str = None,
+            event_stream: dict[str, str] = None,
+            file: Union[Path, None] = None,
+            func: Union[Callable[[Instr], dict], None] = None,
+            binary: Union[Path, None] = None,
+            origin: str = None):
+        import json
+        from .mccode import get_mcstas_instr
+        if file is not None and file.exists():
+            with open(file, 'r') as file:
+                nexus_structure = json.load(file)
+        elif func is not None:
+            nexus_structure = func(get_mcstas_instr(instr))
+        elif binary is not None and binary.exists():
+            from subprocess import run, PIPE
+            result = run([binary, str(instr)], stdout=PIPE, stderr=PIPE)
+            if result.returncode != 0:
+                raise RuntimeError(f"Failed to execute {binary} {instr} due to error {result.stderr.decode()}")
+            nexus_structure = json.loads(result.stdout.decode())
+        else:
+            nexus_structure = default_nexus_structure(get_mcstas_instr(instr), origin=origin)
+        nexus_structure = add_pvs_to_nexus_structure(nexus_structure, pvs)
+        nexus_structure = add_title_to_nexus_structure(nexus_structure, title)
+        # nexus_structure = insert_events_in_nexus_structure(nexus_structure, event_stream)
+        return nexus_structure
+    return define_nexus_structure
 
 
 def start_pool_writer(start_time_string, structure, filename=None, stop_time_string: str | None = None,
@@ -224,6 +233,7 @@ def start_pool_writer(start_time_string, structure, filename=None, stop_time_str
 
 def get_arg_parser():
     from argparse import ArgumentParser
+    from mccode_plumber import __version__
     from .utils import is_callable, is_readable, is_executable, is_writable
     parser = ArgumentParser(description="Control writing Kafka stream(s) to a NeXus file")
     a = parser.add_argument
@@ -247,6 +257,7 @@ def get_arg_parser():
     a('--wait', action='store_true', help='If provided, wait for the writer to finish before exiting')
     a('--time-out', type=float, default=120., help='Wait up to the timeout for writing to start')
     a('--job-id', type=str, default=None, help='Unique Job identifier for this write-job')
+    a('-v', '--version', action='version', version=__version__)
 
     return parser
 
@@ -275,9 +286,12 @@ def construct_writer_pv_dicts_from_parameters(parameters, prefix: str, topic: st
 def parse_writer_args():
     args = get_arg_parser().parse_args()
     params = construct_writer_pv_dicts(args.instrument, args.prefix, args.topic)
-    structure = define_nexus_structure(args.instrument, params, title=args.title, origin=args.origin,
-                                       file=args.ns_file, func=args.ns_func, binary=args.ns_exec,
-                                       event_stream={'source': args.event_source, 'topic': args.event_topic})
+    define_nexus_structure = make_define_nexus_structure()
+    structure = define_nexus_structure(
+        args.instrument, params, title=args.title, origin=args.origin,
+        file=args.ns_file, func=args.ns_func, binary=args.ns_exec,
+        event_stream={'source': args.event_source, 'topic': args.event_topic}
+    )
     if args.ns_save is not None:
         from json import dump
         with open(args.ns_save, 'w') as file:
@@ -303,6 +317,7 @@ def wait_on_writer():
     from os import EX_OK, EX_UNAVAILABLE
     from time import sleep
     from datetime import datetime, timedelta
+    from mccode_plumber import __version__
     from .file_writer_control import JobHandler, CommandState
 
     from argparse import ArgumentParser
@@ -314,6 +329,7 @@ def wait_on_writer():
     a('id', type=str, help='Job id to wait on')
     a('-s', '--stop-after', type=float, help='Stop after time, seconds', default=1)
     a('-t', '--time-out', type=float, help='Time out after, seconds', default=24*60*60*30)
+    a('-v', '--version', action='version', version=__version__)
     args = parser.parse_args()
 
     pool = get_writer_pool(broker=args.broker, job=args.job, command=args.command)
@@ -338,18 +354,25 @@ def wait_on_writer():
     exit(EX_OK)
 
 
+def kill_list_parser():
+    from argparse import ArgumentParser
+    from mccode_plumber import __version__
+    parser = ArgumentParser()
+    a = parser.add_argument
+    a('-b', '--broker', help="Kafka broker", default='localhost:9092', type=str)
+    a('-c', '--command', help="Writer command topic", default="WriterCommand", type=str)
+    a('-t', '--topic', help='Writer job topic', default='WriterJobs', type=str)
+    a('-s', '--sleep', help='Post pool creation sleep time (s)', default=1, type=int)
+    a('-v', '--version', action='version', version=__version__)
+    return parser
+
+
 def kill_job():
     import time
-    from argparse import ArgumentParser
     from .file_writer_control import WorkerJobPool
-    parser = ArgumentParser()
-    parser.add_argument('-b', '--broker', help="Kafka broker", default='localhost:9092', type=str)
-    parser.add_argument('-c', '--command', help="Writer command topic", default="WriterCommand", type=str)
-    parser.add_argument('-t', '--topic', help='Writer job topic', default='WriterJobs', type=str)
-    parser.add_argument('-s', '--sleep', help='Post pool creation sleep time (s)', default=1, type=int)
+    parser = kill_list_parser()
     parser.add_argument('service_id', type=str, help='Writer service id to stop')
     parser.add_argument('job_id', type=str, help='Writer job id to stop')
-
     args = parser.parse_args()
     pool = WorkerJobPool(f'{args.broker}/{args.topic}', f'{args.broker}/{args.command}')
     time.sleep(args.sleep)
@@ -411,15 +434,9 @@ def print_current_state(channel: WorkerJobPool):
 
 def kill_all():
     import time
-    from argparse import ArgumentParser
     from .file_writer_control import WorkerJobPool
-    parser = ArgumentParser()
-    parser.add_argument('-b', '--broker', help="Kafka broker", default='localhost:9092', type=str)
-    parser.add_argument('-c', '--command', help="Writer command topic", default="WriterCommand", type=str)
-    parser.add_argument('-t', '--topic', help='Writer job topic', default='WriterJobs', type=str)
-    parser.add_argument('-s', '--sleep', help='Post pool creation sleep time (s)', default=1, type=int)
-    parser.add_argument('-v', '--verbose', help='Verbose output', action='store_true')
-
+    parser = kill_list_parser()
+    parser.add_argument('--verbose', help='Verbose output', action='store_true')
     args = parser.parse_args()
     pool = WorkerJobPool(f'{args.broker}/{args.topic}', f'{args.broker}/{args.command}')
     time.sleep(args.sleep)
@@ -439,12 +456,7 @@ def kill_all():
 
 def list_status():
     import time
-    from argparse import ArgumentParser
-    parser = ArgumentParser()
-    parser.add_argument('-b', '--broker', help="Kafka broker", default='localhost:9092', type=str)
-    parser.add_argument('-c', '--command', help="Writer command topic", default="WriterCommand", type=str)
-    parser.add_argument('-t', '--topic', help='Writer job topic', default='WriterJobs', type=str)
-    parser.add_argument('-s', '--sleep', type=int, help='Post pool creation sleep time', default=1)
+    parser = kill_list_parser()
     args = parser.parse_args()
     pool = WorkerJobPool(f'{args.broker}/{args.topic}', f'{args.broker}/{args.command}')
     time.sleep(args.sleep)

{mccode_plumber-0.8.0 → mccode_plumber-0.8.2/src/mccode_plumber.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: mccode-plumber
-Version: 0.8.0
+Version: 0.8.2
 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.0
 Requires-Dist: ess-streaming-data-types>=0.14.0
-Requires-Dist: restage>=0.4.0
+Requires-Dist: restage>=0.5.0
 Requires-Dist: mccode-to-kafka>=0.2.2
 Requires-Dist: moreniius>=0.2.3
 Requires-Dist: icecream

{mccode_plumber-0.8.0 → mccode_plumber-0.8.2}/src/mccode_plumber.egg-info/requires.txt

@@ -1,7 +1,7 @@
 p4p
 kafka-python>=2.0
 ess-streaming-data-types>=0.14.0
-restage>=0.4.0
+restage>=0.5.0
 mccode-to-kafka>=0.2.2
 moreniius>=0.2.3
 icecream