maleo-foundation 0.2.97__tar.gz → 0.2.98__tar.gz

{maleo_foundation-0.2.97 → maleo_foundation-0.2.98}/PKG-INFO

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

{maleo_foundation-0.2.97 → maleo_foundation-0.2.98}/maleo_foundation/models/transfers/general/__init__.py

@@ -34,7 +34,7 @@ class RequestContextTransfers(BaseModel):
     forwarded_proto: BaseTypes.OptionalString = Field(None, description="Forwarded protocol (http/https)")
     language: BaseTypes.OptionalString = Field(None, description="Accepted languages from client")
 
-    def generate_google_pubsub_object(self) -> Dict[str, Any]:
+    def to_google_pubsub_object(self) -> Dict[str, Any]:
         result = {
             "request_id": str(self.request_id),
             "requested_at": self.requested_at.isoformat(),
@@ -67,14 +67,14 @@ class RequestContextTransfers(BaseModel):
             path_params = obj["path_params"]["map"] or {},
             query_params = obj["query_params"]["map"] or {},
             ip_address = obj["ip_address"],
-            is_internal = None if obj["is_internal"] is None else bool(obj["is_internal"]),
-            user_agent = obj["user_agent"],
-            ua_browser = obj["ua_browser"],
-            ua_mobile = obj["ua_mobile"],
-            platform = obj["platform"],
-            referer = obj["referer"],
-            origin = obj["origin"],
-            host = obj["host"],
-            forwarded_proto = obj["forwarded_proto"],
-            language = obj["language"],
+            is_internal = None if obj["is_internal"] is None else bool(obj["is_internal"]["boolean"]),
+            user_agent = None if obj["user_agent"] is None else obj["user_agent"]["string"],
+            ua_browser = None if obj["ua_browser"] is None else obj["ua_browser"]["string"],
+            ua_mobile = None if obj["ua_mobile"] is None else obj["ua_mobile"]["string"],
+            platform = None if obj["platform"] is None else obj["platform"]["string"],
+            referer = None if obj["referer"] is None else obj["referer"]["string"],
+            origin = None if obj["origin"] is None else obj["origin"]["string"],
+            host = None if obj["host"] is None else obj["host"]["string"],
+            forwarded_proto = None if obj["forwarded_proto"] is None else obj["forwarded_proto"]["string"],
+            language = None if obj["language"] is None else obj["language"]["string"],
         )

{maleo_foundation-0.2.97 → maleo_foundation-0.2.98}/maleo_foundation/models/transfers/general/token.py

@@ -28,7 +28,7 @@ class MaleoFoundationTokenGeneralTransfers:
         exp_dt: datetime = Field(..., description="Expired at (datetime)")
         exp: int = Field(..., description="Expired at (integer)")
 
-        def generate_google_pubsub_object(self) -> Dict[str, Any]:
+        def to_google_pubsub_object(self) -> Dict[str, Any]:
             result = {
                 "iss": None if self.iss is None else {"string": self.iss},
                 "sub": self.sub,
@@ -54,23 +54,19 @@ class MaleoFoundationTokenGeneralTransfers:
         @classmethod
         def from_google_pubsub_object(cls, obj:Dict[str, Any]):
             return cls(
-                iss = obj["iss"],
-                iat_dt = datetime.fromisoformat(obj["iat_dt"]),
-                method = obj["method"],
-                url = obj["url"],
-                path_params = obj["path_params"]["map"] or {},
-                query_params = obj["query_params"]["map"] or {},
-                ip_address = obj["ip_address"],
-                is_internal = obj["is_internal"],
-                user_agent = obj["user_agent"],
-                ua_browser = obj["ua_browser"],
-                ua_mobile = obj["ua_mobile"],
-                platform = obj["platform"],
-                referer = obj["referer"],
-                origin = obj["origin"],
-                host = obj["host"],
-                forwarded_proto = obj["forwarded_proto"],
-                language = obj["language"],
+                iss = None if obj["iss"] is None else obj["iss"]["string"],
+                sub = obj["sub"],
+                sr = obj["sr"],
+                u_i = obj["u_i"],
+                u_uu = UUID(obj["u_uu"]),
+                u_u = obj["u_u"],
+                u_e = obj["u_e"],
+                u_ut = obj["u_ut"],
+                o_i = None if obj["o_i"] is None else obj["o_i"]["int"],
+                o_uu = None if obj["o_uu"] is None else UUID(obj["o_uu"]["string"]),
+                o_k = None if obj["o_k"] is None else obj["o_k"]["string"],
+                o_ot = None if obj["o_ot"] is None else obj["o_ot"]["string"],
+                uor = None if obj["uor"] is None else obj["uor"]["array"],
                 iat_dt = datetime.fromisoformat(obj["iat_dt"]),
                 iat = int(obj["iat"]),
                 exp_dt = datetime.fromisoformat(obj["exp_dt"]),

{maleo_foundation-0.2.97 → maleo_foundation-0.2.98}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.2.97 → maleo_foundation-0.2.98}/pyproject.toml

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