diff --git a/enterprise/poetry.lock b/enterprise/poetry.lock index 13645253c5..c28ba7e6bc 100644 --- a/enterprise/poetry.lock +++ b/enterprise/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand. [[package]] name = "aiofiles" @@ -5840,10 +5840,8 @@ description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands A optional = false python-versions = ">=3.12" groups = ["main"] -files = [ - {file = "openhands_agent_server-1.5.2-py3-none-any.whl", hash = "sha256:7a368f61036f85446f566b9f6f9d6c7318684776cf2293daa5bce3ee19ac077d"}, - {file = "openhands_agent_server-1.5.2.tar.gz", hash = "sha256:dfaf5583dd71dae933643a8f8160156ce6fa7ed20db5cc3c45465b079bc576cd"}, -] +files = [] +develop = false [package.dependencies] aiosqlite = ">=0.19" @@ -5857,9 +5855,16 @@ uvicorn = ">=0.31.1" websockets = ">=12" wsproto = ">=1.2.0" +[package.source] +type = "git" +url = "https://github.com/OpenHands/agent-sdk.git" +reference = "34fcb39268229948d90bb3f9964b20a736f65777" +resolved_reference = "34fcb39268229948d90bb3f9964b20a736f65777" +subdirectory = "openhands-agent-server" + [[package]] name = "openhands-ai" -version = "0.62.0" +version = "0.0.0-post.5671+d772dd65a" description = "OpenHands: Code Less, Make More" optional = false python-versions = "^3.12,<3.14" @@ -5901,9 +5906,9 @@ memory-profiler = "^0.61.0" numpy = "*" openai = "2.8.0" openhands-aci = "0.3.2" -openhands-agent-server = "1.5.2" -openhands-sdk = "1.5.2" -openhands-tools = "1.5.2" +openhands-agent-server = {git = "https://github.com/OpenHands/agent-sdk.git", rev = "34fcb39268229948d90bb3f9964b20a736f65777", subdirectory = "openhands-agent-server"} +openhands-sdk = {git = "https://github.com/OpenHands/agent-sdk.git", rev = "34fcb39268229948d90bb3f9964b20a736f65777", subdirectory = "openhands-sdk"} +openhands-tools = {git = "https://github.com/OpenHands/agent-sdk.git", rev = "34fcb39268229948d90bb3f9964b20a736f65777", subdirectory = "openhands-tools"} opentelemetry-api = "^1.33.1" opentelemetry-exporter-otlp-proto-grpc = "^1.33.1" pathspec = "^0.12.1" @@ -5964,10 +5969,8 @@ description = "OpenHands SDK - Core functionality for building AI agents" optional = false python-versions = ">=3.12" groups = ["main"] -files = [ - {file = "openhands_sdk-1.5.2-py3-none-any.whl", hash = "sha256:593430e9c8729e345fce3fca7e9a9a7ef084a08222d6ba42113e6ba5f6e9f15d"}, - {file = "openhands_sdk-1.5.2.tar.gz", hash = "sha256:798aa8f8ccd84b15deb418c4301d00f33da288bc1a8d41efa5cc47c10aaf3fd6"}, -] +files = [] +develop = false [package.dependencies] deprecation = ">=2.1.0" @@ -5984,6 +5987,13 @@ websockets = ">=12" [package.extras] boto3 = ["boto3 (>=1.35.0)"] +[package.source] +type = "git" +url = "https://github.com/OpenHands/agent-sdk.git" +reference = "34fcb39268229948d90bb3f9964b20a736f65777" +resolved_reference = "34fcb39268229948d90bb3f9964b20a736f65777" +subdirectory = "openhands-sdk" + [[package]] name = "openhands-tools" version = "1.5.2" @@ -5991,10 +6001,8 @@ description = "OpenHands Tools - Runtime tools for AI agents" optional = false python-versions = ">=3.12" groups = ["main"] -files = [ - {file = "openhands_tools-1.5.2-py3-none-any.whl", hash = "sha256:33e9c2af65aaa7b6b9a10b42d2fb11137e6b35e7ac02a4b9269ef37b5c79cc01"}, - {file = "openhands_tools-1.5.2.tar.gz", hash = "sha256:4644a24144fbdf630fb0edc303526b4add61b3fbe7a7434da73f231312c34846"}, -] +files = [] +develop = false [package.dependencies] bashlex = ">=0.18" @@ -6007,6 +6015,13 @@ openhands-sdk = "*" pydantic = ">=2.11.7" tom-swe = ">=1.0.3" +[package.source] +type = "git" +url = "https://github.com/OpenHands/agent-sdk.git" +reference = "34fcb39268229948d90bb3f9964b20a736f65777" +resolved_reference = "34fcb39268229948d90bb3f9964b20a736f65777" +subdirectory = "openhands-tools" + [[package]] name = "openpyxl" version = "3.1.5" diff --git a/openhands/app_server/app_conversation/live_status_app_conversation_service.py b/openhands/app_server/app_conversation/live_status_app_conversation_service.py index 91b5f69c3c..46272f1213 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 @@ -1153,7 +1153,7 @@ class LiveStatusAppConversationServiceInjector(AppConversationServiceInjector): description='The Tavily Search API key to add to MCP integration', ) sandbox_grouping_strategy: SandboxGroupingStrategy = Field( - default=SandboxGroupingStrategy.NO_GROUPING, + default=SandboxGroupingStrategy.ADD_TO_ANY, description='Strategy for grouping conversations within sandboxes', ) diff --git a/openhands/app_server/sandbox/sandbox_spec_service.py b/openhands/app_server/sandbox/sandbox_spec_service.py index d9de63adbb..9d93df9bc8 100644 --- a/openhands/app_server/sandbox/sandbox_spec_service.py +++ b/openhands/app_server/sandbox/sandbox_spec_service.py @@ -11,7 +11,7 @@ from openhands.sdk.utils.models import DiscriminatedUnionMixin # The version of the agent server to use for deployments. # Typically this will be the same as the values from the pyproject.toml -AGENT_SERVER_IMAGE = 'ghcr.io/openhands/agent-server:8f90b92-python' +AGENT_SERVER_IMAGE = 'ghcr.io/openhands/agent-server:34fcb39-python' class SandboxSpecService(ABC): diff --git a/poetry.lock b/poetry.lock index 04831cc890..b7e3411d93 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.1.4 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand. [[package]] name = "aiofiles" @@ -7384,10 +7384,8 @@ description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands A optional = false python-versions = ">=3.12" groups = ["main"] -files = [ - {file = "openhands_agent_server-1.5.2-py3-none-any.whl", hash = "sha256:7a368f61036f85446f566b9f6f9d6c7318684776cf2293daa5bce3ee19ac077d"}, - {file = "openhands_agent_server-1.5.2.tar.gz", hash = "sha256:dfaf5583dd71dae933643a8f8160156ce6fa7ed20db5cc3c45465b079bc576cd"}, -] +files = [] +develop = false [package.dependencies] aiosqlite = ">=0.19" @@ -7401,6 +7399,13 @@ uvicorn = ">=0.31.1" websockets = ">=12" wsproto = ">=1.2.0" +[package.source] +type = "git" +url = "https://github.com/OpenHands/agent-sdk.git" +reference = "34fcb39268229948d90bb3f9964b20a736f65777" +resolved_reference = "34fcb39268229948d90bb3f9964b20a736f65777" +subdirectory = "openhands-agent-server" + [[package]] name = "openhands-sdk" version = "1.5.2" @@ -7408,10 +7413,8 @@ description = "OpenHands SDK - Core functionality for building AI agents" optional = false python-versions = ">=3.12" groups = ["main"] -files = [ - {file = "openhands_sdk-1.5.2-py3-none-any.whl", hash = "sha256:593430e9c8729e345fce3fca7e9a9a7ef084a08222d6ba42113e6ba5f6e9f15d"}, - {file = "openhands_sdk-1.5.2.tar.gz", hash = "sha256:798aa8f8ccd84b15deb418c4301d00f33da288bc1a8d41efa5cc47c10aaf3fd6"}, -] +files = [] +develop = false [package.dependencies] deprecation = ">=2.1.0" @@ -7428,6 +7431,13 @@ websockets = ">=12" [package.extras] boto3 = ["boto3 (>=1.35.0)"] +[package.source] +type = "git" +url = "https://github.com/OpenHands/agent-sdk.git" +reference = "34fcb39268229948d90bb3f9964b20a736f65777" +resolved_reference = "34fcb39268229948d90bb3f9964b20a736f65777" +subdirectory = "openhands-sdk" + [[package]] name = "openhands-tools" version = "1.5.2" @@ -7435,10 +7445,8 @@ description = "OpenHands Tools - Runtime tools for AI agents" optional = false python-versions = ">=3.12" groups = ["main"] -files = [ - {file = "openhands_tools-1.5.2-py3-none-any.whl", hash = "sha256:33e9c2af65aaa7b6b9a10b42d2fb11137e6b35e7ac02a4b9269ef37b5c79cc01"}, - {file = "openhands_tools-1.5.2.tar.gz", hash = "sha256:4644a24144fbdf630fb0edc303526b4add61b3fbe7a7434da73f231312c34846"}, -] +files = [] +develop = false [package.dependencies] bashlex = ">=0.18" @@ -7451,6 +7459,13 @@ openhands-sdk = "*" pydantic = ">=2.11.7" tom-swe = ">=1.0.3" +[package.source] +type = "git" +url = "https://github.com/OpenHands/agent-sdk.git" +reference = "34fcb39268229948d90bb3f9964b20a736f65777" +resolved_reference = "34fcb39268229948d90bb3f9964b20a736f65777" +subdirectory = "openhands-tools" + [[package]] name = "openpyxl" version = "3.1.5" @@ -16822,4 +16837,4 @@ third-party-runtimes = ["daytona", "e2b-code-interpreter", "modal", "runloop-api [metadata] lock-version = "2.1" python-versions = "^3.12,<3.14" -content-hash = "9ec48649a3b54d1c19d2aae9af77c640e9eadbc6a368ef437a5655f14fc2a37a" +content-hash = "68f0c3910f46c0e6b422f024333e84b9cb8548bda9668c2c8b4b669507e64062" diff --git a/pyproject.toml b/pyproject.toml index e9aa84a836..20ea6a6f47 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -113,12 +113,12 @@ e2b-code-interpreter = { version = "^2.0.0", optional = true } pybase62 = "^1.0.0" # V1 dependencies -#openhands-agent-server = { git = "https://github.com/OpenHands/agent-sdk.git", subdirectory = "openhands-agent-server", rev = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d" } -#openhands-sdk = { git = "https://github.com/OpenHands/agent-sdk.git", subdirectory = "openhands-sdk", rev = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d" } -#openhands-tools = { git = "https://github.com/OpenHands/agent-sdk.git", subdirectory = "openhands-tools", rev = "15f565b8ac38876e40dc05c08e2b04ccaae4a66d" } -openhands-sdk = "1.5.2" -openhands-agent-server = "1.5.2" -openhands-tools = "1.5.2" +openhands-agent-server = { git = "https://github.com/OpenHands/agent-sdk.git", subdirectory = "openhands-agent-server", rev = "34fcb39268229948d90bb3f9964b20a736f65777" } +openhands-sdk = { git = "https://github.com/OpenHands/agent-sdk.git", subdirectory = "openhands-sdk", rev = "34fcb39268229948d90bb3f9964b20a736f65777" } +openhands-tools = { git = "https://github.com/OpenHands/agent-sdk.git", subdirectory = "openhands-tools", rev = "34fcb39268229948d90bb3f9964b20a736f65777" } +#openhands-sdk = "1.5.2" +#openhands-agent-server = "1.5.2" +#openhands-tools = "1.5.2" python-jose = { version = ">=3.3", extras = [ "cryptography" ] } sqlalchemy = { extras = [ "asyncio" ], version = "^2.0.40" } pg8000 = "^1.31.5"