Skip to content

Commit c6e84d7

Browse files
committed
fix(list-users): Don't catch errors
1 parent c8e4de9 commit c6e84d7

File tree

1 file changed

+21
-26
lines changed

1 file changed

+21
-26
lines changed

packages/gg_api_core/src/gg_api_core/tools/list_users.py

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -81,30 +81,25 @@ async def list_users(params: ListUsersParams) -> ListUsersResult:
8181

8282
logger.debug(f"Query parameters: {json.dumps(query_params)}")
8383

84-
try:
85-
if params.get_all:
86-
# Use paginate_all for fetching all results
87-
members = await client.paginate_all("/members", query_params)
88-
logger.debug(f"Retrieved all {len(members)} members using pagination")
89-
return ListUsersResult(members=members, total_count=len(members), next_cursor=None)
84+
if params.get_all:
85+
# Use paginate_all for fetching all results
86+
members = await client.paginate_all("/members", query_params)
87+
logger.debug(f"Retrieved all {len(members)} members using pagination")
88+
return ListUsersResult(members=members, total_count=len(members), next_cursor=None)
89+
else:
90+
# Single page request
91+
result, headers = await client.list_members(params=query_params)
92+
93+
# Handle response format
94+
if isinstance(result, dict):
95+
members = result.get("results", result.get("data", []))
96+
next_cursor = client._extract_next_cursor(headers) if headers else None
97+
elif isinstance(result, list):
98+
members = result
99+
next_cursor = None
90100
else:
91-
# Single page request
92-
result, headers = await client.list_members(params=query_params)
93-
94-
# Handle response format
95-
if isinstance(result, dict):
96-
members = result.get("results", result.get("data", []))
97-
next_cursor = client._extract_next_cursor(headers) if headers else None
98-
elif isinstance(result, list):
99-
members = result
100-
next_cursor = None
101-
else:
102-
logger.error(f"Unexpected result type: {type(result)}")
103-
raise ToolError(f"Unexpected response format: {type(result).__name__}")
104-
105-
logger.debug(f"Found {len(members)} members")
106-
return ListUsersResult(members=members, total_count=len(members), next_cursor=next_cursor)
107-
108-
except Exception as e:
109-
logger.error(f"Error listing workspace members: {str(e)}")
110-
raise ToolError(str(e))
101+
logger.error(f"Unexpected result type: {type(result)}")
102+
raise ToolError(f"Unexpected response format: {type(result).__name__}")
103+
104+
logger.debug(f"Found {len(members)} members")
105+
return ListUsersResult(members=members, total_count=len(members), next_cursor=next_cursor)

0 commit comments

Comments
 (0)