From 815728b0d804036b545e63c9b51d383e2e2b23fd Mon Sep 17 00:00:00 2001
From: z66 <1415243231@qq.com>
Date: Mon, 25 Aug 2025 09:25:12 +0800
Subject: [PATCH] =?UTF-8?q?api=E8=AD=A6=E5=91=8A=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dictionaries/project.xml               |  1 +
 .idea/inspectionProfiles/Project_Default.xml |  1 +
 api.py                                       | 21 +++++++++++---------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
index 5b94c77..03a79d6 100644
--- a/.idea/dictionaries/project.xml
+++ b/.idea/dictionaries/project.xml
@@ -1,6 +1,7 @@
 <component name="ProjectDictionaryState">
   <dictionary name="project">
     <words>
+      <w>jiandaoyun</w>
       <w>yida</w>
     </words>
   </dictionary>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 88504ae..9bde310 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -7,6 +7,7 @@
           <option value="pandas" />
           <option value="pymysql" />
           <option value="requests" />
+          <option value="numpy" />
         </list>
       </option>
     </inspection_tool>
diff --git a/api.py b/api.py
index cfbb49c..8d5d17f 100644
--- a/api.py
+++ b/api.py
@@ -9,7 +9,6 @@ from decimal import Decimal
 import time
 import numpy as np
 from log_config import configure_task_logger, configure_error_task_logger
-import pandas as pd
 import json
 
 # 获取已经配置好的常规日志记录器
@@ -235,7 +234,7 @@ class API:
         retries = 0
         while retries <= max_retries:
             try:
-                res = requests.post(url=url, data=payload, headers=headers, timeout=10)
+                res: requests.Response = requests.post(url=url, data=payload, headers=headers, timeout=10)
                 res.raise_for_status()  # 检查HTTP响应状态码，如果不等于200会抛出异常
                 data_get = res.json()
                 if res.status_code == 200:
@@ -251,6 +250,7 @@ class API:
         if retries > max_retries:
             error_task_logger.error(
                 f"任务 {data['data_list']} 连续{max_retries}次请求失败，放弃此次请求。")
+        return None
 
     @staticmethod
     def entry_data_batch_create(
@@ -301,7 +301,7 @@ class API:
             retries = 0
             while retries <= max_retries:
                 try:
-                    res = requests.post(url=url, data=payload, headers=headers, timeout=10)
+                    res: requests.Response = requests.post(url=url, data=payload, headers=headers, timeout=10)
                     res.raise_for_status()  # 检查HTTP响应状态码，如果不等于200会抛出异常
                     data_get = res.json()
                     if data_get["status"] == "success":
@@ -349,7 +349,7 @@ class API:
         retries = 0
         while retries <= max_retries:
             try:
-                res = requests.post(url=url, data=payload, headers=headers, timeout=10)
+                res: requests.Response = requests.post(url=url, data=payload, headers=headers, timeout=10)
                 res.raise_for_status()  # 检查HTTP响应状态码，如果不等于200会抛出异常
                 data_get = res.json()
                 if res.status_code == 200:
@@ -393,7 +393,7 @@ class API:
 
         while retries <= max_retries:
             try:
-                res = requests.post(url=url, data=payload, headers=headers, timeout=10)
+                res: requests.Response = requests.post(url=url, data=payload, headers=headers, timeout=10)
                 delete_status = res.json()
                 # 手动处理状态码 4001
                 if delete_status == {
@@ -464,7 +464,7 @@ class API:
             retries = 0
             while retries <= max_retries:
                 try:
-                    res = requests.post(url=url, data=payload, headers=headers, timeout=10)
+                    res: requests.Response = requests.post(url=url, data=payload, headers=headers, timeout=10)
                     res.raise_for_status()  # 检查HTTP响应状态码，如果不等于200会抛出异常
                     data_get = res.json()
                     logger.info(f"{i}页 返回结果: {data_get}")
@@ -558,6 +558,7 @@ class API:
     def get_upload_token(data: dict, max_retries: int = 10) -> dict[str, Any] | None:
         """
         获取文件上传凭证
+        :param max_retries: 最大重试次数
         :param data: 应包含应用ID、表单ID、事务ID
         :return: 返回upload_url、upload_token
         """
@@ -576,7 +577,7 @@ class API:
 
         while retries <= max_retries:
             try:
-                res = requests.post(url=url, data=payload, headers=headers, timeout=10)
+                res: requests.Response = requests.post(url=url, data=payload, headers=headers, timeout=10)
                 res.raise_for_status()  # 检查HTTP响应状态码，如果不等于200会抛出异常
                 res_j = res.json()
                 upload_url = res_j['token_and_url_list'][0]['url']
@@ -601,9 +602,10 @@ class API:
         return None
 
     @staticmethod
-    def upload_file(data: dict, max_retries: int = 10) -> dict:
+    def upload_file(data: dict, max_retries: int = 10) -> Any | None:
         """
         上传文件
+        :param max_retries: 最大重试次数
         :param data: 应包含上传文件路径、上传文件url、上传文件token
         :return: 返回上传文件结果
         """
@@ -624,7 +626,7 @@ class API:
         retries = 0
         while retries <= max_retries:
             try:
-                res = requests.post(url=url, data=payload, headers=headers, files=files, timeout=10)
+                res: requests.Response = requests.post(url=url, data=payload, headers=headers, files=files, timeout=10)
                 res.raise_for_status()  # 检查HTTP响应状态码，如果不等于200会抛出异常
                 data_get = res.json()
                 logger.info(f"返回结果: {data_get}")
@@ -643,3 +645,4 @@ class API:
                 f"任务 {data['data_list']} 连续{max_retries}次请求失败，放弃此次请求。")
 
         f.close()
+        return None