Skip to content

armgit / camel

Public Imported from GitHub
0

🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org

Feat: Alter gmail tool call names to include gmail prefix (#3493)

Waleed Alzaroonif8ba740d98a0
diff --git a/camel/toolkits/gmail_toolkit.py b/camel/toolkits/gmail_toolkit.py
index 84f6b2bfd..ff591771f 100644
--- a/camel/toolkits/gmail_toolkit.py
+++ b/camel/toolkits/gmail_toolkit.py
@@ -73,7 +73,7 @@ class GmailToolkit(BaseToolkit):
r"""Allow overriding/injecting the People service (e.g., in tests)."""
self._people_service = service
- def send_email(
+ def gmail_send_email(
self,
to: Union[str, List[str]],
subject: str,
@@ -138,7 +138,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to send email: %s", e)
return {"error": f"Failed to send email: {e!s}"}
- def reply_to_email(
+ def gmail_reply_to_email(
self,
message_id: str,
reply_body: str,
@@ -225,7 +225,7 @@ class GmailToolkit(BaseToolkit):
# Get current user's email and remove it from recipients
try:
- profile_result = self.get_profile()
+ profile_result = self.gmail_get_profile()
if profile_result.get('success'):
current_user_email = profile_result['profile'][
'email_address'
@@ -280,7 +280,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to reply to email: %s", e)
return {"error": f"Failed to reply to email: {e!s}"}
- def forward_email(
+ def gmail_forward_email(
self,
message_id: str,
to: Union[str, List[str]],
@@ -385,7 +385,7 @@ class GmailToolkit(BaseToolkit):
temp_files.append(temp_file.name)
# Download attachment
- result = self.get_attachment(
+ result = self.gmail_get_attachment(
message_id=message_id,
attachment_id=att['attachment_id'],
save_path=temp_file.name,
@@ -440,7 +440,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to forward email: %s", e)
return {"error": f"Failed to forward email: {e!s}"}
- def create_email_draft(
+ def gmail_create_draft(
self,
to: Union[str, List[str]],
subject: str,
@@ -505,7 +505,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to create draft: %s", e)
return {"error": f"Failed to create draft: {e!s}"}
- def send_draft(self, draft_id: str) -> Dict[str, Any]:
+ def gmail_send_draft(self, draft_id: str) -> Dict[str, Any]:
r"""Send a draft email.
Args:
@@ -537,7 +537,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to send draft: %s", e)
return {"error": f"Failed to send draft: {e!s}"}
- def fetch_emails(
+ def gmail_fetch_emails(
self,
query: str = "",
max_results: int = 10,
@@ -616,7 +616,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to fetch emails: %s", e)
return {"error": f"Failed to fetch emails: {e!s}"}
- def fetch_thread_by_id(self, thread_id: str) -> Dict[str, Any]:
+ def gmail_fetch_thread_by_id(self, thread_id: str) -> Dict[str, Any]:
r"""Fetch a thread by ID.
Args:
@@ -653,7 +653,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to fetch thread: %s", e)
return {"error": f"Failed to fetch thread: {e!s}"}
- def modify_email_labels(
+ def gmail_modify_email_labels(
self,
message_id: str,
add_labels: Optional[List[str]] = None,
@@ -710,7 +710,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to modify labels: %s", e)
return {"error": f"Failed to modify labels: {e!s}"}
- def move_to_trash(self, message_id: str) -> Dict[str, Any]:
+ def gmail_move_to_trash(self, message_id: str) -> Dict[str, Any]:
r"""Move a message to trash.
Args:
@@ -742,7 +742,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to move message to trash: %s", e)
return {"error": f"Failed to move message to trash: {e!s}"}
- def get_attachment(
+ def gmail_get_attachment(
self,
message_id: str,
attachment_id: str,
@@ -802,7 +802,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to get attachment: %s", e)
return {"error": f"Failed to get attachment: {e!s}"}
- def list_threads(
+ def gmail_list_threads(
self,
query: str = "",
max_results: int = 10,
@@ -884,7 +884,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to list threads: %s", e)
return {"error": f"Failed to list threads: {e!s}"}
- def list_drafts(
+ def gmail_list_drafts(
self, max_results: int = 10, page_token: Optional[str] = None
) -> Dict[str, Any]:
r"""List email drafts.
@@ -932,7 +932,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to list drafts: %s", e)
return {"error": f"Failed to list drafts: {e!s}"}
- def list_gmail_labels(self) -> Dict[str, Any]:
+ def gmail_list_labels(self) -> Dict[str, Any]:
r"""List all Gmail labels.
Returns:
@@ -968,7 +968,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to list labels: %s", e)
return {"error": f"Failed to list labels: {e!s}"}
- def create_label(
+ def gmail_create_label(
self,
name: str,
label_list_visibility: Literal["labelShow", "labelHide"] = "labelShow",
@@ -1015,7 +1015,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to create label: %s", e)
return {"error": f"Failed to create label: {e!s}"}
- def delete_label(self, label_id: str) -> Dict[str, Any]:
+ def gmail_delete_label(self, label_id: str) -> Dict[str, Any]:
r"""Delete a Gmail label.
Args:
@@ -1044,7 +1044,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to delete label: %s", e)
return {"error": f"Failed to delete label: {e!s}"}
- def modify_thread_labels(
+ def gmail_modify_thread_labels(
self,
thread_id: str,
add_labels: Optional[List[str]] = None,
@@ -1102,7 +1102,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to modify thread labels: %s", e)
return {"error": f"Failed to modify thread labels: {e!s}"}
- def get_profile(self) -> Dict[str, Any]:
+ def gmail_get_profile(self) -> Dict[str, Any]:
r"""Get Gmail profile information.
Returns:
@@ -1127,7 +1127,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to get profile: %s", e)
return {"error": f"Failed to get profile: {e!s}"}
- def get_contacts(
+ def gmail_get_contacts(
self,
max_results: int = 100,
page_token: Optional[str] = None,
@@ -1187,7 +1187,7 @@ class GmailToolkit(BaseToolkit):
logger.error("Failed to get contacts: %s", e)
return {"error": f"Failed to get contacts: {e!s}"}
- def search_people(
+ def gmail_search_people(
self,
query: str,
max_results: int = 10,
@@ -1817,23 +1817,23 @@ class GmailToolkit(BaseToolkit):
representing the functions in the toolkit.
"""
return [
- FunctionTool(self.send_email),
- FunctionTool(self.reply_to_email),
- FunctionTool(self.forward_email),
- FunctionTool(self.create_email_draft),
- FunctionTool(self.send_draft),
- FunctionTool(self.fetch_emails),
- FunctionTool(self.fetch_thread_by_id),
- FunctionTool(self.modify_email_labels),
- FunctionTool(self.move_to_trash),
- FunctionTool(self.get_attachment),
- FunctionTool(self.list_threads),
- FunctionTool(self.list_drafts),
- FunctionTool(self.list_gmail_labels),
- FunctionTool(self.create_label),
- FunctionTool(self.delete_label),
- FunctionTool(self.modify_thread_labels),
- FunctionTool(self.get_profile),
- FunctionTool(self.get_contacts),
- FunctionTool(self.search_people),
+ FunctionTool(self.gmail_send_email),
+ FunctionTool(self.gmail_reply_to_email),
+ FunctionTool(self.gmail_forward_email),
+ FunctionTool(self.gmail_create_draft),
+ FunctionTool(self.gmail_send_draft),
+ FunctionTool(self.gmail_fetch_emails),
+ FunctionTool(self.gmail_fetch_thread_by_id),
+ FunctionTool(self.gmail_modify_email_labels),
+ FunctionTool(self.gmail_move_to_trash),
+ FunctionTool(self.gmail_get_attachment),
+ FunctionTool(self.gmail_list_threads),
+ FunctionTool(self.gmail_list_drafts),
+ FunctionTool(self.gmail_list_labels),
+ FunctionTool(self.gmail_create_label),
+ FunctionTool(self.gmail_delete_label),
+ FunctionTool(self.gmail_modify_thread_labels),
+ FunctionTool(self.gmail_get_profile),
+ FunctionTool(self.gmail_get_contacts),
+ FunctionTool(self.gmail_search_people),
]
diff --git a/examples/toolkits/gmail_toolkit.py b/examples/toolkits/gmail_toolkit.py
index 0d5a6e3fc..9bdabd8a1 100644
--- a/examples/toolkits/gmail_toolkit.py
+++ b/examples/toolkits/gmail_toolkit.py
@@ -68,27 +68,27 @@ print(response.info['tool_calls'])
Example: Sending an email
==================================================
Agent Response:
-Done — your message has been sent to [email protected]. Message ID:
+Done — your message has been sent to [email protected]. Message ID:
1998015e3157fdee.
Tool calls:
[ToolCallingRecord(
- tool_name='send_email',
+ tool_name='gmail_send_email',
args={
- 'to': '[email protected]',
- 'subject': 'Hello from Gmail Toolkit',
- 'body': 'This is a test email sent using the CAMEL Gmail toolkit.',
- 'cc': None,
- 'bcc': None,
- 'attachments': None,
+ 'subject': 'Hello from Gmail Toolkit',
+ 'body': 'This is a test email sent using the CAMEL Gmail toolkit.',
+ 'cc': None,
+ 'bcc': None,
+ 'attachments': None,
'is_html': False
- },
+ },
result={
- 'success': True,
- 'message_id': '1998015e3157fdee',
+ 'success': True,
+ 'message_id': '1998015e3157fdee',
'thread_id': '1998015e3157fdee',
'message': 'Email sent successfully'
- },
+ },
tool_call_id='call_4VzMM1JkKjGN8J5rfT4wH2sF',
images=None
)]
diff --git a/test/toolkits/test_gmail_toolkit.py b/test/toolkits/test_gmail_toolkit.py
index 9ed57f89e..05d309c52 100644
--- a/test/toolkits/test_gmail_toolkit.py
+++ b/test/toolkits/test_gmail_toolkit.py
@@ -100,13 +100,13 @@ def gmail_toolkit(mock_gmail_service, mock_people_service):
yield toolkit
-def test_send_email(gmail_toolkit, mock_gmail_service):
+def test_gmail_send_email(gmail_toolkit, mock_gmail_service):
"""Test sending an email successfully."""
send_mock = MagicMock()
mock_gmail_service.users().messages().send.return_value = send_mock
send_mock.execute.return_value = {'id': 'msg123', 'threadId': 'thread123'}
- result = gmail_toolkit.send_email(
+ result = gmail_toolkit.gmail_send_email(
to='[email protected]', subject='Test Subject', body='Test Body'
)
@@ -118,7 +118,7 @@ def test_send_email(gmail_toolkit, mock_gmail_service):
mock_gmail_service.users().messages().send.assert_called_once()
-def test_send_email_with_attachments(gmail_toolkit, mock_gmail_service):
+def test_gmail_send_email_with_attachments(gmail_toolkit, mock_gmail_service):
"""Test sending an email with attachments."""
send_mock = MagicMock()
mock_gmail_service.users().messages().send.return_value = send_mock
@@ -132,7 +132,7 @@ def test_send_email_with_attachments(gmail_toolkit, mock_gmail_service):
b'test content'
)
- result = gmail_toolkit.send_email(
+ result = gmail_toolkit.gmail_send_email(
subject='Test Subject',
body='Test Body',
@@ -142,9 +142,9 @@ def test_send_email_with_attachments(gmail_toolkit, mock_gmail_service):
assert result['success'] is True
-def test_send_email_invalid_email(gmail_toolkit):
+def test_gmail_send_email_invalid_email(gmail_toolkit):
"""Test sending email with invalid email address."""
- result = gmail_toolkit.send_email(
+ result = gmail_toolkit.gmail_send_email(
to='invalid-email', subject='Test Subject', body='Test Body'
)
@@ -152,13 +152,13 @@ def test_send_email_invalid_email(gmail_toolkit):
assert 'Invalid email address' in result['error']
-def test_send_email_failure(gmail_toolkit, mock_gmail_service):
+def test_gmail_send_email_failure(gmail_toolkit, mock_gmail_service):
"""Test sending email failure."""
send_mock = MagicMock()
mock_gmail_service.users().messages().send.return_value = send_mock
send_mock.execute.side_effect = Exception("API Error")
- result = gmail_toolkit.send_email(
+ result = gmail_toolkit.gmail_send_email(
to='[email protected]', subject='Test Subject', body='Test Body'
)
@@ -166,7 +166,7 @@ def test_send_email_failure(gmail_toolkit, mock_gmail_service):
assert 'Failed to send email' in result['error']
-def test_reply_to_email(gmail_toolkit, mock_gmail_service):
+def test_gmail_reply_to_email(gmail_toolkit, mock_gmail_service):
"""Test replying to an email."""
# Mock getting original message
get_mock = MagicMock()
@@ -193,7 +193,7 @@ def test_reply_to_email(gmail_toolkit, mock_gmail_service):
'threadId': 'thread123',
}
- result = gmail_toolkit.reply_to_email(
+ result = gmail_toolkit.gmail_reply_to_email(
message_id='msg123', reply_body='This is a reply'
)
@@ -202,7 +202,7 @@ def test_reply_to_email(gmail_toolkit, mock_gmail_service):
assert result['message'] == 'Reply sent successfully'
-def test_forward_email(gmail_toolkit, mock_gmail_service):
+def test_gmail_forward_email(gmail_toolkit, mock_gmail_service):
"""Test forwarding an email."""
# Mock getting original message
get_mock = MagicMock()
@@ -230,7 +230,7 @@ def test_forward_email(gmail_toolkit, mock_gmail_service):
'threadId': 'thread123',
}
- result = gmail_toolkit.forward_email(
+ result = gmail_toolkit.gmail_forward_email(
message_id='msg123', to='[email protected]'
)
@@ -239,7 +239,7 @@ def test_forward_email(gmail_toolkit, mock_gmail_service):
assert result['message'] == 'Email forwarded successfully'
-def test_create_email_draft(gmail_toolkit, mock_gmail_service):
+def test_gmail_create_draft(gmail_toolkit, mock_gmail_service):
"""Test creating an email draft."""
create_mock = MagicMock()
mock_gmail_service.users().drafts().create.return_value = create_mock
@@ -248,7 +248,7 @@ def test_create_email_draft(gmail_toolkit, mock_gmail_service):
'message': {'id': 'msg123'},
}
- result = gmail_toolkit.create_email_draft(
+ result = gmail_toolkit.gmail_create_draft(
to='[email protected]', subject='Test Subject', body='Test Body'
)
@@ -258,20 +258,20 @@ def test_create_email_draft(gmail_toolkit, mock_gmail_service):
assert result['message'] == 'Draft created successfully'
-def test_send_draft(gmail_toolkit, mock_gmail_service):
+def test_gmail_send_draft(gmail_toolkit, mock_gmail_service):
"""Test sending a draft."""
send_mock = MagicMock()
mock_gmail_service.users().drafts().send.return_value = send_mock
send_mock.execute.return_value = {'id': 'msg123', 'threadId': 'thread123'}
- result = gmail_toolkit.send_draft(draft_id='draft123')
+ result = gmail_toolkit.gmail_send_draft(draft_id='draft123')
assert result['success'] is True
assert result['message_id'] == 'msg123'
assert result['message'] == 'Draft sent successfully'
-def test_fetch_emails(gmail_toolkit, mock_gmail_service):
+def test_gmail_fetch_emails(gmail_toolkit, mock_gmail_service):
"""Test fetching emails."""
list_mock = MagicMock()
mock_gmail_service.users().messages().list.return_value = list_mock
@@ -300,7 +300,7 @@ def test_fetch_emails(gmail_toolkit, mock_gmail_service):
'sizeEstimate': 1024,
}
- result = gmail_toolkit.fetch_emails(query='test', max_results=10)
+ result = gmail_toolkit.gmail_fetch_emails(query='test', max_results=10)
assert result['success'] is True
assert len(result['emails']) == 2
@@ -308,7 +308,7 @@ def test_fetch_emails(gmail_toolkit, mock_gmail_service):
assert result['next_page_token'] == 'next_token'
-def test_fetch_thread_by_id(gmail_toolkit, mock_gmail_service):
+def test_gmail_fetch_thread_by_id(gmail_toolkit, mock_gmail_service):
"""Test fetching a thread by ID."""
get_mock = MagicMock()
mock_gmail_service.users().threads().get.return_value = get_mock
@@ -337,7 +337,7 @@ def test_fetch_thread_by_id(gmail_toolkit, mock_gmail_service):
'sizeEstimate': 1024,
}
- result = gmail_toolkit.fetch_thread_by_id(thread_id='thread123')
+ result = gmail_toolkit.gmail_fetch_thread_by_id(thread_id='thread123')
assert result['success'] is True
assert result['thread_id'] == 'thread123'
@@ -345,7 +345,7 @@ def test_fetch_thread_by_id(gmail_toolkit, mock_gmail_service):
assert result['message_count'] == 2
-def test_modify_email_labels(gmail_toolkit, mock_gmail_service):
+def test_gmail_modify_email_labels(gmail_toolkit, mock_gmail_service):
"""Test modifying email labels."""
modify_mock = MagicMock()
mock_gmail_service.users().messages().modify.return_value = modify_mock
@@ -354,7 +354,7 @@ def test_modify_email_labels(gmail_toolkit, mock_gmail_service):
'labelIds': ['INBOX', 'IMPORTANT'],
}
- result = gmail_toolkit.modify_email_labels(
+ result = gmail_toolkit.gmail_modify_email_labels(
message_id='msg123', add_labels=['IMPORTANT'], remove_labels=['UNREAD']
)
@@ -364,13 +364,13 @@ def test_modify_email_labels(gmail_toolkit, mock_gmail_service):
assert result['message'] == 'Labels modified successfully'
-def test_move_to_trash(gmail_toolkit, mock_gmail_service):
+def test_gmail_move_to_trash(gmail_toolkit, mock_gmail_service):
"""Test moving a message to trash."""
trash_mock = MagicMock()
mock_gmail_service.users().messages().trash.return_value = trash_mock
trash_mock.execute.return_value = {'id': 'msg123', 'labelIds': ['TRASH']}
- result = gmail_toolkit.move_to_trash(message_id='msg123')
+ result = gmail_toolkit.gmail_move_to_trash(message_id='msg123')
assert result['success'] is True
assert result['message_id'] == 'msg123'
@@ -378,7 +378,7 @@ def test_move_to_trash(gmail_toolkit, mock_gmail_service):
assert result['message'] == 'Message moved to trash successfully'
-def test_get_attachment(gmail_toolkit, mock_gmail_service):
+def test_gmail_get_attachment(gmail_toolkit, mock_gmail_service):
"""Test getting an attachment."""
attachment_mock = MagicMock()
mock_gmail_service.users().messages().attachments().get.return_value = (
@@ -388,7 +388,7 @@ def test_get_attachment(gmail_toolkit, mock_gmail_service):
'data': base64.urlsafe_b64encode(b'test attachment content').decode()
}
- result = gmail_toolkit.get_attachment(
+ result = gmail_toolkit.gmail_get_attachment(
message_id='msg123', attachment_id='att123'
)
@@ -397,7 +397,7 @@ def test_get_attachment(gmail_toolkit, mock_gmail_service):
assert 'data' in result
-def test_get_attachment_save_to_file(gmail_toolkit, mock_gmail_service):
+def test_gmail_get_attachment_save_to_file(gmail_toolkit, mock_gmail_service):
"""Test getting an attachment and saving to file."""
attachment_mock = MagicMock()
mock_gmail_service.users().messages().attachments().get.return_value = (
@@ -411,7 +411,7 @@ def test_get_attachment_save_to_file(gmail_toolkit, mock_gmail_service):
mock_file = MagicMock()
mock_open.return_value.__enter__.return_value = mock_file
- result = gmail_toolkit.get_attachment(
+ result = gmail_toolkit.gmail_get_attachment(
message_id='msg123',
attachment_id='att123',
save_path='/path/to/save.txt',
@@ -422,7 +422,7 @@ def test_get_attachment_save_to_file(gmail_toolkit, mock_gmail_service):
mock_file.write.assert_called_once()
-def test_list_threads(gmail_toolkit, mock_gmail_service):
+def test_gmail_list_threads(gmail_toolkit, mock_gmail_service):
"""Test listing threads."""
list_mock = MagicMock()
mock_gmail_service.users().threads().list.return_value = list_mock
@@ -437,7 +437,7 @@ def test_list_threads(gmail_toolkit, mock_gmail_service):
'nextPageToken': 'next_token',
}
- result = gmail_toolkit.list_threads(query='test', max_results=10)
+ result = gmail_toolkit.gmail_list_threads(query='test', max_results=10)
assert result['success'] is True
assert len(result['threads']) == 1
@@ -445,7 +445,7 @@ def test_list_threads(gmail_toolkit, mock_gmail_service):
assert result['total_count'] == 1
-def test_list_drafts(gmail_toolkit, mock_gmail_service):
+def test_gmail_list_drafts(gmail_toolkit, mock_gmail_service):
"""Test listing drafts."""
list_mock = MagicMock()
mock_gmail_service.users().drafts().list.return_value = list_mock
@@ -463,7 +463,7 @@ def test_list_drafts(gmail_toolkit, mock_gmail_service):
'nextPageToken': 'next_token',
}
- result = gmail_toolkit.list_drafts(max_results=10)
+ result = gmail_toolkit.gmail_list_drafts(max_results=10)
assert result['success'] is True
assert len(result['drafts']) == 1
@@ -471,7 +471,7 @@ def test_list_drafts(gmail_toolkit, mock_gmail_service):
assert result['total_count'] == 1
-def test_list_gmail_labels(gmail_toolkit, mock_gmail_service):
+def test_gmail_list_labels(gmail_toolkit, mock_gmail_service):
"""Test listing Gmail labels."""
list_mock = MagicMock()
mock_gmail_service.users().labels().list.return_value = list_mock
@@ -489,7 +489,7 @@ def test_list_gmail_labels(gmail_toolkit, mock_gmail_service):
]
}
- result = gmail_toolkit.list_gmail_labels()
+ result = gmail_toolkit.gmail_list_labels()
assert result['success'] is True
assert len(result['labels']) == 1
@@ -498,7 +498,7 @@ def test_list_gmail_labels(gmail_toolkit, mock_gmail_service):
assert result['total_count'] == 1
-def test_create_label(gmail_toolkit, mock_gmail_service):
+def test_gmail_create_label(gmail_toolkit, mock_gmail_service):
"""Test creating a Gmail label."""
create_mock = MagicMock()
mock_gmail_service.users().labels().create.return_value = create_mock
@@ -507,7 +507,7 @@ def test_create_label(gmail_toolkit, mock_gmail_service):
'name': 'Test Label',
}
- result = gmail_toolkit.create_label(
+ result = gmail_toolkit.gmail_create_label(
name='Test Label',
label_list_visibility='labelShow',
message_list_visibility='show',
@@ -519,20 +519,20 @@ def test_create_label(gmail_toolkit, mock_gmail_service):
assert result['message'] == 'Label created successfully'
-def test_delete_label(gmail_toolkit, mock_gmail_service):
+def test_gmail_delete_label(gmail_toolkit, mock_gmail_service):
"""Test deleting a Gmail label."""
delete_mock = MagicMock()
mock_gmail_service.users().labels().delete.return_value = delete_mock
delete_mock.execute.return_value = {}
- result = gmail_toolkit.delete_label(label_id='Label_123')
+ result = gmail_toolkit.gmail_delete_label(label_id='Label_123')
assert result['success'] is True
assert result['label_id'] == 'Label_123'
assert result['message'] == 'Label deleted successfully'
-def test_modify_thread_labels(gmail_toolkit, mock_gmail_service):
+def test_gmail_modify_thread_labels(gmail_toolkit, mock_gmail_service):
"""Test modifying thread labels."""
modify_mock = MagicMock()
mock_gmail_service.users().threads().modify.return_value = modify_mock
@@ -541,7 +541,7 @@ def test_modify_thread_labels(gmail_toolkit, mock_gmail_service):
'labelIds': ['INBOX', 'IMPORTANT'],
}
- result = gmail_toolkit.modify_thread_labels(
+ result = gmail_toolkit.gmail_modify_thread_labels(
thread_id='thread123',
add_labels=['IMPORTANT'],
remove_labels=['UNREAD'],
@@ -553,7 +553,7 @@ def test_modify_thread_labels(gmail_toolkit, mock_gmail_service):
assert result['message'] == 'Thread labels modified successfully'
-def test_get_profile(gmail_toolkit, mock_gmail_service):
+def test_gmail_get_profile(gmail_toolkit, mock_gmail_service):
"""Test getting Gmail profile."""
profile_mock = MagicMock()
mock_gmail_service.users().getProfile.return_value = profile_mock
@@ -564,7 +564,7 @@ def test_get_profile(gmail_toolkit, mock_gmail_service):
'historyId': 'hist123',
}
- result = gmail_toolkit.get_profile()
+ result = gmail_toolkit.gmail_get_profile()
assert result['success'] is True
assert result['profile']['email_address'] == '[email protected]'
@@ -572,7 +572,7 @@ def test_get_profile(gmail_toolkit, mock_gmail_service):
assert result['profile']['threads_total'] == 500
-def test_get_contacts(gmail_toolkit, mock_people_service):
+def test_gmail_get_contacts(gmail_toolkit, mock_people_service):
"""Test getting contacts."""
connections_mock = MagicMock()
mock_people_service.people().connections().list.return_value = (
@@ -591,7 +591,7 @@ def test_get_contacts(gmail_toolkit, mock_people_service):
'nextPageToken': 'next_token',
}
- result = gmail_toolkit.get_contacts(max_results=10)
+ result = gmail_toolkit.gmail_get_contacts(max_results=10)
assert result['success'] is True
assert len(result['contacts']) == 1
@@ -599,7 +599,7 @@ def test_get_contacts(gmail_toolkit, mock_people_service):
assert result['total_count'] == 1
-def test_search_people(gmail_toolkit, mock_people_service):
+def test_gmail_search_people(gmail_toolkit, mock_people_service):
"""Test searching for people."""
search_mock = MagicMock()
mock_people_service.people().searchContacts.return_value = search_mock
@@ -617,7 +617,7 @@ def test_search_people(gmail_toolkit, mock_people_service):
]
}
- result = gmail_toolkit.search_people(query='John', max_results=10)
+ result = gmail_toolkit.gmail_search_people(query='John', max_results=10)
assert result['success'] is True
assert len(result['people']) == 1
@@ -627,24 +627,24 @@ def test_search_people(gmail_toolkit, mock_people_service):
def test_error_handling(gmail_toolkit, mock_gmail_service):
"""Test error handling in various methods."""
- # Test send_email error
+ # Test gmail_send_email error
send_mock = MagicMock()
mock_gmail_service.users().messages().send.return_value = send_mock
send_mock.execute.side_effect = Exception("API Error")
- result = gmail_toolkit.send_email(
+ result = gmail_toolkit.gmail_send_email(
to='[email protected]', subject='Test', body='Test'
)
assert 'error' in result
assert 'Failed to send email' in result['error']
- # Test fetch_emails error
+ # Test gmail_fetch_emails error
list_mock = MagicMock()
mock_gmail_service.users().messages().list.return_value = list_mock
list_mock.execute.side_effect = Exception("API Error")
- result = gmail_toolkit.fetch_emails()
+ result = gmail_toolkit.gmail_fetch_emails()
assert 'error' in result
assert 'Failed to fetch emails' in result['error']