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

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

@@ -812,63 +812,188 @@ class DataProcessingAndMessaging:
         self.screen(filename, sheet_name,
                     f"{start_range}:%s" % (self.column_label(len(data.columns)) + str(len(data) + 3)), image_path)
 
-    # -------------------------- 发送邮件（新版） --------------------------
+    # -------------------------- 发送邮件（新版-优化增强版） --------------------------
     def send_email_new(self, recipient_emails, cc_emails=None, bcc_emails=None, subject="", html_body="",
                        attachments=None):
+        # 1. 内部工具：格式化邮箱（和旧版完全对齐，转列表+过滤无效值）
+        def format_email(emails):
+            if not emails:
+                return []
+            # 单个邮箱转列表，列表直接使用
+            email_list = [emails] if isinstance(emails, str) else emails
+            # 过滤：非空字符串 + 简单格式校验（含@和.）
+            valid_emails = [
+                e.strip() for e in email_list
+                if isinstance(e, str) and e.strip() and '@' in e.strip() and '.' in e.strip()
+            ]
+            return valid_emails
+
+        # 2. 内部工具：自动识别附件MIME类型（支持全格式文件）
+        def get_mime_type(file_path):
+            suffix = os.path.splitext(file_path)[1].lower()
+            mime_map = {
+                '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                '.xls': 'application/vnd.ms-excel',
+                '.pdf': 'application/pdf',
+                '.doc': 'application/msword',
+                '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                '.ppt': 'application/vnd.ms-powerpoint',
+                '.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+                '.jpg': 'image/jpeg',
+                '.jpeg': 'image/jpeg',
+                '.png': 'image/png',
+                '.gif': 'image/gif',
+                '.txt': 'text/plain',
+                '.csv': 'text/csv',
+                '.zip': 'application/zip',
+                '.rar': 'application/x-rar-compressed'
+            }
+            return mime_map.get(suffix, 'application/octet-stream')
+
+        # 3. 参数标准化处理（修复None报错隐患）
+        subject = subject.strip()
+        to_emails = format_email(recipient_emails)
+        cc_emails = format_email(cc_emails)
+        bcc_emails = format_email(bcc_emails)
+        attachments = attachments or []
+        # 附件标准化：单个字符串转列表
+        if isinstance(attachments, str):
+            attachments = [attachments.strip()]
+
+        # 4. 核心参数校验（提前报错，避免无效连接）
+        if not to_emails:
+            err_msg = "❌ 邮件发送失败：无有效收件人邮箱"
+            self.logger.error(err_msg)
+            print(err_msg)
+            raise ValueError(err_msg)
+        if not subject:
+            err_msg = "❌ 邮件发送失败：邮件主题不能为空"
+            self.logger.error(err_msg)
+            print(err_msg)
+            raise ValueError(err_msg)
+
+        # 5. 控制台打印（和旧版完全对齐，实时展示发送进度）
+        print(f"📧 开始发送邮件 - 主题: {subject}")
+        print(f"📥 收件人: {', '.join(to_emails)}")
+        if cc_emails:
+            print(f"📋 抄送: {', '.join(cc_emails)}")
+        if bcc_emails:
+            print(f"🔒 密送: {', '.join(bcc_emails)}")
+        if attachments:
+            attach_names = [os.path.basename(att) for att in attachments]
+            print(f"📎 附件: {', '.join(attach_names)}")
+
+        # 6. 日志记录（和原新版逻辑对齐）
         self.logger.info(f"开始发送邮件 - 主题: {subject}")
-        self.logger.info(f"收件人: {', '.join(recipient_emails)}")
+        self.logger.info(f"收件人: {', '.join(to_emails)}")
         if cc_emails:
             self.logger.info(f"抄送: {', '.join(cc_emails)}")
         if bcc_emails:
-            self.logger.info(f"密送: {', '.join(bcc_emails) if bcc_emails else '无'}")
+            self.logger.info(f"密送: {', '.join(bcc_emails)}")
         if attachments:
             attach_names = [os.path.basename(att) for att in attachments]
             self.logger.info(f"附件: {', '.join(attach_names)}")
 
+        # 7. SMTP固定配置
         sender_email = 'cc_yingxiao@xin.com'
         sender_password = 'cw46pfeznNQx'
+        smtp_host = 'mail.xin.com'
+        smtp_port = 587
 
         try:
+            # 8. 构建邮件对象
             msg = MIMEMultipart()
             msg['From'] = sender_email
-            msg['To'] = ', '.join(recipient_emails)
+            msg['To'] = ', '.join(to_emails)
             if cc_emails:
                 msg['Cc'] = ', '.join(cc_emails)
             if bcc_emails:
                 msg['Bcc'] = ', '.join(bcc_emails)
             msg['Subject'] = subject
 
-            body = MIMEText(html_body, 'html')
+            # 9. 邮件正文（修复中文乱码，指定utf-8编码）
+            body = MIMEText(html_body, 'html', 'utf-8')
             msg.attach(body)
 
-            if attachments:
-                for attachment in attachments:
-                    if not os.path.exists(attachment):
-                        error_msg = f"附件不存在: {attachment}"
-                        self.logger.error(error_msg)
-                        raise FileNotFoundError(error_msg)
-
-                    with open(attachment, 'rb') as file:
-                        part = MIMEApplication(file.read(), Name=os.path.basename(attachment))
-                        part['Content-Disposition'] = f'attachment; filename="{os.path.basename(attachment)}"'
-                        msg.attach(part)
-                    self.logger.debug(f"已添加附件: {os.path.basename(attachment)}")
-
-            with smtplib.SMTP('mail.xin.com', 587, timeout=120) as smtp:
+            # 10. 附件处理（全格式支持+提前校验）
+            valid_attachments = []
+            for attachment in attachments:
+                attachment = attachment.strip()
+                if not os.path.exists(attachment):
+                    error_msg = f"❌ 邮件发送失败：附件不存在 -> {attachment}"
+                    self.logger.error(error_msg)
+                    print(error_msg)
+                    raise FileNotFoundError(error_msg)
+
+                # 自动识别MIME类型，适配不同文件
+                file_name = os.path.basename(attachment)
+                mime_type = get_mime_type(attachment)
+
+                with open(attachment, 'rb') as file:
+                    file_content = file.read()
+
+                # 按文件类型选择对应的MIME对象
+                if mime_type.startswith('image/'):
+                    part = MIMEImage(file_content, _subtype=mime_type.split('/')[1])
+                elif mime_type == 'text/plain' or mime_type == 'text/csv':
+                    part = MIMEText(file_content.decode('utf-8'), _subtype=mime_type.split('/')[1], _charset='utf-8')
+                else:
+                    part = MIMEApplication(file_content, _subtype=mime_type.split('/')[1])
+
+                part['Content-Disposition'] = f'attachment; filename="{file_name}"'
+                part['Content-Type'] = f'{mime_type}; name="{file_name}"'
+                msg.attach(part)
+                valid_attachments.append(file_name)
+                self.logger.debug(f"已添加附件: {file_name}")
+                print(f"✅ 已添加附件: {file_name}")
+
+            # 11. 连接SMTP服务器并发送（修复核心bug：587端口必须启用TLS）
+            print(f"🔌 正在连接SMTP服务器 {smtp_host}:{smtp_port}...")
+            with smtplib.SMTP(smtp_host, smtp_port, timeout=120) as smtp:
+                smtp.starttls()  # 587端口强制启用TLS，绝大多数服务器要求
                 smtp.login(sender_email, sender_password)
-                all_recipients = recipient_emails.copy()
-                if cc_emails:
-                    all_recipients.extend(cc_emails)
-                if bcc_emails:
-                    all_recipients.extend(bcc_emails)
+                print(f"🔐 SMTP服务器登录成功")
+
+                # 所有收件人去重，避免重复发送
+                all_recipients = list(set(to_emails + cc_emails + bcc_emails))
                 smtp.sendmail(sender_email, all_recipients, msg.as_string())
 
-            self.logger.info(f"邮件发送成功 - 主题: {subject}")
+            # 12. 发送成功：控制台打印+日志（和旧版完全对齐）
+            success_msg = f"✅ 邮件发送成功 | 主题：{subject} | 收件人：{len(to_emails)}人"
+            if cc_emails:
+                success_msg += f" | 抄送：{len(cc_emails)}人"
+            if bcc_emails:
+                success_msg += f" | 密送：{len(bcc_emails)}人"
+            if valid_attachments:
+                success_msg += f" | 附件：{len(valid_attachments)}个"
 
+            self.logger.info(success_msg)
+            print(success_msg)
+            return True
+
+        # 13. 分类异常捕获（和旧版对齐，易排查问题）
+        except smtplib.SMTPAuthenticationError:
+            err_msg = "❌ 邮件发送失败：SMTP账号/密码/授权码错误"
+            self.logger.error(err_msg, exc_info=True)
+            print(err_msg)
+            raise ValueError(err_msg)
+        except smtplib.SMTPConnectError:
+            err_msg = "❌ 邮件发送失败：SMTP服务器连接失败（检查host/port/防火墙/网络）"
+            self.logger.error(err_msg, exc_info=True)
+            print(err_msg)
+            raise ConnectionError(err_msg)
+        except smtplib.SMTPException as e:
+            err_msg = f"❌ 邮件发送失败：SMTP协议错误 - {str(e)}"
+            self.logger.error(err_msg, exc_info=True)
+            print(err_msg)
+            raise RuntimeError(err_msg)
+        except FileNotFoundError:
+            raise  # 附件错误已提前处理，直接抛出
         except Exception as e:
-            error_msg = f"邮件发送失败 - 主题: {subject}, 错误: {str(e)}"
-            self.logger.error(error_msg, exc_info=True)
-            raise
+            err_msg = f"❌ 邮件发送失败：{str(e)}"
+            self.logger.error(err_msg, exc_info=True)
+            print(err_msg)
+            raise RuntimeError(err_msg)
 
     # -------------------------- Excel格式化 --------------------------
     def format_excel_worksheet(self, worksheet, df, workbook):
@@ -1561,7 +1686,7 @@ class DataProcessingAndMessaging:
     # -------------------------- 上传文件/DF到内网文件服务器（最终完整版） --------------------------
     def upload_to_internal_server(self, input_data, filename_in_server: str = "dataframe_result.xlsx"):
         """
-        上传数据到内网 http://fs-cc.xin.com（带网络重试保障）
+        上传数据到内网 http://fs-cc.xin.com（按要求定制：重试3次、读超时5分钟，无拆分无压缩）
         :param input_data: 支持 3 种输入 →
                            1) 单个 DataFrame
                            2) 字典 {sheet名: df} → 自动生成多Sheet Excel
@@ -1581,14 +1706,15 @@ class DataProcessingAndMessaging:
         self.logger.info(f"开始上传数据到内网服务器，服务器文件名：{filename_in_server}")
         print(f"📤 正在上传 → 服务器文件名：{filename_in_server}")
 
-        # ====================== 【核心：网络重试保障机制】 ======================
+        # ====================== 【按要求修改：重试固定3次】 ======================
         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"]
+                backoff_factor=2,
+                status_forcelist=[500, 502, 503, 504, 408],
+                allowed_methods=["POST"],
+                raise_on_status=False
             )
             adapter = HTTPAdapter(max_retries=retry_strategy)
             session.mount("http://", adapter)
@@ -1599,7 +1725,7 @@ class DataProcessingAndMessaging:
 
         try:
             # ==============================================
-            # 【核心升级点】支持 单个DF / 多个DF（多Sheet）
+            # 【完全保留原逻辑：无Sheet拆分、无ZIP压缩】
             # ==============================================
             if isinstance(input_data, dict):
                 # 字典 → 多Sheet Excel
@@ -1639,9 +1765,11 @@ class DataProcessingAndMessaging:
                 raise ValueError(f"不支持输入类型：{type(input_data)}")
 
             # 上传
-            session = create_retry_session(retries=3)
+            session = create_retry_session()
             files = {"file": (filename_in_server, file_obj, file_type)}
-            response = session.post(upload_url, files=files, timeout=(10, 60))
+            # ====================== 【按要求修改：读超时改为5分钟（300秒）】 ======================
+            response = session.post(upload_url, files=files, timeout=(10, 300))
+            # ======================================================================
 
             # 关闭文件
             if isinstance(input_data, str):
@@ -1654,18 +1782,16 @@ class DataProcessingAndMessaging:
                 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请打开链接下载报表"
+                file_content = f"\n{now_str} | {filename_in_server} | {download_url}"
 
                 with open(link_path, 'a', encoding='utf-8') as f:
                     f.write(file_content)
-                # ======================================================================
 
                 self.logger.info(f"上传链接已保存到：{link_path}")
                 return download_url

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Functions_d
-Version: 1.30
+Version: 1.32
 Summary: 包含数据处理、Hive交互、企业微信消息发送、Excel操作等功能的工具类库
 Author: DongYang
 Author-email: 649898871@qq.com

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Functions_d
-Version: 1.30
+Version: 1.32
 Summary: 包含数据处理、Hive交互、企业微信消息发送、Excel操作等功能的工具类库
 Author: DongYang
 Author-email: 649898871@qq.com

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

@@ -1,6 +1,6 @@
 [metadata]
 name = Functions_d
-version = 1.30
+version = 1.32
 author = DongYang
 author_email = 649898871@qq.com
 description = 包含数据处理、Hive交互、企业微信消息发送、Excel操作等功能的工具类库