pytbox 0.1.3__tar.gz → 0.1.5__tar.gz

{pytbox-0.1.3/src/pytbox.egg-info → pytbox-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytbox
-Version: 0.1.3
+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.3 → pytbox-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytbox"
-version = "0.1.3"
+version = "0.1.5"
 description = "A collection of Python integrations and utilities (Feishu, Dida365, VictoriaMetrics, ...)"
 authors = [{ name = "mingming hou", email = "houm01@foxmail.com" }]
 license = "MIT"

{pytbox-0.1.3 → pytbox-0.1.5}/src/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-0.1.3 → pytbox-0.1.5}/src/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-0.1.3 → pytbox-0.1.5}/src/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.3 → pytbox-0.1.5/src/pytbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytbox
-Version: 0.1.3
+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