github/OpenHands
1
0
Fork 0
mirror of https://github.com/OpenHands/OpenHands.git synced 2026-03-22 13:47:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace 'convo' naming with 'conversation' (#10473)

Browse Source 
Co-authored-by: openhands <openhands@all-hands.dev>
This commit is contained in:
Rohit Malhotra
2025-08-18 15:10:32 -04:00
committed by GitHub
parent baf2cc5c7e
commit 3660933d59
21 changed files with 109 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openhands/server/conversation_manager/docker_nested_conversation_manager.py
View File

@@ -42,7 +42,7 @@ from openhands.storage.files import FileStore
from openhands.storage.locations import get_conversation_dir
from openhands.utils.async_utils import call_sync_from_async
from openhands.utils.import_utils import get_impl
from openhands.utils.utils import create_registry_and_convo_stats
from openhands.utils.utils import create_registry_and_conversation_stats
@dataclass
@@ -486,14 +486,14 @@ class DockerNestedConversationManager(ConversationManager):
user_id, sid, self.config
)
llm_registry, convo_stats, config = create_registry_and_convo_stats(
config, sid, user_id, settings
llm_registry, conversation_stats, config = (
create_registry_and_conversation_stats(config, sid, user_id, settings)
)
session = Session(
sid=sid,
llm_registry=llm_registry,
convo_stats=convo_stats,
conversation_stats=conversation_stats,
file_store=self.file_store,
config=config,
sio=self.sio,

8
openhands/server/conversation_manager/standalone_conversation_manager.py
View File

@@ -39,7 +39,7 @@ from openhands.utils.conversation_summary import (
)
from openhands.utils.import_utils import get_impl
from openhands.utils.shutdown_listener import should_continue
from openhands.utils.utils import create_registry_and_convo_stats
from openhands.utils.utils import create_registry_and_conversation_stats
from .conversation_manager import ConversationManager
@@ -335,15 +335,15 @@ class StandaloneConversationManager(ConversationManager):
)
await self.close_session(oldest_conversation_id)
llm_registry, convo_stats, config = create_registry_and_convo_stats(
self.config, sid, user_id, settings
llm_registry, conversation_stats, config = (
create_registry_and_conversation_stats(self.config, sid, user_id, settings)
)
session = Session(
sid=sid,
file_store=self.file_store,
config=config,
llm_registry=llm_registry,
convo_stats=convo_stats,
conversation_stats=conversation_stats,
sio=self.sio,
user_id=user_id,
)

20
openhands/server/services/conversation_service.py
View File

@@ -53,7 +53,7 @@ async def initialize_conversation(
conversation_title = get_default_conversation_title(conversation_id)
logger.info(f'Saving metadata for conversation {conversation_id}')
convo_metadata = ConversationMetadata(
conversation_metadata = ConversationMetadata(
trigger=conversation_trigger,
conversation_id=conversation_id,
title=conversation_title,
@@ -63,12 +63,12 @@ async def initialize_conversation(
git_provider=git_provider,
)
await conversation_store.save_metadata(convo_metadata)
return convo_metadata
await conversation_store.save_metadata(conversation_metadata)
return conversation_metadata
try:
convo_metadata = await conversation_store.get_metadata(conversation_id)
return convo_metadata
conversation_metadata = await conversation_store.get_metadata(conversation_id)
return conversation_metadata
except Exception:
pass
@@ -83,7 +83,7 @@ async def start_conversation(
image_urls: list[str] | None,
replay_json: str | None,
conversation_id: str,
convo_metadata: ConversationMetadata,
conversation_metadata: ConversationMetadata,
conversation_instructions: str | None,
mcp_config: MCPConfig | None = None,
) -> AgentLoopInfo:
@@ -92,7 +92,7 @@ async def start_conversation(
extra={
'signal': 'create_conversation',
'user_id': user_id,
'trigger': convo_metadata.trigger,
'trigger': conversation_metadata.trigger,
},
)
logger.info('Loading settings')
@@ -119,10 +119,10 @@ async def start_conversation(
raise MissingSettingsError('Settings not found')
session_init_args['git_provider_tokens'] = git_provider_tokens
session_init_args['selected_repository'] = convo_metadata.selected_repository
session_init_args['selected_repository'] = conversation_metadata.selected_repository
session_init_args['custom_secrets'] = custom_secrets
session_init_args['selected_branch'] = convo_metadata.selected_branch
session_init_args['git_provider'] = convo_metadata.git_provider
session_init_args['selected_branch'] = conversation_metadata.selected_branch
session_init_args['git_provider'] = conversation_metadata.git_provider
session_init_args['conversation_instructions'] = conversation_instructions
if mcp_config:
session_init_args['mcp_config'] = mcp_config

4
openhands/server/services/conversation_stats.py
View File

@@ -6,7 +6,9 @@ from openhands.core.logger import openhands_logger as logger
from openhands.llm.llm_registry import RegistryEvent
from openhands.llm.metrics import Metrics
from openhands.storage.files import FileStore
from openhands.storage.locations import get_conversation_stats_filename
from openhands.storage.locations import (
get_conversation_stats_filename,
)
class ConversationStats:

6
openhands/server/session/agent_session.py
View File

@@ -67,7 +67,7 @@ class AgentSession:
sid: str,
file_store: FileStore,
llm_registry: LLMRegistry,
convo_stats: ConversationStats,
conversation_stats: ConversationStats,
status_callback: Callable | None = None,
user_id: str | None = None,
) -> None:
@@ -86,7 +86,7 @@ class AgentSession:
extra={'session_id': sid, 'user_id': user_id}
)
self.llm_registry = llm_registry
self.convo_stats = convo_stats
self.conversation_stats = conversation_stats
async def start(
self,
@@ -450,7 +450,7 @@ class AgentSession:
user_id=self.user_id,
file_store=self.file_store,
event_stream=self.event_stream,
convo_stats=self.convo_stats,
conversation_stats=self.conversation_stats,
agent=agent,
iteration_delta=int(max_iterations),
budget_per_task_delta=max_budget_per_task,

6
openhands/server/session/session.py
View File

@@ -55,7 +55,7 @@ class Session:
sid: str,
config: OpenHandsConfig,
llm_registry: LLMRegistry,
convo_stats: ConversationStats,
conversation_stats: ConversationStats,
file_store: FileStore,
sio: socketio.AsyncServer | None,
user_id: str | None = None,
@@ -66,12 +66,12 @@ class Session:
self.file_store = file_store
self.logger = OpenHandsLoggerAdapter(extra={'session_id': sid})
self.llm_registry = llm_registry
self.convo_stats = convo_stats
self.conversation_stats = conversation_stats
self.agent_session = AgentSession(
sid,
file_store,
llm_registry=self.llm_registry,
convo_stats=convo_stats,
conversation_stats=conversation_stats,
status_callback=self.queue_status_message,
user_id=user_id,
)