From b09ecefd73274e6d9840bb6864ffb20d1ff9a71c Mon Sep 17 00:00:00 2001 From: Matt Zhou Date: Mon, 30 Dec 2024 12:17:44 -0800 Subject: [PATCH] Run lint --- letta/server/server.py | 16 ++++++++-------- tests/integration_test_composio.py | 16 ++++++---------- tests/integration_test_tool_execution_sandbox.py | 4 +++- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/letta/server/server.py b/letta/server/server.py index c4699eb3..a619463a 100644 --- a/letta/server/server.py +++ b/letta/server/server.py @@ -53,7 +53,7 @@ from letta.schemas.memory import ArchivalMemorySummary, ContextWindowOverview, M from letta.schemas.message import Message, MessageCreate, MessageRole, MessageUpdate from letta.schemas.organization import Organization from letta.schemas.passage import Passage -from letta.schemas.sandbox_config import SandboxType, SandboxEnvironmentVariableCreate +from letta.schemas.sandbox_config import SandboxEnvironmentVariableCreate, SandboxType from letta.schemas.source import Source from letta.schemas.tool import Tool from letta.schemas.usage import LettaUsageStatistics @@ -301,14 +301,14 @@ class SyncServer(Server): # Add composio keys to the tool sandbox env vars of the org if tool_settings.composio_api_key: - manager = SandboxConfigManager(tool_settings) - sandbox_config = manager.get_or_create_default_sandbox_config(sandbox_type=SandboxType.LOCAL, actor=self.default_user) + manager = SandboxConfigManager(tool_settings) + sandbox_config = manager.get_or_create_default_sandbox_config(sandbox_type=SandboxType.LOCAL, actor=self.default_user) - manager.create_sandbox_env_var( - SandboxEnvironmentVariableCreate(key="COMPOSIO_API_KEY", value=tool_settings.composio_api_key), - sandbox_config_id=sandbox_config.id, - actor=self.default_user, - ) + manager.create_sandbox_env_var( + SandboxEnvironmentVariableCreate(key="COMPOSIO_API_KEY", value=tool_settings.composio_api_key), + sandbox_config_id=sandbox_config.id, + actor=self.default_user, + ) # collect providers (always has Letta as a default) self._enabled_providers: List[Provider] = [LettaProvider()] diff --git a/tests/integration_test_composio.py b/tests/integration_test_composio.py index 7caf3325..1b2c2e3f 100644 --- a/tests/integration_test_composio.py +++ b/tests/integration_test_composio.py @@ -8,25 +8,21 @@ from letta.server.rest_api.app import app def client(): return TestClient(app) + def test_list_composio_apps(client): - response = client.get( - "/v1/tools/composio/apps" - ) + response = client.get("/v1/tools/composio/apps") assert response.status_code == 200 assert isinstance(response.json(), list) + def test_list_composio_actions_by_app(client): - response = client.get( - "/v1/tools/composio/apps/github/actions" - ) + response = client.get("/v1/tools/composio/apps/github/actions") assert response.status_code == 200 assert isinstance(response.json(), list) + def test_add_composio_tool(client): - response = client.post( - "/v1/tools/composio/GITHUB_STAR_A_REPOSITORY_FOR_THE_AUTHENTICATED_USER" - ) + response = client.post("/v1/tools/composio/GITHUB_STAR_A_REPOSITORY_FOR_THE_AUTHENTICATED_USER") assert response.status_code == 200 assert "id" in response.json() assert "name" in response.json() - diff --git a/tests/integration_test_tool_execution_sandbox.py b/tests/integration_test_tool_execution_sandbox.py index b84bcd51..ad3d2ebb 100644 --- a/tests/integration_test_tool_execution_sandbox.py +++ b/tests/integration_test_tool_execution_sandbox.py @@ -352,7 +352,9 @@ def test_local_sandbox_e2e_composio_star_github(mock_e2b_api_key_none, check_com @pytest.mark.local_sandbox -def test_local_sandbox_e2e_composio_star_github_without_setting_db_env_vars(mock_e2b_api_key_none, check_composio_key_set, composio_github_star_tool, test_user): +def test_local_sandbox_e2e_composio_star_github_without_setting_db_env_vars( + mock_e2b_api_key_none, check_composio_key_set, composio_github_star_tool, test_user +): result = ToolExecutionSandbox(composio_github_star_tool.name, {"owner": "letta-ai", "repo": "letta"}, user=test_user).run() assert result.func_return["details"] == "Action executed successfully"