internal 1.0.68__tar.gz → 1.0.70__tar.gz

{internal-1.0.68 → internal-1.0.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: internal
-Version: 1.0.68
+Version: 1.0.70
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com
@@ -14,6 +14,7 @@ Requires-Dist: dictdiffer (>=0.9.0,<0.10.0)
 Requires-Dist: fastapi (>=0.109.0,<0.110.0)
 Requires-Dist: httpx (>=0.26.0,<0.27.0)
 Requires-Dist: pydantic-settings (>=2.1.0,<3.0.0)
+Requires-Dist: redis (>=5.1.1,<6.0.0)
 Requires-Dist: watchtower (>=3.0.1,<4.0.0)
 Description-Content-Type: text/markdown
 

{internal-1.0.68 → internal-1.0.70}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "internal"
-version = "1.0.68"
+version = "1.0.70"
 description = ""
 authors = ["Ray <ray@cruisys.com>"]
 readme = "README.md"
@@ -15,6 +15,7 @@ watchtower = "^3.0.1"
 httpx = "^0.26.0"
 beanie = "^1.24.0"
 dictdiffer = "^0.9.0"
+redis = "^5.1.1"
 
 
 [build-system]

{internal-1.0.68 → internal-1.0.70}/src/internal/base_config.py

@@ -58,5 +58,8 @@ class BaseConfig(BaseSettings):
     SYSTEM_BRAND: str = "cruisys"
     SYSTEM_ORGANIZATION_ID: str = "cruisys"
 
+    # Redis URL
+    REDIS_URL: str = ""
+
     class Config:
         case_sensitive = False

{internal-1.0.68 → internal-1.0.70}/src/internal/base_factory.py

@@ -13,7 +13,7 @@ from fastapi import FastAPI, status, Request, APIRouter
 from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
 
-from . import database
+from . import database, cache_redis
 from .const import LOG_FMT, LOG_FMT_NO_DT, LOG_DT_FMT, DEFAULT_LOGGER_NAME
 from .exception.base_exception import InternalBaseException
 from .exception.internal_exception import BadGatewayException, GatewayTimeoutException
@@ -42,9 +42,10 @@ class BaseFactory(metaclass=ABCMeta):
 
     @abstractmethod
     async def init_state_cache(self, app, app_config):
-        """
-        Each factory should define what model it wants.
-        """
+        if app_config.REDIS_URL:
+            redis_cache = cache_redis.CacheRedis(app_config.REDIS_URL)
+            await redis_cache.connect()
+            app.state.redis = redis_cache.client
 
     async def init_state_scheduler_app(self, app, app_config):
         """
@@ -77,6 +78,8 @@ class BaseFactory(metaclass=ABCMeta):
             # code to execute when app is shutting down
             await mongodb.close()
             app.state.logger.info("Database disconnected")
+            await app.state.redis.close()
+            app.state.logger.info("Cache disconnected")
 
 
         if title is None:

internal-1.0.70/src/internal/cache_redis.py

@@ -0,0 +1,23 @@
+import redis.asyncio as redis
+
+from motor.motor_asyncio import AsyncIOMotorClient
+from pymongo.errors import ServerSelectionTimeoutError
+
+from .exception.internal_exception import RedisInitializeFailureException, RedisConnectFailureException
+
+
+class CacheRedis:
+    def __init__(self, redis_url: str):
+        self.client = None
+        self.redis_url = redis_url
+
+    async def connect(self):
+        try:
+            connection_pool = redis.ConnectionPool.from_url(self.redis_url)
+            self.client = redis.Redis(connection_pool=connection_pool)
+        except Exception as e:
+            raise RedisInitializeFailureException()
+
+    async def close(self):
+        if self.client:
+            self.client.close()

{internal-1.0.68 → internal-1.0.70}/src/internal/exception/app_exception.py

@@ -49,7 +49,7 @@ class PlateNoFormatException(InternalBaseException):
 
 class VinLengthOrFormatException(InternalBaseException):
     code = "error_vin_length_or_format"
-    message = "VIN only allow alphanumeric 7 or 17 characters"
+    message = "VIN only allow alphanumeric 7 or 10 or 17 characters"
 
     def __init__(self, message: str = None, **kwargs):
         _message = message or self.message

{internal-1.0.68 → internal-1.0.70}/src/internal/exception/internal_exception.py

@@ -63,3 +63,21 @@ class ParamValidationException(InternalBaseException):
     def __init__(self, message: str = None, **kwargs):
         _message = message or self.message
         super().__init__(status.HTTP_422_UNPROCESSABLE_ENTITY, self.code, _message, **kwargs)
+
+
+class RedisInitializeFailureException(InternalBaseException):
+    code = "error_redis_initialize"
+    message = "Redis initialize failure"
+
+    def __init__(self, message: str = None, **kwargs):
+        _message = message or self.message
+        super().__init__(status.HTTP_500_INTERNAL_SERVER_ERROR, self.code, _message, **kwargs)
+
+
+class RedisConnectFailureException(InternalBaseException):
+    code = "error_redis_connect"
+    message = "Redis connect failure"
+
+    def __init__(self, message: str = None, **kwargs):
+        _message = message or self.message
+        super().__init__(status.HTTP_500_INTERNAL_SERVER_ERROR, self.code, _message, **kwargs)