Many fixes and improvements + workflows pass again -> version 0.5.0

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "qlever"
 description = "Script for using the QLever SPARQL engine."
-version = "0.4.0"
+version = "0.4.1"
 authors = [
     { name = "Hannah Bast", email = "[email protected]" }
 ]
@@ -16,7 +16,7 @@ classifiers = [
  "Topic :: Database :: Front-Ends"
 ]
 
-dependencies = [ "psutil", "termcolor" ]
+dependencies = [ "psutil", "termcolor", "argcomplete" ]
 
 [project.urls]
 Github = "https://github.com/ad-freiburg/qlever-control"
@@ -28,4 +28,7 @@ Github = "https://github.com/ad-freiburg/qlever-control"
 [tool.setuptools]
 package-dir = { "" = "src" }
 packages = [ "qlever", "qlever.commands", "qlever.Qleverfiles" ]
-# package-data = { "qlever" = ["Qleverfiles/*"] }
+package-data = { "qlever" = ["Qleverfiles/*"] }
+
+[tool.pytest.ini_options]
+pythonpath = ["src"]

src/qlever/config.py

@@ -4,6 +4,7 @@
 import os
 import traceback
 from pathlib import Path
+from importlib.metadata import version
 
 import argcomplete
 
@@ -180,6 +181,8 @@ def add_qleverfile_option(parser):
         # are defined in the modules in `qlever/commands`. In `__init__.py`
         # an object of each class is created and stored in `command_objects`.
         parser = argparse.ArgumentParser()
+        parser.add_argument("--version", action="version",
+                            version=f"%(prog)s {version('qlever')}")
         add_qleverfile_option(parser)
         subparsers = parser.add_subparsers(dest='command')
         subparsers.required = True

src/qlever/util.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import random
+import secrets
 import re
 import shlex
 import shutil
@@ -93,7 +93,7 @@ def get_curl_cmd_for_sparql_query(
     """
     Get curl command for given SPARQL query.
     """
-    curl_cmd = (f"curl -s http::{host}:{port}"
+    curl_cmd = (f"curl -s http://{host}:{port}"
                 f" -H \"Accept: {media_type}\" "
                 f" --data-urlencode query={shlex.quote(query)}")
     if pinresult and access_token is not None:
@@ -137,8 +137,9 @@ def show_table_line(pid, user, start_time, rss, cmdline):
         pinfo = psutil_process.as_dict(
                 attrs=['pid', 'username', 'create_time',
                        'memory_info', 'cmdline'])
-        cmdline = " ".join(pinfo['cmdline'])
-        if not re.search(cmdline_regex, cmdline):
+        # Note: pinfo[`cmdline`] is `None` if the process is a zombie.
+        cmdline = " ".join(pinfo['cmdline'] or [])
+        if len(cmdline) == 0 or not re.search(cmdline_regex, cmdline):
             return False
         pid = pinfo['pid']
         user = pinfo['username'] if pinfo['username'] else ""
@@ -162,6 +163,5 @@ def get_random_string(length: int) -> str:
     Helper function that returns a randomly chosen string of the given
     length. Take the current time as seed.
     """
-    random.seed(datetime.now())
-    return "".join(random.choices(string.ascii_letters + string.digits,
-                                  k=length))
+    characters = string.ascii_letters + string.digits
+    return "".join(secrets.choice(characters) for _ in range(length))

test/qlever/test_util.py

@@ -0,0 +1,9 @@
+import pytest
+from qlever.util import get_random_string
+
+def test_get_random_string():
+    random_string_1 = get_random_string(20)
+    random_string_2 = get_random_string(20)
+    assert len(random_string_1) == 20
+    assert len(random_string_2) == 20
+    assert random_string_1 != random_string_2