geoseeq 0.5.6a5__tar.gz → 0.5.6a7__tar.gz

{geoseeq-0.5.6a5 → geoseeq-0.5.6a7}/PKG-INFO

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

{geoseeq-0.5.6a5 → geoseeq-0.5.6a7}/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.6a5')  # remember to update setup
+    click.echo('0.5.6a7')  # remember to update setup
 
 
 @main.group('advanced')

{geoseeq-0.5.6a5 → geoseeq-0.5.6a7}/geoseeq/remote_object.py

@@ -1,4 +1,5 @@
 import logging
+from pandas import to_datetime
 
 from requests.exceptions import HTTPError
 
@@ -57,6 +58,14 @@ class RemoteObject:
 
     def cache_blob(self, blob):
         return self.cache.cache_blob(self, blob)
+    
+    @property
+    def updated_at_timestamp(self):
+        """Return the updated_at field as a unix timestamp (in seconds).
+        
+        timestamp from servercomes as a string: '2024-03-13T09:06:56.582551Z' 
+        """
+        return to_datetime(self.updated_at).timestamp()
 
     def load_blob(self, blob, allow_overwrite=False):
         logger.debug(f"Loading blob. {blob}")

{geoseeq-0.5.6a5 → geoseeq-0.5.6a7}/geoseeq/result/file_download.py

@@ -2,7 +2,7 @@
 import urllib.request
 import logging
 import requests
-from os.path import basename, getsize, join, isfile
+from os.path import basename, getsize, join, isfile, getmtime
 from pathlib import Path
 from tempfile import NamedTemporaryFile
 
@@ -82,12 +82,30 @@ class ResultFileDownload:
             return url
         else:
             return self.stored_data[key]
+        
+    
+    def _download_flag_path(self, filename, flag_suffix='.gs_downloaded'):
+        return filename + flag_suffix
+        
+    def download_needs_update(self, filename, flag_suffix='.gs_downloaded', slack=5):
+        """Return True if the file needs to be downloaded, False otherwise.
+        
+        If either the file or the flag file does not exist, return True.
+        If the flag file is older than `updated_at` in the result, return True.
+        Otherwise, return False.
+        """
+        if isfile(filename) and isfile(self._download_flag_path(filename, flag_suffix)):
+            if self.updated_at_timestamp - getmtime(self._download_flag_path(filename, flag_suffix)) > slack:
+                return True
+            return False
+        return True
 
     def download(self, filename=None, flag_suffix='.gs_downloaded', cache=True, head=None, progress_tracker=None):
         """Return a local filepath to the file in this result. Download the file if necessary.
         
         When the file is downloaded, it is cached in the result object. Subsequent calls to download
-        on this object will return the cached file unless cache=False is specified.
+        on this object will return the cached file unless cache=False is specified or the file is updated
+        on the server.
 
         A flag file is created when the file download is complete. Subsequent calls to download
         will return the cached file if the flag file exists unless cache=False is specified.
@@ -101,13 +119,14 @@ class ResultFileDownload:
             filename = self._cached_filename
 
         blob_type = self.stored_data.get("__type__", "").lower()
-        if cache and self._cached_filename:
-            return self._cached_filename
-        flag_filename = filename + flag_suffix
-        if cache and flag_suffix:
-            # check if file and flag file exist, if so, return filename
-            if isfile(filename) and isfile(flag_filename):
-                return filename
+        needs_update = self.download_needs_update(filename, flag_suffix)
+        if not needs_update:
+            if cache and self._cached_filename:
+                return self._cached_filename
+            if cache and flag_suffix:
+                # check if file and flag file exist, if so, return filename
+                if isfile(filename) and isfile(self._download_flag_path(filename, flag_suffix)):
+                    return filename
 
         url = self.get_download_url()
         filepath = download_url(
@@ -116,7 +135,7 @@ class ResultFileDownload:
         )
         if cache and flag_suffix:
             # create flag file
-            open(flag_filename, 'a').close()
+            open(self._download_flag_path(filename, flag_suffix), 'a').close()
         if cache:
             self._cached_filename = filepath
         return filepath

{geoseeq-0.5.6a5 → geoseeq-0.5.6a7}/geoseeq.egg-info/PKG-INFO

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

{geoseeq-0.5.6a5 → geoseeq-0.5.6a7}/pyproject.toml

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

{geoseeq-0.5.6a5 → geoseeq-0.5.6a7}/setup.py

@@ -5,7 +5,7 @@ import setuptools
 
 setuptools.setup(
     name='geoseeq',
-    version='0.5.6a5',  # remember to update version string in CLI as well
+    version='0.5.6a7',  # remember to update version string in CLI as well
     author="David C. Danko",
     author_email='dcdanko@biotia.io',
     description=open('README.md').read(),