geoseeq 0.5.6a13__tar.gz → 0.5.6a14__tar.gz

{geoseeq-0.5.6a13 → geoseeq-0.5.6a14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geoseeq
-Version: 0.5.6a13
+Version: 0.5.6a14
 Summary: GeoSeeq command line tools and python API
 Author: David C. Danko
 Author-email: "David C. Danko" <dcdanko@biotia.io>

{geoseeq-0.5.6a13 → geoseeq-0.5.6a14}/geoseeq/cli/main.py

@@ -53,7 +53,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.5.6a13')  # remember to update setup
+    click.echo('0.5.6a14')  # remember to update setup
 
 
 @main.group('advanced')

{geoseeq-0.5.6a13 → geoseeq-0.5.6a14}/geoseeq/cli/upload/upload.py

@@ -121,6 +121,7 @@ def cli_upload_file(state, cores, threads_per_upload, num_retries, ignore_errors
         use_cache=state.use_cache,
         num_retries=num_retries,
         ignore_errors=ignore_errors,
+        session=knex.new_session(),
     )
     for geoseeq_file_name, file_path in name_pairs:
         if isfile(file_path):

{geoseeq-0.5.6a13 → geoseeq-0.5.6a14}/geoseeq/knex.py

@@ -96,6 +96,9 @@ class Knex:
         sess.auth = self.auth
         sess.verify = self._verify
         return sess
+    
+    def new_session(self):
+        return self._new_session()
 
     def _set_verify(self):
         try:

{geoseeq-0.5.6a13 → geoseeq-0.5.6a14}/geoseeq/result/file_upload.py

@@ -184,15 +184,16 @@ class ResultFileUpload:
                 logger.debug(f"Upload for part {num + 1} succeeded.")
                 break
             except (requests.exceptions.HTTPError, requests.exceptions.SSLError, requests.exceptions.ConnectionError) as e:
+                attempts += 1
                 logger.debug(
-                    f"Upload for part {num + 1} failed. Attempt {attempts + 1} of {max_retries}."
+                    f"Upload for part {num + 1} failed. Attempt {attempts} of {max_retries}. Error: {e}"
                 )
-                attempts += 1
                 if attempts >= max_retries:
                     raise e
 
                 retry_time = min(8 ** attempts, 120)  # exponential backoff, max 120s
                 retry_time *= 0.8 + (random() * 0.4)  # randomize to avoid thundering herd
+                logger.debug(f"Retrying upload for part {num + 1} in {retry_time} seconds.")
                 time.sleep(retry_time)
             
         etag = http_response.headers["ETag"].replace('"', "")

{geoseeq-0.5.6a13 → geoseeq-0.5.6a14}/geoseeq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geoseeq
-Version: 0.5.6a13
+Version: 0.5.6a14
 Summary: GeoSeeq command line tools and python API
 Author: David C. Danko
 Author-email: "David C. Danko" <dcdanko@biotia.io>

{geoseeq-0.5.6a13 → geoseeq-0.5.6a14}/pyproject.toml

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