Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Only fetch actions available to an entity during schema validation #1095

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

fix: Only fetch actions available to an entity during schema validation #1095

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9fe5466
wip
tushar-composio Dec 23, 2024
3fda8b6
fix: default entity id
tushar-composio Dec 27, 2024
e71c298
prevent example test running from modifying the test files
tushar-composio Dec 30, 2024
5af820b
Merge branch 'master' into ENG-3203
tushar-composio Jan 8, 2025
2a33873
fix: changed comparison field to clientUniqueUserId
Devanshusisodiya Feb 5, 2025
20ca66c
Update python/tests/test_example.py
angrybayblade Feb 5, 2025
3848355
Update python/composio/tools/toolset.py
angrybayblade Feb 5, 2025
590f9e8
Merge branch 'master' into ENG-3203
Devanshusisodiya Feb 11, 2025
fefebc2
fix: check for entity id
Devanshusisodiya Feb 11, 2025
301a07d
Merge branch 'master' into ENG-3203
Devanshusisodiya Feb 12, 2025
bc5ba62
Merge branch 'master' into ENG-3203
Devanshusisodiya Feb 19, 2025
e193bfd
test: fix tests
Devanshusisodiya Feb 19, 2025
419aa66
test: fix tests
Devanshusisodiya Feb 19, 2025
5722fd9
test: fix ci tests
Devanshusisodiya Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions python/composio/client/collections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
Trigger,
TriggerType,
)
from composio.constants import PUSHER_CLUSTER, PUSHER_KEY
from composio.constants import DEFAULT_ENTITY_ID, PUSHER_CLUSTER, PUSHER_KEY
from composio.exceptions import (
ErrorFetchingResource,
InvalidParams,
Expand Down Expand Up @@ -92,7 +92,7 @@ class ConnectedAccountModel(BaseModel):
connectionParams: AuthConnectionParamsModel

clientUniqueUserId: t.Optional[str] = None
entityId: t.Optional[str] = None
entityId: str = DEFAULT_ENTITY_ID

# Override arbitrary model config.
model_config: ConfigDict = ConfigDict( # type: ignore
Comment on lines 92 to 98
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor: The change from an optional entityId to a default value of DEFAULT_ENTITY_ID enhances consistency across the codebase. This aligns with the check_connected_account function, which now expects an entity_id parameter. This change ensures logical consistency and reduces potential errors related to missing entityId values.

Expand Down
7 changes: 5 additions & 2 deletions python/composio/tools/toolset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,7 +1659,9 @@ def _validate_connection_ids(
return valid
raise InvalidConnectedAccount(f"Invalid connected accounts found: {invalid}")

def check_connected_account(self, action: ActionType) -> None:
def check_connected_account(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new parameter entity_id is added to check_connected_account but the docstring hasn’t been updated. Please document the new parameter.

self, action: ActionType, entity_id: t.Optional[str] = None
) -> None:
"""Check if connected account is required and if required it exists or not."""
action = Action(action)
if action.no_auth or action.is_runtime:
Expand All @@ -1677,6 +1679,7 @@ def check_connected_account(self, action: ActionType) -> None:
if action.app not in [
connection.appUniqueId.upper() # Normalize app names/ids coming from API
for connection in self._connected_accounts
if connection.clientUniqueUserId == entity_id
]:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check_connected_account method now filters connections by clientUniqueUserId but doesn't handle the case when entity_id is None, which could incorrectly reject valid connections. Should add a conditional check.

📝 Committable Code Suggestion

‼️ Ensure you review the code suggestion before committing it to the branch. Make sure it replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
if action.app not in [
connection.appUniqueId.upper() # Normalize app names/ids coming from API
for connection in self._connected_accounts
if connection.clientUniqueUserId == entity_id
]:
if action.app not in [
connection.appUniqueId.upper() # Normalize app names/ids coming from API
for connection in self._connected_accounts
if entity_id is None or connection.clientUniqueUserId == entity_id
]:

raise ConnectedAccountNotFoundError(
f"No connected account found for app `{action.app}`; "
Expand Down Expand Up @@ -1790,7 +1793,7 @@ def _execute_remote(
action=action
)
if auth is None:
self.check_connected_account(action=action)
self.check_connected_account(action=action, entity_id=entity_id)

output = self.client.get_entity( # pylint: disable=protected-access
id=entity_id
Expand Down
Loading