integrate_module 0.99.2__tar.gz → 0.99.3__tar.gz

{integrate_module-0.99.2/integrate_module.egg-info → integrate_module-0.99.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: integrate_module
-Version: 0.99.2
+Version: 0.99.3
 Summary: Localized probabilistic data integration
 Author-email: Thomas Mejer Hansen <tmeha@geo.au.dk>
 License: MIT

{integrate_module-0.99.2 → integrate_module-0.99.3}/integrate/integrate_io.py

@@ -2967,6 +2967,10 @@ def get_case_data(case='DAUGAARD', loadAll=False, loadType='', filelist=None, **
         print("filelist to download:")
         print(filelist)
 
+    # Direct-download endpoint for the shared data. Use ERDA's 'share_redirect'
+    # form (serves raw file bytes, returns proper 404s), NOT the 'sharelink'
+    # browse link, which returns an HTML directory page with status 200 for any
+    # path and would be saved as a corrupt file.
     urlErda = 'https://anon.erda.au.dk/share_redirect/dxOLKDtoul'
     urlErdaCase = '%s/%s' % (urlErda,case)
     from tqdm import tqdm
@@ -2976,7 +2980,22 @@ def get_case_data(case='DAUGAARD', loadAll=False, loadType='', filelist=None, **
     if showInfo>-1:
         print('--> Got data for case: %s' % case)
 
-    return [f.replace('\\', '/').split('/')[-1] for f in filelist]
+    # Return the local filename for each requested file, but only if it was
+    # actually obtained (downloaded or already present locally). download_file
+    # saves to download_dir='.' using the basename, so we check for that here.
+    # Files that could not be obtained (e.g. missing on the remote server)
+    # return an empty string, so callers can test `if len(name) == 0`.
+    result = []
+    for f in filelist:
+        basename = f.replace('\\', '/').split('/')[-1]
+        if os.path.exists(basename):
+            result.append(basename)
+        else:
+            if showInfo>-1:
+                print('File %s was not obtained (missing locally and on remote); returning empty string.' % basename)
+            result.append('')
+
+    return result
 
 
 

{integrate_module-0.99.2 → integrate_module-0.99.3/integrate_module.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: integrate_module
-Version: 0.99.2
+Version: 0.99.3
 Summary: Localized probabilistic data integration
 Author-email: Thomas Mejer Hansen <tmeha@geo.au.dk>
 License: MIT

{integrate_module-0.99.2 → integrate_module-0.99.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "integrate_module"
-version = "0.99.02"
+version = "0.99.3"
 description = "Localized probabilistic data integration"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.10"