maleo-foundation 0.2.74__tar.gz → 0.2.76__tar.gz

{maleo_foundation-0.2.74 → maleo_foundation-0.2.76}/PKG-INFO

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

{maleo_foundation-0.2.74 → maleo_foundation-0.2.76}/maleo_foundation/constants.py

@@ -11,16 +11,16 @@ ACCESS_TOKEN_DURATION_MINUTES:int = 5
 SORT_COLUMN_PATTERN = re.compile(r'^[a-z_]+\.(asc|desc)$')
 DATE_FILTER_PATTERN = re.compile(r'^[a-z_]+(?:\|from::\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2}))?(?:\|to::\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2}))?$')
 STATUS_UPDATE_CRITERIAS:dict[
-    BaseEnums.StatusUpdateAction,
+    BaseEnums.StatusUpdateType,
     BaseTypes.OptionalListOfStatuses
 ] = {
-    BaseEnums.StatusUpdateAction.DELETE: None,
-    BaseEnums.StatusUpdateAction.RESTORE: None,
-    BaseEnums.StatusUpdateAction.DEACTIVATE: [
+    BaseEnums.StatusUpdateType.DELETE: None,
+    BaseEnums.StatusUpdateType.RESTORE: None,
+    BaseEnums.StatusUpdateType.DEACTIVATE: [
         BaseEnums.StatusType.INACTIVE,
         BaseEnums.StatusType.ACTIVE,
     ],
-    BaseEnums.StatusUpdateAction.ACTIVATE: [
+    BaseEnums.StatusUpdateType.ACTIVATE: [
         BaseEnums.StatusType.INACTIVE,
         BaseEnums.StatusType.ACTIVE,
     ]

{maleo_foundation-0.2.74 → maleo_foundation-0.2.76}/maleo_foundation/enums.py

@@ -44,19 +44,25 @@ class BaseEnums:
         ASC = "asc"
         DESC = "desc"
 
-    class StatusUpdateAction(StrEnum):
+    class TokenType(StrEnum):
+        REFRESH = "refresh"
+        ACCESS = "access"
+
+    class StatusUpdateType(StrEnum):
         ACTIVATE = "activate"
         DEACTIVATE = "deactivate"
         RESTORE = "restore"
         DELETE = "delete"
 
-    class TokenType(StrEnum):
-        REFRESH = "refresh"
-        ACCESS = "access"
+    class UpdateType(StrEnum):
+        STATUS = "status"
+        DATA = "data"
 
     class OperationType(StrEnum):
         CREATE = "create"
         UPDATE = "update"
+        RESTORE = "restore"
+        DELETE = "delete"
 
     class IdentifierTypes(StrEnum):
         ID = "id"
@@ -144,6 +150,23 @@ class BaseEnums:
         TTL_12HR = int(12*60*60)
         TTL_1DY = int(1*24*60*60)
         TTL_3DY = int(3*24*60*60)
-        TTL_1WK = int(1*24*60*60)
-        TTL_2WK = int(2*24*60*60)
-        TTL_1MO = int(1*30*24*60*60)
+        TTL_1WK = int(1*7*24*60*60)
+        TTL_2WK = int(2*7*24*60*60)
+        TTL_1MO = int(1*30*24*60*60)
+
+    class Expiration(IntEnum):
+        EXP_15SC = int(15)
+        EXP_30SC = int(30)
+        EXP_1MN = int(1*60)
+        EXP_5MN = int(5*60)
+        EXP_10MN = int(10*60)
+        EXP_15MN = int(15*60)
+        EXP_30MN = int(30*60)
+        EXP_1HR = int(1*60*60)
+        EXP_6HR = int(6*60*60)
+        EXP_12HR = int(12*60*60)
+        EXP_1DY = int(1*24*60*60)
+        EXP_3DY = int(3*24*60*60)
+        EXP_1WK = int(1*7*24*60*60)
+        EXP_2WK = int(2*7*24*60*60)
+        EXP_1MO = int(1*30*24*60*60)

{maleo_foundation-0.2.74 → maleo_foundation-0.2.76}/maleo_foundation/managers/client/google/storage.py

@@ -3,7 +3,9 @@ from datetime import timedelta
 from google.cloud.storage import Bucket, Client
 from google.oauth2.service_account import Credentials
 from pathlib import Path
+from redis.asyncio.client import Redis
 from typing import Optional, Union
+from maleo_foundation.enums import BaseEnums
 from maleo_foundation.types import BaseTypes
 from maleo_foundation.utils.logging import SimpleConfig
 from .base import GoogleClientManager
@@ -15,7 +17,8 @@ class GoogleCloudStorage(GoogleClientManager):
         service_key:BaseTypes.OptionalString=None,
         credentials:Optional[Credentials]=None,
         credentials_path:Optional[Union[Path, str]]=None,
-        bucket_name:BaseTypes.OptionalString = None
+        bucket_name:BaseTypes.OptionalString = None,
+        redis:Optional[Redis] = None
     ) -> None:
         key = "google-cloud-storage"
         name = "GoogleCloudStorage"
@@ -31,6 +34,7 @@ class GoogleCloudStorage(GoogleClientManager):
             raise ValueError(f"Bucket '{self._bucket_name}' does not exist.")
         self._root_location = service_key
         self._logger.info("Client manager initialized successfully")
+        self._redis = redis
 
     @property
     def bucket_name(self) -> str:
@@ -53,8 +57,9 @@ class GoogleCloudStorage(GoogleClientManager):
         location:str,
         content_type:Optional[str]=None,
         make_public:bool=False,
-        expiration:timedelta=timedelta(minutes=15),
-        root_location_override:BaseTypes.OptionalString=None
+        expiration:BaseEnums=BaseEnums.Expiration.EXP_15MN,
+        root_location_override:BaseTypes.OptionalString=None,
+        set_in_redis:bool=False
     ) -> str:
         """
         Upload a file to Google Cloud Storage.
@@ -69,9 +74,11 @@ class GoogleCloudStorage(GoogleClientManager):
             str: The public URL or blob path depending on `make_public`.
         """
         if root_location_override is None or (isinstance(root_location_override, str) and len(root_location_override) <= 0):
-            blob = self._bucket.blob(f"{self._root_location}/{location}")
+            blob_name = f"{self._root_location}/{location}"
         else:
-            blob = self._bucket.blob(f"{root_location_override}/{location}")
+            blob_name = f"{root_location_override}/{location}"
+
+        blob = self._bucket.blob(blob_name=blob_name)
         blob.upload_from_string(content, content_type=content_type)
 
         if make_public:
@@ -80,16 +87,24 @@ class GoogleCloudStorage(GoogleClientManager):
         else:
             url = blob.generate_signed_url(
                 version="v4",
-                expiration=expiration,
+                expiration=timedelta(seconds=int(expiration)),
                 method="GET"
             )
+
+        if set_in_redis:
+            if make_public:
+                self._redis.set(f"{self.key}:{blob_name}", url)
+            else:
+                self._redis.set(f"{self.key}:{blob_name}", url, ex=int(expiration))
+
         return url
 
     def generate_signed_url(
         self,
         location:str,
-        expiration:timedelta=timedelta(minutes=15),
-        root_location_override:BaseTypes.OptionalString=None
+        expiration:BaseEnums=BaseEnums.Expiration.EXP_15MN,
+        root_location_override:BaseTypes.OptionalString=None,
+        use_redis:bool=False
     ) -> str:
         """
         generate signed URL of a file in the bucket based on its location.
@@ -104,16 +119,29 @@ class GoogleCloudStorage(GoogleClientManager):
         Raises:
             ValueError: If the file does not exist
         """
+        if use_redis and self._redis is None:
+            raise ValueError("Can not use redis. Redis is not initialized")
+
         if root_location_override is None or (isinstance(root_location_override, str) and len(root_location_override) <= 0):
-            blob = self._bucket.blob(blob_name=f"{self._root_location}/{location}")
+            blob_name=f"{self._root_location}/{location}"
         else:
-            blob = self._bucket.blob(blob_name=f"{root_location_override}/{location}")
+            blob_name=f"{root_location_override}/{location}"
+
+        blob = self._bucket.blob(blob_name=blob_name)
         if not blob.exists():
             raise ValueError(f"File '{location}' did not exists.")
 
+        if use_redis:
+            if self._redis is None:
+                raise ValueError("Can not use redis. Redis is not initialized")
+            url = self._redis.get(blob_name)
+            if url is not None:
+                return url
+
         url = blob.generate_signed_url(
             version="v4",
-            expiration=expiration,
+            expiration=timedelta(seconds=int(expiration)),
             method="GET"
         )
+        self._redis.set(f"{self.key}:{blob_name}", url, ex=int(expiration))
         return url

{maleo_foundation-0.2.74 → maleo_foundation-0.2.76}/maleo_foundation/managers/service.py

@@ -152,12 +152,12 @@ class ServiceManager:
             self._log_config.google_cloud_logging = None
         self._load_google_credentials()
         self._initialize_secret_manager()
-        self._initialize_cloud_storage()
         self._load_maleo_credentials()
         self._load_configs()
         self._load_keys()
         self._initialize_loggers()
         self._initialize_cache()
+        self._initialize_cloud_storage()
         self._initialize_db()
         self._initialize_foundation()
 
@@ -187,23 +187,6 @@ class ServiceManager:
     def secret_manager(self) -> GoogleSecretManager:
         return self._secret_manager
 
-    def _initialize_cloud_storage(self) -> None:
-        environment = (
-            BaseEnums.EnvironmentType.STAGING
-            if self._settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
-            else self._settings.ENVIRONMENT
-        )
-        self._cloud_storage = GoogleCloudStorage(
-            log_config=self._log_config,
-            service_key=self._settings.SERVICE_KEY,
-            bucket_name=f"maleo-suite-{environment}",
-            credentials=self._google_credentials
-        )
-
-    @property
-    def cloud_storage(self) -> GoogleCloudStorage:
-        return self._cloud_storage
-
     def _load_maleo_credentials(self) -> None:
         environment = (
             BaseEnums.EnvironmentType.STAGING
@@ -348,6 +331,24 @@ class ServiceManager:
     def cache(self) -> CacheManagers:
         return self._cache
 
+    def _initialize_cloud_storage(self) -> None:
+        environment = (
+            BaseEnums.EnvironmentType.STAGING
+            if self._settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL
+            else self._settings.ENVIRONMENT
+        )
+        self._cloud_storage = GoogleCloudStorage(
+            log_config=self._log_config,
+            service_key=self._settings.SERVICE_KEY,
+            bucket_name=f"maleo-suite-{environment}",
+            credentials=self._google_credentials,
+            redis=self._redis
+        )
+
+    @property
+    def cloud_storage(self) -> GoogleCloudStorage:
+        return self._cloud_storage
+
     def _initialize_db(self) -> None:
         self._database = DatabaseManager(
             metadata=self._db_metadata,

{maleo_foundation-0.2.74 → maleo_foundation-0.2.76}/maleo_foundation/models/responses.py

@@ -19,6 +19,11 @@ class BaseResponses:
         message:str = "Invalid expand"
         description:str = "Invalid expand field(s) configuration are given. Check 'other' for more information."
 
+    class InvalidParameter(BadRequest):
+        code:str = "MAL-IPR-001"
+        message:str = "Invalid parameters"
+        description:str = "Invalid parameters and/or parameters combinations is given. Check 'other' for more information."
+
     class InvalidSystemRole(BadRequest):
         code:str = "MAL-ISR-001"
         message:str = "Invalid system role"

{maleo_foundation-0.2.74 → maleo_foundation-0.2.76}/maleo_foundation/models/table.py

@@ -11,12 +11,7 @@ class BaseTable:
     def __tablename__(cls) -> str:
         return CaseFormatter.to_snake_case(cls.__name__)
 
-    #* ----- ----- Common columns definition ----- ----- *#
-
-    #* Identifiers
-    id = Column(Integer, primary_key=True)
-    uuid = Column(UUID, default=uuid4, unique=True, nullable=False)
-
+class DataMixin:
     #* Timestamps
     created_at = Column(
         TIMESTAMP(timezone=True),
@@ -43,4 +38,35 @@ class BaseTable:
         Enum(BaseEnums.StatusType, name="statustype"),
         default=BaseEnums.StatusType.ACTIVE,
         nullable=False
-    )
+    )
+
+class DataIdentifiers:
+    #* Identifiers
+    id = Column(Integer, primary_key=True)
+    uuid = Column(UUID, default=uuid4, unique=True, nullable=False)
+
+class DataTable(
+    DataMixin,
+    DataIdentifiers
+): pass
+
+class AccessIdentifiers:
+    #* Identifiers
+    access_id = Column(Integer, primary_key=True)
+    access_uuid = Column(UUID, default=uuid4, unique=True, nullable=False)
+    accessed_at = Column(
+        TIMESTAMP(timezone=True),
+        server_default=func.now(),
+        nullable=False
+    )
+    accessed_by = Column(Integer, default=0, nullable=False)
+
+class AccessMixin:
+    id = Column(Integer)
+    uuid = Column(UUID)
+
+class AccessTable(
+    DataMixin,
+    AccessMixin,
+    AccessIdentifiers
+): pass

{maleo_foundation-0.2.74 → maleo_foundation-0.2.76}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.2.74 → maleo_foundation-0.2.76}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.2.74"
+version = "0.2.76"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }