fred-oss 0.57.0__tar.gz → 0.59.0__tar.gz

{fred_oss-0.57.0/src/main/fred_oss.egg-info → fred_oss-0.59.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fred-oss
-Version: 0.57.0
+Version: 0.59.0
 Summary: FREDOSS
 Home-page: https://fred.fahera.mx
 Author: Fahera Research, Education, and Development

{fred_oss-0.57.0 → fred_oss-0.59.0}/src/main/fred/dao/comp/_keyval.py

@@ -61,7 +61,7 @@ class FredKeyVal(ComponentInterface):
                 return (
                     key
                     for key in cls._srv.client._memstore_keyval.keys()
-                    if fnmatch.fnmatch(key, pattern=pattern)
+                    if fnmatch.fnmatch(key, pat=pattern)
                 )
             case ServiceCatalog.MINIO:
                 import fnmatch
@@ -73,13 +73,19 @@ class FredKeyVal(ComponentInterface):
                 )
                 if not bucket_name:
                     raise ValueError("Missing bucket info to list keys in MinIO service.")
+                obj_list_extras = {
+                    "prefix": kwargs.pop("prefix", ""),
+                    "shallow": kwargs.pop("shallow", False),
+                }
                 return (
                     key
-                    for obj in cls._srv.objects(bucket_name, **kwargs)
-                    if fnmatch.fnmatch((key := obj.object_name), pattern=pattern)
+                    for key in cls._srv.objects(bucket_name, **obj_list_extras)
+                    if fnmatch.fnmatch(key, pat=pattern)
                 )
             case _:
                 raise NotImplementedError(f"Keys method not implemented for service {cls._nme}")
+        if kwargs:
+            logger.warning(f"Additional kwargs ignored: {kwargs}")
 
     def set(self, value: str, key: Optional[str] = None, **kwargs) -> None:
         """Sets a key-value pair in the store.
@@ -135,8 +141,10 @@ class FredKeyVal(ComponentInterface):
                 )
             case _:
                 raise NotImplementedError(f"Set method not implemented for service {self._nme}")
+        if kwargs:
+            logger.warning(f"Additional kwargs ignored: {kwargs}")
 
-    def get(self, key: Optional[str] = None, fail: bool = False) -> Optional[str]:
+    def get(self, key: Optional[str] = None, fail: bool = False, **kwargs) -> Optional[str]:
         """Gets the value associated with a key from the store.
         The implementation of this method depends on the underlying service.
         For example, if the service is Redis, it uses the GET command to retrieve the
@@ -173,21 +181,32 @@ class FredKeyVal(ComponentInterface):
                         raise KeyError(f"Object {object_name} not found in bucket {bucket_name}.")
                     return None
                 try:
-                    response = self._srv.client.get_object(bucket_name, object_name)
-                    result_bytes = response.read()
-                    result = result_bytes.decode("utf-8")
+                    if kwargs.pop("presigned_url", False):
+                        result = self._srv.object_presigned_url(bucket_name, object_name, **kwargs)
+                    else:
+                        response = self._srv.client.get_object(bucket_name, object_name)
+                        result_bytes = response.read()
+                        try:
+                            # This should work for most cases where original text data was stored (e.g., JSON, YAML, CSVs, etc.)
+                            result = result_bytes.decode("utf-8")
+                        except UnicodeDecodeError:
+                            import base64
+                            # This should work for binary data (e.g., images, PDFs, etc.)
+                            result = base64.b64encode(result_bytes).decode("ascii")
+                        finally:
+                            response.close()
+                            response.release_conn()
                 except Exception as e:
                     logger.error(f"Error retrieving object {object_name} from bucket {bucket_name}: {e}")
                     result = None
                     if fail:
                         raise KeyError(f"Object {object_name} not found in bucket {bucket_name}.")
-                finally:
-                    response.close()
-                    response.release_conn()
             case _:
                 raise NotImplementedError(f"Get method not implemented for service {self._nme}")
         if fail and result is None:
             raise KeyError(f"Key {key} not found.")
+        if kwargs:
+            logger.warning(f"Additional kwargs ignored: {kwargs}")
         return result
 
     def delete(self, key: Optional[str] = None) -> None:

{fred_oss-0.57.0 → fred_oss-0.59.0}/src/main/fred/dao/service/_minio/service.py

@@ -1,3 +1,6 @@
+import datetime as dt
+from typing import Iterator
+
 from minio import Minio
 
 from fred.settings import logger_manager
@@ -38,12 +41,12 @@ class MinioService(ServiceInterface[Minio]):
             for bucket in self.client.list_buckets()
         ]
 
-    def objects(self, bucket_name: str, prefix: str = "", shallow: bool = False) -> list[str]:
+    def objects(self, bucket_name: str, prefix: str = "", shallow: bool = False) -> Iterator[str]:
         """List all objects in a specific bucket in the MinIO instance."""
-        return [
+        return (
             obj.object_name
             for obj in self.client.list_objects(bucket_name, prefix=prefix, recursive=not shallow)
-        ]
+        )
 
     def bucket_exists(self, bucket_name: str) -> bool:
         """Check if a bucket exists in the MinIO instance."""
@@ -62,6 +65,15 @@ class MinioService(ServiceInterface[Minio]):
             "metadata": stat.metadata,
         }
 
+    def object_presigned_url(self, bucket_name: str, object_name: str, expiration_hours: int = 6, **kwargs) -> str:
+        """Generate a presigned URL for an object in a specific bucket in the MinIO instance."""
+        return self.client.presigned_get_object(
+            bucket_name=bucket_name,
+            object_name=object_name,
+            expires=dt.timedelta(hours=expiration_hours),
+            **kwargs,
+        )
+
     def object_exists(self, bucket_name: str, object_name: str) -> bool:
         """Check if an object exists in a specific bucket in the MinIO instance."""
         from minio.error import S3Error

fred_oss-0.59.0/src/main/fred/version

@@ -0,0 +1 @@
+0.59.0

{fred_oss-0.57.0 → fred_oss-0.59.0/src/main/fred_oss.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fred-oss
-Version: 0.57.0
+Version: 0.59.0
 Summary: FREDOSS
 Home-page: https://fred.fahera.mx
 Author: Fahera Research, Education, and Development

fred_oss-0.57.0/src/main/fred/version

@@ -1 +0,0 @@
-0.57.0