dhisana 0.0.1.dev28__tar.gz → 0.0.1.dev29__tar.gz

{dhisana-0.0.1.dev28 → dhisana-0.0.1.dev29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dhisana
-Version: 0.0.1.dev28
+Version: 0.0.1.dev29
 Summary: A Python SDK for Dhisana AI Platform
 Home-page: https://github.com/dhisana-ai/dhisana-python-sdk
 Author: Admin

{dhisana-0.0.1.dev28 → dhisana-0.0.1.dev29}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='dhisana',  
-    version='0.0.1-dev28',
+    version='0.0.1-dev29',
     description='A Python SDK for Dhisana AI Platform',
     author='Admin',
     author_email='contact@dhisana.ai',

{dhisana-0.0.1.dev28 → dhisana-0.0.1.dev29}/src/dhisana/utils/google_workspace_tools.py

@@ -15,6 +15,7 @@ from googleapiclient.discovery import build
 from googleapiclient.http import MediaIoBaseDownload, MediaFileUpload
 from google.auth.transport.requests import Request
 from googleapiclient.errors import HttpError
+from pydantic import BaseModel
 
 from dhisana.utils.assistant_tool_tag import assistant_tool
 
@@ -332,12 +333,16 @@ async def list_files_in_drive_folder_by_name(
 #                        GMAIL EMAIL OPERATIONS
 ################################################################################
 
+class SendEmailContext(BaseModel):
+    recipient: str
+    subject: str
+    body: str
+    sender_name: str
+    sender_email: str
+    
 @assistant_tool
 async def send_email_using_service_account_async(
-    recipient: str,
-    subject: str,
-    body: str,
-    sender_email: str,
+    send_email_context: SendEmailContext,
     tool_config: Optional[List[Dict]] = None
 ) -> str:
     """
@@ -345,36 +350,27 @@ async def send_email_using_service_account_async(
     The service account must have domain-wide delegation to impersonate the sender_email.
 
     Args:
-        recipient (str): The email address of the recipient.
-        subject (str): The subject of the email.
-        body (str): The body text of the email.
-        sender_email (str): The address to impersonate for sending.
-        tool_config (Optional[List[Dict]]): Tool configuration for credentials.
+        send_email_context (SendEmailContext): The context with recipient, subject, body, sender_name, and sender_email.
+        tool_config (Optional[List[Dict]]): Tool configuration for credentials (if any).
 
     Returns:
         str: The ID of the sent message.
-
-    Raises:
-        httpx.HTTPError, Google-related errors for any issues with the API.
     """
-    if not sender_email:
+    if not send_email_context.sender_email:
         raise ValueError("sender_email is required to impersonate for sending.")
 
     SCOPES = ['https://mail.google.com/']
-    credentials = get_google_credentials(sender_email, SCOPES, tool_config)
+    credentials = get_google_credentials(send_email_context.sender_email, SCOPES, tool_config)
     access_token = credentials.token
 
     gmail_api_url = 'https://gmail.googleapis.com/gmail/v1/users/me/messages/send'
 
-    # Create the email message
-    message = MIMEText(body)
-    message['to'] = recipient
-    message['from'] = sender_email
-    message['subject'] = subject
+    message = MIMEText(send_email_context.body)
+    message['to'] = send_email_context.recipient
+    message['from'] = f"{send_email_context.sender_name} <{send_email_context.sender_email}>"
+    message['subject'] = send_email_context.subject
 
-    # Encode the message in base64url format
     raw_message = base64.urlsafe_b64encode(message.as_bytes()).decode()
-
     payload = {'raw': raw_message}
     headers = {
         'Authorization': f'Bearer {access_token}',
@@ -389,13 +385,16 @@ async def send_email_using_service_account_async(
     return sent_message.get('id', 'No ID returned')
 
 
+class QueryEmailContext(BaseModel):
+    start_time: str
+    end_time: str
+    sender_email: str
+    unread_only: bool = True
+    labels: Optional[List[str]] = None
+
 @assistant_tool
 async def list_emails_in_time_range_async(
-    start_time: str,
-    end_time: str,
-    sender_email: str,
-    unread_only: bool = True,
-    labels: Optional[List[str]] = None,
+    context: QueryEmailContext,
     tool_config: Optional[List[Dict]] = None
 ) -> List[Dict[str, Any]]:
     """
@@ -403,43 +402,36 @@ async def list_emails_in_time_range_async(
     The service account must have domain-wide delegation to impersonate the sender_email.
 
     Args:
-        start_time (str): The start time in RFC 3339 format (e.g., '2021-01-01T00:00:00Z').
-        end_time (str): The end time in RFC 3339 format (e.g., '2021-01-31T23:59:59Z').
-        sender_email (str): The mailbox email to impersonate.
-        unread_only (bool): If True, only return unread emails.
-        labels (Optional[List[str]]): Optional list of Gmail labels to filter.
+        context (QueryEmailContext): The query context with start_time, end_time, sender_email, unread_only, and labels.
         tool_config (Optional[List[Dict]]): Tool configuration for credentials.
 
     Returns:
         List[Dict[str, Any]]: A list of email message details.
-
-    Raises:
-        httpx.HTTPError, Google-related errors for any issues with the API.
     """
-    if labels is None:
-        labels = []
+    if context.labels is None:
+        context.labels = []
 
-    if not sender_email:
+    if not context.sender_email:
         raise ValueError("sender_email is required to impersonate for listing emails.")
 
     SCOPES = ['https://mail.google.com/']
-    credentials = get_google_credentials(sender_email, SCOPES, tool_config)
+    credentials = get_google_credentials(context.sender_email, SCOPES, tool_config)
     access_token = credentials.token
 
     gmail_api_url = 'https://gmail.googleapis.com/gmail/v1/users/me/messages'
 
     # Convert RFC 3339 times to Unix epoch timestamps
-    start_dt = datetime.datetime.fromisoformat(start_time.replace('Z', '+00:00'))
-    end_dt = datetime.datetime.fromisoformat(end_time.replace('Z', '+00:00'))
+    start_dt = datetime.datetime.fromisoformat(context.start_time.replace('Z', '+00:00'))
+    end_dt = datetime.datetime.fromisoformat(context.end_time.replace('Z', '+00:00'))
     start_timestamp = int(start_dt.timestamp())
     end_timestamp = int(end_dt.timestamp())
 
     # Build the search query
     query = f'after:{start_timestamp} before:{end_timestamp}'
-    if unread_only:
+    if context.unread_only:
         query += ' is:unread'
-    if labels:
-        label_query = ' '.join([f'label:{lbl}' for lbl in labels])
+    if context.labels:
+        label_query = ' '.join([f'label:{lbl}' for lbl in context.labels])
         query += f' {label_query}'
 
     headers = {'Authorization': f'Bearer {access_token}'}
@@ -458,7 +450,6 @@ async def list_emails_in_time_range_async(
             message_response.raise_for_status()
             message_data = message_response.json()
 
-            # Extract relevant info
             headers_list = message_data['payload']['headers']
             email_details.append({
                 "mailbox_email_id": message_data['id'],
@@ -639,13 +630,17 @@ async def get_email_details_async(
     return message_details
 
 
+class ReplyEmailContext(BaseModel):
+    message_id: str
+    reply_body: str
+    sender_email: str
+    sender_name: str
+    mark_as_read: str = "True"
+    add_labels: Optional[List[str]] = None
+
 @assistant_tool
 async def reply_to_email_async(
-    message_id: str,
-    reply_body: str,
-    sender_email: str,
-    mark_as_read: str = "True",
-    add_labels: Optional[List[str]] = None,
+    reply_email_context: ReplyEmailContext,
     tool_config: Optional[List[Dict]] = None
 ) -> Dict[str, Any]:
     """
@@ -653,35 +648,32 @@ async def reply_to_email_async(
     The service account must have domain-wide delegation to impersonate the sender_email.
 
     Args:
-        message_id (str): The ID of the email message to reply to.
-        reply_body (str): The body text of the reply email.
-        sender_email (str): The mailbox email to impersonate for domain-wide delegation.
-        mark_as_read (str): If "True", mark the email thread as read after replying.
-        add_labels (List[str]): Optional list of labels to add to the email thread.
+        context (ReplyEmailContext): The context with message_id, reply_body, sender_email, sender_name,
+                                     mark_as_read, and add_labels.
         tool_config (Optional[List[Dict]]): Tool configuration for credentials.
 
     Returns:
         Dict[str, Any]: A dictionary containing the details of the sent message.
     """
-    if add_labels is None:
-        add_labels = []
+    if reply_email_context.add_labels is None:
+        reply_email_context.add_labels = []
 
-    if not sender_email:
+    if not reply_email_context.sender_email:
         raise ValueError("sender_email is required to impersonate for replying to an email.")
 
     SCOPES = ['https://mail.google.com/']
-    credentials = get_google_credentials(sender_email, SCOPES, tool_config)
+    credentials = get_google_credentials(reply_email_context.sender_email, SCOPES, tool_config)
     access_token = credentials.token
 
-    # 1. Retrieve original message
     gmail_api_base_url = 'https://gmail.googleapis.com/gmail/v1/users/me'
-    get_message_url = f'{gmail_api_base_url}/messages/{message_id}'
+    get_message_url = f'{gmail_api_base_url}/messages/{reply_email_context.message_id}'
     headers = {
         'Authorization': f'Bearer {access_token}',
         'Content-Type': 'application/json'
     }
     params = {'format': 'full'}
 
+    # 1. Retrieve original message
     async with httpx.AsyncClient() as client:
         response = await client.get(get_message_url, headers=headers, params=params)
         response.raise_for_status()
@@ -701,11 +693,11 @@ async def reply_to_email_async(
     message_id_header = headers_dict.get('Message-ID', '')
 
     # 3. Create the reply email message
-    msg = MIMEText(reply_body)
+    msg = MIMEText(reply_email_context.reply_body)
     msg['To'] = to_addresses
     if cc_addresses:
         msg['Cc'] = cc_addresses
-    msg['From'] = sender_email
+    msg['From'] = f"{reply_email_context.sender_name} <{reply_email_context.sender_email}>"
     msg['Subject'] = subject
     msg['In-Reply-To'] = message_id_header
     msg['References'] = message_id_header
@@ -724,7 +716,7 @@ async def reply_to_email_async(
         sent_message = response.json()
 
     # 5. (Optional) Mark the thread as read
-    if mark_as_read.lower() == "true":
+    if reply_email_context.mark_as_read.lower() == "true":
         modify_thread_url = f'{gmail_api_base_url}/threads/{thread_id}/modify'
         modify_payload = {'removeLabelIds': ['UNREAD']}
         async with httpx.AsyncClient() as client:
@@ -732,9 +724,9 @@ async def reply_to_email_async(
             response.raise_for_status()
 
     # 6. (Optional) Add labels
-    if add_labels:
+    if reply_email_context.add_labels:
         modify_thread_url = f'{gmail_api_base_url}/threads/{thread_id}/modify'
-        modify_payload = {'addLabelIds': add_labels}
+        modify_payload = {'addLabelIds': reply_email_context.add_labels}
         async with httpx.AsyncClient() as client:
             response = await client.post(modify_thread_url, headers=headers, json=modify_payload)
             response.raise_for_status()
@@ -744,9 +736,9 @@ async def reply_to_email_async(
         "mailbox_email_id": sent_message['id'],
         "message_id": sent_message['threadId'],
         "email_subject": subject,
-        "email_sender": sender_email,
+        "email_sender": reply_email_context.sender_email,
         "email_recipients": [to_addresses] + ([cc_addresses] if cc_addresses else []),
-        "read_email_status": 'READ' if mark_as_read.lower() == "true" else 'UNREAD',
+        "read_email_status": 'READ' if reply_email_context.mark_as_read.lower() == "true" else 'UNREAD',
         "email_labels": sent_message.get('labelIds', [])
     }
 

{dhisana-0.0.1.dev28 → dhisana-0.0.1.dev29}/src/dhisana.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dhisana
-Version: 0.0.1.dev28
+Version: 0.0.1.dev29
 Summary: A Python SDK for Dhisana AI Platform
 Home-page: https://github.com/dhisana-ai/dhisana-python-sdk
 Author: Admin