maleo-foundation 0.2.62__py3-none-any.whl → 0.2.65__py3-none-any.whl

maleo_foundation/managers/client/google/storage.py

@@ -29,6 +29,7 @@ class GoogleCloudStorage(GoogleClientManager):
         if self._bucket is None:
             self._client.close()
             raise ValueError(f"Bucket '{self._bucket_name}' does not exist.")
+        self._root_location = service_key
         self._logger.info("Client manager initialized successfully")
 
     @property
@@ -46,7 +47,45 @@ class GoogleCloudStorage(GoogleClientManager):
             self._client = None
             self._logger.info("Client manager disposed successfully")
 
-    def generate_signed_url(self, location:str) -> str:
+    def upload(
+        self,
+        content:bytes,
+        location:str,
+        content_type:Optional[str]=None,
+        make_public:bool=False,
+        expiration:timedelta=timedelta(minutes=15)
+    ) -> str:
+        """
+        Upload a file to Google Cloud Storage.
+
+        Args:
+            content (bytes): The file content as bytes.
+            location (str): The path inside the bucket to save the file.
+            content_type (Optional[str]): MIME type (e.g., 'image/png').
+            make_public (bool): Whether to make the file publicly accessible.
+
+        Returns:
+            str: The public URL or blob path depending on `make_public`.
+        """
+        blob = self._bucket.blob(f"{self._root_location}/{location}")
+        blob.upload_from_string(content, content_type=content_type)
+
+        if make_public:
+            blob.make_public()
+            url = blob.public_url
+        else:
+            url = blob.generate_signed_url(
+                version="v4",
+                expiration=expiration,
+                method="GET"
+            )
+        return url
+
+    def generate_signed_url(
+        self,
+        location:str,
+        expiration:timedelta=timedelta(minutes=15)
+    ) -> str:
         """
         generate signed URL of a file in the bucket based on its location.
 
@@ -60,13 +99,13 @@ class GoogleCloudStorage(GoogleClientManager):
         Raises:
             ValueError: If the file does not exist
         """
-        blob = self._bucket.blob(blob_name=location)
+        blob = self._bucket.blob(blob_name=f"{self._root_location}/{location}")
         if not blob.exists():
             raise ValueError(f"File '{location}' did not exists.")
 
         url = blob.generate_signed_url(
             version="v4",
-            expiration=timedelta(minutes=15),
+            expiration=expiration,
             method="GET"
         )
         return url

maleo_foundation/managers/service.py

@@ -41,7 +41,7 @@ from maleo_foundation.utils.logging import (
     ServiceLogger,
     MiddlewareLogger
 )
-from maleo_foundation.utils.mergers import BaseMergers
+from maleo_foundation.utils.merger import deep_merge
 
 class Settings(BaseSettings):
     ENVIRONMENT:BaseEnums.EnvironmentType = Field(..., description="Environment")
@@ -264,7 +264,7 @@ class ServiceManager:
         )
 
         #* Load whole configurations
-        merged_configs = BaseMergers.deep_merge(
+        merged_configs = deep_merge(
             static_configs.model_dump(),
             runtime_configs.model_dump(exclude={"database"}),
             {"cache": cache.model_dump()},

{maleo_foundation-0.2.62.dist-info → maleo_foundation-0.2.65.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.2.62
+Version: 0.2.65
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.2.62.dist-info → maleo_foundation-0.2.65.dist-info}/RECORD

@@ -34,7 +34,7 @@ maleo_foundation/expanded_types/encryption/rsa.py,sha256=Esf_H8nMz2kOLAWa3M7dlD-
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=cpY1IOiUytT9XXYtzS0E9OSYOuB7jBKo0XHe__uI1Jg,5340
 maleo_foundation/managers/middleware.py,sha256=77wRCC_CWc22nSDL-UJanO3rXmSB7wLzaAIXEFjXq6M,4249
-maleo_foundation/managers/service.py,sha256=ner08wL3ewUGhTLto7HJMHwXu-YDJoMtMTHDm236Bdc,19265
+maleo_foundation/managers/service.py,sha256=CB6JI_jMWrVQo32jJ3oCGRgSdOfsdBehCu1pVhAJzBo,19251
 maleo_foundation/managers/cache/__init__.py,sha256=CeY0oof2bVl_v5WS-FKXNwn2gf3xrEMfUsHK9cHo59s,471
 maleo_foundation/managers/cache/base.py,sha256=YyPjde4KTsp2IHV6NdFMysa0ev-1GX1rtX-0jQPuIBU,837
 maleo_foundation/managers/cache/redis.py,sha256=xLa8QfXdNtghs0eBxIqc04H3XTYmxLEzrqJZAFCigvM,1150
@@ -45,7 +45,7 @@ maleo_foundation/managers/client/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 maleo_foundation/managers/client/google/base.py,sha256=eIdd6C2BFIu4EyZ1j017VZaJn_nSTPGFftBwQmVAUDA,1366
 maleo_foundation/managers/client/google/parameter.py,sha256=Lnj7mQgxWQpsQwbmDRK5_bF01M1QpM5PS0eZP2q17yQ,1337
 maleo_foundation/managers/client/google/secret.py,sha256=Ski1CHYeA8vjSk2Oc2Pf4CfFrzT_RcA6NEZwza7gM7Y,4464
-maleo_foundation/managers/client/google/storage.py,sha256=ECyEBgEvvbTDVfqXey-meGnoU4qvIRU32BxbCuzcaHU,2576
+maleo_foundation/managers/client/google/storage.py,sha256=TaOc2Dmj_CP0rpqrlBMQYAfqLSDkpgcIui1683PKR9Y,3796
 maleo_foundation/middlewares/authentication.py,sha256=UL6kL65SvqrzemlIDopoO9N1C05eWlYMHVR2tiRsVEA,4821
 maleo_foundation/middlewares/base.py,sha256=0vHU0CJEj9s3slGE3fxCQwL0_hqXW-xvhu82WRVpkpg,14551
 maleo_foundation/middlewares/cors.py,sha256=9uvBvY2N6Vxa9RP_YtESxcWo6Doi6uS0lzAG9iLY7Uc,2288
@@ -118,7 +118,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=SKsqPuFnAiCcYLf24CxKnMybhVHpgqnq1gGSlThqjts,994
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.2.62.dist-info/METADATA,sha256=YHruZS9nCTQHrcO0se4LewI5rveFO_GMulIRZitoqGA,3598
-maleo_foundation-0.2.62.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.2.62.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.62.dist-info/RECORD,,
+maleo_foundation-0.2.65.dist-info/METADATA,sha256=GDsEA14M9OdABexRKjRzPB_uS5Ee8nKZ34FLm8bNgfg,3598
+maleo_foundation-0.2.65.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.2.65.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.65.dist-info/RECORD,,