qlever 0.3.9__py3-none-any.whl → 0.4.1__py3-none-any.whl

qlever/config.py

@@ -4,6 +4,7 @@ import argparse
 import os
 import traceback
 from pathlib import Path
+from importlib.metadata import version
 
 import argcomplete
 
@@ -180,6 +181,8 @@ class QleverConfig:
         # 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

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_process_info(psutil_process, cmdline_regex, show_heading=True):
         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))

{qlever-0.3.9.dist-info → qlever-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qlever
-Version: 0.3.9
+Version: 0.4.1
 Summary: Script for using the QLever SPARQL engine.
 Author-email: Hannah Bast <bast@cs.uni-freiburg.de>
 License: Apache License
@@ -214,6 +214,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psutil
 Requires-Dist: termcolor
+Requires-Dist: argcomplete
 
 # QLever
 

{qlever-0.3.9.dist-info → qlever-0.4.1.dist-info}/RECORD

@@ -1,15 +1,12 @@
 qlever/__init__.py,sha256=IyfS1OhlVE7-rjtv6FPlL0R56VxcNsS6KS7NJQhTDIM,1367
 qlever/__main__.py,sha256=MqM37bEzQeJEGUXZvuLcilIvnObZiG2eTGIkfKGpdnw,62016
-qlever/argcomplete-test.py,sha256=MJosqJc313c9aiPfuGJiaI2vwCf-dwAu-SVZ2TX5Wzk,463
 qlever/command.py,sha256=yOr0Uc8D8-AM7EjwDsVzbc3KNYjPH-FVOZhIHkqO588,2749
-qlever/config.py,sha256=LOVW8alFCVgZz_GAWm7vnjZVMVE7m3QTecy34lHgjGE,10017
+qlever/config.py,sha256=-jjHAL8jdp25v53SqXKP4gWip6Qw9OdlDvFN6X7uk_4,10184
 qlever/containerize.py,sha256=p8g3O3G8a_0XLzSTzl_e5t9dqjbCQ-ippoA8vI2Z9pI,4193
-qlever/customhelp-test.py,sha256=fYLu-KMCHJQkQ8-XE6PtaYqPTMwI-Ew5B_EnIdHKxv4,1505
 qlever/log.py,sha256=k9Mq4hxQ_d2k0e-5ZVgcB2XIRhOsGMO9I3rIR7YQyDA,1376
 qlever/qlever_main.py,sha256=k8vIQYK7zqObFNet11iLf--nrLdPooL5amprmlySi4k,2300
 qlever/qleverfile.py,sha256=6Ll81xkzel_s2Ju9ZfBXUGlRfikaAzZM6Do-dTrdo3k,12934
-qlever/test_copilot.py,sha256=NL2YMvBY0myCyxIoppa7dgN_vr54r6Pe8Mmc41OfelI,17
-qlever/util.py,sha256=WM09PMRffUoPpEse4VwK9BzUavFkaB2Bm8KfVWxC3sQ,6161
+qlever/util.py,sha256=dwqtpY14P3ds_PYx5bgqus_nsx_BhPQzUSa0Z86ONdo,6236
 qlever/Qleverfiles/Qleverfile.dblp,sha256=SFjBD20aOSWod4mEQnxHSDWdInoE_EFp2nyMw7ev7ZA,1167
 qlever/Qleverfiles/Qleverfile.dblp-plus,sha256=Dwd9pK1vPcelKfw6sA-IuyhbZ6yIxOh6_84JgPYnB9Q,1332
 qlever/Qleverfiles/Qleverfile.default,sha256=mljl6I1RCkpIWOqMQwjzPZIsarYQx1R0mIlc583KuqU,1869
@@ -42,9 +39,9 @@ qlever/commands/status.py,sha256=5S6EdapZEwFKV9cQZtNYcZhMbAXAY-FP6ggjIhfX8ek,163
 qlever/commands/stop.py,sha256=TZs4bxKHvujlZAU8BZmFjA5eXSZNAa6EeNzvPpEZsuI,4139
 qlever/commands/ui.py,sha256=rV8u017WLbfz0zVT_c9GC4d9v1WWwrTM3kfGONbeCvQ,2499
 qlever/commands/warmup.py,sha256=WOZSxeV8U_F6pEEnAb6YybXLQMxZFTRJXs4BPHUhsmc,1030
-qlever-0.3.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-qlever-0.3.9.dist-info/METADATA,sha256=xSj11QMM7EztxVfk0Yi1N7F65h2XKfNsghyWxF96wg8,17049
-qlever-0.3.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qlever-0.3.9.dist-info/entry_points.txt,sha256=s0iWBHKRUzsJ7B6nVGiyMdOJtiOS84IJMSSxgbNU6LU,85
-qlever-0.3.9.dist-info/top_level.txt,sha256=kd3zsYqiFd0--Czh5XTVkfEq6XR-XgRFW35X0v0GT-c,7
-qlever-0.3.9.dist-info/RECORD,,
+qlever-0.4.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+qlever-0.4.1.dist-info/METADATA,sha256=GkXf_oneu0Oe02UOPR8OvqVzxDNA-ljS6yPGLi2x_Bk,17076
+qlever-0.4.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qlever-0.4.1.dist-info/entry_points.txt,sha256=s0iWBHKRUzsJ7B6nVGiyMdOJtiOS84IJMSSxgbNU6LU,85
+qlever-0.4.1.dist-info/top_level.txt,sha256=kd3zsYqiFd0--Czh5XTVkfEq6XR-XgRFW35X0v0GT-c,7
+qlever-0.4.1.dist-info/RECORD,,

qlever/argcomplete-test.py

@@ -1,19 +0,0 @@
-#!/usr/bin/env python3
-# PYTHON_ARGCOMPLETE_OK
-
-import argparse
-import argcomplete
-import os
-import sys
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--foo', required=True, help='foo help')
-    comp_line = os.getenv('COMP_LINE', '[not in AC mode]')
-    print('COMP_LINE: %s' % comp_line, file=sys.stderr)
-    argcomplete.autocomplete(parser)
-    args = parser.parse_args()
-    print(args.foo)
-
-if __name__ == '__main__':
-    main()

qlever/customhelp-test.py

@@ -1,41 +0,0 @@
-#!/usr/bin/env python3
-# PYTHON_ARGCOMPLETE_OK
-
-import argparse
-import argcomplete
-
-# class MyHelpFormatter(argparse.HelpFormatter):
-#     def _format_action_invocation(self, action):
-#         if not action.option_strings:
-#             default = self._get_default_metavar_for_positional(action)
-#             metavar = getattr(action, 'metavar', default)
-#             return metavar
-#         else:
-#             parts = []
-#             if action.nargs == 0:
-#                 parts.extend(action.option_strings)
-#             else:
-#                 default = self._get_default_metavar_for_optional(action)
-#                 args_string = self._format_args(action, default)
-#                 parts.extend(action.option_strings)
-#                 parts[-1] += ' ' + args_string
-#             return ', '.join(parts)
-# 
-class MyHelpAction(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string=None):
-        parser.print_help()
-        parser.print_help()
-        parser.exit()
-
-def main():
-    parser = argparse.ArgumentParser(description='This is MY script')
-    parser.add_argument('--foo', required=True, help='foo help')
-    # parser.add_argument('--help', action=MyHelpAction, nargs=0,
-    #                     help='this is MY help message')
-    # parser.add_argument('--help', action=MyHelpAction, help='show this help message and exit')
-    argcomplete.autocomplete(parser)
-    args = parser.parse_args()
-    print(args.foo)
-
-if __name__ == '__main__':
-    main()

qlever/test_copilot.py

@@ -1 +0,0 @@
-if __name__ == "