geoseeq 0.6.12.dev0__tar.gz → 0.6.12.dev1__tar.gz

{geoseeq-0.6.12.dev0 → geoseeq-0.6.12.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: geoseeq
-Version: 0.6.12.dev0
+Version: 0.6.12.dev1
 Summary: GeoSeeq command line tools and python API
 Author: David C. Danko
 Author-email: "David C. Danko" <dcdanko@biotia.io>

{geoseeq-0.6.12.dev0 → geoseeq-0.6.12.dev1}/geoseeq/cli/main.py

@@ -54,7 +54,7 @@ def version():
     Use of this tool implies acceptance of the GeoSeeq End User License Agreement.
     Run `geoseeq eula show` to view the EULA.
     """
-    click.echo('0.6.12dev0')  # remember to update pyproject.toml
+    click.echo('0.6.12dev1')  # remember to update pyproject.toml
 
 
 @main.group('advanced')

{geoseeq-0.6.12.dev0 → geoseeq-0.6.12.dev1}/geoseeq/upload_download_manager.py

@@ -127,7 +127,7 @@ class GeoSeeqUploadManager:
 
 
 def _download_one_file(args):
-    original_url, file_path, callback, pbar, ignore_errors, head, log_level, parallel_downloads = args
+    original_url, original_original_url, file_path, callback, pbar, ignore_errors, head, log_level, parallel_downloads = args
     if parallel_downloads:
         _make_in_process_logger(log_level)
     if isinstance(original_url, ResultFile):
@@ -142,7 +142,7 @@ def _download_one_file(args):
             callback_result = callback(local_path)
         else:
             callback_result = None
-        return local_path, original_url, callback_result
+        return local_path, original_original_url, callback_result
     except Exception as e:
         if ignore_errors:
             logger.error(f"Error downloading {url}: {e}")
@@ -195,7 +195,9 @@ class GeoSeeqDownloadManager:
     def _convert_result_files_to_urls(self):
         self._result_files = [(
             url.get_download_url() if isinstance(url, ResultFile) else url,
-            file_path, callback
+            url,  # original url
+            file_path,
+            callback
         ) for url, file_path, callback in self._result_files]
 
     def download_files(self):
@@ -205,11 +207,11 @@ class GeoSeeqDownloadManager:
         """
         self._convert_result_files_to_urls()
         download_args = [(
-            url, file_path, callback,
+            url, original_url, file_path, callback,
             self.progress_tracker_factory(file_path),
             self.ignore_errors, self.head, self.log_level,
             self.n_parallel_downloads > 1
-        ) for url, file_path, callback in self._result_files]
+        ) for url, original_url, file_path, callback in self._result_files]
         out = []
         if self.n_parallel_downloads == 1:
             logger.info(f"Downloading files in series.")

{geoseeq-0.6.12.dev0 → geoseeq-0.6.12.dev1}/geoseeq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: geoseeq
-Version: 0.6.12.dev0
+Version: 0.6.12.dev1
 Summary: GeoSeeq command line tools and python API
 Author: David C. Danko
 Author-email: "David C. Danko" <dcdanko@biotia.io>

{geoseeq-0.6.12.dev0 → geoseeq-0.6.12.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "geoseeq"
-version = "0.6.12dev0"
+version = "0.6.12dev1"
 authors = [
   { name="David C. Danko", email="dcdanko@biotia.io" },
 ]