qlever 0.4.4__py3-none-any.whl → 0.5.0__py3-none-any.whl

qlever/Qleverfiles/Qleverfile.ohm-planet

@@ -0,0 +1,37 @@
+# Qleverfile for OHM Planet, use with https://github.com/ad-freiburg/qlever-control
+#
+# qlever get-data  # ~20 mins (download PBF, convert to TTL, add GeoSPARQL triples)
+# qlever index     # ~10 mins and ~5 GB RAM (on an AMD Ryzen 9 5900X)
+# qlever start     # start the server (instantaneous)
+#
+# For `qlever get-data` to work, `osm2rdf` and `spatialjoin` must be installed
+# and included in the `PATH`.
+
+[data]
+NAME           = ohm-planet
+GET_DATA_URL   = $$(curl -s https://planet.openhistoricalmap.org/planet/state.txt)
+GET_DATA_CMD_1 = curl -LRfC - -o ${NAME}.pbf ${GET_DATA_URL} 
+GET_DATA_CMD_2 = osm2rdf ${NAME}.pbf -o ${NAME}.ttl --source-dataset OHM --simplify-wkt 0 --write-ogc-geo-triples none 2>&1 | tee ${NAME}.osm2rdf-log.txt
+GET_DATA_CMD_3 = bzcat ${NAME}.ttl.bz2 | \grep "^osm2rdf" | sed -En 's/^osm2rdf(geom)?:(ohm_)?(node|rel|way)[a-z]*_([0-9]+) geo:asWKT "([^\"]+)".*/ohm\3:\4\t\5/p' | tee ${NAME}.spatialjoin-input.tsv | spatialjoin --contains ' ogc:sfContains ' --intersects ' ogc:sfIntersects ' --suffix $$' .\n' -o ${NAME}.spatialjoin-triples.ttl.bz2 2>&1 | tee ${NAME}.spatialjoin-log.txt && rm -f areas events lines points simplelines
+GET_DATA_CMD   = ${GET_DATA_CMD_1} && echo && ${GET_DATA_CMD_2} && echo && ${GET_DATA_CMD_3} && bzcat ${NAME}.ttl.bz2 | head -100 | \grep "^@prefix" > ${NAME}.prefix-definitions
+VERSION        = $$(date -r ${NAME}.pbf +%d.%m.%Y || echo "NO_DATE")
+DESCRIPTION    = OHM Planet, data from ${GET_DATA_URL} version ${VERSION} (with GeoSPARQL predicates ogc:sfContains and ogc:sfIntersects)
+
+[index]
+INPUT_FILES      = ${data:NAME}.prefix-definitions ${data:NAME}.spatialjoin-triples.ttl.bz2 ${data:NAME}.ttl.bz2
+CAT_INPUT_FILES  = bzcat -f ${INPUT_FILES}
+SETTINGS_JSON    = { "prefixes-external": [""], "ascii-prefixes-only": false, "parallel-parsing": true, "num-triples-per-batch": 5000000 }
+
+[server]
+PORT               = 7037
+ACCESS_TOKEN       = ${data:NAME}_32673264324
+MEMORY_FOR_QUERIES = 10G
+CACHE_MAX_SIZE     = 5G
+WARMUP_CMD         = curl -s http://localhost:${PORT} -H "Accept: application/qlever-results+json" --data-urlencode "query=PREFIX geo: <http://www.opengis.net/ont/geosparql#> SELECT ?subject ?geometry WHERE { ?subject geo:hasGeometry ?m . ?m geo:asWKT ?geometry } INTERNAL SORT BY ?subject" --data-urlencode "access-token=${server:ACCESS_TOKEN}" --data-urlencode "pinresult=true" --data-urlencode "send=0" | jq .resultsize | xargs printf "Result size: %'d\n"
+
+
+[runtime]
+SYSTEM = native
+
+[ui]
+CONFIG = ohm-planet

qlever/commands/get_data.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
 import shlex
-import subprocess
 
 from qlever.command import QleverCommand
 from qlever.log import log
-from qlever.util import get_total_file_size
+from qlever.util import get_total_file_size, run_command
 
 
 class GetDataCommand(QleverCommand):
@@ -36,8 +35,7 @@ class GetDataCommand(QleverCommand):
 
         # Execute the command line.
         try:
-            subprocess.run(args.get_data_cmd, shell=True, check=True,
-                           stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
+            run_command(args.get_data_cmd, show_output=True)
         except Exception as e:
             log.error(f"Problem executing \"{args.get_data_cmd}\": {e}")
             return False

qlever/config.py

@@ -5,9 +5,9 @@ import os
 import traceback
 from importlib.metadata import version
 from pathlib import Path
-from termcolor import colored
 
 import argcomplete
+from termcolor import colored
 
 from qlever import command_objects, script_name
 from qlever.log import log, log_levels
@@ -199,7 +199,7 @@ class QleverConfig:
         # If called without arguments, show the help message.
         if len(os.sys.argv) == 1:
             parser.print_help()
-            exit(1)
+            exit(0)
 
         # Parse the command line arguments.
         args = parser.parse_args()

qlever/qlever_old.py

@@ -5,14 +5,11 @@
 # convenient command-line tool for all things QLever.  See the `README.md` file
 # for how to use it.
 
-from configparser import ConfigParser, ExtendedInterpolation
-from datetime import datetime, date
-import os
 import glob
 import inspect
 import json
 import logging
-import psutil
+import os
 import re
 import shlex
 import shutil
@@ -20,16 +17,20 @@ import socket
 import subprocess
 import sys
 import time
-import pkg_resources
-from termcolor import colored
 import traceback
+from configparser import ConfigParser, ExtendedInterpolation
+from datetime import date, datetime
+
+import pkg_resources
+import psutil
+
+from qlever.log import log
 
 BLUE = "\033[34m"
 RED = "\033[31m"
 BOLD = "\033[1m"
 NORMAL = "\033[0m"
 
-from qlever.log import log
 # # Custom formatter for log messages.
 # class CustomFormatter(logging.Formatter):
 #     def format(self, record):
@@ -42,8 +43,8 @@ from qlever.log import log
 #             return colored(message, "red")
 #         else:
 #             return message
-# 
-# 
+#
+#
 # # Custom logger.
 # log = logging.getLogger("qlever")
 # log.setLevel(logging.INFO)

{qlever-0.4.4.dist-info → qlever-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qlever
-Version: 0.4.4
+Version: 0.5.0
 Summary: Script for using the QLever SPARQL engine.
 Author-email: Hannah Bast <bast@cs.uni-freiburg.de>
 License: Apache-2.0

{qlever-0.4.4.dist-info → qlever-0.5.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 qlever/__init__.py,sha256=7VKA8tp5iHZQyTXhDOcxUbloZ7WyxDnkruq0iJOzQcE,1403
 qlever/__main__.py,sha256=MqM37bEzQeJEGUXZvuLcilIvnObZiG2eTGIkfKGpdnw,62016
 qlever/command.py,sha256=yOr0Uc8D8-AM7EjwDsVzbc3KNYjPH-FVOZhIHkqO588,2749
-qlever/config.py,sha256=fMEyI0dsLsDeBXiclobwB0m1gmzd7J1r7OZfk7_J2dc,10254
+qlever/config.py,sha256=qYPy-MQ7BwGrvKSazQWhs0lnlOFqm-d47mpZhc3fptc,10254
 qlever/containerize.py,sha256=p8g3O3G8a_0XLzSTzl_e5t9dqjbCQ-ippoA8vI2Z9pI,4193
 qlever/log.py,sha256=and5prQcLW_5nM8AAZNeNbVqJxLtJmX3EjHFhtHCR28,1279
 qlever/qlever_main.py,sha256=tA_xqOs_FjvqlDIvKTprwuysfTwzsUjE7at26gRhCVA,2336
-qlever/qlever_old.py,sha256=br9ryMpr2E5iV0eX-2cm7IinA4y5h4vGiJomJLVcKDM,62056
+qlever/qlever_old.py,sha256=6sHosOfJzkURpdK4wXLdGl4SUtPnlsNEUwAqUeJiRYA,62026
 qlever/qleverfile.py,sha256=6Ll81xkzel_s2Ju9ZfBXUGlRfikaAzZM6Do-dTrdo3k,12934
 qlever/util.py,sha256=eepj0SY9JJOUQq5kvtoPnWfoLLV9fbw_sTEWKHet66E,7147
 qlever/Qleverfiles/Qleverfile.dblp,sha256=SFjBD20aOSWod4mEQnxHSDWdInoE_EFp2nyMw7ev7ZA,1167
@@ -15,6 +15,7 @@ qlever/Qleverfiles/Qleverfile.dnb,sha256=yw4MmLsDPP3P5JWPgJwgPJh66TqwkyUXbQR5lSf
 qlever/Qleverfiles/Qleverfile.fbeasy,sha256=jeztW4gFpWL_w1nCH5qGHeZyZv2lz_kG6f1G3r3DkJ4,974
 qlever/Qleverfiles/Qleverfile.freebase,sha256=k6PqYrtHTBr0EydObm1Hg9QWyAAM9fXkdcjhReDg0fM,1035
 qlever/Qleverfiles/Qleverfile.imdb,sha256=uL5XlPwX01AmH-j6_Bc-PRm2fuPxGSIu8NaDflY525U,1623
+qlever/Qleverfiles/Qleverfile.ohm-planet,sha256=PVf9xf11KoPfKBAwYVrOAjibUZ2EG5giCSmllFqcmmQ,2493
 qlever/Qleverfiles/Qleverfile.olympics,sha256=5w9BOFwEBhdSzPz-0LRxwhv-7Gj6xbF539HOXr3cqD0,1088
 qlever/Qleverfiles/Qleverfile.osm-country,sha256=UnlkckSXJDrknZORlU-Hdj_J82U4kStl1aRctCc5n6M,1953
 qlever/Qleverfiles/Qleverfile.osm-planet,sha256=2RilNix0fplN3GsNNyOu3GzmUss1Pq7586WKOFAQnSs,1400
@@ -30,7 +31,7 @@ qlever/commands/add_text_index.py,sha256=dkqYtwgOhgnXiei_eyhBWYCtdAiQUEmjWoa3JMl
 qlever/commands/cache_stats.py,sha256=6JjueQstAqc8dNfgY8TP2EitFMxdUvCwrcyd7KUEb2o,4157
 qlever/commands/clear_cache.py,sha256=AnE1MOoj1ZexxrRT8FGeBLlv8rtQIVV4DP8VBn5-X-s,2843
 qlever/commands/example_queries.py,sha256=2rYTd35t0r7et0i-IBBcCpmVlYZya9kvwSI-gdTpNdE,12326
-qlever/commands/get_data.py,sha256=Ua1OuqfTwTcDUXD4TWTYg7dJIFkzl_e6SB73oZhUVQA,1506
+qlever/commands/get_data.py,sha256=f9kjZI3TKad6JHSuXWNkeoajmW8h0Sx8ShvjauDCtNo,1412
 qlever/commands/index.py,sha256=lJhDnweknFZQm1czqPzNyz33EvbjIvOrS4j0wDaJ98o,5663
 qlever/commands/index_stats.py,sha256=_BiUNBhmbYd9RPxrlm4HF0oENO6JmqnRiAkwkyOdN4U,11722
 qlever/commands/log.py,sha256=8Krt3MsTUDapYqVw1zUu5X15SF8mV97Uj0qKOWK8jXk,1861
@@ -40,9 +41,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.4.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-qlever-0.4.4.dist-info/METADATA,sha256=6OKe211H7bjBnvdsSx1BO-m3ndvjc7baWLLmf4_P9PM,4146
-qlever-0.4.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qlever-0.4.4.dist-info/entry_points.txt,sha256=U_gbYYi0wwdsn884eb0XoOXfvhACOsxhlO330dZ9bi0,87
-qlever-0.4.4.dist-info/top_level.txt,sha256=kd3zsYqiFd0--Czh5XTVkfEq6XR-XgRFW35X0v0GT-c,7
-qlever-0.4.4.dist-info/RECORD,,
+qlever-0.5.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+qlever-0.5.0.dist-info/METADATA,sha256=GtQdaBBOd5WYb2_UrqpTawHjJsKkEbEI6qyyaVi4rwY,4146
+qlever-0.5.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qlever-0.5.0.dist-info/entry_points.txt,sha256=U_gbYYi0wwdsn884eb0XoOXfvhACOsxhlO330dZ9bi0,87
+qlever-0.5.0.dist-info/top_level.txt,sha256=kd3zsYqiFd0--Czh5XTVkfEq6XR-XgRFW35X0v0GT-c,7
+qlever-0.5.0.dist-info/RECORD,,