geoseeq 0.6.12.dev0__py3-none-any.whl → 0.6.12.dev1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
geoseeq/cli/main.py CHANGED
@@ -54,7 +54,7 @@ def version():
54
54
  Use of this tool implies acceptance of the GeoSeeq End User License Agreement.
55
55
  Run `geoseeq eula show` to view the EULA.
56
56
  """
57
- click.echo('0.6.12dev0') # remember to update pyproject.toml
57
+ click.echo('0.6.12dev1') # remember to update pyproject.toml
58
58
 
59
59
 
60
60
  @main.group('advanced')
@@ -127,7 +127,7 @@ class GeoSeeqUploadManager:
127
127
 
128
128
 
129
129
  def _download_one_file(args):
130
- original_url, file_path, callback, pbar, ignore_errors, head, log_level, parallel_downloads = args
130
+ original_url, original_original_url, file_path, callback, pbar, ignore_errors, head, log_level, parallel_downloads = args
131
131
  if parallel_downloads:
132
132
  _make_in_process_logger(log_level)
133
133
  if isinstance(original_url, ResultFile):
@@ -142,7 +142,7 @@ def _download_one_file(args):
142
142
  callback_result = callback(local_path)
143
143
  else:
144
144
  callback_result = None
145
- return local_path, original_url, callback_result
145
+ return local_path, original_original_url, callback_result
146
146
  except Exception as e:
147
147
  if ignore_errors:
148
148
  logger.error(f"Error downloading {url}: {e}")
@@ -195,7 +195,9 @@ class GeoSeeqDownloadManager:
195
195
  def _convert_result_files_to_urls(self):
196
196
  self._result_files = [(
197
197
  url.get_download_url() if isinstance(url, ResultFile) else url,
198
- file_path, callback
198
+ url, # original url
199
+ file_path,
200
+ callback
199
201
  ) for url, file_path, callback in self._result_files]
200
202
 
201
203
  def download_files(self):
@@ -205,11 +207,11 @@ class GeoSeeqDownloadManager:
205
207
  """
206
208
  self._convert_result_files_to_urls()
207
209
  download_args = [(
208
- url, file_path, callback,
210
+ url, original_url, file_path, callback,
209
211
  self.progress_tracker_factory(file_path),
210
212
  self.ignore_errors, self.head, self.log_level,
211
213
  self.n_parallel_downloads > 1
212
- ) for url, file_path, callback in self._result_files]
214
+ ) for url, original_url, file_path, callback in self._result_files]
213
215
  out = []
214
216
  if self.n_parallel_downloads == 1:
215
217
  logger.info(f"Downloading files in series.")
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: geoseeq
3
- Version: 0.6.12.dev0
3
+ Version: 0.6.12.dev1
4
4
  Summary: GeoSeeq command line tools and python API
5
5
  Author: David C. Danko
6
6
  Author-email: "David C. Danko" <dcdanko@biotia.io>
@@ -11,7 +11,7 @@ geoseeq/project.py,sha256=kN6m1N4Tlud7saU03Sbir-oIBnXet_Cwi2OVVdaeag0,13929
11
11
  geoseeq/remote_object.py,sha256=GYN6PKU7Zz3htIdpFjfZiFejzGqqJHbJyKlefM1Eixk,7151
12
12
  geoseeq/sample.py,sha256=nlvmSy2WmiOMamkulNRloFPX7E9jVs34m1vO1PSOrHU,8336
13
13
  geoseeq/search.py,sha256=gawad6Cx5FxJBPlYkXWb-UKAO-UC0_yhvyU9Ca1kaNI,3388
14
- geoseeq/upload_download_manager.py,sha256=jVGZn9xXa4HZUFRFZawRRhfzFc8f2U8x06P-WTDDSNw,9271
14
+ geoseeq/upload_download_manager.py,sha256=UcspWFnmYZSlVvGe-RGlefDSbQ_2mjTW_irTfWokPXc,9376
15
15
  geoseeq/user.py,sha256=tol8i1UGLRrbMw5jeJDnna1ikRgrCDd50Jxz0a1lSgg,690
16
16
  geoseeq/utils.py,sha256=ZXpWb2MetUIeLrExiXb7IaOXYrW1pvrdP3o0KWzbwCs,4035
17
17
  geoseeq/work_orders.py,sha256=5uLVVfdKE8qh4gGaHkdBpXJGRTujuSg59knWCqEET4A,8071
@@ -22,7 +22,7 @@ geoseeq/cli/detail.py,sha256=q8Suu-j2k18knfSVFG-SWWGNsKM-n8y9RMA3LcIIi9Y,4132
22
22
  geoseeq/cli/download.py,sha256=W3OswqpHg1thzW6CJ7IcSS0Te2LA2WfgYISQMSl4GQg,18921
23
23
  geoseeq/cli/fastq_utils.py,sha256=-bmeQLaiMBm57zWOF0R5OlWTU0_3sh1JBC1RYw2BOFM,3083
24
24
  geoseeq/cli/get_eula.py,sha256=79mbUwyiF7O1r0g6UTxG9kJGQEqKuH805E6eLkPC6Y4,997
25
- geoseeq/cli/main.py,sha256=wiZwbHB21qaqERjOk1tvkgX7pyhJv2_vSfe9tp1NItI,3922
25
+ geoseeq/cli/main.py,sha256=b0FYukZD8YVGL4qgDZkOR0fzW1_W4cpJ_9zGoO_G9cM,3922
26
26
  geoseeq/cli/manage.py,sha256=wGXAcVaXqE5JQEU8Jh6OlHr02nB396bpS_SFcOZdrEo,5929
27
27
  geoseeq/cli/progress_bar.py,sha256=p1Xl01nkYxSBZCB30ue2verIIi22W93m3ZAMAxipD0g,738
28
28
  geoseeq/cli/project.py,sha256=V5SdXm2Hwo2lxrkpwRDedw-mAE4XnM2uwT-Gj1D90VQ,3030
@@ -85,9 +85,9 @@ geoseeq/vc/vc_stub.py,sha256=IQr8dI0zsWKVAeY_5ybDD6n49_3othcgfHS3P0O9tuY,3110
85
85
  tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
86
86
  tests/test_api_client.py,sha256=TS5njc5pcPP_Ycy-ljcfPVT1hQRBsFVdQ0lCqBmoesU,12810
87
87
  tests/test_plotting.py,sha256=TcTu-2ARr8sxZJ7wPQxmbs3-gHw7uRvsgrhhhg0qKik,784
88
- geoseeq-0.6.12.dev0.dist-info/LICENSE,sha256=IuhIl1XCxXLPLJT_coN1CNqQU4Khlq7x4IdW7ioOJD8,1067
89
- geoseeq-0.6.12.dev0.dist-info/METADATA,sha256=PC7pMgWpLQfZMsADepB4xj7y4zBpNjGJdP0DkcB7ccY,4937
90
- geoseeq-0.6.12.dev0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
91
- geoseeq-0.6.12.dev0.dist-info/entry_points.txt,sha256=yF-6KDM8zXib4Al0qn49TX-qM7PUkWUIcYtsgt36rjM,45
92
- geoseeq-0.6.12.dev0.dist-info/top_level.txt,sha256=zZk7mmeaqAYqFJG8nq2DTgSQPbflRjJwkDIhNURPDEU,14
93
- geoseeq-0.6.12.dev0.dist-info/RECORD,,
88
+ geoseeq-0.6.12.dev1.dist-info/LICENSE,sha256=IuhIl1XCxXLPLJT_coN1CNqQU4Khlq7x4IdW7ioOJD8,1067
89
+ geoseeq-0.6.12.dev1.dist-info/METADATA,sha256=Zew3EG64pLMkOfV1SmL0k-hIbesOEP61ddXRM_cRM_4,4937
90
+ geoseeq-0.6.12.dev1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
91
+ geoseeq-0.6.12.dev1.dist-info/entry_points.txt,sha256=yF-6KDM8zXib4Al0qn49TX-qM7PUkWUIcYtsgt36rjM,45
92
+ geoseeq-0.6.12.dev1.dist-info/top_level.txt,sha256=zZk7mmeaqAYqFJG8nq2DTgSQPbflRjJwkDIhNURPDEU,14
93
+ geoseeq-0.6.12.dev1.dist-info/RECORD,,