qlever 0.5.15__py3-none-any.whl → 0.5.18__py3-none-any.whl

qlever/commands/stop.py

@@ -1,15 +1,40 @@
 from __future__ import annotations
-
 import re
-
 import psutil
-
 from qlever.command import QleverCommand
 from qlever.commands.status import StatusCommand
 from qlever.containerize import Containerize
 from qlever.log import log
 from qlever.util import show_process_info
 
+# try to kill the given process, return true iff it was killed successfully.
+# the process_info is used for logging.
+def stop_process(proc, pinfo):
+    try:
+        proc.kill()
+        log.info(f"Killed process {pinfo['pid']}")
+        return True
+    except Exception as e:
+        log.error(f"Could not kill process with PID "
+                  f"{pinfo['pid']} ({e}) ... try to kill it "
+                  f"manually")
+        log.info("")
+        show_process_info(proc, "", show_heading=True)
+        return False
+
+
+# try to stop and remove container. return True iff it was stopped
+# successfully. Gives log info accordingly.
+def stop_container(server_container):
+    for container_system in Containerize.supported_systems():
+        if Containerize.stop_and_remove_container(
+                container_system, server_container):
+            log.info(f"{container_system.capitalize()} container with "
+                     f"name \"{server_container}\" stopped "
+                     f" and removed")
+            return True
+    return False
+
 
 class StopCommand(QleverCommand):
     """
@@ -20,7 +45,7 @@ class StopCommand(QleverCommand):
         pass
 
     def description(self) -> str:
-        return ("Stop QLever server for a given datasedataset or port")
+        return "Stop QLever server for a given datasedataset or port"
 
     def should_have_qleverfile(self) -> bool:
         return True
@@ -54,46 +79,34 @@ class StopCommand(QleverCommand):
         # First check if there is container running and if yes, stop and remove
         # it (unless the user has specified `--no-containers`).
         if not args.no_containers:
-            for container_system in Containerize.supported_systems():
-                if Containerize.stop_and_remove_container(
-                        container_system, args.server_container):
-                    log.info(f"{container_system.capitalize()} container with "
-                             f"name \"{args.server_container}\" stopped "
-                             f" and removed")
-                    return True
+            if stop_container(args.server_container):
+                return True
 
         # Check if there is a process running on the server port using psutil.
-        #
         # NOTE: On MacOS, some of the proc's returned by psutil.process_iter()
         # no longer exist when we try to access them, so we just skip them.
+        stop_process_results = []
         for proc in psutil.process_iter():
             try:
                 pinfo = proc.as_dict(
-                        attrs=['pid', 'username', 'create_time',
-                               'memory_info', 'cmdline'])
+                    attrs=['pid', 'username', 'create_time',
+                           'memory_info', 'cmdline'])
                 cmdline = " ".join(pinfo['cmdline'])
             except Exception as e:
                 log.debug(f"Error getting process info: {e}")
+                return False
             if re.search(cmdline_regex, cmdline):
                 log.info(f"Found process {pinfo['pid']} from user "
                          f"{pinfo['username']} with command line: {cmdline}")
                 log.info("")
-                try:
-                    proc.kill()
-                    log.info(f"Killed process {pinfo['pid']}")
-                except Exception as e:
-                    log.error(f"Could not kill process with PID "
-                              f"{pinfo['pid']} ({e}) ... try to kill it "
-                              f"manually")
-                    log.info("")
-                    show_process_info(proc, "", show_heading=True)
-                    return False
-                return True
+                stop_process_results.append(stop_process(proc, pinfo))
+        if len(stop_process_results) > 0:
+            return all(stop_process_results)
 
         # If no matching process found, show a message and the output of the
         # status command.
         message = "No matching process found" if args.no_containers else \
-                  "No matching process or container found"
+            "No matching process or container found"
         log.error(message)
         args.cmdline_regex = "^ServerMain.* -i [^ ]*"
         log.info("")

qlever/commands/system_info.py

@@ -56,7 +56,9 @@ class SystemInfoCommand(QleverCommand):
 
     def execute(self, args) -> bool:
         # Say what the command is doing.
-        self.show("Show system information and Qleverfile", only_show=args.show)
+        self.show(
+            "Show system information and Qleverfile", only_show=args.show
+        )
         if args.show:
             return True
 
@@ -80,13 +82,15 @@ class SystemInfoCommand(QleverCommand):
         memory_total = psutil.virtual_memory().total / (1024.0**3)
         memory_available = psutil.virtual_memory().available / (1024.0**3)
         log.info(
-            f"RAM: {memory_total:.1f} GB total, " f"{memory_available:.1f} GB available"
+            f"RAM: {memory_total:.1f} GB total, "
+            f"{memory_available:.1f} GB available"
         )
         num_cores = psutil.cpu_count(logical=False)
         num_threads = psutil.cpu_count(logical=True)
         cpu_freq = psutil.cpu_freq().max / 1000
         log.info(
-            f"CPU: {num_cores} Cores, " f"{num_threads} Threads @ {cpu_freq:.2f} GHz"
+            f"CPU: {num_cores} Cores, "
+            f"{num_threads} Threads @ {cpu_freq:.2f} GHz"
         )
 
         cwd = Path.cwd()

qlever/commands/ui.py

@@ -27,7 +27,13 @@ class UiCommand(QleverCommand):
         return {
             "data": ["name"],
             "server": ["host_name", "port"],
-            "ui": ["ui_port", "ui_config", "ui_system", "ui_image", "ui_container"],
+            "ui": [
+                "ui_port",
+                "ui_config",
+                "ui_system",
+                "ui_image",
+                "ui_container",
+            ],
         }
 
     def additional_arguments(self, subparser) -> None:
@@ -35,7 +41,9 @@ class UiCommand(QleverCommand):
 
     def execute(self, args) -> bool:
         # If QLEVER_OVERRIDE_DISABLE_UI is set, this command is disabled.
-        qlever_is_running_in_container = environ.get("QLEVER_IS_RUNNING_IN_CONTAINER")
+        qlever_is_running_in_container = environ.get(
+            "QLEVER_IS_RUNNING_IN_CONTAINER"
+        )
         if qlever_is_running_in_container:
             log.error(
                 "The environment variable `QLEVER_OVERRIDE_DISABLE_UI` is set, "
@@ -67,7 +75,9 @@ class UiCommand(QleverCommand):
             f'{args.ui_config} {server_url}"'
         )
         self.show(
-            "\n".join(["Stop running containers", pull_cmd, run_cmd, exec_cmd]),
+            "\n".join(
+                ["Stop running containers", pull_cmd, run_cmd, exec_cmd]
+            ),
             only_show=args.show,
         )
         if qlever_is_running_in_container:
@@ -77,7 +87,9 @@ class UiCommand(QleverCommand):
 
         # Stop running containers.
         for container_system in Containerize.supported_systems():
-            Containerize.stop_and_remove_container(container_system, args.ui_container)
+            Containerize.stop_and_remove_container(
+                container_system, args.ui_container
+            )
 
         # Check if the UI port is already being used.
         if is_port_used(args.ui_port):

qlever/log.py

@@ -10,6 +10,7 @@ class QleverLogFormatter(logging.Formatter):
     """
     Custom formatter for logging.
     """
+
     def format(self, record):
         message = record.getMessage()
         if record.levelno == logging.DEBUG:
@@ -34,7 +35,7 @@ log_levels = {
     "WARNING": logging.WARNING,
     "ERROR": logging.ERROR,
     "CRITICAL": logging.CRITICAL,
-    "NO_LOG": logging.CRITICAL + 1
+    "NO_LOG": logging.CRITICAL + 1,
 }