π OpenHands: AI-Driven Development
Remove deprecated V0 issue interface and migrate ConversationTrigger imports (#14169)
Tim O'Farrell3a85dbce7845
diff --git a/enterprise/server/sharing/shared_conversation_models.py b/enterprise/server/sharing/shared_conversation_models.pyindex a27c3ec559..fefaf04613 100644--- a/enterprise/server/sharing/shared_conversation_models.py+++ b/enterprise/server/sharing/shared_conversation_models.py@@ -3,7 +3,7 @@ from datetime import datetime# Simplified imports to avoid dependency chain issues# from openhands.integrations.service_types import ProviderType# from openhands.sdk.llm import MetricsSnapshot-# from openhands.storage.data_models.conversation_metadata import ConversationTrigger+# from openhands.app_server.app_conversation.app_conversation_models import ConversationTrigger# For now, use Any to avoid import issuesfrom typing import Anyfrom uuid import uuid4diff --git a/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py b/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.pyindex 37cda4dca2..47e1842cf5 100644--- a/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py+++ b/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py@@ -22,10 +22,10 @@ from storage.user import Userfrom openhands.app_server.app_conversation.app_conversation_models import (AppConversationInfo,+ ConversationTrigger,)from openhands.app_server.user.specifiy_user_context import SpecifyUserContextfrom openhands.integrations.service_types import ProviderType-from openhands.storage.data_models.conversation_metadata import ConversationTrigger# Test UUIDsUSER1_ID = UUID('a1111111-1111-1111-1111-111111111111')diff --git a/enterprise/tests/unit/test_sharing/test_sharing_shared_conversation_info_service.py b/enterprise/tests/unit/test_sharing/test_sharing_shared_conversation_info_service.pyindex b735923c33..915ae4c48d 100644--- a/enterprise/tests/unit/test_sharing/test_sharing_shared_conversation_info_service.py+++ b/enterprise/tests/unit/test_sharing/test_sharing_shared_conversation_info_service.py@@ -16,6 +16,7 @@ from storage.user import Userfrom openhands.app_server.app_conversation.app_conversation_models import (AppConversationInfo,+ ConversationTrigger,)from openhands.app_server.app_conversation.sql_app_conversation_info_service import (SQLAppConversationInfoService,@@ -24,7 +25,6 @@ from openhands.app_server.user.specifiy_user_context import SpecifyUserContextfrom openhands.app_server.utils.sql_utils import Basefrom openhands.integrations.provider import ProviderTypefrom openhands.sdk.llm import MetricsSnapshot, TokenUsage-from openhands.storage.data_models.conversation_metadata import ConversationTrigger@pytest.fixturediff --git a/openhands/app_server/app_conversation/live_status_app_conversation_service.py b/openhands/app_server/app_conversation/live_status_app_conversation_service.pyindex 08b0777486..81ff6befe6 100644--- a/openhands/app_server/app_conversation/live_status_app_conversation_service.py+++ b/openhands/app_server/app_conversation/live_status_app_conversation_service.py@@ -34,6 +34,7 @@ from openhands.app_server.app_conversation.app_conversation_models import (AppConversationStartTask,AppConversationStartTaskStatus,AppConversationUpdateRequest,+ ConversationTrigger,PluginSpec,)from openhands.app_server.app_conversation.app_conversation_service import (@@ -98,7 +99,6 @@ from openhands.sdk.secret import LookupSecret, StaticSecretfrom openhands.sdk.utils.paging import page_iteratorfrom openhands.sdk.workspace.remote.async_remote_workspace import AsyncRemoteWorkspacefrom openhands.server.types import AppMode-from openhands.storage.data_models.conversation_metadata import ConversationTriggerfrom openhands.storage.data_models.settings import SandboxGroupingStrategyfrom openhands.tools.preset.default import (get_default_tools,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.pyindex fa60e890fb..d412b24bf1 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@@ -46,6 +46,7 @@ from openhands.app_server.app_conversation.app_conversation_models import (AppConversationInfo,AppConversationInfoPage,AppConversationSortOrder,+ ConversationTrigger,)from openhands.app_server.services.injector import InjectorStatefrom openhands.app_server.user.user_context import UserContext@@ -57,7 +58,6 @@ from openhands.integrations.provider import ProviderTypefrom openhands.sdk import ConversationStatsfrom openhands.sdk.event import ConversationStateUpdateEventfrom openhands.sdk.llm import MetricsSnapshot, TokenUsage-from openhands.storage.data_models.conversation_metadata import ConversationTriggerlogger = logging.getLogger(__name__)diff --git a/openhands/app_server/event_callback/webhook_router.py b/openhands/app_server/event_callback/webhook_router.pyindex 5f5cc826bf..dc77d605d2 100644--- a/openhands/app_server/event_callback/webhook_router.py+++ b/openhands/app_server/event_callback/webhook_router.py@@ -18,6 +18,7 @@ from openhands.app_server.app_conversation.app_conversation_info_service import)from openhands.app_server.app_conversation.app_conversation_models import (AppConversationInfo,+ ConversationTrigger,)from openhands.app_server.config import (depends_app_conversation_info_service,@@ -50,7 +51,6 @@ from openhands.server.user_auth.default_user_auth import DefaultUserAuthfrom openhands.server.user_auth.user_auth import (get_for_user as get_user_auth_for_user,)-from openhands.storage.data_models.conversation_metadata import ConversationTriggerrouter = APIRouter(prefix='/webhooks', tags=['Webhooks'])event_service_dependency = depends_event_service()diff --git a/openhands/integrations/forgejo/service/resolver.py b/openhands/integrations/forgejo/service/resolver.pyindex 0442a72095..f84104000e 100644--- a/openhands/integrations/forgejo/service/resolver.py+++ b/openhands/integrations/forgejo/service/resolver.py@@ -1,12 +1,9 @@from __future__ import annotations-from collections import defaultdictfrom datetime import datetime-from typing import castfrom openhands.integrations.forgejo.service.base import ForgejoMixinBasefrom openhands.integrations.service_types import Comment-from openhands.resolver.interfaces.issue import ReviewThreadclass ForgejoResolverMixin(ForgejoMixinBase):@@ -78,39 +75,6 @@ class ForgejoResolverMixin(ForgejoMixinBase):comments.sort(key=lambda c: c.created_at)return comments[-max_comments:]- async def get_pr_review_threads(- self,- repository: str,- pr_number: int,- max_threads: int = 10,- ) -> list[ReviewThread]:- owner, repo = self._split_repo(repository)- url = self._build_repo_api_url(owner, repo, 'pulls', str(pr_number), 'comments')- params = {'page': '1', 'limit': '100', 'order': 'asc'}-- response, _ = await self._make_request(url, params)- raw_comments = response if isinstance(response, list) else []-- grouped: dict[str, list[str]] = defaultdict(list)- files: dict[str, set[str]] = defaultdict(set)-- for payload in raw_comments:- if not isinstance(payload, dict):- continue- path = cast(str, payload.get('path') or 'general')- body = cast(str, payload.get('body') or '')- grouped[path].append(body)- if payload.get('path'):- files[path].add(cast(str, payload['path']))-- threads: list[ReviewThread] = []- for path, messages in grouped.items():- comment_text = '\n---\n'.join(messages)- file_list = sorted(files.get(path, {path}))- threads.append(ReviewThread(comment=comment_text, files=file_list))-- return threads[:max_threads]-def _to_comment(self, payload: dict | None) -> Comment | None:if not isinstance(payload, dict):return Nonediff --git a/openhands/resolver/interfaces/issue.py b/openhands/resolver/interfaces/issue.pydeleted file mode 100644index a456be5c70..0000000000--- a/openhands/resolver/interfaces/issue.py+++ /dev/null@@ -1,138 +0,0 @@-# IMPORTANT: LEGACY V0 CODE - Deprecated since version 1.0.0, scheduled for removal April 1, 2026-# This file is part of the legacy (V0) implementation of OpenHands and will be removed soon as we complete the migration to V1.-# OpenHands V1 uses the Software Agent SDK for the agentic core and runs a new application server. Please refer to:-# - V1 agentic core (SDK): https://github.com/OpenHands/software-agent-sdk-# - V1 application server (in this repo): openhands/app_server/-# Unless you are working on deprecation, please avoid extending this legacy file and consult the V1 codepaths above.-# Tag: Legacy-V0-from abc import ABC, abstractmethod-from typing import Any--from pydantic import BaseModel, field_validator---class ReviewThread(BaseModel):- comment: str- files: list[str]---class Issue(BaseModel):- owner: str- repo: str- number: int- title: str- body: str = ''-- @field_validator('body', mode='before')- @classmethod- def body_must_not_be_none(cls, v: str | None) -> str:- return v if v is not None else ''-- thread_comments: list[str] | None = None # Added field for issue thread comments- closing_issues: list[str] | None = None- review_comments: list[str] | None = None- review_threads: list[ReviewThread] | None = None- thread_ids: list[str] | None = None- head_branch: str | None = None- base_branch: str | None = None---class IssueHandlerInterface(ABC):- @abstractmethod- def set_owner(self, owner: str) -> None:- pass-- @abstractmethod- def download_issues(self) -> list[Any]:- pass-- @abstractmethod- def get_issue_comments(- self, issue_number: int, comment_id: int | None = None- ) -> list[str] | None:- pass-- @abstractmethod- def get_base_url(self) -> str:- pass-- @abstractmethod- def get_branch_url(self, branch_name: str) -> str:- pass-- @abstractmethod- def get_download_url(self) -> str:- pass-- @abstractmethod- def get_clone_url(self) -> str:- pass-- @abstractmethod- def get_pull_url(self, pr_number: int) -> str:- pass-- @abstractmethod- def get_graphql_url(self) -> str:- pass-- @abstractmethod- def get_headers(self) -> dict[str, str]:- pass-- @abstractmethod- def get_compare_url(self, branch_name: str) -> str:- pass-- @abstractmethod- def get_branch_name(self, base_branch_name: str) -> str:- pass-- @abstractmethod- def get_default_branch_name(self) -> str:- pass-- @abstractmethod- def branch_exists(self, branch_name: str) -> bool:- pass-- @abstractmethod- def reply_to_comment(self, pr_number: int, comment_id: str, reply: str) -> None:- pass-- @abstractmethod- def send_comment_msg(self, issue_number: int, msg: str) -> None:- pass-- @abstractmethod- def get_authorize_url(self) -> str:- pass-- @abstractmethod- def create_pull_request(self, data: dict[str, Any] | None = None) -> dict[str, Any]:- if data is None:- data = {}- raise NotImplementedError-- @abstractmethod- def request_reviewers(self, reviewer: str, pr_number: int) -> None:- pass-- @abstractmethod- def get_context_from_external_issues_references(- self,- closing_issues: list[str],- closing_issue_numbers: list[int],- issue_body: str,- review_comments: list[str] | None,- review_threads: list[ReviewThread],- thread_comments: list[str] | None,- ) -> list[str]:- pass-- @abstractmethod- def get_converted_issues(- self, issue_numbers: list[int] | None = None, comment_id: int | None = None- ) -> list[Issue]:- """Download issues from the git provider (GitHub, GitLab, Bitbucket, or Azure DevOps)."""- passdiff --git a/tests/unit/app_server/test_live_status_app_conversation_service.py b/tests/unit/app_server/test_live_status_app_conversation_service.pyindex 63bd1d0a13..759f208fe2 100644--- a/tests/unit/app_server/test_live_status_app_conversation_service.py+++ b/tests/unit/app_server/test_live_status_app_conversation_service.py@@ -21,6 +21,7 @@ from openhands.app_server.app_conversation.app_conversation_models import (AgentType,AppConversationInfo,AppConversationStartRequest,+ ConversationTrigger,)from openhands.app_server.app_conversation.live_status_app_conversation_service import (LiveStatusAppConversationService,@@ -42,7 +43,6 @@ from openhands.sdk.secret import LookupSecret, StaticSecretfrom openhands.sdk.settings import AgentSettings, ConversationSettingsfrom openhands.sdk.workspace.remote.async_remote_workspace import AsyncRemoteWorkspacefrom openhands.server.types import AppMode-from openhands.storage.data_models.conversation_metadata import ConversationTriggerfrom openhands.storage.data_models.settings import SandboxGroupingStrategy, Settingsdiff --git a/tests/unit/app_server/test_sql_app_conversation_info_service.py b/tests/unit/app_server/test_sql_app_conversation_info_service.pyindex aa228df881..4a24e8d5c3 100644--- a/tests/unit/app_server/test_sql_app_conversation_info_service.py+++ b/tests/unit/app_server/test_sql_app_conversation_info_service.py@@ -16,6 +16,7 @@ from sqlalchemy.pool import StaticPoolfrom openhands.app_server.app_conversation.app_conversation_models import (AppConversationInfo,AppConversationSortOrder,+ ConversationTrigger,)from openhands.app_server.app_conversation.sql_app_conversation_info_service import (SQLAppConversationInfoService,@@ -24,7 +25,6 @@ from openhands.app_server.user.specifiy_user_context import SpecifyUserContextfrom openhands.app_server.utils.sql_utils import Basefrom openhands.integrations.service_types import ProviderTypefrom openhands.sdk.llm import MetricsSnapshot, TokenUsage-from openhands.storage.data_models.conversation_metadata import ConversationTrigger# Note: org_id column exists but foreign key constraint is not enforced in testsdiff --git a/tests/unit/app_server/test_webhook_router_parent_conversation.py b/tests/unit/app_server/test_webhook_router_parent_conversation.pyindex 3291b4e1f1..bd897cfb57 100644--- a/tests/unit/app_server/test_webhook_router_parent_conversation.py+++ b/tests/unit/app_server/test_webhook_router_parent_conversation.py@@ -16,6 +16,7 @@ from sqlalchemy.pool import StaticPoolfrom openhands.agent_server.models import ConversationInfo, Successfrom openhands.app_server.app_conversation.app_conversation_models import (AppConversationInfo,+ ConversationTrigger,)from openhands.app_server.app_conversation.sql_app_conversation_info_service import (SQLAppConversationInfoService,@@ -26,7 +27,6 @@ from openhands.app_server.user.specifiy_user_context import SpecifyUserContextfrom openhands.app_server.utils.sql_utils import Basefrom openhands.integrations.provider import ProviderTypefrom openhands.sdk.conversation import ConversationExecutionStatus-from openhands.storage.data_models.conversation_metadata import ConversationTrigger@asynccontextmanagerdiff --git a/tests/unit/app_server/test_webhook_router_tags.py b/tests/unit/app_server/test_webhook_router_tags.pyindex 67530db193..5177f31f35 100644--- a/tests/unit/app_server/test_webhook_router_tags.py+++ b/tests/unit/app_server/test_webhook_router_tags.py@@ -12,6 +12,9 @@ import pytestfrom sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_enginefrom sqlalchemy.pool import StaticPool+from openhands.app_server.app_conversation.app_conversation_models import (+ ConversationTrigger,+)from openhands.app_server.app_conversation.sql_app_conversation_info_service import (SQLAppConversationInfoService,StoredConversationMetadata,@@ -22,7 +25,6 @@ from openhands.app_server.event_callback.webhook_router import ()from openhands.app_server.user.specifiy_user_context import SpecifyUserContextfrom openhands.app_server.utils.sql_utils import Base-from openhands.storage.data_models.conversation_metadata import ConversationTrigger# ---------------------------------------------------------------------------# Fixtures