persidict 0.34.1__py3-none-any.whl → 0.34.2__py3-none-any.whl

persidict/s3_dict.py

@@ -197,48 +197,61 @@ class S3Dict(PersiDict):
 
         obj_name = self._build_full_objectname(key)
 
-
-        try:
-            head = self.s3_client.head_object(
-                Bucket=self.bucket_name, Key=obj_name)
-            s3_etag = head.get("ETag")
-        except ClientError as e:
-            if e.response['Error']['Code'] == '404':
-                raise KeyError(f"Key {key} not found in S3 bucket {self.bucket_name}")
-            else:
-                # Re-raise other client errors (e.g., permissions, throttling)
-                raise
-
+        cached_etag = None
         etag_file_name = file_name + ".__etag__"
-        if not self.immutable_items and os.path.exists(file_name) and os.path.exists(etag_file_name):
+        if not self.immutable_items and os.path.exists(file_name) and os.path.exists(
+                etag_file_name):
             with open(etag_file_name, "r") as f:
                 cached_etag = f.read()
-            if cached_etag == s3_etag:
-                return self.local_cache._read_from_file(file_name)
-
-        dir_name = os.path.dirname(file_name)
-        fd, temp_path = tempfile.mkstemp(dir=dir_name, prefix=".__tmp__")
 
         try:
-            with os.fdopen(fd, 'wb') as f:
-                self.s3_client.download_fileobj(self.bucket_name, obj_name, f)
-                f.flush()
-                os.fsync(f.fileno())
-            os.replace(temp_path, file_name)
+            get_kwargs = {'Bucket': self.bucket_name, 'Key': obj_name}
+            if cached_etag:
+                get_kwargs['IfNoneMatch'] = cached_etag
+
+            response = self.s3_client.get_object(**get_kwargs)
+
+            # 200 OK: object was downloaded, either because it's new or changed.
+            s3_etag = response.get("ETag")
+            body = response['Body']
+
+            dir_name = os.path.dirname(file_name)
+            fd, temp_path = tempfile.mkstemp(dir=dir_name, prefix=".__tmp__")
+
             try:
-                if os.name == 'posix':
-                    dir_fd = os.open(dir_name, os.O_RDONLY)
-                    try:
-                        os.fsync(dir_fd)
-                    finally:
-                        os.close(dir_fd)
-            except OSError:
-                pass
-        except:
-            os.remove(temp_path)  # Clean up temp file on failure
-            raise
+                with os.fdopen(fd, 'wb') as f:
+                    # Stream body to file to avoid loading all in memory
+                    for chunk in body.iter_chunks():
+                        f.write(chunk)
+                    f.flush()
+                    os.fsync(f.fileno())
+                os.replace(temp_path, file_name)
+                try:
+                    if os.name == 'posix':
+                        dir_fd = os.open(dir_name, os.O_RDONLY)
+                        try:
+                            os.fsync(dir_fd)
+                        finally:
+                            os.close(dir_fd)
+                except OSError:
+                    pass
+            except:
+                os.remove(temp_path)  # Clean up temp file on failure
+                raise
+
+            self._write_etag_file(file_name, s3_etag)
 
-        self._write_etag_file(file_name, s3_etag)
+        except ClientError as e:
+            error_code = e.response.get("Error", {}).get("Code")
+            if e.response['ResponseMetadata']['HTTPStatusCode'] == 304:
+                # 304 Not Modified: our cached version is up-to-date.
+                # The file will be read from cache at the end of the function.
+                pass
+            elif e.response.get("Error", {}).get("Code") == 'NoSuchKey':
+                raise KeyError(f"Key {key} not found in S3 bucket {self.bucket_name}")
+            else:
+                # Re-raise other client errors (e.g., permissions, throttling)
+                raise
 
         return self.local_cache._read_from_file(file_name)
 

{persidict-0.34.1.dist-info → persidict-0.34.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: persidict
-Version: 0.34.1
+Version: 0.34.2
 Summary: Simple persistent key-value store for Python. Values are stored as files on a disk or as S3 objects on AWS cloud.
 Keywords: persistence,dicts,distributed,parallel
 Author: Vlad (Volodymyr) Pavlov

{persidict-0.34.1.dist-info → persidict-0.34.2.dist-info}/RECORD

@@ -4,11 +4,11 @@ persidict/file_dir_dict.py,sha256=Dr4gdIC5uqykRgNca1pI_M_jEd_9FGjys0BvzAJR0JU,17
 persidict/jokers.py,sha256=kX4bE-jKWTM2ki7JOmm_2uJS8zm8u6InZ_V12xo2ImI,1436
 persidict/overlapping_multi_dict.py,sha256=a-lUbmY15_HrDq6jSIt8F8tJboqbeYiuRQeW4elf_oU,2663
 persidict/persi_dict.py,sha256=SF6aWs6kCeeW-bZ9HJwx0sPX7Xav_aURqeSZ-j5quv0,14266
-persidict/s3_dict.py,sha256=fzU3GKKNor6WRoIpP_-7d8ckO4eyhBOOo5kbpsmdxQA,15434
+persidict/s3_dict.py,sha256=j_Fb73wbkOrsneu3a48VUpDDXqVSTtEa0sRI-c_Kbjk,16104
 persidict/safe_chars.py,sha256=HjK1MwROYy_U9ui-rhg1i3nGkj52K4OFWD-wCCcnJ7Y,536
 persidict/safe_str_tuple.py,sha256=xyIzxlCKmvnNHkFFKWtcBREefxZ0-HLxoH_epYDt8qg,3719
 persidict/safe_str_tuple_signing.py,sha256=5uCjAVZRqOou-KpDZw-Exboc3-3vuayJMqrrt8aZ0ck,3742
 persidict/write_once_dict.py,sha256=-XHQhTEdvPHTKqLXK4WWW0k5cFitkzalVJC1n4BbKGo,6496
-persidict-0.34.1.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
-persidict-0.34.1.dist-info/METADATA,sha256=a6o3joH0aBP1HEWHYxJgKn8KkktLA79TLenbkuttITM,9312
-persidict-0.34.1.dist-info/RECORD,,
+persidict-0.34.2.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
+persidict-0.34.2.dist-info/METADATA,sha256=ihAySv6w1tA9-sHA6ONLvM0aDrRkn5RA4a1-G8dFxeE,9312
+persidict-0.34.2.dist-info/RECORD,,