sharedkernel 2.6.3__py3-none-any.whl → 2.7.0__py3-none-any.whl

sharedkernel/config.py

@@ -1,6 +1,7 @@
 import os
 
-VERBOSE = True if os.getenv("VERBOSE", "False").lower() == "true" else False
+IP_SESSION_VERBOSE = True if os.getenv("IP_SESSION_VERBOSE", "False").lower() == "true" else False
+LOG_VERBOSE = True if os.getenv("LOG_VERBOSE", "False").lower() == "true" else False
 
 # Log *******************************************************************************
 LOG_ENABLE = True if os.getenv("LOG_ENABLE", "False").lower() == "true" else False

sharedkernel/database/cache/cache_repository.py

@@ -0,0 +1,37 @@
+
+from abc import ABC, abstractmethod
+from typing import Generic, Optional, TypeVar
+from pydantic import BaseModel
+
+T = TypeVar("T", bound=BaseModel)
+
+
+class CacheRepository(ABC, Generic[T]):
+    @abstractmethod
+    async def set(
+        self,
+        key: str,
+        value: T,
+        ttl_seconds: int | None = None,
+    ) -> None:
+        pass
+
+    @abstractmethod
+    async def get(self, key: str) -> Optional[T]:
+        pass
+
+    @abstractmethod
+    async def exists(self, key: str) -> bool:
+        pass
+
+    @abstractmethod
+    async def delete(self, key: str) -> int:
+        pass
+
+    @abstractmethod
+    async def delete_group(self, key_prefix: str) -> int:
+        pass
+
+    @abstractmethod
+    async def clear(self) -> int:
+        pass

sharedkernel/database/cache/redis_generic_cache.py

@@ -0,0 +1,88 @@
+from typing import Generic, Optional, Type, TypeVar
+from pydantic import BaseModel
+from redis.asyncio import Redis
+
+from cache.cache_repository import CacheRepository
+
+T = TypeVar("T", bound=BaseModel)
+
+
+class RedisGenericCache(CacheRepository[T], Generic[T]):
+    def __init__(
+        self,
+        client: Redis,
+        namespace: str,
+        model: Type[T],
+        default_ttl_seconds: int | None = None,
+    ):
+        self.client = client
+        self.namespace = namespace
+        self.model = model
+        self.default_ttl_seconds = default_ttl_seconds
+
+    def _pref(self, key: str) -> str:
+        return f"{self.namespace}:{key}"
+
+    def _unpref(self, key: str) -> str:
+        prefix = f"{self.namespace}:"
+        return key.removeprefix(prefix)
+
+    def _serialize(self, value: T) -> str:
+        return value.model_dump_json()
+
+    def _deserialize(self, raw: str | bytes) -> T:
+        return self.model.model_validate_json(raw.decode())
+
+    async def set(
+        self,
+        key: str,
+        value: T,
+        ttl_seconds: int | None = None,
+    ) -> None:
+        if value is None:
+            return
+
+        redis_key = self._pref(key)
+        ttl = ttl_seconds if ttl_seconds else self.default_ttl_seconds
+
+        if ttl:
+            await self.client.set(redis_key, self._serialize(value), ex=ttl)
+        else:
+            await self.client.set(redis_key, self._serialize(value))
+
+    async def get(self, key: str) -> Optional[T]:
+        raw = await self.client.get(self._pref(key))
+        if raw is None:
+            return None
+        return self._deserialize(raw)
+
+    async def exists(self, key: str) -> bool:
+        return bool(await self.client.exists(self._pref(key)))
+
+    async def delete(self, key: str) -> int:
+        return await self.client.delete(self._pref(key))
+
+    async def delete_group(self, key_prefix: str) -> int:
+        pattern = self._pref(f"{key_prefix}*")
+        deleted = 0
+
+        async for key in self.client.scan_iter(match=pattern):
+            deleted += await self.client.delete(key)
+
+        return deleted
+
+    async def clear(self) -> int:
+        deleted = 0
+
+        async for key in self.client.scan_iter(match=f"{self.namespace}:*"):
+            deleted += await self.client.delete(key)
+
+        return deleted
+
+    async def get_all_ids(self) -> list[str]:
+        result: list[str] = []
+
+        async for raw in self.client.scan_iter(match=f"{self.namespace}:*"):
+            result.append(self._unpref(raw.decode()))
+
+        return result

sharedkernel/ip_session_service.py

@@ -78,88 +78,89 @@ class IPSessionAuth:
     def ip_session_auth(self, request: Request):
 
         if not config.IP_SESSION_AUTH_ENABLE:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | OK | IP Session Auth is disabled")
             return
 
-        if config.VERBOSE:
-            print("IP_SESSION_AUTH | INFO | Request Headers: ", request.headers)
+        if config.IP_SESSION_VERBOSE:
+            print("="*70)
+            print("IP_SESSION_AUTH | INFO | Request Headers:\n", request.headers)
 
         api_key = request.headers.get(config.APIKEY_HEADER_NAME)
 
         if api_key:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | OK | API Key is provided")
             return
 
         state = getattr(request.state, "decoded_token", None)
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | State: ", state)
 
         if not state:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No state found")
             raise UnAuthorizedException()
 
         nameid = state.get("nameid")
         sessionid = state.get("sessionId")
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | Nameid: ", nameid)
             print("IP_SESSION_AUTH | INFO | Sessionid: ", sessionid)
 
         if not nameid or not sessionid:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No nameid or sessionid found")
             raise UnAuthorizedException()
 
         request_ip = self._get_ip_from_request(request, config.IP_HEADER_NAME)
 
         if not request_ip:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No request ip found")
             raise UnAuthorizedException()
 
         request_ip = request_ip.strip()
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | Request ip: ", request_ip)
 
         if self._is_ip_allowed(request_ip):
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | OK | IP is in whitelist")
             return
 
         redis_key = f"userId:{nameid}:session:{sessionid}"
         user_data = self.redis.get(redis_key)
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | User data: ", user_data)
 
         if not user_data:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No user data found")
             raise UnAuthorizedException()
 
         try:
             payload = json.loads(user_data.decode())
         except (ValueError, UnicodeDecodeError, TypeError):
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | Error decoding user data")
             raise UnAuthorizedException()
 
         stored_ip = payload.get("Ip")
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | Stored ip: ", stored_ip)
             
         if not stored_ip:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No stored ip found")
             raise UnAuthorizedException()
 
         if stored_ip.strip() != request_ip:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | Stored ip does not match request ip")
             raise UnAuthorizedException()
 
         lifetime_minutes = self._get_lifetime()
         self.redis.expire(redis_key, lifetime_minutes * 60)
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | OK | IP session auth successful")

sharedkernel/logger/logger_service.py

@@ -92,8 +92,9 @@ class LoggerService:
 
 
     def emit(self, log: LogDTO):
-        # if config.VERBOSE:
-        #     print("LOGGER | INFO | Emitting log:\n", log)
+        if config.LOG_VERBOSE:
+            print("="*70)
+            print("LOGGER | INFO | Emitting log:\n", log)
         self.publish(log)
 
 

{sharedkernel-2.6.3.dist-info → sharedkernel-2.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sharedkernel
-Version: 2.6.3
+Version: 2.7.0
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -20,7 +20,7 @@ Requires-Dist: markdown
 Requires-Dist: beautifulsoup4
 Requires-Dist: deepdiff
 Requires-Dist: kombu
-Requires-Dist: redis
+Requires-Dist: redis==8.0.0
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
@@ -31,6 +31,10 @@ Dynamic: summary
 this is a shared kernel package
 
 # Change Log
+### Version 2.7.0
+- Add Redis and cache repository
+### Version 2.6.4
+- Add Verbose to log
 ### Version 2.6.3
 - fix bug ip-header-name
 ### Version 2.6.2

{sharedkernel-2.6.3.dist-info → sharedkernel-2.7.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 sharedkernel/common.py,sha256=HL5vsuJBaIeBcoXA8Hbe6jnYAv4danIszo5Y7G2gGDA,622
-sharedkernel/config.py,sha256=kiRDUipAHTWI-F0IN3NghgU6GlM9MNVybApNonm8wWo,1888
+sharedkernel/config.py,sha256=H_PjT9jawZqKtwnlVCSuefkh_b24QJX2ckP-YNGp6aA,1996
 sharedkernel/data_format_converter.py,sha256=GWGbfhKJBifkz-cfnqKAFjJM43WC0qdq9KSELj3xR30,3774
 sharedkernel/date_converter.py,sha256=Cjd4ewm0pIfQzv7nlgAAB_EYrr-VvXxQGehJCNphgXc,4491
 sharedkernel/diff_utils.py,sha256=mtwJmc05GAXUOB0ZLtqAhfBT1kGoSQ7qmP5N44P73ho,2564
 sharedkernel/file_validation.py,sha256=X-vdUy1Se2li3f-_Ro5UJi_Muqz-QmkKu6b5eHs-eiA,2892
-sharedkernel/ip_session_service.py,sha256=CXXNZWfFqm_28L1Wx0mTrw_MC5RxsNdfzubw0Ld90gA,5597
+sharedkernel/ip_session_service.py,sha256=qFYvXpvQfwcYa3qRckw7e0DQW0fMHnl_0zg0FAkpZXo,5812
 sharedkernel/jwt_service.py,sha256=QNkGLn1ZzU5gBD0Cjyadtqu_zHnS3_A2y-CDZSrc4Q8,1872
 sharedkernel/multipart_upload.py,sha256=JVlCBlznB9dWh2_spjAqzLOqQT1CHUTvrR4m7ug8qaM,1877
 sharedkernel/regex_masking.py,sha256=zQrgteP8Cuq1EC9B7QUJqAXUxK9ISD9kWMYK2AbRfw0,3288
@@ -17,6 +17,9 @@ sharedkernel/database/mongo_generic_audit_repository.py,sha256=F8z_4l7c2wHOeF995
 sharedkernel/database/mongo_generic_repository.py,sha256=KrigWbKXo99GegMjvrlH4BYGPH8kvST9smxcWjdNqEU,5887
 sharedkernel/database/mongo_health_checker.py,sha256=IYAaV8mJgGG_uxfnSRRvbq6JybxpA58pBCpDb7XXaq8,1842
 sharedkernel/database/pagination_response_dto.py,sha256=91Gkajx4hHmYfypP7EJTiMP1ZrzopjwRuEyMrzQ3SVE,389
+sharedkernel/database/cache/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sharedkernel/database/cache/cache_repository.py,sha256=xL5Q18wgsSzIID_Zq8r0sa2OKC_c96q7cg2zUALzPwg,750
+sharedkernel/database/cache/redis_generic_cache.py,sha256=9_jUDfvUP37_IQ0ANDzniHv-Hj6lQDKPtJ0J76e8r7A,2526
 sharedkernel/enum/__init__.py,sha256=BQxVEO5O1PrNB8gm5nUrh_9Us2HcdgPF-8iZuro7UEM,73
 sharedkernel/enum/error_code.py,sha256=M_z-rAW4-zmWs1hMcc97zo4CpqzmoUidMarwo9UuNAk,551
 sharedkernel/enum/redis_mode_enum.py,sha256=v_n9g7_rq_pdMiZrC8mMveRcjgF3eBv3K2tsaV1Pidc,136
@@ -29,7 +32,7 @@ sharedkernel/logger/log_dto.py,sha256=GN0nfZMTMJN4hXM47M_Wkkr1Fgm4kVgWfgQWNZfuUe
 sharedkernel/logger/log_enums.py,sha256=b6RCy6oLx-uUQANQVoEq3yxMld0m4Gtq5pTDos78vL8,209
 sharedkernel/logger/log_info.py,sha256=bGv8QBTNB-4EfJf-cYuuAU2c_d1PNt_7R15vc3y-fJk,141
 sharedkernel/logger/log_middlewares.py,sha256=fjqti-K1u5dJkrbU02jTtRK__N7vEUot5N5DbAUZ-XY,1014
-sharedkernel/logger/logger_service.py,sha256=KXvA3ql7s_uyY7QHs-CtGqodIrMplPVYV1RcHcFe9k8,6581
+sharedkernel/logger/logger_service.py,sha256=z_1JpMWFWRAdhoErYy1UtKzhRYtd_uDGiEuP3hOz4A0,6608
 sharedkernel/normalizer/__init__.py,sha256=cDmbquAW6o7rnvv3XkI7h5vMYp-3NmGN6zp1ryYOUcc,154
 sharedkernel/normalizer/number_normalizer.py,sha256=zJ700T0t9P7hgxp7vox98LdPw9A4jsUjIHA_II9YmqU,286
 sharedkernel/normalizer/phone_number_normalizer.py,sha256=8z-JGWvH45GiOkceMz9jZ4gLoW9X120I1JSzCAGWcvU,19268
@@ -40,7 +43,7 @@ sharedkernel/objects/json_string_model.py,sha256=j63tnoqiok0EmBP6T-ChYuQYKPw7mLq
 sharedkernel/objects/jwt_model.py,sha256=XQHQhTbg7PT8XiUh5fd9MwRH4ldPsesI_hfbjaSqdKg,134
 sharedkernel/objects/result.py,sha256=I_9hX5TPEO1oStzuFLjFh1rtimXorz7ml-OaW_2BMvc,680
 sharedkernel/objects/user_info.py,sha256=51WyspRxlIWzK7Lfxgqg4D6mylXeHe9ZSenf-RhYTdA,286
-sharedkernel-2.6.3.dist-info/METADATA,sha256=aNnJemtZyuKmUV5KQtZbv8n2sgluq2wYWnmSwABS1qo,3995
-sharedkernel-2.6.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sharedkernel-2.6.3.dist-info/top_level.txt,sha256=TVTOnV1MItSSlpSjqkiijuHkoVsGHS4CArpsM-lylkE,13
-sharedkernel-2.6.3.dist-info/RECORD,,
+sharedkernel-2.7.0.dist-info/METADATA,sha256=8tNBtxeSL5t9rwHqbq94K3xGS3SXVyVjhWHCPZ56fW0,4092
+sharedkernel-2.7.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sharedkernel-2.7.0.dist-info/top_level.txt,sha256=TVTOnV1MItSSlpSjqkiijuHkoVsGHS4CArpsM-lylkE,13
+sharedkernel-2.7.0.dist-info/RECORD,,