arcade-google-sheets 4.2.1__py3-none-any.whl → 5.0.0__py3-none-any.whl

arcade_google_sheets/__main__.py

@@ -0,0 +1,29 @@
+import sys
+from typing import cast
+
+from arcade_mcp_server import MCPApp
+from arcade_mcp_server.mcp_app import TransportType
+
+import arcade_google_sheets
+
+app = MCPApp(
+    name="GoogleSheets",
+    instructions=(
+        "Use this server when you need to interact with Google Sheets to enable users to "
+        "efficiently manage and access their spreadsheets."
+    ),
+)
+
+app.add_tools_from_module(arcade_google_sheets)
+
+
+def main() -> None:
+    transport = sys.argv[1] if len(sys.argv) > 1 else "stdio"
+    host = sys.argv[2] if len(sys.argv) > 2 else "127.0.0.1"
+    port = int(sys.argv[3]) if len(sys.argv) > 3 else 8000
+
+    app.run(transport=cast(TransportType, transport), host=host, port=port)
+
+
+if __name__ == "__main__":
+    main()

arcade_google_sheets/models.py

@@ -30,14 +30,14 @@ class CellExtendedValue(BaseModel):
     errorValue: Optional["CellErrorValue"] = None
 
     @model_validator(mode="after")
-    def check_exactly_one_value(cls, instance):  # type: ignore[no-untyped-def]
-        provided = [v for v in instance.__dict__.values() if v is not None]
+    def check_exactly_one_value(self):  # type: ignore[no-untyped-def]
+        provided = [v for v in self.__dict__.values() if v is not None]
         if len(provided) != 1:
             raise ValueError(
                 "Exactly one of numberValue, stringValue, boolValue, "
                 "formulaValue, or errorValue must be set."
             )
-        return instance
+        return self
 
 
 class NumberFormat(BaseModel):

arcade_google_sheets/tools/file_picker.py

@@ -2,9 +2,10 @@ import base64
 import json
 from typing import Annotated
 
-from arcade_tdk import ToolContext, ToolMetadataKey, tool
-from arcade_tdk.auth import Google
-from arcade_tdk.errors import ToolExecutionError
+from arcade_core.schema import ToolMetadataKey
+from arcade_mcp_server import Context, tool
+from arcade_mcp_server.auth import Google
+from arcade_mcp_server.exceptions import ToolExecutionError
 
 
 @tool(
@@ -12,7 +13,7 @@ from arcade_tdk.errors import ToolExecutionError
     requires_metadata=[ToolMetadataKey.CLIENT_ID, ToolMetadataKey.COORDINATOR_URL],
 )
 def generate_google_file_picker_url(
-    context: ToolContext,
+    context: Context,
 ) -> Annotated[dict, "Google File Picker URL for user file selection and permission granting"]:
     """Generate a Google File Picker URL for user-driven file selection and authorization.
 

arcade_google_sheets/tools/read.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
-from arcade_tdk import ToolContext, tool
-from arcade_tdk.auth import Google
+from arcade_mcp_server import Context, tool
+from arcade_mcp_server.auth import Google
 
 from arcade_google_sheets.templates import sheet_url_template
 from arcade_google_sheets.utils import (
@@ -19,7 +19,7 @@ from arcade_google_sheets.utils import (
     ),
 )
 async def get_spreadsheet(
-    context: ToolContext,
+    context: Context,
     spreadsheet_id: Annotated[str, "The id of the spreadsheet to get"],
     sheet_position: Annotated[
         int | None,
@@ -89,7 +89,7 @@ async def get_spreadsheet(
     ),
 )
 async def get_spreadsheet_metadata(
-    context: ToolContext,
+    context: Context,
     spreadsheet_id: Annotated[str, "The id of the spreadsheet to get metadata for"],
 ) -> Annotated[dict, "The spreadsheet metadata for the specified spreadsheet"]:
     """Gets the metadata for a spreadsheet including the metadata for the sheets in the spreadsheet.
@@ -104,7 +104,7 @@ async def get_spreadsheet_metadata(
 
     metadata = get_spreadsheet_metadata_helper(service, spreadsheet_id)
     metadata_dict = metadata.model_dump(exclude_none=True)
-    for sheet in metadata_dict.get("sheets", []):
+    for sheet in metadata_dict.get("sheets") or []:
         sheet["sheet_url"] = sheet_url_template.format(
             spreadsheet_id=spreadsheet_id,
             sheet_id=sheet["properties"]["sheetId"],
@@ -114,5 +114,5 @@ async def get_spreadsheet_metadata(
         "spreadsheet_title": metadata_dict["properties"]["title"],
         "spreadsheet_id": metadata_dict["spreadsheetId"],
         "spreadsheet_url": metadata_dict["spreadsheetUrl"],
-        "sheets": metadata_dict["sheets"],
+        "sheets": metadata_dict.get("sheets") or [],
     }

arcade_google_sheets/tools/search.py

@@ -1,7 +1,7 @@
 from typing import Annotated, Any
 
-from arcade_tdk import ToolContext, tool
-from arcade_tdk.auth import Google
+from arcade_mcp_server import Context, tool
+from arcade_mcp_server.auth import Google
 
 from arcade_google_sheets.enums import OrderBy
 from arcade_google_sheets.templates import (
@@ -20,7 +20,7 @@ from arcade_google_sheets.utils import (
     ),
 )
 async def search_spreadsheets(
-    context: ToolContext,
+    context: Context,
     spreadsheet_contains: Annotated[
         list[str] | None,
         "Keywords or phrases that must be in the spreadsheet title. Provide a list of "
@@ -107,7 +107,9 @@ async def search_spreadsheets(
             params.pop("pageToken", None)
 
         results = drive_service.files().list(**params).execute()
-        batch = results.get("files", [])
+        batch = results.get("files") or []
+        if not isinstance(batch, list):
+            batch = []
         spreadsheets.extend(batch[: limit - len(spreadsheets)])
 
         pagination_token = results.get("nextPageToken")

arcade_google_sheets/tools/system_context.py

@@ -1,7 +1,7 @@
 from typing import Annotated, Any
 
-from arcade_tdk import ToolContext, tool
-from arcade_tdk.auth import Google
+from arcade_mcp_server import Context, tool
+from arcade_mcp_server.auth import Google
 
 from arcade_google_sheets.utils import build_sheets_service
 from arcade_google_sheets.who_am_i_util import build_who_am_i_response
@@ -17,7 +17,7 @@ from arcade_google_sheets.who_am_i_util import build_who_am_i_response
     )
 )
 async def who_am_i(
-    context: ToolContext,
+    context: Context,
 ) -> Annotated[
     dict[str, Any],
     "Get comprehensive user profile and Google Sheets environment information.",

arcade_google_sheets/tools/write.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
-from arcade_tdk import ToolContext, tool
-from arcade_tdk.auth import Google
+from arcade_mcp_server import Context, tool
+from arcade_mcp_server.auth import Google
 
 from arcade_google_sheets.converters import SheetDataInputToValueRangesConverter
 from arcade_google_sheets.models import (
@@ -26,7 +26,7 @@ from arcade_google_sheets.utils import (
     )
 )
 def create_spreadsheet(
-    context: ToolContext,
+    context: Context,
     title: Annotated[str, "The title of the new spreadsheet"] = "Untitled spreadsheet",
     data: Annotated[
         str | None,
@@ -71,7 +71,7 @@ def create_spreadsheet(
     )
 )
 def write_to_cell(
-    context: ToolContext,
+    context: Context,
     spreadsheet_id: Annotated[str, "The id of the spreadsheet to write to"],
     column: Annotated[str, "The column string to write to. For example, 'A', 'F', or 'AZ'"],
     row: Annotated[int, "The row number to write to"],
@@ -115,7 +115,7 @@ def write_to_cell(
     )
 )
 def update_cells(
-    context: ToolContext,
+    context: Context,
     spreadsheet_id: Annotated[str, "The id of the spreadsheet to write to"],
     data: Annotated[
         str,
@@ -163,7 +163,7 @@ def update_cells(
     )
 )
 def add_note_to_cell(
-    context: ToolContext,
+    context: Context,
     spreadsheet_id: Annotated[str, "The id of the spreadsheet to add a comment to"],
     column: Annotated[str, "The column string to add a note to. For example, 'A', 'F', or 'AZ'"],
     row: Annotated[int, "The row number to add a note to"],

arcade_google_sheets/utils.py

@@ -2,7 +2,7 @@ import logging
 import string
 from typing import Any
 
-from arcade_tdk.errors import RetryableToolError, ToolExecutionError
+from arcade_mcp_server.exceptions import RetryableToolError, ToolExecutionError
 from google.oauth2.credentials import Credentials
 from googleapiclient.discovery import Resource, build
 
@@ -380,8 +380,8 @@ def parse_get_spreadsheet_response(api_response: dict) -> dict:
     """
     Parse the get spreadsheet Google Sheets API response into a structured dictionary.
     """
-    properties = api_response.get("properties", {})
-    sheets = [parse_sheet(sheet) for sheet in api_response.get("sheets", [])]
+    properties = api_response.get("properties") or {}
+    sheets = [parse_sheet(sheet) for sheet in (api_response.get("sheets") or [])]
 
     return {
         "title": properties.get("title", ""),
@@ -396,9 +396,9 @@ def parse_sheet(api_sheet: dict) -> dict:
     Parse an individual sheet's data from the Google Sheets 'get spreadsheet'
     API response into a structured dictionary.
     """
-    props = api_sheet.get("properties", {})
-    grid_props = props.get("gridProperties", {})
-    cell_data = convert_api_grid_data_to_dict(api_sheet.get("data", []))
+    props = api_sheet.get("properties") or {}
+    grid_props = props.get("gridProperties") or {}
+    cell_data = convert_api_grid_data_to_dict(api_sheet.get("data") or [])
 
     return {
         "sheetId": props.get("sheetId"),
@@ -419,7 +419,9 @@ def extract_user_entered_cell_value(cell: dict) -> Any:
     Returns:
         The extracted value if present, otherwise None.
     """
-    user_val = cell.get("userEnteredValue", {})
+    if not isinstance(cell, dict):
+        return ""
+    user_val = cell.get("userEnteredValue") or {}
     for key in ["stringValue", "numberValue", "boolValue", "formulaValue"]:
         if key in user_val:
             return user_val[key]
@@ -440,11 +442,12 @@ def process_row(row: dict, start_column_index: int) -> dict:
         dict: A mapping of column letters to cell values for non-empty cells.
     """
     row_result = {}
-    for j, cell in enumerate(row.get("values", [])):
+    for j, cell in enumerate(row.get("values") or []):
+        cell_dict = cell if isinstance(cell, dict) else {}
         column_index = start_column_index + j
         column_string = index_to_col(column_index)
-        user_entered_cell_value = extract_user_entered_cell_value(cell)
-        formatted_cell_value = cell.get("formattedValue", "")
+        user_entered_cell_value = extract_user_entered_cell_value(cell_dict)
+        formatted_cell_value = cell_dict.get("formattedValue", "")
 
         if user_entered_cell_value != "" or formatted_cell_value != "":
             row_result[column_string] = {
@@ -470,14 +473,19 @@ def convert_api_grid_data_to_dict(grids: list[dict]) -> dict:
         dict: A dictionary mapping row numbers to dictionaries of column letter/value pairs.
             Only includes non-empty rows and non-empty cells.
     """
+    if not grids:
+        return {}
     result = {}
     for grid in grids:
+        if not isinstance(grid, dict):
+            continue
         start_row = grid.get("startRow", 0)
         start_column = grid.get("startColumn", 0)
 
-        for i, row in enumerate(grid.get("rowData", []), start=1):
+        for i, row in enumerate(grid.get("rowData") or [], start=1):
             current_row = start_row + i
-            row_data = process_row(row, start_column)
+            row_dict = row if isinstance(row, dict) else {}
+            row_data = process_row(row_dict, start_column)
 
             if row_data:
                 result[current_row] = row_data
@@ -719,7 +727,7 @@ def batch_update(service: Resource, spreadsheet_id: str, data: list[ValueRange])
         .execute()
     )
     updated_ranges = [
-        value_response["updatedRange"] for value_response in response.get("responses", [])
+        value_response["updatedRange"] for value_response in (response.get("responses") or [])
     ]
     return {
         "spreadsheet_id": response["spreadsheetId"],

{arcade_google_sheets-4.2.1.dist-info → arcade_google_sheets-5.0.0.dist-info}/METADATA

@@ -1,20 +1,19 @@
 Metadata-Version: 2.4
 Name: arcade_google_sheets
-Version: 4.2.1
-Summary: Arcade.dev LLM tools for Google Sheets
+Version: 5.0.0
+Summary: Arcade.dev LLM tools for Google Sheets.
 Author-email: Arcade <dev@arcade.dev>
 License: Proprietary - Arcade Software License Agreement v1.0
 License-File: LICENSE
 Requires-Python: >=3.10
-Requires-Dist: arcade-tdk<3.0.0,>=2.3.1
+Requires-Dist: arcade-mcp-server<2.0.0,>=1.9.2
 Requires-Dist: google-api-core<3.0.0,>=2.19.1
 Requires-Dist: google-api-python-client<3.0.0,>=2.137.0
 Requires-Dist: google-auth-httplib2<1.0.0,>=0.2.0
 Requires-Dist: google-auth<3.0.0,>=2.32.0
 Requires-Dist: googleapis-common-protos<2.0.0,>=1.63.2
 Provides-Extra: dev
-Requires-Dist: arcade-ai[evals]<3.0.0,>=2.2.1; extra == 'dev'
-Requires-Dist: arcade-serve<3.0.0,>=2.1.0; extra == 'dev'
+Requires-Dist: arcade-mcp[evals]<2.0.0,>=1.5.6; extra == 'dev'
 Requires-Dist: mypy<1.6.0,>=1.5.1; extra == 'dev'
 Requires-Dist: pre-commit<3.5.0,>=3.4.0; extra == 'dev'
 Requires-Dist: pytest-asyncio<0.25.0,>=0.24.0; extra == 'dev'

arcade_google_sheets-5.0.0.dist-info/RECORD

@@ -0,0 +1,21 @@
+arcade_google_sheets/__init__.py,sha256=asCX32sPK-bi2HRpWZSlLd7dRKy7Uztqxwu-eoXTY1g,466
+arcade_google_sheets/__main__.py,sha256=IZerVlNUgDiSWMpq0_dB-ivmohL1CsRat2GIg9PD2Zg,743
+arcade_google_sheets/constants.py,sha256=4tQOrQ1YagSklJSSw5Eq21XCcFCJdO7lso5SqWIdrPI,63
+arcade_google_sheets/converters.py,sha256=1muE_28Jk0eyFUzoVo_lN0_qy3z-uv7f5XoZLH9mitQ,3924
+arcade_google_sheets/enums.py,sha256=30OMPu2l_aUjz8kQzC1mR5w0lLbs0fZn8T6PDtoXpL4,4608
+arcade_google_sheets/models.py,sha256=dy-a4-72Sa7u8LUghrzZYBv4m7w3hWotUE8ezxRUN-Y,8610
+arcade_google_sheets/templates.py,sha256=hSvjiErERLPe6RqWY6QNmivOy7Ofdg_zABcLWCI-ByU,189
+arcade_google_sheets/types.py,sha256=R-rCRcyFqDZx3jgl_kWeCliqC8fHuZ8ub_LQ2KoU2AE,37
+arcade_google_sheets/utils.py,sha256=5rWHJkHM3XLca5k9vxkx3Ns0zrt6XK8pbxHkfXj9-zY,35211
+arcade_google_sheets/who_am_i_util.py,sha256=MfDKsAOMUkH0DZNjMzcmDiuvxMEUJMT9o_a7uixCJF4,2734
+arcade_google_sheets/tools/__init__.py,sha256=GBe1Op-o6QzCy9nA3qS53Ij2Uex5IXdFPUnGQo_TPkg,673
+arcade_google_sheets/tools/file_picker.py,sha256=DQaNsJYCho4uk_JeMz1lkPEoJy0UG0ujbAJ4lzkxUE4,2389
+arcade_google_sheets/tools/read.py,sha256=Fghd2sF5aOJaOqENHl25cTRRdMOj927W84nFzCBOgIw,4017
+arcade_google_sheets/tools/search.py,sha256=tbudaTSb3JPar0wyYQaLcipD4o19vxpnpyixq4m0rpY,4912
+arcade_google_sheets/tools/system_context.py,sha256=iE19p5SFXa3McnrgXjt1eTzHrVLSrDf3gzj00zBVMLc,1182
+arcade_google_sheets/tools/write.py,sha256=vdfWegznaozsQd5JNNtqzFCvZSlAozh5kmwbeku9stw,7776
+arcade_google_sheets-5.0.0.dist-info/METADATA,sha256=1ooqlOgVwGIEVeA5C1gumtID2Q9TzXO_2Bq6vUq9TVE,1074
+arcade_google_sheets-5.0.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+arcade_google_sheets-5.0.0.dist-info/entry_points.txt,sha256=FbDSAKpaNbY3OvFkCdMJQsybxYs6pOxAyljHUoNt9c0,134
+arcade_google_sheets-5.0.0.dist-info/licenses/LICENSE,sha256=ixeE7aL9b2B-_ZYHTY1vQcJB4NufKeo-LWwKNObGDN0,1960
+arcade_google_sheets-5.0.0.dist-info/RECORD,,

{arcade_google_sheets-4.2.1.dist-info → arcade_google_sheets-5.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

arcade_google_sheets-5.0.0.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+arcade-google-sheets = arcade_google_sheets.__main__:main
+arcade_google_sheets = arcade_google_sheets.__main__:main

arcade_google_sheets-4.2.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-arcade_google_sheets/__init__.py,sha256=asCX32sPK-bi2HRpWZSlLd7dRKy7Uztqxwu-eoXTY1g,466
-arcade_google_sheets/constants.py,sha256=4tQOrQ1YagSklJSSw5Eq21XCcFCJdO7lso5SqWIdrPI,63
-arcade_google_sheets/converters.py,sha256=1muE_28Jk0eyFUzoVo_lN0_qy3z-uv7f5XoZLH9mitQ,3924
-arcade_google_sheets/enums.py,sha256=30OMPu2l_aUjz8kQzC1mR5w0lLbs0fZn8T6PDtoXpL4,4608
-arcade_google_sheets/models.py,sha256=xwPdwUis0OHTDbSLy85qWl7zIh2lDTi5HZMNKwdZjzo,8627
-arcade_google_sheets/templates.py,sha256=hSvjiErERLPe6RqWY6QNmivOy7Ofdg_zABcLWCI-ByU,189
-arcade_google_sheets/types.py,sha256=R-rCRcyFqDZx3jgl_kWeCliqC8fHuZ8ub_LQ2KoU2AE,37
-arcade_google_sheets/utils.py,sha256=VmDZOzAOEtfSPOra-ieVl_U16RLonQUOnZ4RW4Gf-oA,34895
-arcade_google_sheets/who_am_i_util.py,sha256=MfDKsAOMUkH0DZNjMzcmDiuvxMEUJMT9o_a7uixCJF4,2734
-arcade_google_sheets/tools/__init__.py,sha256=GBe1Op-o6QzCy9nA3qS53Ij2Uex5IXdFPUnGQo_TPkg,673
-arcade_google_sheets/tools/file_picker.py,sha256=Dqn-hfMoTsWyHM8QCakVgHr5TKrzL_1Lj-vYHVGtOW4,2342
-arcade_google_sheets/tools/read.py,sha256=qQX_TdcbPbkuaHPuhx7CzWsWJ_a97FSCDJqOlGHF_TM,4003
-arcade_google_sheets/tools/search.py,sha256=olCaUwDqW26yaYqMT5lPmQDFL6M9g7qON7JG3mcgYJM,4841
-arcade_google_sheets/tools/system_context.py,sha256=rVpYeyFsL8mj0Lt6VWOhnfGaSy3ezOHL74EFJHjE9Ww,1176
-arcade_google_sheets/tools/write.py,sha256=4kNx941PQt6VUGTogbepnbfUdcsVze6u5c8QvlNnWCI,7782
-arcade_google_sheets-4.2.1.dist-info/METADATA,sha256=xM1z7j9tHzv6ncsWfQ2fU0dKY7BkNZ_lBgufskoz68w,1123
-arcade_google_sheets-4.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-arcade_google_sheets-4.2.1.dist-info/licenses/LICENSE,sha256=ixeE7aL9b2B-_ZYHTY1vQcJB4NufKeo-LWwKNObGDN0,1960
-arcade_google_sheets-4.2.1.dist-info/RECORD,,