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

python/composio/client/collections.py

@@ -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,
@@ -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

python/composio/tools/toolset.py

@@ -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(
+        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:
@@ -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 entity_id is None or connection.clientUniqueUserId == entity_id
         ]:
             raise ConnectedAccountNotFoundError(
                 f"No connected account found for app `{action.app}`; "
@@ -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

python/tests/test_example.py

@@ -218,6 +218,7 @@ def test_example(
         ), f"Please provide value for `{key}` for testing `{example['file']}`"
 
     filepath = Path(example["file"])
+    original_source = filepath.read_text(encoding="utf-8")
     code = filepath.read_text(encoding="utf-8")
 
     if plugin_to_test != "lyzr":
@@ -236,10 +237,10 @@ def test_example(
     # Wait for 2 minutes for example to run
     proc.wait(timeout=180)
 
+    filepath.write_text(original_source, encoding="utf-8")
+
     # Check if process exited with success
-    assert proc.returncode == 0, (
-        t.cast(t.IO[bytes], proc.stderr).read().decode(encoding="utf-8")
-    )
+    assert proc.returncode == 0
 
     # Validate output
     output = (