cgse-core 2025.0.7__tar.gz → 2025.0.8__tar.gz

{cgse_core-2025.0.7 → cgse_core-2025.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgse-core
-Version: 2025.0.7
+Version: 2025.0.8
 Summary: Core services for the CGSE framework
 Author: IVS KU Leuven
 Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>
@@ -14,6 +14,7 @@ Requires-Dist: gitpython>=3.1.44
 Requires-Dist: prometheus-client>=0.21.1
 Requires-Dist: pyzmq==23.2.1
 Requires-Dist: rich>=13.9.4
+Requires-Dist: typer>=0.15.1
 Description-Content-Type: text/markdown
 
 # The core services for the CGSE platform

{cgse_core-2025.0.7 → cgse_core-2025.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-core"
-version = "2025.0.7"
+version = "2025.0.8"
 description = "Core services for the CGSE framework"
 authors = [
     {name = "IVS KU Leuven"}
@@ -26,6 +26,7 @@ dependencies = [
     "prometheus-client>=0.21.1",
     "pyzmq == 23.2.1",
     "rich>=13.9.4",
+    "typer>=0.15.1",
 ]
 
 [project.scripts]
@@ -34,7 +35,7 @@ sm_cs = 'egse.storage.storage_cs:cli'
 cm_cs = 'egse.confman.confman_cs:cli'
 pm_cs = 'egse.procman.procman_cs:cli'
 
-cgse = 'scripts.cgse:cli'
+cgse = 'scripts.cgse:app'
 
 [project.entry-points."cgse.version"]
 cgse-core = 'egse'

{cgse_core-2025.0.7 → cgse_core-2025.0.8}/src/egse/confman/confman_cs.py

@@ -153,7 +153,7 @@ def status():
     import rich
     from egse.confman import get_status
 
-    rich.print(get_status())
+    rich.print(get_status(), end='')
 
 
 @cli.command()

{cgse_core-2025.0.7 → cgse_core-2025.0.8}/src/egse/procman/__init__.py

@@ -486,7 +486,7 @@ class ProcessManagerController(ProcessManagerInterface):
 
                     if process_name == "DAQ6510":
                         setup = GlobalState.setup
-                        das_delay = setup.gse.DAQ6510.route.delay
+                        das_delay = setup.gse.DAQ6510.route.mon_delay
                         das_count = setup.gse.DAQ6510.route.scan.COUNT.SCAN
                         das_interval = setup.gse.DAQ6510.route.scan.INTERVAL
 

{cgse_core-2025.0.7 → cgse_core-2025.0.8}/src/egse/storage/storage_cs.py

@@ -17,7 +17,6 @@ from apscheduler.schedulers.background import BackgroundScheduler
 from prometheus_client import start_http_server
 from pytz import utc
 
-from egse.bits import humanize_bytes
 from egse.control import ControlServer
 from egse.env import get_data_storage_location
 from egse.env import get_site_id
@@ -26,8 +25,6 @@ from egse.settings import Settings
 from egse.storage import StorageProtocol
 from egse.storage import StorageProxy
 from egse.storage import cycle_daily_files
-from egse.storage import is_storage_manager_active
-from egse.system import replace_environment_variable
 
 # Use explicit name here otherwise the logger will probably be called __main__
 
@@ -145,7 +142,7 @@ def status(full):
     import rich
     from egse.storage import get_status
 
-    rich.print(get_status(full=full))
+    rich.print(get_status(full=full), end='')
 
 
 def check_prerequisites():

cgse_core-2025.0.8/src/scripts/_start.py

@@ -0,0 +1,41 @@
+import subprocess
+import sys
+from pathlib import Path
+
+import rich
+
+
+def start_log_cs():
+    rich.print("Starting the logging core service...")
+
+    out = open(Path('~/.log_cs.start.out').expanduser(), 'w')
+
+    subprocess.Popen(
+        [sys.executable, '-m', 'egse.logger.log_cs', 'start'],
+        stdout=out, stderr=out, stdin=subprocess.DEVNULL,
+        close_fds=True
+    )
+
+
+def start_sm_cs():
+    rich.print("Starting the storage manager core service...")
+
+    out = open(Path('~/.sm_cs.start.out').expanduser(), 'w')
+
+    subprocess.Popen(
+        [sys.executable, '-m', 'egse.storage.storage_cs', 'start'],
+        stdout=out, stderr=out, stdin=subprocess.DEVNULL,
+        close_fds=True
+    )
+
+
+def start_cm_cs():
+    rich.print("Starting the configuration manager core service...")
+
+    out = open(Path('~/.cm_cs.start.out').expanduser(), 'w')
+
+    subprocess.Popen(
+        [sys.executable, '-m', 'egse.confman.confman_cs', 'start'],
+        stdout=out, stderr=out, stdin=subprocess.DEVNULL,
+        close_fds=True
+    )

cgse_core-2025.0.8/src/scripts/_status.py

@@ -0,0 +1,81 @@
+import asyncio
+# import subprocess
+import sys
+
+import rich
+
+
+async def run_all_status():
+    tasks = [
+        status_log_cs(),
+        status_sm_cs(),
+        status_cm_cs(),
+    ]
+
+    await asyncio.gather(*tasks)
+
+
+async def status_log_cs():
+
+    proc = await asyncio.create_subprocess_exec(
+        sys.executable, '-m', 'egse.logger.log_cs', 'status',
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE
+    )
+
+    stdout, stderr = await proc.communicate()
+
+    # proc = subprocess.Popen(
+    #     [sys.executable, '-m', 'egse.logger.log_cs', 'status'],
+    #     stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+    # )
+    #
+    # stdout, stderr = proc.communicate()
+
+    rich.print(stdout.decode(), end='')
+    if stderr:
+        rich.print(f"[red]{stderr.decode()}[/]")
+
+
+async def status_sm_cs():
+
+    proc = await asyncio.create_subprocess_exec(
+        sys.executable, '-m', 'egse.storage.storage_cs', 'status',
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE
+    )
+
+    stdout, stderr = await proc.communicate()
+
+    # proc = subprocess.Popen(
+    #     [sys.executable, '-m', 'egse.storage.storage_cs', 'status'],
+    #     stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+    # )
+    #
+    # stdout, stderr = proc.communicate()
+
+    rich.print(stdout.decode(), end='')
+    if stderr:
+        rich.print(f"[red]{stderr.decode()}[/]")
+
+
+async def status_cm_cs():
+
+    proc = await asyncio.create_subprocess_exec(
+        sys.executable, '-m', 'egse.confman.confman_cs', 'status',
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE
+    )
+
+    stdout, stderr = await proc.communicate()
+
+    # proc = subprocess.Popen(
+    #     [sys.executable, '-m', 'egse.confman.confman_cs', 'status'],
+    #     stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+    # )
+    #
+    # stdout, stderr = proc.communicate()
+
+    rich.print(stdout.decode(), end='')
+    if stderr:
+        rich.print(f"[red]{stderr.decode()}[/]")

cgse_core-2025.0.8/src/scripts/_stop.py

@@ -0,0 +1,41 @@
+import subprocess
+import sys
+from pathlib import Path
+
+import rich
+
+
+def stop_log_cs():
+    rich.print("Terminating the logging core service...")
+
+    out = open(Path('~/.log_cs.stop.out').expanduser(), 'w')
+
+    subprocess.Popen(
+        [sys.executable, '-m', 'egse.logger.log_cs', 'stop'],
+        stdout=out, stderr=out, stdin=subprocess.DEVNULL,
+        close_fds=True
+    )
+
+
+def stop_sm_cs():
+    rich.print("Terminating the storage manager core service...")
+
+    out = open(Path('~/.sm_cs.stop.out').expanduser(), 'w')
+
+    subprocess.Popen(
+        [sys.executable, '-m', 'egse.storage.storage_cs', 'stop'],
+        stdout=out, stderr=out, stdin=subprocess.DEVNULL,
+        close_fds=True
+    )
+
+
+def stop_cm_cs():
+    rich.print("Terminating the configuration manager core service...")
+
+    out = open(Path('~/.cm_cs.stop.out').expanduser(), 'w')
+
+    subprocess.Popen(
+        [sys.executable, '-m', 'egse.confman.confman_cs', 'stop'],
+        stdout=out, stderr=out, stdin=subprocess.DEVNULL,
+        close_fds=True
+    )

cgse_core-2025.0.8/src/scripts/cgse.py

@@ -0,0 +1,98 @@
+"""
+This script is as an administration script for the CGSE. The script provides commands to start, stop, and
+get the status of the core services and any other service that is registered as a plugin.
+
+The following main commands have been implemented:
+
+$ cgse version
+
+    Prints the installed version of the cgse-core and any other package that is registered under
+    the entry points group 'cgse.version'.
+
+$ cgse core {start,stop,status}
+
+    Starts, stops, or prints the status of the core services.
+
+Other main commands can be added from external packages when they are provided as entry points with
+the group name 'cgse.command.plugins'.
+
+Commands can be added as single commands or as a group containing further sub-commands. To add a group,
+the entry point shall contain 'group' in its extras.
+"""
+
+import rich
+import typer
+from rich.console import Console
+from rich.traceback import Traceback
+
+from egse.plugin import entry_points
+from scripts import services
+
+app = typer.Typer(add_completion=True)
+app.add_typer(services.app, name="core")
+
+
+@app.command()
+def version():
+    """Prints the version of the cgse-core and other registered packages."""
+    from egse.version import get_version_installed
+
+    # if installed_version := get_version_installed("cgse-core"):
+    #     rich.print(f"CGSE-CORE installed version = [bold default]{installed_version}[/]")
+
+    for ep in sorted(entry_points("cgse.version"), key=lambda x: x.name):
+        if installed_version := get_version_installed(ep.name):
+            rich.print(f"{ep.name.upper()} installed version = [bold default]{installed_version}[/]")
+
+
+def broken_command(name: str, module: str, exc: Exception):
+    """
+    Rather than completely crash the CLI when a broken plugin is loaded, this
+    function provides a modified help message informing the user that the plugin is
+    broken and could not be loaded.  If the user executes the plugin and specifies
+    the `--traceback` option a traceback is reported showing the exception the
+    plugin loader encountered.
+    """
+    def broken_plugin(traceback: bool = False):
+        rich.print(f"[red]ERROR: Couldn't load this plugin command: {name} ⟶ reason: {exc}[/]")
+        if traceback:
+            console = Console(width=100)
+            tb = Traceback.from_exception(type(exc), exc, exc.__traceback__)
+            console.print(tb)
+
+    broken_plugin.__doc__ = f"ERROR: Couldn't load plugin '{name}' from {module}"
+    broken_plugin.__name__ = name
+    return broken_plugin
+
+
+# Load the known plugins for the `cgse` command. Plugins are added as commands to the `cgse`.
+
+for ep in entry_points("cgse.command.plugins"):
+    try:
+        if not ep.extras or 'command' in ep.extras:
+            app.command()(ep.load())
+        elif 'group' in ep.extras:
+            app.add_typer(ep.load(), name=ep.name)
+        else:
+            rich.print(f"\n[red]ERROR: don't know what to do with {ep.extras} for {ep.name}, command not added.[/]\n")
+    except Exception as exc:
+        app.command()(broken_command(ep.name, ep.module, exc))
+
+
+for ep in entry_points("cgse.service.plugins"):
+    try:
+        app.add_typer(ep.load(), name=ep.name)
+    except Exception as exc:
+        app.command()(broken_command(ep.name, ep.module, exc))
+
+
+@app.callback(no_args_is_help=True, invoke_without_command=True)
+def main():
+    """
+    The main cgse command to inspect, configure, monitor the core services
+    and device control servers.
+    """
+
+
+if __name__ == "__main__":
+    app()

cgse_core-2025.0.8/src/scripts/services.py

@@ -0,0 +1,49 @@
+import asyncio
+
+import rich
+import typer
+
+app = typer.Typer(
+    name="core",
+    help="handle core services: start, stop, status",
+    no_args_is_help=True
+)
+
+
+@app.command(name="start")
+def start_core_services():
+    """Start the core services in the background."""
+    from scripts._start import start_log_cs, start_sm_cs, start_cm_cs
+
+    rich.print("[green]Starting the core services...[/]")
+
+    start_log_cs()
+    start_sm_cs()
+    start_cm_cs()
+
+
+@app.command(name="stop")
+def stop_core_services():
+    """Stop the core services."""
+    from scripts._stop import stop_log_cs, stop_sm_cs, stop_cm_cs
+
+    rich.print("[green]Terminating the core services...[/]")
+
+    stop_cm_cs()
+    stop_sm_cs()
+    stop_log_cs()
+
+
+@app.command(name="status")
+def status_core_services():
+    """Print the status of the core services."""
+    # from scripts._status import status_log_cs, status_sm_cs, status_cm_cs
+
+    rich.print("[green]Status of the core services...[/]")
+
+    from scripts._status import run_all_status
+    asyncio.run(run_all_status())
+
+    # status_log_cs()
+    # status_sm_cs()
+    # status_cm_cs()

cgse_core-2025.0.7/src/scripts/cgse.py

@@ -1,179 +0,0 @@
-"""
-This script is as an administration script for the CGSE. The script provides commands to start, stop, and
-get the status of the core services and any other service that is registered as a plugin.
-
-The following main commands have been implemented:
-
-$ cgse version
-
-    Prints the installed version of the cgse-core and any other package that is registered under
-    the entry points group 'cgse.version'.
-
-$ cgse {start,stop} {core,service} NAME ARGS
-
-    Starts, stops the core services or any service that is registered under the entry points
-    group 'cgse.service.plugins'.
-
-$ cgse status {core,service} NAME ARGS
-
-    Prints the status of the core services or any service that is registered under the entry
-    points group 'cgse.service.plugins'.
-
-Other main commands can be added from external packages when they are provided as entry points with
-the group name 'cgse.plugins'. The entry point needs to be a Click command.
-
-"""
-import subprocess
-
-import click
-import rich
-
-from egse.plugin import entry_points
-from egse.plugin import handle_click_plugins
-from egse.process import SubProcess
-
-
-@handle_click_plugins(entry_points("cgse.plugins"))
-@click.group()
-def cli():
-    pass
-
-
-@cli.command()
-def version():
-    """Prints the version of the cgse-core and other registered packages."""
-    from egse.version import get_version_installed
-
-    # if installed_version := get_version_installed("cgse-core"):
-    #     rich.print(f"CGSE-CORE installed version = [bold default]{installed_version}[/]")
-
-    for ep in sorted(entry_points("cgse.version"), key=lambda x: x.name):
-        if installed_version := get_version_installed(ep.name):
-            rich.print(f"{ep.name.upper()} installed version = [bold default]{installed_version}[/]")
-
-
-@cli.group()
-@click.pass_context
-def start(ctx):
-    """Start the service"""
-    ctx.ensure_object(dict)
-
-    ctx.obj['action'] = 'start'
-
-
-@cli.group()
-@click.pass_context
-def stop(ctx):
-    """Stop the service"""
-    ctx.ensure_object(dict)
-
-    ctx.obj['action'] = 'stop'
-
-
-@cli.group()
-@click.pass_context
-def status(ctx):
-    """Provide the status of the service"""
-    ctx.ensure_object(dict)
-
-    ctx.obj['action'] = 'status'
-
-
-@start.command()
-@click.pass_context
-def core(ctx):
-    print(f"executing: cgse {ctx.obj['action']} core")
-    ctx.invoke(log_cs)
-    ctx.invoke(sm_cs)
-    ctx.invoke(cm_cs)
-    ctx.invoke(pm_cs)
-
-
-@handle_click_plugins(entry_points("cgse.service.plugins"))
-@start.group()
-@click.pass_context
-def service(ctx):
-    pass
-
-
-stop.add_command(core)
-stop.add_command(service)
-
-status.add_command(core)
-status.add_command(service)
-
-
-@service.command()
-@click.pass_context
-def log_cs(ctx):
-    print(f"executing: log_cs {ctx.obj['action']}")
-    if ctx.obj['action'] == 'start':
-        proc = SubProcess("log_cs", ["log_cs", "start"])
-        proc.execute()
-    elif ctx.obj['action'] == 'stop':
-        proc = SubProcess("log_cs", ["log_cs", "stop"])
-        proc.execute()
-    elif ctx.obj['action'] == 'status':
-        proc = SubProcess("log_cs", ["log_cs", "status"], stdout=subprocess.PIPE)
-        proc.execute()
-        output, _ = proc.communicate()
-        rich.print(output, end='')
-    else:
-        rich.print(f"[red]ERROR: Unknown action '{ctx.obj['action']}'[/]")
-
-
-@service.command()
-@click.pass_context
-def sm_cs(ctx):
-    print(f"executing: sm_cs {ctx.obj['action']}")
-    if ctx.obj['action'] == 'start':
-        proc = SubProcess("sm_cs", ["sm_cs", "start"])
-        proc.execute()
-    elif ctx.obj['action'] == 'stop':
-        proc = SubProcess("sm_cs", ["sm_cs", "stop"])
-        proc.execute()
-    elif ctx.obj['action'] == 'status':
-        proc = SubProcess("sm_cs", ["sm_cs", "status"], stdout=subprocess.PIPE)
-        proc.execute()
-        output, _ = proc.communicate()
-        rich.print(output, end='')
-    else:
-        rich.print(f"[red]ERROR: Unknown action '{ctx.obj['action']}'[/]")
-
-
-@service.command()
-@click.pass_context
-def cm_cs(ctx):
-    print(f"executing: cm_cs {ctx.obj['action']}")
-    if ctx.obj['action'] == 'start':
-        proc = SubProcess("cm_cs", ["cm_cs", "start"])
-        proc.execute()
-    elif ctx.obj['action'] == 'stop':
-        proc = SubProcess("cm_cs", ["cm_cs", "stop"])
-        proc.execute()
-    elif ctx.obj['action'] == 'status':
-        proc = SubProcess("cm_cs", ["cm_cs", "status"], stdout=subprocess.PIPE)
-        proc.execute()
-        output, _ = proc.communicate()
-        rich.print(output, end='')
-    else:
-        rich.print(f"[red]ERROR: Unknown action '{ctx.obj['action']}'[/]")
-
-
-@service.command()
-@click.pass_context
-def pm_cs(ctx):
-    print(f"executing: pm_cs {ctx.obj['action']}")
-    if ctx.obj['action'] == 'start':
-        proc = SubProcess("pm_cs", ["pm_cs", "start"])
-        proc.execute()
-    elif ctx.obj['action'] == 'stop':
-        proc = SubProcess("pm_cs", ["pm_cs", "stop"])
-        proc.execute()
-    elif ctx.obj['action'] == 'status':
-        proc = SubProcess("pm_cs", ["pm_cs", "status"], stdout=subprocess.PIPE)
-        proc.execute()
-        output, _ = proc.communicate()
-        rich.print(output, end='')
-    else:
-        rich.print(f"[red]ERROR: Unknown action '{ctx.obj['action']}'[/]")