Merge branch 'issues/483' of github.com:taylorwilsdon/google_workspace_mcp into issues/483

Author: taylorwilsdon

auth/google_auth.py

@@ -587,7 +587,11 @@ def get_credentials(
                     )
 
                     # Refresh expired credentials before checking scopes
-                    if not credentials.valid and credentials.expired and credentials.refresh_token:
+                    if (
+                        not credentials.valid
+                        and credentials.expired
+                        and credentials.refresh_token
+                    ):
                         try:
                             credentials.refresh(Request())
                             logger.info(

auth/scopes.py

@@ -84,7 +84,12 @@
 # See https://developers.google.com/gmail/api/auth/scopes,
 # https://developers.google.com/drive/api/guides/api-specific-auth, etc.
 SCOPE_HIERARCHY = {
-    GMAIL_MODIFY_SCOPE: {GMAIL_READONLY_SCOPE, GMAIL_SEND_SCOPE, GMAIL_COMPOSE_SCOPE, GMAIL_LABELS_SCOPE},
+    GMAIL_MODIFY_SCOPE: {
+        GMAIL_READONLY_SCOPE,
+        GMAIL_SEND_SCOPE,
+        GMAIL_COMPOSE_SCOPE,
+        GMAIL_LABELS_SCOPE,
+    },
     DRIVE_SCOPE: {DRIVE_READONLY_SCOPE, DRIVE_FILE_SCOPE},
     CALENDAR_SCOPE: {CALENDAR_READONLY_SCOPE, CALENDAR_EVENTS_SCOPE},
     DOCS_WRITE_SCOPE: {DOCS_READONLY_SCOPE},

gchat/chat_tools.py

@@ -25,7 +25,7 @@
 def _cache_sender(user_id: str, name: str) -> None:
     """Store a resolved sender name, evicting oldest entries if cache is full."""
     if len(_sender_name_cache) >= _SENDER_CACHE_MAX_SIZE:
-        to_remove = list(_sender_name_cache.keys())[:_SENDER_CACHE_MAX_SIZE // 2]
+        to_remove = list(_sender_name_cache.keys())[: _SENDER_CACHE_MAX_SIZE // 2]
         for k in to_remove:
             del _sender_name_cache[k]
     _sender_name_cache[user_id] = name
@@ -204,7 +204,9 @@ async def get_messages(
     for msg in messages:
         sender_obj = msg.get("sender", {})
         sender_key = sender_obj.get("name", "")
-        sender = sender_map.get(sender_key) or await _resolve_sender(people_service, sender_obj)
+        sender = sender_map.get(sender_key) or await _resolve_sender(
+            people_service, sender_obj
+        )
         create_time = msg.get("createTime", "Unknown Time")
         text_content = msg.get("text", "No text content")
         msg_name = msg.get("name", "")
@@ -347,7 +349,9 @@ async def search_messages(
                     msg["_space_name"] = space.get("displayName", "Unknown")
                 messages.extend(space_msgs)
             except HttpError as e:
-                logger.debug("Skipping space %s during search: %s", space.get("name"), e)
+                logger.debug(
+                    "Skipping space %s during search: %s", space.get("name"), e
+                )
                 continue
         context = "all accessible spaces"
 
@@ -370,7 +374,9 @@ async def search_messages(
     for msg in messages:
         sender_obj = msg.get("sender", {})
         sender_key = sender_obj.get("name", "")
-        sender = sender_map.get(sender_key) or await _resolve_sender(people_service, sender_obj)
+        sender = sender_map.get(sender_key) or await _resolve_sender(
+            people_service, sender_obj
+        )
         create_time = msg.get("createTime", "Unknown Time")
         text_content = msg.get("text", "No text content")
         space_name = msg.get("_space_name", "Unknown Space")

tests/test_scopes.py

@@ -151,7 +151,9 @@ def test_gmail_modify_covers_labels(self):
 
     def test_gmail_modify_does_not_cover_settings(self):
         """gmail.modify does NOT cover gmail.settings.basic."""
-        assert not has_required_scopes([GMAIL_MODIFY_SCOPE], [GMAIL_SETTINGS_BASIC_SCOPE])
+        assert not has_required_scopes(
+            [GMAIL_MODIFY_SCOPE], [GMAIL_SETTINGS_BASIC_SCOPE]
+        )
 
     def test_gmail_modify_covers_multiple_children(self):
         """gmail.modify should satisfy multiple child scopes at once."""