Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix: correct SQLAlchemy Result and Table type annotations (#14076)

Rohit Malhotra6b29a82de39b
diff --git a/enterprise/storage/gitlab_webhook_store.py b/enterprise/storage/gitlab_webhook_store.py
index 29afabe2ea..e6f9279c74 100644
--- a/enterprise/storage/gitlab_webhook_store.py
+++ b/enterprise/storage/gitlab_webhook_store.py
@@ -3,7 +3,7 @@ from __future__ import annotations
from dataclasses import dataclass
from integrations.types import GitLabResourceType
-from sqlalchemy import and_, asc, select, text, update
+from sqlalchemy import and_, asc, delete, select, text, update
from sqlalchemy.dialects.postgresql import insert
from storage.database import a_session_maker
from storage.gitlab_webhook import GitlabWebhook
@@ -123,11 +123,11 @@ class GitlabWebhookStore:
async with session.begin():
# Create query based on the identifier provided
if resource_type == GitLabResourceType.PROJECT:
- query = GitlabWebhook.__table__.delete().where(
+ query = delete(GitlabWebhook).where(
GitlabWebhook.project_id == resource_id
)
else: # has_group_id must be True based on validation
- query = GitlabWebhook.__table__.delete().where(
+ query = delete(GitlabWebhook).where(
GitlabWebhook.group_id == resource_id
)
diff --git a/frontend/__tests__/routes/llm-settings.test.tsx b/frontend/__tests__/routes/llm-settings.test.tsx
index ffc3a18586..130d2d2461 100644
--- a/frontend/__tests__/routes/llm-settings.test.tsx
+++ b/frontend/__tests__/routes/llm-settings.test.tsx
@@ -258,7 +258,7 @@ describe("LlmSettingsScreen", () => {
it("keeps Advanced visible but hides All in SaaS mode for the default LLM route schema", async () => {
vi.spyOn(
organizationService,
- "getOrganizationAgentSettings",
+ "getOrganizationSettings",
).mockResolvedValue(
buildSettings({
agent_settings: {
diff --git a/openhands/app_server/app_conversation/sql_app_conversation_info_service.py b/openhands/app_server/app_conversation/sql_app_conversation_info_service.py
index 9854af072f..6abf52112e 100644
--- a/openhands/app_server/app_conversation/sql_app_conversation_info_service.py
+++ b/openhands/app_server/app_conversation/sql_app_conversation_info_service.py
@@ -21,7 +21,7 @@ import logging
import uuid
from dataclasses import dataclass
from datetime import UTC, datetime
-from typing import AsyncGenerator
+from typing import AsyncGenerator, cast
from uuid import UUID
from fastapi import Request
@@ -33,6 +33,7 @@ from sqlalchemy import (
func,
select,
)
+from sqlalchemy.engine import CursorResult
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import Mapped, mapped_column
@@ -599,7 +600,7 @@ class SQLAppConversationInfoService(AppConversationInfoService):
)
# Execute the secure delete query
- result = await self.db_session.execute(delete_query)
+ result = cast(CursorResult, await self.db_session.execute(delete_query))
return result.rowcount > 0
diff --git a/openhands/app_server/app_conversation/sql_app_conversation_start_task_service.py b/openhands/app_server/app_conversation/sql_app_conversation_start_task_service.py
index 63cb920702..59e5959ae6 100644
--- a/openhands/app_server/app_conversation/sql_app_conversation_start_task_service.py
+++ b/openhands/app_server/app_conversation/sql_app_conversation_start_task_service.py
@@ -19,11 +19,12 @@ from __future__ import annotations
import logging
from dataclasses import dataclass
from datetime import datetime
-from typing import AsyncGenerator
+from typing import AsyncGenerator, cast
from uuid import UUID
from fastapi import Request
from sqlalchemy import Enum, String, func, select
+from sqlalchemy.engine import CursorResult
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import Mapped, mapped_column
@@ -264,7 +265,7 @@ class SQLAppConversationStartTaskService(AppConversationStartTaskService):
StoredAppConversationStartTask.created_by_user_id == self.user_id
)
- result = await self.session.execute(delete_query)
+ result = cast(CursorResult, await self.session.execute(delete_query))
# Return True if any rows were affected
return result.rowcount > 0