fastgenerateapi 1.2.33__tar.gz → 1.2.35__tar.gz

{fastgenerateapi-1.2.33 → fastgenerateapi-1.2.35}/PKG-INFO

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

{fastgenerateapi-1.2.33 → fastgenerateapi-1.2.35}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.2.33 → fastgenerateapi-1.2.35}/fastgenerateapi/file_tool/xlsx_util.py

@@ -123,42 +123,47 @@ class XlsxImporterImpl(XlsxImporterInterface):
     def __init__(self, file: Optional[UploadFile], *args, **kwargs):
         self.file = file
         self.args = args
+        self.kwargs = kwargs
+        # 初始化时预计算常量，避免循环内重复计算
         self.required_field_dict = {field: True for field in  self.required_fields} if self.required_fields else {}
         self.field_title_dict = {self.fields[i]: self.xlsx_headers[i] for i in range(len(self.fields))}
-        self.kwargs = kwargs
+        self.fields_length = len(self.fields) if self.fields else 0
 
     # ------------------------------ 钩子函数 ------------------------------------
     async def handle_data(self, rows: List[Dict[str, str]]):
         if not self.model_class:
-            raise NotImplementedError
-        create_list = []
+            raise NotImplementedError("model_class must be set")
+
         global_dict = {}
         if self.fields_handler:
             if is_async_callable(self.fields_handler):
                 rows = await self.fields_handler(rows, *self.args, **self.kwargs, global_dict=global_dict)
             else:
                 rows = self.fields_handler(rows, *self.args, **self.kwargs, global_dict=global_dict)
+        processed_rows = []
         for row in rows:
             try:
+                # 前置处理
                 if self.field_before_handler_list:
-                    for field_before_handler in self.field_before_handler_list:
-                        if is_async_callable(field_before_handler):
-                            row = await field_before_handler(row, *self.args, **self.kwargs, global_dict=global_dict)
+                    for handler in self.field_before_handler_list:
+                        if is_async_callable(handler):
+                            row = await handler(row, *self.args, **self.kwargs, global_dict=global_dict)
                         else:
-                            row = field_before_handler(row, *self.args, **self.kwargs, global_dict=global_dict)
+                            row = handler(row, *self.args, **self.kwargs, global_dict=global_dict)
+                # 数据验证
                 if self.create_schema:
                     create_dict = self.create_schema(**row).model_dump(exclude_unset=True)
                 else:
                     create_dict = row
+                # 后置处理
                 if self.field_after_handler_list:
-                    for field_after_handler in self.field_after_handler_list:
-                        if is_async_callable(field_after_handler):
-                            create_dict = await field_after_handler(create_dict, *self.args, **self.kwargs, global_dict=global_dict)
+                    for handler in self.field_after_handler_list:
+                        if is_async_callable(handler):
+                            create_dict = await handler(create_dict, *self.args, **self.kwargs, global_dict=global_dict)
                         else:
-                            create_dict = field_after_handler(create_dict, *self.args, **self.kwargs, global_dict=global_dict)
-                if not create_dict:
-                    continue
-                create_obj = self.model_class(**create_dict)
+                            create_dict = handler(create_dict, *self.args, **self.kwargs, global_dict=global_dict)
+                if create_dict:
+                    processed_rows.append(self.model_class(**create_dict))
             except ValidationError as e:
                 alise_dict = ToolMixin.get_schema_alise_to_name(self.create_schema)
                 _error_field = e.errors()[0].get('loc')[0]
@@ -167,9 +172,9 @@ class XlsxImporterImpl(XlsxImporterInterface):
                 if not row.get(error_field):
                     return ResponseMixin.error(msg=f"第{row['_row_index']}行【{description}】不能为空")
                 return ResponseMixin.error(msg=f"第{row['_row_index']}行【{description}】填写错误")
-            create_list.append(create_obj)
-        await self.model_class.bulk_create(create_list)
-        return create_list
+        if processed_rows:
+            await self.model_class.bulk_create(processed_rows)
+        return processed_rows
 
     async def upload_file(self, bytes_io: io.BytesIO):
         raise NotImplementedError
@@ -180,28 +185,28 @@ class XlsxImporterImpl(XlsxImporterInterface):
     async def push_status_error(self, msg: Optional[str]):
         raise NotImplementedError
 
-    async def validate_field(self, row_value):
-
+    def validate_field(self, row_value):
+        """字段验证逻辑"""
         return row_value
 
     # ------------------------------ 复用函数 ------------------------------------
     async def check_headers(self, row: tuple[Cell, ...]):
         if not self.xlsx_headers:
-            raise NotImplementedError
-        header_list = []
-        for col_index, col in enumerate(row):
-            header_list.append(col.value)
+            raise NotImplementedError("xlsx_headers must be set")
+        header_list = [cell.value for cell in row]
         if len(header_list) != len(self.xlsx_headers):
-            return ResponseMixin.error(msg="文件首行长度校验错误")
+            return ResponseMixin.error(msg=f"文件首行长度错误，期望{len(self.xlsx_headers)}列，实际{len(header_list)}列")
         if not operator.eq(header_list, self.xlsx_headers):
-            return ResponseMixin.error(msg="文件首行内容校验错误")
+            return ResponseMixin.error(msg="文件首行内容校验错误，请检查导入模板是否正确")
 
         return
 
     async def get_data_dict(self, sh: Worksheet) -> List[Dict[str, str]]:
         data_list = []
-        for row_index in range(2, sh.max_row + 1):
-            row_data = await self.row_to_dict(sh[row_index], row_index)
+        # 使用iter_rows批量读取，利用只读模式优势
+        rows = sh.iter_rows(min_row=2, max_row=sh.max_row, values_only=False)
+        for row_index, row in enumerate(rows, start=2):
+            row_data = self.row_to_dict(row, row_index)
             if not row_data:
                 continue
             row_data["_row_index"] = row_index
@@ -209,22 +214,26 @@ class XlsxImporterImpl(XlsxImporterInterface):
 
         return data_list
 
-    async def row_to_dict(self, row, row_index) -> dict:
+    def row_to_dict(self, row, row_index) -> dict:
         row_data = {}
-        error_msg = ""
-        for i in range(min(len(row), len(self.fields))):
+        error_msg = None
+        has_value = False
+        for i in range(min(len(row), self.fields_length)):
             field = self.fields[i]
-            row_value = row[i].value
+            cell = row[i]
+            row_value = cell.value if cell else None
             if row_value in [None, "", " "]:
                 row_value = None
             elif isinstance(row_value, int):
                 row_value = str(row_value)
-            row_value = await self.validate_field(row_value)
+            row_value = self.validate_field(row_value)
             if self.required_field_dict.get(field) and not row_value:
                 if not error_msg:
                     error_msg = f"第{row_index}行【{self.field_title_dict.get(field)}】不能为空"
-            row_data[self.fields[i]] = row_value
-        if any(row_data.values()):
+            row_data[field] = row_value
+            if row_value:
+                has_value = True
+        if has_value:
             if error_msg:
                 return ResponseMixin.error(msg=error_msg)
             return row_data
@@ -377,7 +386,6 @@ class XlsxUtil:
             try:
                 # 校验表头信息
                 await importer.check_headers(sh[1])
-
                 # 读取excel数据
                 rows = await importer.get_data_dict(sh)
             finally:
@@ -387,7 +395,6 @@ class XlsxUtil:
             return ResponseMixin.error(msg="导入数据不能为空")
         # 处理完整数据
         await importer.handle_data(rows)
-
         return
 
     @staticmethod

{fastgenerateapi-1.2.33 → fastgenerateapi-1.2.35}/fastgenerateapi.egg-info/PKG-INFO

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