Merge pull request #37 from bkatiemills/helper_telemetry

fallback for version fishing
argovis · Jul 25, 2024 · 0ea2a6b · 0ea2a6b
2 parents 2a2432d + ad97b4e
commit 0ea2a6b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/argovisHelpers/helpers.py b/argovisHelpers/helpers.py
@@ -3,6 +3,7 @@
 from shapely.ops import orient
 import geopandas as gpd
 import pkg_resources
+from pkg_resources import DistributionNotFound
 
 def slice_timesteps(options, r):
     # given a qsr option dict and data route, return a list of reasonable time divisions
@@ -224,7 +225,11 @@ def argofetch(route, options={}, apikey='', apiroot='https://argovis-api.colorad
         if option in options:
             options[option] = str(options[option])
 
-    dl = requests.get(apiroot.rstrip('/') + '/' + route.lstrip('/'), params = options, headers={'x-argokey': apikey, 'x-avh-telemetry': pkg_resources.get_distribution('argovisHelpers').version})
+    try:
+        version = pkg_resources.get_distribution('argovisHelpers').version
+    except DistributionNotFound:
+        version = '-1'
+    dl = requests.get(apiroot.rstrip('/') + '/' + route.lstrip('/'), params = options, headers={'x-argokey': apikey, 'x-avh-telemetry': version})
     statuscode = dl.status_code
     if verbose:
         print(urllib.parse.unquote(dl.url))