fastgenerateapi 1.2.19__tar.gz → 1.2.21__tar.gz

{fastgenerateapi-1.2.19 → fastgenerateapi-1.2.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.19
+Version: 1.2.21
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com

{fastgenerateapi-1.2.19 → fastgenerateapi-1.2.21}/fastgenerateapi/__version__.py

@@ -8,7 +8,7 @@
 #                                                  d8888P
 
 
-VERSION = (1, 2, 19)
+VERSION = (1, 2, 21)
 
 __version__ = '.'.join(map(str, VERSION))
 

{fastgenerateapi-1.2.19 → fastgenerateapi-1.2.21}/fastgenerateapi/api_view/get_one_view.py

@@ -9,14 +9,14 @@ from fastapi_cache.decorator import cache
 from pydantic import BaseModel
 from starlette.requests import Request
 from starlette.responses import JSONResponse
-from tortoise import Model
 
 from fastgenerateapi.api_view.base_view import BaseView
 from fastgenerateapi.api_view.mixin.get_mixin import GetMixin
 from fastgenerateapi.cache.cache_decorator import get_one_cache_decorator
 from fastgenerateapi.cache.key_builder import generate_key_builder
 from fastgenerateapi.data_type.data_type import CALLABLE, DEPENDENCIES
-from fastgenerateapi.schemas_factory import get_one_schema_factory, response_factory
+from fastgenerateapi.data_type.tortoise_type import T_Model
+from fastgenerateapi.schemas_factory import response_factory
 from fastgenerateapi.settings.all_settings import settings
 from fastgenerateapi.utils.exception import NOT_FOUND
 
@@ -44,10 +44,16 @@ class GetOneView(BaseView, GetMixin):
         if self.is_with_prefetch:
             await self.setattr_model(model, prefetch_related_fields=self.prefetch_related_fields, *args, **kwargs)
 
-        # await self.setattr_model_rpc(self.rpc_class, model, self.rpc_param)
         model = await self.set_get_model(model, *args, **kwargs)
+        model = await self.set_get_one_model(model, *args, **kwargs)
 
-        return self.get_one_schema.from_orm(model)
+        return self.get_one_schema.model_validate(model)
+
+    async def set_get_one_model(self, model: T_Model, *args, **kwargs) -> T_Model:
+        """
+        对于查询的model，展示数据处理
+        """
+        return model
 
     def _get_one_decorator(self, *args: Any, **kwargs: Any) -> DecoratedCallable:
         @get_one_cache_decorator(cache(expire=settings.app_settings.CACHE_GET_ONE_SECONDS, coder=JsonCoder, key_builder=generate_key_builder))

{fastgenerateapi-1.2.19 → fastgenerateapi-1.2.21}/fastgenerateapi/api_view/mixin/utils/xlsx_util.py

@@ -36,14 +36,14 @@ class XlsxUtil:
     thin_border = Border(top=Side('thin'),left=Side('thin'),right=Side('thin'),bottom=Side('thin'))
 
     @classmethod
-    def write_headers(cls, sh: Worksheet, headers: List[str]) -> List[int]:
+    def write_headers(cls, sh: Worksheet, xlsx_headers: List[str]) -> List[int]:
         """
         写入第一行信息
         :return:
         """
         col_width_list = []
         sh.row_dimensions[1].height = 26
-        for col, header in enumerate(headers, 1):
+        for col, header in enumerate(xlsx_headers, 1):
             sh.cell(1, col).value = header
             sh.cell(1, col).alignment = XlsxUtil.default_align
             sh.cell(1, col).fill = XlsxUtil.default_fill
@@ -85,7 +85,7 @@ class XlsxUtil:
 
     @staticmethod
     async def export_xlsx(
-            headers: List[str],
+            xlsx_headers: List[str],
             model_list: List[Model],
             fields: List[str],
             index: Optional[bool] = False,
@@ -101,7 +101,7 @@ class XlsxUtil:
     ) -> StreamingResponse:
         """
         导出excel文件
-        :param headers: 第一行表头
+        :param xlsx_headers: 第一行表头
         :param model_list: 模型列表
         :param fields: 字段列表
         :param index: 是否导出序号字段
@@ -130,7 +130,7 @@ class XlsxUtil:
             sh = wb.active
             sh.title = sheet or (f'{model_class._meta.table_description}' if model_class else "sheet1")
 
-            col_width_list = XlsxUtil.write_headers(sh, headers)
+            col_width_list = XlsxUtil.write_headers(sh, xlsx_headers)
 
             if model_handler:
                 if is_async_callable(model_handler):
@@ -159,7 +159,7 @@ class XlsxUtil:
                             info = handler(info, *args, **kwargs)
                     write(sh, row, col, info)
 
-            XlsxUtil.adaptive_format(sh, col_width_list, len(headers))
+            XlsxUtil.adaptive_format(sh, col_width_list, len(xlsx_headers))
         finally:
             if file_save_path:
                 wb.save(file_save_path)
@@ -172,7 +172,7 @@ class XlsxUtil:
 
     @staticmethod
     async def excel_model(
-            headers: List[str] = None,
+            xlsx_headers: List[str] = None,
             sheet: Optional[str] = None,
             model_class: Optional[Model] = None,
             filename: Optional[str] = '导入模板.xlsx',
@@ -181,7 +181,7 @@ class XlsxUtil:
     ) -> Union[FileResponse, StreamingResponse]:
         """
         导出excel模板
-        :param headers: 第一行表头
+        :param xlsx_headers: 第一行表头
         :param sheet: sheet名称
         :param model_class: 当无title时，使用表名称
         :param filename: 导出文件名
@@ -207,9 +207,9 @@ class XlsxUtil:
             sh = wb.active
             sh.title = sheet or (f'{model_class._meta.table_description}' if model_class else "sheet1")
 
-            col_width_list = XlsxUtil.write_headers(sh, headers)
+            col_width_list = XlsxUtil.write_headers(sh, xlsx_headers)
 
-            XlsxUtil.adaptive_format(sh, col_width_list, len(headers))
+            XlsxUtil.adaptive_format(sh, col_width_list, len(xlsx_headers))
         finally:
             bytes_io = io.BytesIO()
             wb.save(bytes_io)
@@ -226,13 +226,15 @@ class XlsxUtil:
                 if isinstance(row_value, int):
                     row_value = str(row_value)
                 row_data[fields[i]] = row_value
+            else:
+                row_data[fields[i]] = None
 
         return row_data
 
     @staticmethod
     async def get_import_xlsx_data(
             file: UploadFile,
-            headers: List[str],
+            xlsx_headers: List[str],
             fields: List[str],
             sheet: Optional[str] = None,
     ) -> List[dict]:
@@ -253,9 +255,9 @@ class XlsxUtil:
                 for msg in header_row:
                     header_list.append(str(msg.value).replace(" ", ''))
 
-                if len(header_list) != len(headers):
+                if len(header_list) != len(xlsx_headers):
                     return ResponseMixin.error(msg="文件首行长度校验错误")
-                if not operator.eq(header_list, headers):
+                if not operator.eq(header_list, xlsx_headers):
                     return ResponseMixin.error(msg="文件首行内容校验错误")
 
                 for row in range(2, ws.max_row + 1):
@@ -273,7 +275,7 @@ class XlsxUtil:
     async def import_xlsx(
             cls,
             file: UploadFile,
-            headers: List[str],
+            xlsx_headers: List[str],
             fields: List[str],
             model_class: Optional[Type[Model]],
             create_schema: Optional[Type[BaseModel]],
@@ -286,7 +288,7 @@ class XlsxUtil:
         """
         导入只能用于一张表
         :param file:
-        :param headers: 请求文件首行文字校验
+        :param xlsx_headers: 请求文件首行文字校验
         :param fields: 值对应的字段
         :param model_class: 用于创建数据
         :param create_schema: 用于校验必填字段
@@ -295,7 +297,7 @@ class XlsxUtil:
         :param sheet: sheet名称
         :return:
         """
-        file_data_list = await cls.get_import_xlsx_data(file, headers, fields, sheet)
+        file_data_list = await cls.get_import_xlsx_data(file, xlsx_headers, fields, sheet)
         if not file_data_list:
             return ResponseMixin.error(msg="导入数据不能为空")
         create_list = []

{fastgenerateapi-1.2.19 → fastgenerateapi-1.2.21}/fastgenerateapi/controller/filter_controller.py

@@ -2,6 +2,7 @@ from datetime import datetime, date, time
 from typing import Union, Any, Optional, Type
 
 from pydantic.fields import FieldInfo
+from pytz import timezone
 from tortoise import Model
 from tortoise.expressions import Q
 from tortoise.queryset import QuerySet
@@ -12,6 +13,12 @@ from fastgenerateapi.pydantic_utils.base_model import alias_generator
 
 class FilterUtils:
 
+    @staticmethod
+    def datetime_to_shanghai(d: datetime) -> datetime:
+        if d.tzinfo is None:
+            return d.replace(tzinfo=timezone('Asia/Shanghai'))
+        return d.astimezone(timezone('Asia/Shanghai'))
+
     @staticmethod
     def date_to_datetime_23(date_value: Union[None, str, date, datetime]) -> Optional[datetime]:
         """

{fastgenerateapi-1.2.19 → fastgenerateapi-1.2.21}/fastgenerateapi/my_fields/enum_field.py

@@ -37,7 +37,8 @@ class IntEnumField(IntEnumFieldInstance):
     def __init__(self, enum_list: List[any], start_num=0, **kwargs: Any) -> None:
         self.start_num = start_num
         self.enum_list = enum_list
-        self.description = kwargs.get("description", "") + " >> " + self.get_description(enum_list, start_num)
+        self._description = kwargs.get("description", "")
+        self.description = self._description + " >> " + self.get_description(enum_list, start_num)
         kwargs["description"] = self.description
         super().__init__(enum_type=self.create_enum(enum_list, start_num=start_num), **kwargs)
 

{fastgenerateapi-1.2.19 → fastgenerateapi-1.2.21}/fastgenerateapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.19
+Version: 1.2.21
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com