Functions-d 1.28__tar.gz → 1.30__tar.gz

{functions_d-1.28 → functions_d-1.30}/Functions_d/Functions_d.py

@@ -1558,7 +1558,129 @@ class DataProcessingAndMessaging:
             # 其他未知错误才记录警告
             self.logger.warning(f"关闭Excel进程时发生异常: {str(e)}")
 
+    # -------------------------- 上传文件/DF到内网文件服务器（最终完整版） --------------------------
+    def upload_to_internal_server(self, input_data, filename_in_server: str = "dataframe_result.xlsx"):
+        """
+        上传数据到内网 http://fs-cc.xin.com（带网络重试保障）
+        :param input_data: 支持 3 种输入 →
+                           1) 单个 DataFrame
+                           2) 字典 {sheet名: df} → 自动生成多Sheet Excel
+                           3) 本地Excel文件路径(str)
+        :param filename_in_server: 服务器上显示的文件名
+        :return: 下载链接（失败返回None）
+        """
+        import requests
+        import pandas as pd
+        import os
+        import datetime
+        from io import BytesIO
+        from requests.adapters import HTTPAdapter
+        from urllib3.util.retry import Retry
+
+        upload_url = "http://fs-cc.xin.com"
+        self.logger.info(f"开始上传数据到内网服务器，服务器文件名：{filename_in_server}")
+        print(f"📤 正在上传 → 服务器文件名：{filename_in_server}")
+
+        # ====================== 【核心：网络重试保障机制】 ======================
+        def create_retry_session(retries=3):
+            session = requests.Session()
+            retry_strategy = Retry(
+                total=retries,
+                backoff_factor=1,
+                status_forcelist=[500, 502, 503, 504],
+                allowed_methods=["POST"]
+            )
+            adapter = HTTPAdapter(max_retries=retry_strategy)
+            session.mount("http://", adapter)
+            session.mount("https://", adapter)
+            return session
+
+        # ======================================================================
+
+        try:
+            # ==============================================
+            # 【核心升级点】支持 单个DF / 多个DF（多Sheet）
+            # ==============================================
+            if isinstance(input_data, dict):
+                # 字典 → 多Sheet Excel
+                self.logger.info(f"输入类型为【多DataFrame字典】，共 {len(input_data)} 个Sheet")
+                excel_buffer = BytesIO()
+                with pd.ExcelWriter(excel_buffer, engine="openpyxl") as writer:
+                    for sheet_name, df in input_data.items():
+                        # 截取sheet名（Excel限制31字符）
+                        safe_sheet_name = sheet_name[:30]
+                        df.to_excel(writer, sheet_name=safe_sheet_name, index=False)
+                excel_buffer.seek(0)
+                file_obj = excel_buffer
+                file_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+
+            elif isinstance(input_data, pd.DataFrame):
+                # 单个DF
+                self.logger.info("输入类型为【单个DataFrame】")
+                excel_buffer = BytesIO()
+                with pd.ExcelWriter(excel_buffer, engine="openpyxl") as writer:
+                    input_data.to_excel(writer, index=False)
+                excel_buffer.seek(0)
+                file_obj = excel_buffer
+                file_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+
+            elif isinstance(input_data, str) and os.path.isfile(input_data):
+                # 本地文件
+                self.logger.info(f"输入类型为【本地文件】：{input_data}")
+                file_obj = open(input_data, 'rb')
+                if input_data.endswith('.xlsx'):
+                    file_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                elif input_data.endswith('.xls'):
+                    file_type = "application/vnd.ms-excel"
+                else:
+                    raise ValueError(f"仅支持xlsx/xls，不支持：{input_data}")
+
+            else:
+                raise ValueError(f"不支持输入类型：{type(input_data)}")
+
+            # 上传
+            session = create_retry_session(retries=3)
+            files = {"file": (filename_in_server, file_obj, file_type)}
+            response = session.post(upload_url, files=files, timeout=(10, 60))
+
+            # 关闭文件
+            if isinstance(input_data, str):
+                file_obj.close()
+
+            # 结果处理
+            if response.status_code == 200:
+                download_url = response.text.strip()
+                self.logger.info(f"✅ 上传成功，链接：{download_url}")
+                print("✅ 上传成功！")
+                print("🔗 下载地址：", download_url)
 
+                # ====================== 【核心：生成同名链接文件】 ======================
+                file_base_name = os.path.splitext(filename_in_server)[0]
+                link_file_name = f"{file_base_name}.log"
+                link_path = os.path.join(os.path.dirname(self.main_log_file), link_file_name)
+
+                now_str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                # 🔥 这里增加了提示语
+                file_content = f"{now_str} | {filename_in_server} | {download_url}\n请打开链接下载报表"
+
+                with open(link_path, 'a', encoding='utf-8') as f:
+                    f.write(file_content)
+                # ======================================================================
+
+                self.logger.info(f"上传链接已保存到：{link_path}")
+                return download_url
+
+            else:
+                err = f"❌ 上传失败，状态码：{response.status_code}"
+                self.logger.error(err)
+                print(err)
+                return None
+
+        except Exception as e:
+            err_msg = f"❌ 上传异常：{str(e)}"
+            self.logger.error(err_msg, exc_info=True)
+            print(err_msg)
+            return None
 # 使用示例
 if __name__ == "__main__":
     # 实例化 DataProcessingAndMessaging 类

{functions_d-1.28 → functions_d-1.30}/Functions_d.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Functions_d
-Version: 1.28
+Version: 1.30
 Summary: 包含数据处理、Hive交互、企业微信消息发送、Excel操作等功能的工具类库
 Author: DongYang
 Author-email: 649898871@qq.com
@@ -30,6 +30,7 @@ Requires-Dist: pillow>=8.4.0
 Requires-Dist: pypinyin>=0.48.0
 Requires-Dist: psutil>=5.8.0
 Requires-Dist: tenacity>=8.0.0
+Requires-Dist: openpyxl>=3.0.0
 
 # 说明
 这是一个函数封装工具

{functions_d-1.28 → functions_d-1.30}/Functions_d.egg-info/requires.txt

@@ -14,3 +14,4 @@ pillow>=8.4.0
 pypinyin>=0.48.0
 psutil>=5.8.0
 tenacity>=8.0.0
+openpyxl>=3.0.0

{functions_d-1.28 → functions_d-1.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Functions_d
-Version: 1.28
+Version: 1.30
 Summary: 包含数据处理、Hive交互、企业微信消息发送、Excel操作等功能的工具类库
 Author: DongYang
 Author-email: 649898871@qq.com
@@ -30,6 +30,7 @@ Requires-Dist: pillow>=8.4.0
 Requires-Dist: pypinyin>=0.48.0
 Requires-Dist: psutil>=5.8.0
 Requires-Dist: tenacity>=8.0.0
+Requires-Dist: openpyxl>=3.0.0
 
 # 说明
 这是一个函数封装工具

{functions_d-1.28 → functions_d-1.30}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Functions_d
-version = 1.28
+version = 1.30
 author = DongYang
 author_email = 649898871@qq.com
 description = 包含数据处理、Hive交互、企业微信消息发送、Excel操作等功能的工具类库
@@ -36,6 +36,7 @@ install_requires =
 	pypinyin>=0.48.0
 	psutil>=5.8.0
 	tenacity>=8.0.0
+	openpyxl>=3.0.0
 
 [options.packages.find]
 where = .