pytbox 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

pytbox/base.py

@@ -14,6 +14,7 @@ from pytbox.utils.env import get_env_by_os_environment
 from pytbox.vmware import VMwareClient
 from pytbox.pyjira import PyJira
 from pytbox.mail.client import MailClient
+from pytbox.mail.alimail import AliMail
 
 config = load_config_by_file(path='/workspaces/pytbox/tests/alert/config_dev.toml', oc_vault_id=os.environ.get('oc_vault_id'))
 
@@ -83,4 +84,5 @@ pyjira = PyJira(
 )
 
 mail_163 = MailClient(mail_address=config['mail']['163']['mail_address'], password=config['mail']['163']['password'])
-mail_qq = MailClient(mail_address=config['mail']['qq']['mail_address'], password=config['mail']['qq']['password'])
+mail_qq = MailClient(mail_address=config['mail']['qq']['mail_address'], password=config['mail']['qq']['password'])
+ali_mail = AliMail(mail_address=config['mail']['aliyun']['mail_address'], client_id=config['mail']['aliyun']['client_id'], client_secret=config['mail']['aliyun']['client_secret'])

pytbox/mail/alimail.py

@@ -4,32 +4,29 @@ from typing import Literal
 from datetime import datetime, timedelta
 
 import requests
+from ..utils.response import ReturnResponse
+from .mail_detail import MailDetail
+from ..utils.timeutils import TimeUtils
 
 
 
 class AliMail:
-    def __init__(self, email_address: str=None, client_id: str=None, client_secret: str=None):
-        
-        self.email_address = email_address
-        self.client_id = auth['username']
-        self.client_secret = auth['password']
+    '''
+    _summary_
+    '''
+    def __init__(self, mail_address: str=None, client_id: str=None, client_secret: str=None, timeout: int=3):
+        self.email_address = mail_address
+        self.client_id = client_id
+        self.client_secret = client_secret
         self.base_url = "https://alimail-cn.aliyuncs.com/v2"
+        self.timeout = timeout
         self.headers = {
                 "Content-Type": "application/json",
-                "Authorization": f"bearer {self._get_access_token()}"
+                "Authorization": f"bearer {self._get_access_token_by_request()}"
             }
+        self.session = requests.Session()
+        self.session.headers.update(self.headers)
         
-    def _get_access_token(self):
-        current_time = datetime.now()
-        # stored_token = mongo_alimail_token.find_one({"token_type": "bearer"})
-        if stored_token and stored_token.get('expiration_time'):
-            expiration_time = stored_token['expiration_time']
-            if current_time < expiration_time:
-                return stored_token['access_token']
-            else:
-                return self._get_access_token_by_request()
-        else:
-            return self._get_access_token_by_request()
     
     def _get_access_token_by_request(self):
         '''
@@ -52,7 +49,7 @@ class AliMail:
             "client_secret": self.client_secret
         }
         try:
-            response = requests.post(interface_url, headers=headers, data=data, timeout=3)
+            response = requests.post(interface_url, headers=headers, data=data, timeout=self.timeout)
             response_json = response.json()
             current_time = datetime.now()
             data = {
@@ -61,28 +58,23 @@ class AliMail:
                 'expires_in':  response_json["expires_in"],
                 'expiration_time': current_time + timedelta(seconds=response_json["expires_in"])
             }
-            mongo_alimail_token.update_one(
-                {"token_type": "bearer"},
-                {"$set": data},
-                upsert=True
-            )
             return data.get("access_token")
         except requests.RequestException as e:
             # 处理请求失败异常
-            print(f"请求失败：{e}")
+            raise e
         except (KeyError, ValueError) as e:
             # 处理解析响应失败异常
-            print(f"解析响应失败： {e}")
+            raise e
 
-    def list_mail_folders(self):
-        response = requests.get(
+    def get_mail_folders(self):
+        response = self.session.get(
             url=f"{self.base_url}/users/{self.email_address}/mailFolders",
             headers=self.headers
         )
         return response.json().get('folders')
 
-    def query_folder_id(self, folder_name: Literal['inbox']='inbox'):
-        folders = self.list_mail_folders()
+    def get_folder_id(self, folder_name: Literal['inbox']='inbox'):
+        folders = self.get_mail_folders()
         for folder in folders:
             if folder.get('displayName') == folder_name:
                 return folder.get('id')
@@ -92,7 +84,7 @@ class AliMail:
         params = {
             "$select": "body,toRecipients,internetMessageId,internetMessageHeaders"
         }
-        response = requests.get(
+        response = self.session.get(
             url=f"{self.base_url}/users/{self.email_address}/messages/{mail_id}",
             headers=self.headers,
             params=params,
@@ -100,30 +92,51 @@ class AliMail:
         )
         return response.json().get('message')
 
-    def list_mail(self, folder_name: str='inbox', size: int=100):
-        folder_id = self.query_folder_id(folder_name=folder_name)
+    def get_mail_list(self, folder_name: str='inbox', size: int=100):
+        folder_id = self.get_folder_id(folder_name=folder_name)
         params = {
             "size": size,
             # "$select": "toRecipients"
         }
-        response = requests.get(
+        response = self.session.get(
             url=f"{self.base_url}/users/{self.email_address}/mailFolders/{folder_id}/messages",
             headers=self.headers,
             params=params,
             timeout=3
         )
         messages = response.json().get("messages")
+        sent_to_list = []
         for message in messages:
             mail_id = message.get("id")
             detail = self.get_mail_detail(mail_id=mail_id)
-            message.update(detail)
-            yield message
-        
+            
+            for to_recipient in detail.get('toRecipients'):
+                sent_to_list.append(to_recipient.get('email'))
+            
+            yield MailDetail(
+                uid=message.get('id'),
+                sent_from=message.get('from').get('email'),
+                sent_to=sent_to_list,
+                date=TimeUtils.convert_str_to_datetime(time_str=message.get('sentDateTime'), app='alimail'),
+                cc="",
+                subject=message.get('subject'),
+                body_plain=message.get('summary'),
+                body_html=""
+            )
+
+    def move(self, uid: str, destination_folder: str) -> ReturnResponse:
+        params = {
+            "ids": [uid],
+            "destinationFolderId": self.get_folder_id(destination_folder)
+        }
+        r = self.session.post(
+            url=f"{self.base_url}/users/{self.email_address}/messages/move",
+            params=params
+        )
+        if r.status_code == 200:
+            return ReturnResponse(code=0, msg=f'邮件移动到 {destination_folder} 成功', data=None)
+        else:
+            return ReturnResponse(code=1, msg=f'邮件移动到 {destination_folder} 失败', data=r.json())
 
 if __name__ == '__main__':
-    ali_mail = AliMail()
-    # print(ali_mail.query_folder_id())
-    # for i in ali_mail.list_mail(size=1):
-    #     print(i)
-    # print(ali_mail.access_token)
-    print(ali_mail.get_mail_detail(mail_id='DzzzzzzMeuY'))
+    ali_mail = AliMail()

pytbox/utils/timeutils.py

@@ -287,7 +287,7 @@ class TimeUtils:
         return int(time.time()) * 1000
 
     @staticmethod
-    def convert_str_to_datetime(time_str: str, app: Literal['lg_alert_trigger', 'lg_alert_resolved', 'mongo']='lg_alert_trigger') -> datetime.datetime:
+    def convert_str_to_datetime(time_str: str, app: Literal['lg_alert_trigger', 'lg_alert_resolved', 'mongo', 'alimail']='lg_alert_trigger') -> datetime.datetime:
         """
         将字符串转换为datetime对象
 
@@ -305,7 +305,10 @@ class TimeUtils:
         elif app == 'mongo':
             time_obj = datetime.datetime.fromisoformat(time_str.replace('Z', '+00:00'))
             return time_obj  # 已经包含时区信息，直接返回
-        
+        elif app == 'alimail':
+            time_obj = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%SZ")
+            time_obj = time_obj + datetime.timedelta(hours=8)
+            # return time_obj
         # 对于没有时区信息的时间对象，设置为Asia/Shanghai时区
         time_with_tz = time_obj.replace(tzinfo=ZoneInfo("Asia/Shanghai"))
         return time_with_tz

{pytbox-0.1.4.dist-info → pytbox-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytbox
-Version: 0.1.4
+Version: 0.1.5
 Summary: A collection of Python integrations and utilities (Feishu, Dida365, VictoriaMetrics, ...)
 Author-email: mingming hou <houm01@foxmail.com>
 License-Expression: MIT

{pytbox-0.1.4.dist-info → pytbox-0.1.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pytbox/base.py,sha256=XGl2d87FLVp8ILhFF4P_ZVTZGSzxejV3PoyKUp4UCkQ,2937
+pytbox/base.py,sha256=wWjzJ6gcEnUBIG3-U49CKeoqT-1Tk20EJRt2oYDAj0k,3157
 pytbox/cli.py,sha256=N775a0GK80IT2lQC2KRYtkZpIiu9UjavZmaxgNUgJhQ,160
 pytbox/dida365.py,sha256=pUMPB9AyLZpTTbaz2LbtzdEpyjvuGf4YlRrCvM5sbJo,10545
 pytbox/excel.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -51,7 +51,7 @@ pytbox/feishu/helpers.py,sha256=jhSkHiUw4822QBXx2Jw8AksogZdakZ-3QqvC3lB3qEI,201
 pytbox/feishu/typing.py,sha256=3hWkJgOi-v2bt9viMxkyvNHsPgrbAa0aZOxsZYg2vdM,122
 pytbox/log/logger.py,sha256=7ZisXRxLb_MVbIqlYHWoTbj1EA0Z4G5SZvITlt1IKW8,7416
 pytbox/log/victorialog.py,sha256=gffEiq38adv9sC5oZeMcyKghd3SGfRuqtZOFuqHQF6E,4139
-pytbox/mail/alimail.py,sha256=ap6K6kmKTjqbHlfecYBi-EZtOY1iQ8tCilP8oqUz21Q,4621
+pytbox/mail/alimail.py,sha256=njKA3PUbIaiKFaxKvUObmklmEEHg2YA-O5rpgsgT5_w,5147
 pytbox/mail/client.py,sha256=6HeKpChHGjTCYGBgQcfAhWlU_wh9wtO-bjP6TU38pGM,6120
 pytbox/mail/mail_detail.py,sha256=6u8DK-7WzYPSuX6TdicSCh2Os_9Ou6Rn9xc6WRvv85M,699
 pytbox/network/meraki.py,sha256=054E3C5KzAuXs9aPalvdAOUo6Hc5aOKZSWUaVbPquy4,6112
@@ -61,10 +61,10 @@ pytbox/utils/load_vm_devfile.py,sha256=GVbB-FvGb0l586SDaraz__ZaXyDWd1WxcXVw5xGfX
 pytbox/utils/ping_checker.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 pytbox/utils/response.py,sha256=kXjlwt0WVmLRam2eu1shzX2cQ7ux4cCQryaPGYwle5g,1247
 pytbox/utils/richutils.py,sha256=OT9_q2Q1bthzB0g1GlhZVvM4ZAepJRKL6a_Vsr6vEqo,487
-pytbox/utils/timeutils.py,sha256=XbK2KB-SVi7agNqoQN7i40wysrZvrGuwebViv1Cw-Ok,20226
+pytbox/utils/timeutils.py,sha256=uSKgwt20mVcgIGKLsH2tNum8v3rcpzgmBibPvyPQFgM,20433
 pytbox/win/ad.py,sha256=-3pWfL3dElz-XoO4j4M9lrgu3KJtlhrS9gCWJBpafAU,1147
-pytbox-0.1.4.dist-info/METADATA,sha256=2b2hP5huukvGXvX0rEY1ZNphXx-nKFnmXe0F_-uBbgc,6319
-pytbox-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytbox-0.1.4.dist-info/entry_points.txt,sha256=YaTOJ2oPjOiv2SZwY0UC-UA9QS2phRH1oMvxGnxO0Js,43
-pytbox-0.1.4.dist-info/top_level.txt,sha256=YADgWue-Oe128ptN3J2hS3GB0Ncc5uZaSUM3e1rwswE,7
-pytbox-0.1.4.dist-info/RECORD,,
+pytbox-0.1.5.dist-info/METADATA,sha256=hIq6VA2Lt7Y0T3nZgFuP1K_ug-pcckGJ3olhE4cc4Bg,6319
+pytbox-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytbox-0.1.5.dist-info/entry_points.txt,sha256=YaTOJ2oPjOiv2SZwY0UC-UA9QS2phRH1oMvxGnxO0Js,43
+pytbox-0.1.5.dist-info/top_level.txt,sha256=YADgWue-Oe128ptN3J2hS3GB0Ncc5uZaSUM3e1rwswE,7
+pytbox-0.1.5.dist-info/RECORD,,