internal 0.1.0__tar.gz → 0.1.2__tar.gz

{internal-0.1.0 → internal-0.1.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: internal
-Version: 0.1.0
+Version: 0.1.2
 Summary: 
 Author: Ray
-Author-email: ray@RayMBP16
+Author-email: ray@cruisys.com
 Requires-Python: >=3.11,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
@@ -12,7 +12,6 @@ Requires-Dist: arrow (>=1.3.0,<2.0.0)
 Requires-Dist: beanie (>=1.24.0,<2.0.0)
 Requires-Dist: fastapi (>=0.109.0,<0.110.0)
 Requires-Dist: httpx (>=0.26.0,<0.27.0)
-Requires-Dist: motor (>=3.3.2,<4.0.0)
 Requires-Dist: pydantic-settings (>=2.1.0,<3.0.0)
 Requires-Dist: watchtower (>=3.0.1,<4.0.0)
 Description-Content-Type: text/markdown

{internal-0.1.0 → internal-0.1.2}/pyproject.toml

@@ -1,8 +1,8 @@
 [tool.poetry]
 name = "internal"
-version = "0.1.0"
+version = "0.1.2"
 description = ""
-authors = ["Ray <ray@RayMBP16>"]
+authors = ["Ray <ray@cruisys.com>"]
 readme = "README.md"
 packages = [{include = "internal", from = "src"}]
 
@@ -12,7 +12,6 @@ fastapi = "^0.109.0"
 arrow = "^1.3.0"
 pydantic-settings = "^2.1.0"
 watchtower = "^3.0.1"
-motor = "^3.3.2"
 httpx = "^0.26.0"
 beanie = "^1.24.0"
 

{internal-0.1.0 → internal-0.1.2}/src/internal/base_factory.py

@@ -6,13 +6,16 @@ from abc import ABCMeta, abstractmethod
 
 import dotenv
 import watchtower
-from fastapi import FastAPI
+from fastapi import FastAPI, status
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
+from starlette.requests import Request
+from beanie import init_beanie
 
 from . import database
 from .base_config import get_app_config
 from .const import LOG_FMT, LOG_FMT_NO_DT, LOG_DT_FMT, DEFAULT_LOGGER_NAME
+from .exception.base_exception import InternalBaseException
 from .utils import update_dict_with_cast
 from .ext.amazon import aws
 
@@ -24,7 +27,13 @@ class BaseFactory(metaclass=ABCMeta):
     @abstractmethod
     def init_modules(self, app):
         """
-        Each factory should define what modules it want.
+        Each factory should define what modules it wants.
+        """
+
+    @abstractmethod
+    async def get_document_model_list(self) -> list:
+        """
+        Each factory should define what model it wants.
         """
 
     def create_app(self, title=DEFAULT_APP_NAME) -> FastAPI:
@@ -50,6 +59,8 @@ class BaseFactory(metaclass=ABCMeta):
         @app.on_event("startup")
         async def startup_db_client():
             await mongodb.connect()
+            document_model_list = await self.get_document_model_list()
+            await init_beanie(database=app.state.db.db_name, document_models=document_model_list)
             app.state.logger.info("Database connected")
 
         @app.on_event("shutdown")
@@ -57,11 +68,27 @@ class BaseFactory(metaclass=ABCMeta):
             await mongodb.close()
             app.state.logger.info("Database disconnected")
 
-        app.db = mongodb
+        app.state.db = mongodb
 
         self.__init_modules(app)
         self.__init_builtin_api(app)
 
+        @app.exception_handler(InternalBaseException)
+        async def http_exception_handler(request: Request, exc: InternalBaseException):
+            return JSONResponse(
+                status_code=exc.status_code,
+                content=exc.detail
+            )
+
+        @app.exception_handler(Exception)
+        async def http_exception_handler(request: Request, exc: Exception):
+            app.state.logger.warn(f"Exception, request:{request.__dict__}, exc:{exc}")
+            detail = {"code": status.HTTP_500_INTERNAL_SERVER_ERROR, "message": "Internal server error"}
+            return JSONResponse(
+                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                content=detail
+            )
+
         return app
 
     def __load_local_config(self):
@@ -118,7 +145,6 @@ class BaseFactory(metaclass=ABCMeta):
                 boto3_client=logs_client, create_log_group=False)
             watchtower_handler.setFormatter(logging.Formatter(fmt=LOG_FMT_NO_DT, datefmt=LOG_DT_FMT))
             app.state.logger.addHandler(watchtower_handler)
-            logging.getLogger('sqlalchemy').addHandler(watchtower_handler)
 
     def __init_builtin_api(self, app):
 

internal-0.1.2/src/internal/exception/base_exception.py

@@ -0,0 +1,11 @@
+from fastapi import HTTPException
+
+
+class InternalBaseException(HTTPException):
+    def __init__(self, status_code: int = None, code: str = "SUCCESS", message: str = "success", **kwargs):
+        detail = {
+            "code": code,
+            "message": message,
+            "data": kwargs,
+        }
+        super().__init__(status_code=status_code, detail=detail)

{internal-0.1.0 → internal-0.1.2}/src/internal/model/base_model.py

@@ -1,8 +1,8 @@
 from datetime import datetime
+from beanie import Document
+from pydantic import Field
 
-from pydantic import BaseModel, Field
 
-
-class InternalBaseModel(BaseModel):
+class InternalBaseModel(Document):
     create_time: datetime = Field(default_factory=datetime.utcnow)
     update_time: datetime = Field(default_factory=datetime.utcnow)

{internal-0.1.0 → internal-0.1.2}/src/internal/utils.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import hashlib
+import json
 
 import arrow
 
@@ -41,4 +42,6 @@ def export_time_format(date, fmt=ARR_EXPORT_DATETIME_FMT):
 def update_dict_with_cast(curr_settings: BaseConfig, new_conf: dict):
     for key, value in new_conf.items():
         if hasattr(curr_settings, key):
-            setattr(curr_settings, key, value)
+            key_type = type(getattr(curr_settings, key))
+            cast_func = key_type if key_type in (str, int) else json.loads
+            setattr(curr_settings, key, cast_func(value))

internal-0.1.0/src/internal/exception/base_exception.py

@@ -1,9 +0,0 @@
-from fastapi import HTTPException
-
-
-class InternalBaseException(HTTPException):
-    STATUS_CODE: int = None
-    DETAIL: str = None
-
-    def __init__(self):
-        super().__init__(status_code=self.STATUS_CODE, detail=self.DETAIL)