pyvalhalla-git 3.5.1.post186__cp311-cp311-macosx_14_0_arm64.whl → 3.5.1.post193__cp311-cp311-macosx_14_0_arm64.whl

{pyvalhalla_git-3.5.1.post186.dist-info → pyvalhalla_git-3.5.1.post193.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvalhalla-git
-Version: 3.5.1.post186
+Version: 3.5.1.post193
 Summary: High-level bindings to the Valhalla C++ library
 Home-page: https://github.com/valhalla/valhalla
 Author: Nils Nolde
@@ -26,7 +26,7 @@ Dynamic: summary
 
 ## Valhalla Python bindings
 
-This package contains the Python bindings to [Valhalla routing engine](https://github.com/valhalla/valhalla).
+This folder contains the Python bindings to [Valhalla routing engine](https://github.com/valhalla/valhalla).
 
 > [!NOTE]
 > `pyvalhalla(-git)` packages are currently only published for:
@@ -34,6 +34,8 @@ This package contains the Python bindings to [Valhalla routing engine](https://g
 > - `win-amd64`
 > - `macos-arm64`
 
+On top of the (very) high-level Python bindings, we package some data-building Valhalla executables to ease the process of graph creation.
+
 ### License
 
 Due to the dependencies we package, the Python bindings are licensed under GNU Lesser General Public License v2 or later (LGPLv2+).
@@ -47,6 +49,8 @@ We distribute all currently maintained CPython versions as **binary wheels** for
 
 ### Usage
 
+#### Bindings
+
 Find a more extended notebook in `./examples`, e.g. how to [use the actor](./examples/actor_examples.ipynb).
 
 Before using the Python bindings you need to have access to a routable Valhalla graph. Either install Valhalla from source and built the graph from OSM compatible data or use our [Valhalla docker image](https://github.com/gis-ops/docker-valhalla) for a painless experience, e.g. this will build the routing graph for Andorra in `./custom_files`:
@@ -71,6 +75,24 @@ actor = Actor(config)
 route = actor.route({"locations": [...]})
 ```
 
+#### Valhalla executables
+
+To access the C++ (native) executables, there are 2 options:
+- (recommended) execute the module, e.g. `python -m valhalla valhalla_build_tiles -h`
+- execute the Python wrapper scripts directly, e.g. `valhalla_build_tiles -h`
+
+> [!NOTE]
+> For the latter option to work, the Python environment's `bin/` folder has to be in the `$PATH`. Inside virtual environments, that's always the case.
+
+Executing the scripts directly might also not work properly if there's a system-wide Valhalla installation, unless the Python environment's `bin/` folder has higher priority than system folders in `$PATH`. The module execution uses an explicit Python executable which should be preferred.
+
+There are also some additional commands we added:
+- `--help`: print the help for `python -m valhalla` explicitly
+- `--quiet`: redirect `stdout` of the C++ executables to `/dev/null`; can be added **once** anywhere in the command, will not be forwarded to a C++ executable
+- `print_bin_path`: simply prints the absolute path to the package-internal `bin/` directory where the C++ executables are; useful if the executables should be accessed directly in some script
+
+To find out which Valhalla executables are currently included, run `python -m valhalla --help`. We limit the number of executables to control the wheel size. However, we're open to include any other executable if there's a good reason.
+
 ### Building from source
 
 #### Linux
@@ -94,7 +116,7 @@ Once built, start a container to actually build Valhalla using AlmaLinux 8:
 ```shell
 cd valhalla
 docker run -dt -v $PWD:/valhalla-py --name valhalla-py --workdir /valhalla-py ghcr.io/valhalla/manylinux:2_28_valhalla_python
-docker exec -t valhalla-py /valhalla-py/src/bindings/python/build_linux.sh build_manylinux 3.12
+docker exec -t valhalla-py /valhalla-py/src/bindings/python/build_linux.sh build_manylinux 3.13
 ```
 
 This will also build & install `libvalhalla` before building the bindings. At this point there should be a `wheelhouse` folder with the fixed python wheel, ready to be installed or distributed to arbitrary python 3.12 installations.

{pyvalhalla_git-3.5.1.post186.dist-info → pyvalhalla_git-3.5.1.post193.dist-info}/RECORD

@@ -1,17 +1,20 @@
-_valhalla.cpython-311-darwin.so,sha256=W8fG1NB_XUSp0nQIZ1rWm17ZsKYGeAqzqLe38VaroPU,11478848
-pyvalhalla_git-3.5.1.post186.dist-info/RECORD,,
-pyvalhalla_git-3.5.1.post186.dist-info/WHEEL,sha256=IDSs5FX6_bA_Je6GNgVyz6rcn2XC7t_ySnnLoSan-5o,136
-pyvalhalla_git-3.5.1.post186.dist-info/top_level.txt,sha256=mU472JpF5fOfpVQ8UxZ_dwLmecLogajAMO5RmYsU1gw,19
-pyvalhalla_git-3.5.1.post186.dist-info/METADATA,sha256=OYtGycjzcSnqGQOaZfzQK8iPGrwzGVDO0m6Be-CEsEs,4773
-pyvalhalla_git-3.5.1.post186.dist-info/licenses/LICENSE.md,sha256=sZlxfQFAuJ8ba_1E8G3hYQ7eC770tBIywEWAg3rrixM,44
-pyvalhalla_git-3.5.1.post186.dist-info/licenses/AUTHORS,sha256=IGm6Dg1NRkmFHV2GWvlPdfiqVoc1kfoc0pMbcKiCs30,171
-pyvalhalla_git-3.5.1.post186.dist-info/licenses/COPYING,sha256=i9sUrrsAX_p17jiQqhCyQrMMhAyqAbmWxWM4yiefN80,1135
+_valhalla.cpython-311-darwin.so,sha256=G6uefdkhtibfTw88P2RrKWv43FJGjBK6bToQRSvnTWA,11478848
+pyvalhalla_git-3.5.1.post193.dist-info/RECORD,,
+pyvalhalla_git-3.5.1.post193.dist-info/WHEEL,sha256=IDSs5FX6_bA_Je6GNgVyz6rcn2XC7t_ySnnLoSan-5o,136
+pyvalhalla_git-3.5.1.post193.dist-info/top_level.txt,sha256=mU472JpF5fOfpVQ8UxZ_dwLmecLogajAMO5RmYsU1gw,19
+pyvalhalla_git-3.5.1.post193.dist-info/METADATA,sha256=yE_nUq5JEu1Gdl7hI9obCXKTop4bRF0UoIMwrtDaK7U,6335
+pyvalhalla_git-3.5.1.post193.dist-info/licenses/LICENSE.md,sha256=sZlxfQFAuJ8ba_1E8G3hYQ7eC770tBIywEWAg3rrixM,44
+pyvalhalla_git-3.5.1.post193.dist-info/licenses/AUTHORS,sha256=IGm6Dg1NRkmFHV2GWvlPdfiqVoc1kfoc0pMbcKiCs30,171
+pyvalhalla_git-3.5.1.post193.dist-info/licenses/COPYING,sha256=i9sUrrsAX_p17jiQqhCyQrMMhAyqAbmWxWM4yiefN80,1135
 valhalla/config.py,sha256=kpYm-7RS4Mz3plcfGWNDx1s6tfXjnBGMei1uxhQ7VJM,1488
-valhalla/__init__.py,sha256=TQKBm2DP8mNh3OYJ-orTqk1KWGOum2U8fJo27IwQrBk,194
-valhalla/__version__.py,sha256=j09GVnLX42684aHEkbNDnFb8yBslAG4k6Jr7KXPp0Wk,530
+valhalla/_valhalla.cc,sha256=3OorCxyOun1-Q9olHlHw75q3XlprX4Lgd4UKQSHahsY,3699
+valhalla/__init__.py,sha256=hkaH-hN0yQ4NLDcAD-d5Jm1Qne6rc7HcDJimDZ92-B8,269
+valhalla/__version__.py,sha256=Ayqd5H42DgZ_KBT7ApCl3-fCyWjKpNYrTUjrUdD0Qz4,530
 valhalla/utils.py,sha256=VCxJ5rNX4Ha8Ey4T81y1b3Ke2svUwGn5TNyW8nC_8p8,1923
 valhalla/actor.py,sha256=MviJjb6ui1KwIzJbACHncuLNDdHkj1hyzCHlDD_yEjw,4077
+valhalla/_scripts.py,sha256=-zpCo07ckNy9yQFs2BymmmYwKS94ZAhlRyHLPUsfEKg,1504
 valhalla/valhalla_build_config.py,sha256=WJJG6t6I8NnkGc_Wd4vSwI2mgZcwQqPrwvKph2AjfGc,42507
+valhalla/__main__.py,sha256=X6B0ffW0-hWWJ-ZowzWnK9tFCF1himT3eQkTWyJ_xL0,2273
 valhalla/.dylibs/libsnappy.1.2.2.dylib,sha256=1D_MdNjNSmrGYQG30ZlmqXb2H1xTbacCevELbUEtRk0,79184
 valhalla/.dylibs/libhwy.1.2.0.dylib,sha256=Yrg_gB_yAOrT3Y494y1ePdkxz4-uSWDcin5WVWEmba4,96928
 valhalla/.dylibs/libIlmThread-3_3.32.3.3.3.dylib,sha256=Cbc2qNJa6hSvnHc_LWttt6wsd3ZgyI6CoCEd3yUlkXs,69744
@@ -37,13 +40,13 @@ valhalla/.dylibs/libodbcinst.2.dylib,sha256=ojdBzS-LKx2NFNU-6Igh2OPRTs5XjMTVRk4b
 valhalla/.dylibs/libcom_err.3.0.dylib,sha256=j9RHAQA4fjOq7X76qcJn9cBjp4D-g1JHwP5443B4IB4,71104
 valhalla/.dylibs/libabsl_time_zone.2407.0.0.dylib,sha256=-eXub4yDlTAmFiN3NuOs82ZAUYCMudJ9F427zfSAPWM,164752
 valhalla/.dylibs/libprotobuf-lite.29.3.0.dylib,sha256=3e2AhLItC8PCJZ7XqSw-DDosEc5sB2U3OWnntagFsmg,653232
-valhalla/.dylibs/libspatialite.8.dylib,sha256=k9EK5y-3eetKyV37vU8j4cOW-fawtnH9MXNRPsQEoug,7282384
+valhalla/.dylibs/libspatialite.8.dylib,sha256=beLpS0M1Y60E2owRzaPnE7tZcC2VAppwUBpTctMSx9c,7282384
 valhalla/.dylibs/libaws-c-common.1.0.0.dylib,sha256=4AjFBLKvWXHbl9_IyeSezeKzv4ZhemWhva7Ium8pAxs,291664
 valhalla/.dylibs/libabsl_random_internal_platform.2407.0.0.dylib,sha256=0nrMu5IgPIbe08Ynsz_nTWJPTcprVajShNAD0q9MvX4,35136
 valhalla/.dylibs/librttopo.1.dylib,sha256=rSxptDKe24UQ3T6arfqdI6ergAZn2BqMJAXmAxwgYIg,408256
 valhalla/.dylibs/libOpenEXRUtil-3_3.32.3.3.3.dylib,sha256=anrBioOSsoPGSwCoY2Hm-bKyCTOHh2B5FeqrgGZ-aAc,226704
 valhalla/.dylibs/libabsl_decode_rust_punycode.2407.0.0.dylib,sha256=1XB62QL8ehlozvz5aMjcsNJZRd6kbHeMu5ocafh1oVA,52016
-valhalla/.dylibs/libkmldom.1.3.0.dylib,sha256=jpNk43-fq4fPk4B3pTESfFzD3fJwNsbDk5LCjkcCKSI,638272
+valhalla/.dylibs/libkmldom.1.3.0.dylib,sha256=CwYTfDvqsLx7yBMJrwjlIZu5FHKCAe4KoCSi1BdMKO0,544544
 valhalla/.dylibs/libabsl_log_internal_conditions.2407.0.0.dylib,sha256=1to5Iv9wsYmB0ypRC7NnF6Yc-4NqWE2HSwGmCV0E2FY,52224
 valhalla/.dylibs/libabsl_random_seed_sequences.2407.0.0.dylib,sha256=KSwJ1YVwM5ZyL4BrZcTEw8-omsbxW5lMRpo9Ua4RhfA,70064
 valhalla/.dylibs/libgeos.3.13.1.dylib,sha256=7n-wMLqOgD_5IAVIFLgRY4ZVujYo7aIqQTGON_kK_ds,2892720
@@ -52,7 +55,7 @@ valhalla/.dylibs/libjxl_cms.0.11.1.dylib,sha256=PvnuHhauhGSKjWH7U7ADaMU2_vVwEH0g
 valhalla/.dylibs/libabsl_flags_commandlineflag.2407.0.0.dylib,sha256=z7Xt5bPmR7Des_goN87EteLCIvmaTKw_6ylBXyJFyQc,68864
 valhalla/.dylibs/libabsl_random_distributions.2407.0.0.dylib,sha256=B3jjqnPAJ4fRRNGTP3EZn5KW-rzMs7r_N6QhMBwr2E0,70096
 valhalla/.dylibs/libczmq.4.dylib,sha256=kzBHAUAW53X-JB241N9RJw0LfZH0HRfdK4q7sxKM5Bo,558576
-valhalla/.dylibs/libaws-crt-cpp.dylib,sha256=vXvNyJJbovyhb6kxb2QcIW3XZMUUqEXNFHj3etsRzqY,741936
+valhalla/.dylibs/libaws-crt-cpp.dylib,sha256=vLFpiHkswITRBeD-oBX9e0i_kKJ2G_TcT2kw2pAJVxU,754112
 valhalla/.dylibs/liblz4.1.10.0.dylib,sha256=kTcBPZ3_-j-qwnREacTtLmapjNnZ-0xq9SeFcK_4Ic4,176960
 valhalla/.dylibs/liburiparser.1.0.31.dylib,sha256=Bfg4JjnDbHarAalKCjwHNbSTLQNAHoR1Y03yPPJmqLU,127680
 valhalla/.dylibs/libabsl_flags_private_handle_accessor.2407.0.0.dylib,sha256=lCU_SDCmo2efV6SkJ42zi6B_-4RpS5VcHOWZjLyjAIo,52880
@@ -86,7 +89,7 @@ valhalla/.dylibs/libssl.3.dylib,sha256=XbtHxY-Fp8FxFknYWDnlyKjSTUI44tPzH07xVDIzF
 valhalla/.dylibs/libabsl_log_internal_format.2407.0.0.dylib,sha256=1KEcZ4z8p2nlMUztcWAaZMEpQC1VDa3-Phv9cixj4Js,72112
 valhalla/.dylibs/libabsl_log_sink.2407.0.0.dylib,sha256=wmmSP56bkIXGQSKmKvqhXgp19sXigY12wt8boXNwxSU,68624
 valhalla/.dylibs/libarrow_dataset.2000.0.0.dylib,sha256=dIUWH4uFDQA5lC5-TLx_UyE6oF2HYWWV3hH9FVJ82dM,2432768
-valhalla/.dylibs/libprime_server.0.dylib,sha256=DsiKbQelYe3YAJ2jt6ysBKsUerqQnuk3oLm1ucx4Q-4,393168
+valhalla/.dylibs/libprime_server.0.dylib,sha256=h_ScEhTzdwdHHS5UCpDq60I9j423In1XM84PM_MwIjY,393168
 valhalla/.dylibs/libabsl_strerror.2407.0.0.dylib,sha256=p_NTirDupMktySlY_NFWEw-9vf3Q_mnDwvD2zO2uugI,53872
 valhalla/.dylibs/libnetcdf.22.dylib,sha256=B2gbziNwPMxNBjwrhgkAwpJeo76uXpxSGzHSWE9h1zc,1309456
 valhalla/.dylibs/libabsl_time.2407.0.0.dylib,sha256=4jzEGP5uO8FeGeMnPpxPiX2oDl_eiknqIDWaB93ENDU,111456
@@ -106,8 +109,8 @@ valhalla/.dylibs/libproj.25.9.6.0.dylib,sha256=ZCPxoJlqpdIKKYb7E9S4y8No6RjnEEhG7
 valhalla/.dylibs/libabsl_raw_logging_internal.2407.0.0.dylib,sha256=LLgu98w-324prrVK10j3FsOzYJDsOlJBAkjENugdTjY,70816
 valhalla/.dylibs/libgpgme.11.dylib,sha256=CEtXjEOyMgntUSPSpkG8dRsvNp60mpW0BP4V083h0yU,348384
 valhalla/.dylibs/libabsl_crc32c.2407.0.0.dylib,sha256=PFufLEkmo7d0bZIm1yt9rXcpdvwi_wAl-AijDumWItU,92272
-valhalla/.dylibs/libkmlbase.1.3.0.dylib,sha256=FSW9Turehptm835VtGu_ZiCDo2TsFrlWoWNX1SXPM7k,165760
-valhalla/.dylibs/libsmime3.dylib,sha256=n5U-nGdEcmkC5O_5WEq1X1ms0AFKlFHYjLrdj0N_Aaw,219776
+valhalla/.dylibs/libkmlbase.1.3.0.dylib,sha256=Qr4dJYXZM--T7IQ5fZoYREV_JtP5HnCWMKEjNnHDJbk,166752
+valhalla/.dylibs/libsmime3.dylib,sha256=87Ktg9KgH5ogISkAJf9NE7uWVUlCqBbvzmXABulukgk,219920
 valhalla/.dylibs/libblosc.1.21.6.dylib,sha256=pxnvs--ddsLT4lC3BFmgeiwjL6zZAeYikLJ_vRxVPp8,711168
 valhalla/.dylibs/libgif.7.2.0.dylib,sha256=A5xhTPnXl-fF4bQ5ksIECjEstlAk6p_9Dv67yXiUbcU,72816
 valhalla/.dylibs/libaws-checksums.1.0.0.dylib,sha256=QAsW89Ix2A8pR4g6GET6qldgj1dQjK_kysHL-dB3Dvk,119200
@@ -134,7 +137,6 @@ valhalla/.dylibs/libabsl_random_internal_randen.2407.0.0.dylib,sha256=389bsaBTlH
 valhalla/.dylibs/libabsl_strings_internal.2407.0.0.dylib,sha256=VIS3roTD2Ktg-w2A59NQJmDeePGjqsSloe6EgeUNDEw,56912
 valhalla/.dylibs/libabsl_log_internal_message.2407.0.0.dylib,sha256=wNCBhDl2G0M9lL0Moz5X4BEG1edXBAppoFYb9dfyztA,127264
 valhalla/.dylibs/libabsl_str_format_internal.2407.0.0.dylib,sha256=Z0xy_NsL04mgE6lMru69Vdh5FaLn6XISJjji82Lv4ZU,140160
-valhalla/.dylibs/libsqlite3.3.49.2.dylib,sha256=M6w2ZzUaXHIn-f8WJp7nTXsqmmRBxtpCspc89MDCtV0,1240880
 valhalla/.dylibs/libexpat.1.10.2.dylib,sha256=gICKKxEExotTSwMvRxeOFrv0Ww9pNYjgQUWnG3fUGcI,167248
 valhalla/.dylibs/libabsl_strings.2407.0.0.dylib,sha256=yACdJjQQqjy1Mnf0q0SQHk34Z2q8pBI-Sl7_56NaxtQ,154128
 valhalla/.dylibs/libabsl_log_internal_nullguard.2407.0.0.dylib,sha256=fohoSzbN6IWNIu8mE8zxamyNMdG4cQIjsOBwqTqZGUQ,35200
@@ -143,13 +145,14 @@ valhalla/.dylibs/libutf8_validity.dylib,sha256=yl9wImeibCDiqUpSgQ9OxOQ3sTBfkD2vm
 valhalla/.dylibs/libabsl_malloc_internal.2407.0.0.dylib,sha256=kPNixRU-lTta8lsGjK3eY35FgEIy7iHcXCjY7mXhHVg,56848
 valhalla/.dylibs/libabsl_flags_marshalling.2407.0.0.dylib,sha256=13nvhdwqZmZAezuryYmq0LKmAF2LDvVMxfJ7w01s7H0,88416
 valhalla/.dylibs/libabsl_symbolize.2407.0.0.dylib,sha256=WAUWxmJCIx2R4eOEmHEnHG1iOCkps8i0L6ssOppaAjs,70304
+valhalla/.dylibs/libsqlite3.3.50.0.dylib,sha256=EJQEIAnU-7D3NdV-HD_x4Y5iryw1U0m_GaRewHXIHlI,1241152
 valhalla/.dylibs/libabsl_cordz_functions.2407.0.0.dylib,sha256=GUIypwx0OBC0nzLkL7VAynZ8hbyccyJRw_BCC_Sx5I8,51744
 valhalla/.dylibs/libarrow.2000.0.0.dylib,sha256=SntSm_VDy_c8qMCLBOUv29ExXQtMzOtf17sW8cVwvLk,25388256
-valhalla/.dylibs/libssl3.dylib,sha256=3LFQ5zTf-ZFNKB36GTzsz8EcmnRsZXxJJhUHuCe8Y1A,383648
+valhalla/.dylibs/libssl3.dylib,sha256=YGGbdTQH67awKo8ShOFLQA-0isuxSaD2Gg15mWnzNo8,383648
 valhalla/.dylibs/libabsl_bad_variant_access.2407.0.0.dylib,sha256=6LDDEBn-T27Qe0TCOuMi8G5UYbjbPjbxXmTcXaz2kqA,35056
 valhalla/.dylibs/libImath-3_1.29.11.0.dylib,sha256=Z1460VjZmA3BeqrG4k5XHvpIC92AnyERcmw_XIrrtOE,357824
 valhalla/.dylibs/libkrb5.3.3.dylib,sha256=HrDFydzihrrMq8H7EftoK8pSk2rcogle8JSEgNoSi1s,791520
-valhalla/.dylibs/libkmlengine.1.3.0.dylib,sha256=lKxMxxoCROFp3bq4Mur0yrpr_n0uE0e7GlhpZaI0qJc,243856
+valhalla/.dylibs/libkmlengine.1.3.0.dylib,sha256=Pd7uhEslhQRysNYHoBKIepStgUkW4xHn7-ouKL3IRt8,230736
 valhalla/.dylibs/libsharpyuv.0.1.1.dylib,sha256=tP0cj6tzdlEvUN761sTEIhj40hN-FMfwUsZf57W7IRA,69872
 valhalla/.dylibs/libabsl_graphcycles_internal.2407.0.0.dylib,sha256=9tUFtAzRrBkdAv2ZRjgQL43mdsIGuxIWyVijdXfE0FA,73968
 valhalla/.dylibs/libre2.11.0.0.dylib,sha256=lju4ZHBQ1Nrspjnm7sY_kT21FXOdXSku4MnvWSQuCmU,546608
@@ -182,6 +185,7 @@ valhalla/.dylibs/libabsl_log_entry.2407.0.0.dylib,sha256=s9KoClNT2PuqU_h7sebelqc
 valhalla/.dylibs/libabsl_crc_internal.2407.0.0.dylib,sha256=I9JTmdYui8VdPufKXhJgzuIQ1H3MpxcxHvhRBUNF0eg,130704
 valhalla/.dylibs/libbrotlienc.1.1.0.dylib,sha256=Fwb0M-aX67G8G0EuuOZRfRDuAHrEe4JF8w_buGeyrr0,623552
 valhalla/.dylibs/libabsl_city.2407.0.0.dylib,sha256=829JJ33BdkBaE2PAkC5J8xG27hjXg4MSTkdi2mwieNI,35328
+valhalla/.dylibs/libluajit-5.1.2.1.1748459687.dylib,sha256=FTbbIqu70b-qRbFCALwnDM2DvxviixFp295yUlHec1A,544832
 valhalla/.dylibs/libparquet.2000.0.0.dylib,sha256=sHbCSkHr2lWggUV9cny65GAWNH06Yv4Mje7Rs7WBiVA,3544336
 valhalla/.dylibs/libabsl_crc_cord_state.2407.0.0.dylib,sha256=FSDkyuNBDMhZYLTV7tTY0lkQiUnReVhAbnS1AuwSWY4,74720
 valhalla/.dylibs/libk5crypto.3.1.dylib,sha256=DULNjaEXgUFMMLG_PNQTPTydp6cY5eHigTjsepJXarQ,197616
@@ -195,11 +199,11 @@ valhalla/.dylibs/libb2.1.dylib,sha256=wwmxJIEnwlg5TRM5c7h9d8xOUhF55Pqu91xQeDiMrr
 valhalla/.dylibs/libabsl_cord.2407.0.0.dylib,sha256=NShy60FKMp3MHtCY2YxDSja0oi0p0igwj8TirSNGogc,162800
 valhalla/.dylibs/libaws-c-compression.1.0.0.dylib,sha256=YO6pOrvPedyUiA7mxggAiKUDwcc9nsjcDFxYqukOpQ0,70112
 valhalla/.dylibs/libopenjp2.2.5.3.dylib,sha256=S1xsR6a9lalCw9h4GuEKYLjGECHRHK3hYzp_UcrnJps,325968
-valhalla/.dylibs/libnssutil3.dylib,sha256=DWcFP61C2zhHkktD-ePpsQXzdD8hxiybKM4F04QqsKU,223120
-valhalla/.dylibs/libgdal.37.3.11.0.dylib,sha256=v76MtdTGGRzcIawTB8iWSxPa5psVnIsfRIEQIG0MaEY,23847104
+valhalla/.dylibs/libnssutil3.dylib,sha256=dvkRF38TppLNG3KWIsInIVfMfMqbVX2-aIhHVvEaZ10,223120
+valhalla/.dylibs/libgdal.37.3.11.0.dylib,sha256=tTv7DyPOkIQJ5G2hw8VvOl6KkE7v7zRtbwoS7gWqREQ,23847104
 valhalla/.dylibs/libabsl_base.2407.0.0.dylib,sha256=RaaKM2LJF_7lQQT_WScLOfnwDscWE6FPadQMnz_7iSI,74448
 valhalla/.dylibs/libabsl_vlog_config_internal.2407.0.0.dylib,sha256=svUIxoI6gPGS2U5JSfAJ2lVe7VyMUAVI9YrRDzC8QtI,95296
-valhalla/.dylibs/libnss3.dylib,sha256=fz6bW5ZR-zBycAa9uC3caX0UIDoXLztXf_kTXz-plYc,1180048
+valhalla/.dylibs/libnss3.dylib,sha256=32iCXZ7ZOROeAtV1YwQdhP1d4hIpMgr-BofPpUE9_SY,1180048
 valhalla/.dylibs/libtiff.6.dylib,sha256=j_qDL-lqSKZtwcJJewDZitwoOvWyqndDfvJoalvkHtI,526512
 valhalla/.dylibs/libzstd.1.5.7.dylib,sha256=vmnK_6voSbVHNZxfOBNSs_nnoIYTxsBRcvM8xtOFGsY,670240
 valhalla/.dylibs/libaws-c-event-stream.1.0.0.dylib,sha256=WJ23clSZh5RkgK4nyurZTiXjxbVnkXjmK7f7REqk82U,134448
@@ -208,6 +212,5 @@ valhalla/.dylibs/libabsl_random_internal_pool_urbg.2407.0.0.dylib,sha256=BwN9C3N
 valhalla/.dylibs/libfreexl.1.dylib,sha256=rSFQ5_1mwGEtKUCVjBRlNPKR8aBc8qjOw1m81pXKJtM,106160
 valhalla/.dylibs/libgeotiff.5.dylib,sha256=4Ho3GFLCMr6PnifceZPJ7eVjC79oBaU3IS9iyZ_F-uQ,195456
 valhalla/.dylibs/libabsl_log_internal_check_op.2407.0.0.dylib,sha256=BNckrUSPq6ldE5VfZ8ryB91ZZgaakLMEk7Nm9aOOAd4,113872
-valhalla/.dylibs/libluajit-5.1.2.1.1744318430.dylib,sha256=B5Zub7TuhvqJTLcRt3d5z2m9xOkaNTTeqazfRUFFKS4,544832
 valhalla/.dylibs/libabsl_cord_internal.2407.0.0.dylib,sha256=dsxQsWyv8FrcH3LusABslihzUNFiR1oULZDn8Ku_zD4,101648
 valhalla/.dylibs/libaom.3.12.1.dylib,sha256=eS5adGQZEgifzAyG9gWvzqXyh4MVL-wRO4rIdkTZ2Xg,3905040

valhalla/__init__.py

@@ -1,8 +1,11 @@
+from pathlib import Path
+
 try:
     from ._valhalla import *
 except ModuleNotFoundError:
     from _valhalla import *
-
 from .actor import Actor
 from .config import get_config, get_help
 from .__version__ import __version__
+
+PYVALHALLA_DIR = Path(__file__).parent.resolve()

valhalla/__main__.py

@@ -0,0 +1,69 @@
+import subprocess
+import sys
+from typing import Optional
+
+from ._scripts import PYVALHALLA_BIN_DIR, run
+
+PRINT_BIN_PATH = "print_bin_path"
+
+
+def print_help():
+    print(
+        "\npyvalhalla package provides a CLI to run Valhalla C++ executables. Arguments are simply passed on as they are."
+    )
+    print(
+        "One notable exception is --quiet/-q, which will forward the C++ executable's stdout to /dev/null."
+    )
+    print("'python -m valhalla --help' will print this help.")
+    print(
+        "\nExample usage: 'python -m valhalla --quiet valhalla_build_tiles -c valhalla.json -s initialize -e build test.pbf'"
+    )
+    print("\nAvailable commands:")
+    # left-align executable names
+    exe_names = [p.name for p in PYVALHALLA_BIN_DIR.iterdir()]
+    fixed_width = len(max(exe_names, key=lambda x: len(x)))
+    print(
+        f"\t{PRINT_BIN_PATH:<{fixed_width}} - Print the absolute path of directory containing the C++ executables"
+    )
+    for command in exe_names:
+        print(f"\t{command:<{fixed_width}} - see usage with 'python -m pyvalhalla {command} --help' ")
+
+
+def main():
+    if len(sys.argv) < 2:
+        print("[FATAL] command needs arguments, see 'python -m valhalla --help': \n")
+        print_help()
+        sys.exit(1)
+
+    prog_or_opt = sys.argv[1]
+
+    if prog_or_opt in ("--help", "-h"):
+        print_help()
+        sys.exit(0)
+    elif prog_or_opt == PRINT_BIN_PATH:
+        # useful when another script wants to run the executables directly for some reason
+        # in theory one doesn't even need a python installation for the Valhalla executables
+        # to still work, provided the correct wheel is used for the specific platform
+        print(PYVALHALLA_BIN_DIR)
+    else:
+        exc: Optional[Exception] = None
+        try:
+            run(from_main=True)
+        except (FileNotFoundError, subprocess.CalledProcessError) as e:
+            exc = e
+        finally:
+            if not exc:
+                sys.exit(0)
+
+            if isinstance(exc, subprocess.CalledProcessError):
+                print(f"Failed calling command '{exc.cmd}'\n")
+
+            print_help()
+            print("Sub-command failed with:\n")
+            print(exc, file=sys.stderr)
+
+            sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

valhalla/__version__.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.5.1.post186'
-__version_tuple__ = version_tuple = (3, 5, 1, 'post186')
+__version__ = version = '3.5.1.post193'
+__version_tuple__ = version_tuple = (3, 5, 1, 'post193')

valhalla/_scripts.py

@@ -0,0 +1,46 @@
+from pathlib import Path
+from shutil import which
+import subprocess
+import sys
+
+from . import PYVALHALLA_DIR
+
+PYVALHALLA_BIN_DIR = PYVALHALLA_DIR.joinpath("bin").resolve()
+
+
+def run(from_main=False) -> None:
+    """
+    Parses the command line arguments and runs the Valhalla executables with the
+    provided arguments. Note, by default we assume this is not being called by
+    __main__.py via e.g. 'python -m valhalla ...', but directly with e.g.d
+    'valhalla_build_tiles -h'. sys.argv relates to different executables for
+    both scenarios.
+
+    :param from_main: We parse sys.argv differently if it's called from __main__.py
+    """
+    prog = sys.argv[1] if from_main else Path(sys.argv[0]).name
+    prog_args = sys.argv[2:] if from_main else sys.argv[1:]
+
+    if not which(prog):
+        raise FileNotFoundError(f"Can't find executable at {prog}")
+    prog_path = PYVALHALLA_BIN_DIR.joinpath(prog).resolve()
+
+    print(f"[INFO] Running {prog_path} with args: {prog_args}...")
+
+    # --quiet/-q is our option, don't pass it to the executables
+    is_quiet = False
+    for arg in prog_args:
+        if arg not in ("--quiet", "-q"):
+            continue
+        prog_args.pop(prog_args.index(arg))
+        is_quiet = True
+
+    # recommended way to call exe
+    proc = subprocess.run(
+        [str(prog_path)] + prog_args,
+        stderr=sys.stderr,
+        stdout=subprocess.DEVNULL if is_quiet else sys.stdout,
+    )
+
+    # raises CalledProcessError if not successful
+    proc.check_returncode()

valhalla/_valhalla.cc

@@ -0,0 +1,81 @@
+#include "baldr/rapidjson_utils.h"
+#include "midgard/logging.h"
+#include "midgard/util.h"
+#include "tyr/actor.h"
+
+#include <boost/make_shared.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <pybind11/pybind11.h>
+
+#include <string>
+
+namespace vt = valhalla::tyr;
+namespace {
+
+// configuring multiple times is wasteful/ineffectual but not harmful
+// TODO: make this threadsafe just in case its abused
+const boost::property_tree::ptree configure(const std::string& config) {
+  boost::property_tree::ptree pt;
+  try {
+    // parse the config and configure logging
+    rapidjson::read_json(config, pt);
+
+    auto logging_subtree = pt.get_child_optional("mjolnir.logging");
+    if (logging_subtree) {
+      auto logging_config = valhalla::midgard::ToMap<const boost::property_tree::ptree&,
+                                                     std::unordered_map<std::string, std::string>>(
+          logging_subtree.get());
+      valhalla::midgard::logging::Configure(logging_config);
+    }
+  } catch (...) { throw std::runtime_error("Failed to load config from: " + config); }
+
+  return pt;
+}
+} // namespace
+
+namespace py = pybind11;
+
+PYBIND11_MODULE(_valhalla, m) {
+  py::class_<vt::actor_t>(m, "_Actor", "Valhalla Actor class")
+      .def(py::init<>([](std::string config) { return vt::actor_t(configure(config), true); }))
+      .def(
+          "route", [](vt::actor_t& self, std::string& req) { return self.route(req); },
+          "Calculates a route.")
+      .def(
+          "locate", [](vt::actor_t& self, std::string& req) { return self.locate(req); },
+          "Provides information about nodes and edges.")
+      .def(
+          "optimized_route",
+          [](vt::actor_t& self, std::string& req) { return self.optimized_route(req); },
+          "Optimizes the order of a set of waypoints by time.")
+      .def(
+          "matrix", [](vt::actor_t& self, std::string& req) { return self.matrix(req); },
+          "Computes the time and distance between a set of locations and returns them as a matrix table.")
+      .def(
+          "isochrone", [](vt::actor_t& self, std::string& req) { return self.isochrone(req); },
+          "Calculates isochrones and isodistances.")
+      .def(
+          "trace_route", [](vt::actor_t& self, std::string& req) { return self.trace_route(req); },
+          "Map-matching for a set of input locations, e.g. from a GPS.")
+      .def(
+          "trace_attributes",
+          [](vt::actor_t& self, std::string& req) { return self.trace_attributes(req); },
+          "Returns detailed attribution along each portion of a route calculated from a set of input locations, e.g. from a GPS trace.")
+      .def(
+          "height", [](vt::actor_t& self, std::string& req) { return self.height(req); },
+          "Provides elevation data for a set of input geometries.")
+      .def(
+          "transit_available",
+          [](vt::actor_t& self, std::string& req) { return self.transit_available(req); },
+          "Lookup if transit stops are available in a defined radius around a set of input locations.")
+      .def(
+          "expansion", [](vt::actor_t& self, std::string& req) { return self.expansion(req); },
+          "Returns all road segments which were touched by the routing algorithm during the graph traversal.")
+      .def(
+          "centroid", [](vt::actor_t& self, std::string& req) { return self.centroid(req); },
+          "Returns routes from all the input locations to the minimum cost meeting point of those paths.")
+      .def(
+          "status", [](vt::actor_t& self, std::string& req) { return self.status(req); },
+          "Returns nothing or optionally details about Valhalla's configuration.");
+}