cgse-tools 0.11.5__tar.gz → 0.12.0__tar.gz

{cgse_tools-0.11.5 → cgse_tools-0.12.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: cgse-tools
-Version: 0.11.5
+Version: 0.12.0
 Summary: Tools for CGSE
 Author: IvS KU Leuven
 Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>
 License-Expression: MIT
 Keywords: CGSE,Common-EGSE,hardware testing,software framework
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Requires-Dist: cgse-common
 Requires-Dist: textual>=2.0.0
 Description-Content-Type: text/markdown

{cgse_tools-0.11.5 → cgse_tools-0.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-tools"
-version = "0.11.5"
+version = "0.12.0"
 description = "Tools for CGSE"
 authors = [
     {name = "IvS KU Leuven"}
@@ -10,7 +10,7 @@ maintainers = [
     {name = "Sara Regibo", email = "sara.regibo@kuleuven.be"}
 ]
 readme = {"file" = "README.md", "content-type" = "text/markdown"}
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = "MIT"
 keywords = [
     "CGSE",

{cgse_tools-0.11.5 → cgse_tools-0.12.0}/src/cgse_tools/cgse_clock.py

@@ -54,7 +54,7 @@ class ClockApp(App):
 
 @app.command()
 def clock(utc: bool = False):
-    """Showcase for running an in-line Textual App. """
+    """Showcase for running an in-line Textual App."""
 
     ClockApp(utc).run(inline=True)
 

{cgse_tools-0.11.5 → cgse_tools-0.12.0}/src/cgse_tools/cgse_commands.py

@@ -9,9 +9,15 @@ from typing import Annotated
 
 import rich
 import typer
+from rich.console import Console
+from rich.table import Table
 
 from cgse_common import AppState
+from egse.config import find_files
+from egse.env import get_conf_data_location
+from egse.env import get_site_id
 from egse.plugin import entry_points
+from egse.process import ProcessInfo
 from egse.setup import Setup
 from egse.system import format_datetime
 
@@ -39,7 +45,7 @@ def init(project: str = ""):
     project = project.upper()
     site_id = None
 
-    rich.print("[light_steel_blue]Please note default values are given between \[brackets].[/]")
+    rich.print(r"[light_steel_blue]Please note default values are given between \[brackets].[/]")
 
     answer = Prompt.ask(f"What is the name of the project [{project}] ?")
     if answer:
@@ -80,7 +86,7 @@ def init(project: str = ""):
     Path(log_file_location).expanduser().mkdir(exist_ok=True, parents=True)
 
     if not Path(local_settings_path).expanduser().exists():
-        with open(Path(local_settings_path).expanduser(), 'w') as fd:
+        with open(Path(local_settings_path).expanduser(), "w") as fd:
             fd.write(
                 textwrap.dedent(
                     f"""\
@@ -92,7 +98,7 @@ def init(project: str = ""):
 
     answer = Confirm.ask("Shall I add the environment to your ~/bash_profile ?")
     if answer:
-        with open(Path("~/.bash_profile").expanduser(), 'a') as fd:
+        with open(Path("~/.bash_profile").expanduser(), "a") as fd:
             fd.write(
                 textwrap.dedent(
                     f"""
@@ -120,7 +126,6 @@ def init(project: str = ""):
                 export {project}_LOCAL_SETTINGS={local_settings_path}
             """
             )
-
         )
 
 
@@ -130,22 +135,18 @@ show = typer.Typer(help="Show information about settings, environment, setup, ..
 @show.command(name="settings")
 def show_settings():
     """Show the settings that are defined by the installed packages."""
-    proc = subprocess.Popen(
-        [sys.executable, "-m", "egse.settings"],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE
-    )
+    proc = subprocess.Popen([sys.executable, "-m", "egse.settings"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = proc.communicate()
-    rich.print(stdout.decode(), end='')
+    rich.print(stdout.decode(), end="")
     if stderr:
         rich.print(f"[red]{stderr.decode()}[/]")
 
 
 @show.command(name="env")
 def show_env(
-        mkdir: Annotated[bool, typer.Option(help="Create the missing folder")] = None,
-        full: Annotated[bool, typer.Option(help="Provide additional info")] = None,
-        doc: Annotated[bool, typer.Option(help="Provide documentation on environment variables")] = None,
+    mkdir: Annotated[bool, typer.Option(help="Create the missing folder")] = None,
+    full: Annotated[bool, typer.Option(help="Provide additional info")] = None,
+    doc: Annotated[bool, typer.Option(help="Provide documentation on environment variables")] = None,
 ):
     """Show the environment variables that are defined for the project."""
     options = [opt for opt, flag in [("--mkdir", mkdir), ("--full", full), ("--doc", doc)] if flag]
@@ -153,13 +154,9 @@ def show_env(
     cmd = [sys.executable, "-m", "egse.env"]
     cmd += options if options else []
 
-    proc = subprocess.Popen(
-        cmd,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE
-    )
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = proc.communicate()
-    rich.print(stdout.decode(), end='')
+    rich.print(stdout.decode(), end="")
     if stderr:
         rich.print(f"[red]{stderr.decode()}[/]")
 
@@ -167,13 +164,95 @@ def show_env(
 @show.command(name="procs")
 def show_processes():
     """Show the processes that are running for the installed packages."""
+    processes: list[ProcessInfo] = []
+
     for ep in entry_points("cgse.explore"):
         # print(f"{ep.name = }, {ep.module = }, {ep.load() = }, {ep.extras = }")
         explore = ep.load()
         with contextlib.suppress(AttributeError):
             show_procs = getattr(explore, "show_processes")
-            for line in show_procs():
-                rich.print(line)
+            processes.extend(show_procs())
+
+    console = Console()
+    console.print(create_rich_table(processes))
+
+
+def create_rich_table(processes: list[ProcessInfo]):
+    """Create a rich table with the processes from all registered packages."""
+
+    table = Table(title="Process Information")
+
+    table.add_column("PID", style="cyan", no_wrap=True)
+    table.add_column("Name", style="magenta")
+    table.add_column("User", style="green")
+    table.add_column("CPU%", justify="right", style="yellow")
+    # table.add_column("Memory%", justify="right", style="blue")
+    table.add_column("Memory MB", justify="right", style="blue")
+    table.add_column("Status", style="red")
+    table.add_column("Command", style="white")
+
+    # Sort by CPU usage
+    processes.sort(key=lambda x: x.cpu_percent, reverse=True)
+
+    for proc in processes:
+        proc = proc.as_dict()
+        cmd = re.sub(r"^.*/?python(?:\d+\.\d+)?\s+(?:-m)?\s*", "python -m ", proc["command"])
+        table.add_row(
+            str(proc["pid"]),
+            proc["name"],
+            proc.get("username", "N/A"),
+            f"{proc.get('cpu_percent', 0):.1f}",
+            # f"{proc.get('memory_percent', 0):.1f}",
+            f"{proc.get('memory_mb', 0):.1f}",
+            proc.get("status", "unknown"),
+            cmd[:100] + "..." if len(cmd) > 100 else cmd,
+        )
+
+    return table
+
+
+@show.command(name="setup")
+def show_setup(
+    use_cm: Annotated[bool, typer.Option(help="Get the current setup from the configuration manager")] = True,
+    list_all: Annotated[bool, typer.Option(help="Print a list of all available setups")] = False,
+    setup_id: Annotated[int, typer.Option(help="Show the setup with this id")] = -1,
+):
+    if use_cm:
+        try:
+            from egse.confman import ConfigurationManagerProxy
+        except ImportError:
+            rich.print("[dark_orange3]WARNING: package 'cgse-core' is not installed, service not available.[/]")
+            return
+
+        with ConfigurationManagerProxy() as cm:
+            if list_all:
+                rich.print(cm.list_setups())
+            else:
+                rich.print(cm.get_setup())
+        return
+
+    location = get_conf_data_location()
+    site_id = get_site_id()
+
+    if list_all:
+        files = find_files(f"SETUP_{site_id}_*_*.yaml", root=location)
+        files = list(files)
+        if files:
+            location = files[0].parent.resolve()
+        rich.print(sorted([f.name for f in files]))
+        rich.print(f"Loaded from [purple]{location}.")
+    else:
+        if setup_id == -1:
+            setup_files = find_files(f"SETUP_{site_id}_*_*.yaml", root=location)
+        else:
+            setup_files = find_files(f"SETUP_{site_id}_{setup_id:05d}_*.yaml", root=location)
+        setup_files = list(setup_files)
+        if len(setup_files) > 0:
+            setup_file = sorted(setup_files)[-1]
+            setup = Setup.from_yaml_file(setup_file)
+            rich.print(setup)
+        else:
+            rich.print("[red]No setup files were found.[/]")
 
 
 check = typer.Typer(help="Check installation, settings, required files, etc.", no_args_is_help=True)
@@ -229,9 +308,7 @@ def check_setups(verbose: bool = False):
         )
     elif not Path(conf_data_location).exists():
         any_errors += 1
-        error_messages.append(
-            f"[red]The location of the configuration data doesn't exist: {conf_data_location!s}[/]"
-        )
+        error_messages.append(f"[red]The location of the configuration data doesn't exist: {conf_data_location!s}[/]")
 
     if any_errors:
         print_error_messages(error_messages)
@@ -245,9 +322,7 @@ def check_setups(verbose: bool = False):
 
     if not files:
         any_errors += 1
-        error_messages.append(
-            f"[red]No SETUP files were found at {conf_data_location}[/]"
-        )
+        error_messages.append(f"[red]No SETUP files were found at {conf_data_location}[/]")
     else:
         verbose and rich.print(f":arrow_forward: Found {len(files)} Setup files.")
 
@@ -255,9 +330,7 @@ def check_setups(verbose: bool = False):
 
     if not any(True for file in files if regex.search(str(file))):
         any_errors += 1
-        error_messages.append(
-            f"[red]There is no 'Zero' SETUP for {site_id} in {conf_data_location}[/]"
-        )
+        error_messages.append(f"[red]There is no 'Zero' SETUP for {site_id} in {conf_data_location}[/]")
     else:
         verbose and rich.print(f":arrow_forward: Found the 'Zero' Setup file: SETUP_{site_id}_00000_*.yaml")
 

{cgse_tools-0.11.5 → cgse_tools-0.12.0}/src/cgse_tools/cgse_services.py

@@ -4,9 +4,7 @@ import rich
 import typer
 
 dev_x = typer.Typer(
-    name="dev-x",
-    help="device-x is an imaginary device that serves as an example",
-    no_args_is_help=True
+    name="dev-x", help="device-x is an imaginary device that serves as an example", no_args_is_help=True
 )
 
 

{cgse_tools-0.11.5 → cgse_tools-0.12.0}/src/egse/tools/status.py

@@ -26,7 +26,6 @@ class StatusApp(App):
 
 
 def get_log_cs_status():
-
     from egse.logger import send_request
 
     response = send_request("status")
@@ -36,9 +35,9 @@ def get_log_cs_status():
             f"""\
             Log Manager:
                 Status: [green]active[/]
-                Level [grey50](file)[/]: {response.get('file_logger_level')}
-                Level [grey50](stdout)[/]: {response.get('stream_logger_level')}
-                Log file location: {response.get('file_logger_location')}
+                Level [grey50](file)[/]: {response.get("file_logger_level")}
+                Level [grey50](stdout)[/]: {response.get("stream_logger_level")}
+                Log file location: {response.get("file_logger_location")}
             """
         )
     else:
@@ -48,14 +47,14 @@ def get_log_cs_status():
 
 
 def get_cm_cs_status():
-
     from egse.confman import get_status
+
     return Text.from_markup(get_status())
 
 
 def get_sm_cs_status():
-
     from egse.storage import get_status
+
     return Text.from_markup(get_status())
 
 
@@ -75,12 +74,14 @@ def main():
                 installed in the Python environment you are running this tool from.
                 """
             ),
-        flush=True)
+            flush=True,
+        )
         print(exc)
         return
 
     app = StatusApp()
     app.run()
 
+
 if __name__ == "__main__":
     main()