refac

Author: taylorwilsdon

gcalendar/calendar_tools.py

@@ -376,9 +376,9 @@ async def get_events(
     if event_id:
         logger.info(f"[get_events] Retrieving single event with ID: {event_id}")
         event = await asyncio.to_thread(
-            lambda: (
-                service.events().get(calendarId=calendar_id, eventId=event_id).execute()
-            )
+            lambda: service.events()
+            .get(calendarId=calendar_id, eventId=event_id)
+            .execute()
         )
         items = [event]
     else:
@@ -701,15 +701,13 @@ async def create_event(
                     if drive_service:
                         try:
                             file_metadata = await asyncio.to_thread(
-                                lambda: (
-                                    drive_service.files()
-                                    .get(
-                                        fileId=file_id,
-                                        fields="mimeType,name",
-                                        supportsAllDrives=True,
-                                    )
-                                    .execute()
+                                lambda: drive_service.files()
+                                .get(
+                                    fileId=file_id,
+                                    fields="mimeType,name",
+                                    supportsAllDrives=True,
                                 )
+                                .execute()
                             )
                             mime_type = file_metadata.get("mimeType", mime_type)
                             filename = file_metadata.get("name")
@@ -737,28 +735,24 @@ async def create_event(
             if drive_service:
                 drive_service.close()
         created_event = await asyncio.to_thread(
-            lambda: (
-                service.events()
-                .insert(
-                    calendarId=calendar_id,
-                    body=event_body,
-                    supportsAttachments=True,
-                    conferenceDataVersion=1 if add_google_meet else 0,
-                )
-                .execute()
+            lambda: service.events()
+            .insert(
+                calendarId=calendar_id,
+                body=event_body,
+                supportsAttachments=True,
+                conferenceDataVersion=1 if add_google_meet else 0,
             )
+            .execute()
         )
     else:
         created_event = await asyncio.to_thread(
-            lambda: (
-                service.events()
-                .insert(
-                    calendarId=calendar_id,
-                    body=event_body,
-                    conferenceDataVersion=1 if add_google_meet else 0,
-                )
-                .execute()
+            lambda: service.events()
+            .insert(
+                calendarId=calendar_id,
+                body=event_body,
+                conferenceDataVersion=1 if add_google_meet else 0,
             )
+            .execute()
         )
     link = created_event.get("htmlLink", "No link available")
     confirmation_message = f"Successfully created event '{created_event.get('summary', summary)}' for {user_google_email}. Link: {link}"
@@ -982,9 +976,9 @@ async def modify_event(
     # Get the existing event to preserve fields that aren't being updated
     try:
         existing_event = await asyncio.to_thread(
-            lambda: (
-                service.events().get(calendarId=calendar_id, eventId=event_id).execute()
-            )
+            lambda: service.events()
+            .get(calendarId=calendar_id, eventId=event_id)
+            .execute()
         )
         logger.info(
             "[modify_event] Successfully retrieved existing event before update"
@@ -1041,16 +1035,14 @@ async def modify_event(
 
     # Proceed with the update
     updated_event = await asyncio.to_thread(
-        lambda: (
-            service.events()
-            .update(
-                calendarId=calendar_id,
-                eventId=event_id,
-                body=event_body,
-                conferenceDataVersion=1,
-            )
-            .execute()
+        lambda: service.events()
+        .update(
+            calendarId=calendar_id,
+            eventId=event_id,
+            body=event_body,
+            conferenceDataVersion=1,
         )
+        .execute()
     )
 
     link = updated_event.get("htmlLink", "No link available")
@@ -1104,9 +1096,9 @@ async def delete_event(
     # Try to get the event first to verify it exists
     try:
         await asyncio.to_thread(
-            lambda: (
-                service.events().get(calendarId=calendar_id, eventId=event_id).execute()
-            )
+            lambda: service.events()
+            .get(calendarId=calendar_id, eventId=event_id)
+            .execute()
         )
         logger.info("[delete_event] Successfully verified event exists before deletion")
     except HttpError as get_error:
@@ -1123,9 +1115,9 @@ async def delete_event(
 
     # Proceed with the deletion
     await asyncio.to_thread(
-        lambda: (
-            service.events().delete(calendarId=calendar_id, eventId=event_id).execute()
-        )
+        lambda: service.events()
+        .delete(calendarId=calendar_id, eventId=event_id)
+        .execute()
     )
 
     confirmation_message = f"Successfully deleted event (ID: {event_id}) from calendar '{calendar_id}' for {user_google_email}."

gsheets/sheets_tools.py

@@ -402,7 +402,7 @@ async def _format_sheet_range_impl(
         font_size: Font size in points.
 
     Returns:
-        Formatted string with confirmation of applied formatting.
+        Dictionary with keys: range_name, spreadsheet_id, summary.
     """
     # Validate at least one formatting option is provided
     has_any_format = any(
@@ -596,10 +596,13 @@ async def _format_sheet_range_impl(
         applied_parts.append(f"font size {font_size}")
 
     summary = ", ".join(applied_parts)
-    return (
-        f"Applied formatting to range '{range_name}' in spreadsheet {spreadsheet_id}: "
-        f"{summary}."
-    )
+
+    # Return structured data for the wrapper to format
+    return {
+        "range_name": range_name,
+        "spreadsheet_id": spreadsheet_id,
+        "summary": summary
+    }
 
 
 @server.tool()
@@ -674,11 +677,10 @@ async def format_sheet_range(
         font_size=font_size,
     )
 
-    # Add user email to confirmation for the tool response
-    return result.replace(
-        f"Applied formatting to range '{range_name}' in spreadsheet {spreadsheet_id}:",
-        f"Applied formatting to range '{range_name}' in spreadsheet {spreadsheet_id} "
-        f"for {user_google_email}:",
+    # Build confirmation message with user email
+    return (
+        f"Applied formatting to range '{result['range_name']}' in spreadsheet "
+        f"{result['spreadsheet_id']} for {user_google_email}: {result['summary']}."
     )
 
 

tests/gsheets/test_format_sheet_range.py

@@ -38,8 +38,8 @@ async def test_format_wrap_strategy_wrap():
         wrap_strategy="WRAP",
     )
 
-    assert "test_spreadsheet_123" in result
-    assert "A1:C10" in result
+    assert result["spreadsheet_id"] == "test_spreadsheet_123"
+    assert result["range_name"] == "A1:C10"
 
     call_args = mock_service.spreadsheets().batchUpdate.call_args
     request_body = call_args[1]["body"]
@@ -59,7 +59,7 @@ async def test_format_wrap_strategy_clip():
         wrap_strategy="CLIP",
     )
 
-    assert "test_spreadsheet_123" in result
+    assert result["spreadsheet_id"] == "test_spreadsheet_123"
     call_args = mock_service.spreadsheets().batchUpdate.call_args
     request_body = call_args[1]["body"]
     cell_format = request_body["requests"][0]["repeatCell"]["cell"]["userEnteredFormat"]
@@ -96,7 +96,7 @@ async def test_format_horizontal_alignment_center():
         horizontal_alignment="CENTER",
     )
 
-    assert "test_spreadsheet_123" in result
+    assert result["spreadsheet_id"] == "test_spreadsheet_123"
     call_args = mock_service.spreadsheets().batchUpdate.call_args
     request_body = call_args[1]["body"]
     cell_format = request_body["requests"][0]["repeatCell"]["cell"]["userEnteredFormat"]
@@ -310,7 +310,7 @@ async def test_format_all_new_params_with_existing():
         font_size=12,
     )
 
-    assert "test_spreadsheet_123" in result
+    assert result["spreadsheet_id"] == "test_spreadsheet_123"
     call_args = mock_service.spreadsheets().batchUpdate.call_args
     request_body = call_args[1]["body"]
     cell_format = request_body["requests"][0]["repeatCell"]["cell"]["userEnteredFormat"]
@@ -432,5 +432,5 @@ async def test_format_confirmation_message_includes_new_params():
         font_size=14,
     )
 
-    assert "test_spreadsheet_123" in result
-    assert "A1:C10" in result
+    assert result["spreadsheet_id"] == "test_spreadsheet_123"
+    assert result["range_name"] == "A1:C10"