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

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

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

{geoseeq-0.6.12.dev1 → geoseeq-0.6.13.dev0}/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.12dev1')  # remember to update pyproject.toml
+    click.echo('0.6.13dev0')  # remember to update pyproject.toml
 
 
 @main.group('advanced')

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

@@ -127,22 +127,21 @@ class GeoSeeqUploadManager:
 
 
 def _download_one_file(args):
-    original_url, original_original_url, file_path, callback, pbar, ignore_errors, head, log_level, parallel_downloads = args
+    url, file_path, key, callback, pbar, ignore_errors, head, log_level, parallel_downloads = args
     if parallel_downloads:
         _make_in_process_logger(log_level)
-    if isinstance(original_url, ResultFile):
-        url = original_url.get_download_url()
+    if dirname(file_path):
+        makedirs(dirname(file_path), exist_ok=True)
+    if isinstance(url, ResultFile):
+        local_path = url.download(filename=file_path, progress_tracker=pbar, head=head)
     else:
-        url = original_url
-    try:
-        if dirname(file_path):
-            makedirs(dirname(file_path), exist_ok=True)
         local_path = download_url(url, filename=file_path, progress_tracker=pbar, head=head)
+    try:
         if callback is not None:
             callback_result = callback(local_path)
         else:
             callback_result = None
-        return local_path, original_original_url, callback_result
+        return local_path, key, callback_result
     except Exception as e:
         if ignore_errors:
             logger.error(f"Error downloading {url}: {e}")
@@ -161,13 +160,13 @@ class GeoSeeqDownloadManager:
         self._result_files = []
 
 
-    def add_download(self, url, file_path=None, progress_tracker=None, callback=None):
+    def add_download(self, url, file_path=None, progress_tracker=None, callback=None, key=None):
         if not file_path:
             if isinstance(url, ResultFile):
                 file_path = url.get_local_filename()
             else:
                 raise ValueError("file_path must be provided if url is not a ResultFile object.")
-        self._result_files.append((url, file_path, callback))
+        self._result_files.append((url, file_path, key, callback))
 
 
     def add_result_folder_download(self, result_folder, local_folder_path, hidden_files=True):
@@ -178,14 +177,14 @@ class GeoSeeqDownloadManager:
 
     def get_preview_string(self):
         out = ["Download Preview:"]
-        for url, file_path, _ in self._result_files:
+        for url, file_path, _, _ in self._result_files:
             out.append(f"{url} -> {file_path}")
         return "\n".join(out)
     
     def get_url_string(self):
         self._convert_result_files_to_urls()
         out = []
-        for url, _, _ in self._result_files:
+        for url, _, _, _ in self._result_files:
             out.append(url)
         return "\n".join(out)
     
@@ -195,23 +194,24 @@ class GeoSeeqDownloadManager:
     def _convert_result_files_to_urls(self):
         self._result_files = [(
             url.get_download_url() if isinstance(url, ResultFile) else url,
-            url,  # original url
             file_path,
+            key,
             callback
-        ) for url, file_path, callback in self._result_files]
+        ) for url, file_path, key, callback in self._result_files]
 
     def download_files(self):
-        """Return a list of 3-ples (local_path, remote url, callback_result).
+        """Return a list of 3-ples (local_path, key, callback_result).
         
+        If no key was provided the key is None
         If no callback was provided with the file callback result is None
         """
         self._convert_result_files_to_urls()
         download_args = [(
-            url, original_url, file_path, callback,
+            url, file_path, key, callback,
             self.progress_tracker_factory(file_path),
             self.ignore_errors, self.head, self.log_level,
             self.n_parallel_downloads > 1
-        ) for url, original_url, file_path, callback in self._result_files]
+        ) for url, file_path, key, callback in self._result_files]
         out = []
         if self.n_parallel_downloads == 1:
             logger.info(f"Downloading files in series.")

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

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

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

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