maleo-foundation 0.3.53__tar.gz → 0.3.55__tar.gz

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/PKG-INFO

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

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/maleo_foundation/authentication.py

@@ -33,7 +33,7 @@ class CredentialsModel(BaseModel):
 
 class User(BaseUser):
     def __init__(
-        self, authenticated: bool = True, username: str = "", email: str = ""
+        self, authenticated: bool = False, username: str = "", email: str = ""
     ) -> None:
         self._authenticated = authenticated
         self._username = username
@@ -53,7 +53,7 @@ class User(BaseUser):
 
 
 class UserModel(BaseModel):
-    is_authenticated: bool = Field(True, description="Authenticated")
+    is_authenticated: bool = Field(False, description="Authenticated")
     display_name: str = Field("", description="Username")
     identity: str = Field("", description="Email")
 

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/maleo_foundation/enums.py

@@ -168,8 +168,12 @@ class BaseEnums:
         EXP_2WK = int(2 * 7 * 24 * 60 * 60)
         EXP_1MO = int(1 * 30 * 24 * 60 * 60)
 
-    class DataSource(StrEnum):
+    class ServiceDataSource(StrEnum):
         CACHE = "cache"
         DATABASE = "database"
         MICROSERVICE = "microservice"
         THIRD_PARTY = "third_party"
+
+    class ClientDataSource(StrEnum):
+        CACHE = "cache"
+        REQUEST = "request"

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/maleo_foundation/managers/client/google/storage.py

@@ -111,10 +111,14 @@ class GoogleCloudStorage(GoogleClientManager):
             if self._redis is None:
                 raise ValueError("Can not use redis. Redis is not initialized")
             if make_public:
-                await self._redis.set(f"{self.key}:{blob_name}", url)
+                await self._redis.set(
+                    f"{self._service_key}:{self.key}:{blob_name}", url
+                )
             else:
                 await self._redis.set(
-                    f"{self.key}:{blob_name}", url, ex=int(expiration)
+                    f"{self._service_key}:{self.key}:{blob_name}",
+                    url,
+                    ex=int(expiration),
                 )
 
         return url
@@ -161,7 +165,7 @@ class GoogleCloudStorage(GoogleClientManager):
         if use_redis:
             if self._redis is None:
                 raise ValueError("Can not use redis. Redis is not initialized")
-            url = await self._redis.get(f"{self.key}:{blob_name}")
+            url = await self._redis.get(f"{self._service_key}:{self.key}:{blob_name}")
             if url is not None:
                 return url
 
@@ -172,6 +176,8 @@ class GoogleCloudStorage(GoogleClientManager):
         if use_redis:
             if self._redis is None:
                 raise ValueError("Can not use redis. Redis is not initialized")
-            await self._redis.set(f"{self.key}:{blob_name}", url, ex=int(expiration))
+            await self._redis.set(
+                f"{self._service_key}:{blob_name}", url, ex=int(expiration)
+            )
 
         return url

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/maleo_foundation/models/schemas/result.py

@@ -1,7 +1,5 @@
-from datetime import datetime, timezone
 from pydantic import BaseModel, Field
 from typing import Dict, Optional, Union, Any
-from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.types import BaseTypes
 
@@ -96,10 +94,9 @@ class BaseResultSchemas:
         )
 
     class Get(BaseModel):
-        accessed_at: datetime = Field(
-            datetime.now(tz=timezone.utc), description="Accessed at timestamp"
+        accessed_at: BaseTypes.OptionalDatetime = Field(
+            None, description="Accessed at timestamp"
         )
-        source: BaseEnums.DataSource = Field(..., description="Data source")
 
 
 BaseResultSchemas.PaginatedMultipleData.model_rebuild()

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/maleo_foundation/models/transfers/general/data.py

@@ -24,7 +24,7 @@ class DataAccess(BaseModel):
     )
     service: BaseEnums.Service = Field(..., description="Service key")
     resource: str = Field(..., description="Resource name")
-    source: BaseEnums.DataSource = Field(..., description="Data source type")
+    source: BaseEnums.ServiceDataSource = Field(..., description="Data source type")
     table: BaseTypes.OptionalString = Field(None, description="Table name")
     data_id: int = Field(..., ge=1, description="Data Id")
     data: BaseTypes.StringToAnyDict = Field(..., description="Data")

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/maleo_foundation/models/transfers/general/token.py

@@ -99,7 +99,7 @@ class MaleoFoundationTokenGeneralTransfers:
             values["iat_dt"] = iat_dt
             # * Convert `iat` to timestamp (int)
             values["iat"] = int(iat_dt.timestamp())
-            exp_in = values.get("exp_in")
+            exp_in = values.get("exp_in", 15)
             exp_dt = values.get("exp_dt", None)
             if not exp_dt:
                 exp_dt = iat_dt + timedelta(minutes=exp_in)

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/maleo_foundation/models/transfers/results/client/service.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
-from pydantic import model_validator
+from pydantic import Field, model_validator
+from typing import Optional
+from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.schemas.result import BaseResultSchemas
 
 
@@ -33,3 +35,8 @@ class BaseClientServiceResultsTransfers:
             values["total_data"] = pagination.total_data
 
             return values
+
+    class Get(BaseResultSchemas.Get):
+        source: Optional[BaseEnums.ClientDataSource] = Field(
+            None, description="Data source"
+        )

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/maleo_foundation/models/transfers/results/service/general.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
-from pydantic import model_validator
+from pydantic import Field, model_validator
+from typing import Optional
+from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.schemas.result import BaseResultSchemas
 
 
@@ -45,6 +47,6 @@ class BaseServiceGeneralResultsTransfers:
             return values
 
     class Get(BaseResultSchemas.Get):
-        """Repository data source result schema."""
-
-        pass
+        source: Optional[BaseEnums.ServiceDataSource] = Field(
+            None, description="Data source"
+        )

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.3.53 → maleo_foundation-0.3.55}/pyproject.toml

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