π OpenHands: AI-Driven Development
Fix litellm_proxy model info JSON parsing error handling (#10009)
Xingyao Wang5282770a4cea
diff --git a/openhands/llm/llm.py b/openhands/llm/llm.pyindex 601261d2cd..aafd633819 100644--- a/openhands/llm/llm.py+++ b/openhands/llm/llm.py@@ -461,12 +461,16 @@ class LLM(RetryMixin, DebugMixin):},)- resp_json = response.json()- if 'data' not in resp_json:- logger.error(- f'Error getting model info from LiteLLM proxy: {resp_json}'- )- all_model_info = resp_json.get('data', [])+ try:+ resp_json = response.json()+ if 'data' not in resp_json:+ logger.info(+ f'No data field in model info response from LiteLLM proxy: {resp_json}'+ )+ all_model_info = resp_json.get('data', [])+ except Exception as e:+ logger.info(f'Error parsing JSON response from LiteLLM proxy: {e}')+ all_model_info = []current_model_info = next((infodiff --git a/poetry.lock b/poetry.lockindex ef30bbc1d3..d1ca9adaa7 100644--- a/poetry.lock+++ b/poetry.lock@@ -1,4 +1,4 @@-# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.+# This file is automatically @generated by Poetry 2.1.2 and should not be changed by hand.[[package]]name = "aiofiles"@@ -404,7 +404,7 @@ description = "LTS Port of Python audioop"optional = falsepython-versions = ">=3.13"groups = ["main"]-markers = "python_version >= \"3.13\""+markers = "python_version == \"3.13\""files = [{file = "audioop_lts-0.2.1-cp313-abi3-macosx_10_13_universal2.whl", hash = "sha256:fd1345ae99e17e6910f47ce7d52673c6a1a70820d78b67de1b7abb3af29c426a"},{file = "audioop_lts-0.2.1-cp313-abi3-macosx_10_13_x86_64.whl", hash = "sha256:e175350da05d2087e12cea8e72a70a1a8b14a17e92ed2022952a4419689ede5e"},@@ -2997,8 +2997,8 @@ files = [google-api-core = {version = ">=1.34.1,<2.0.dev0 || >=2.11.dev0,<3.0.0dev", extras = ["grpc"]}google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0dev"proto-plus = [- {version = ">=1.22.3,<2.0.0dev"},{version = ">=1.25.0,<2.0.0dev", markers = "python_version >= \"3.13\""},+ {version = ">=1.22.3,<2.0.0dev"},]protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<6.0.0dev"@@ -3020,8 +3020,8 @@ googleapis-common-protos = ">=1.56.2,<2.0.0"grpcio = {version = ">=1.49.1,<2.0.0", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}grpcio-status = {version = ">=1.49.1,<2.0.0", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}proto-plus = [- {version = ">=1.22.3,<2.0.0"},{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},+ {version = ">=1.22.3,<2.0.0"},]protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"requests = ">=2.18.0,<3.0.0"@@ -3239,8 +3239,8 @@ google-api-core = {version = ">=1.34.1,<2.0.dev0 || >=2.11.dev0,<3.0.0", extrasgoogle-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0"grpc-google-iam-v1 = ">=0.14.0,<1.0.0"proto-plus = [- {version = ">=1.22.3,<2.0.0"},{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},+ {version = ">=1.22.3,<2.0.0"},]protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"@@ -6632,8 +6632,8 @@ files = [[package.dependencies]googleapis-common-protos = ">=1.52,<2.0"grpcio = [- {version = ">=1.63.2,<2.0.0", markers = "python_version < \"3.13\""},{version = ">=1.66.2,<2.0.0", markers = "python_version >= \"3.13\""},+ {version = ">=1.63.2,<2.0.0", markers = "python_version < \"3.13\""},]opentelemetry-api = ">=1.15,<2.0"opentelemetry-exporter-otlp-proto-common = "1.34.1"@@ -9337,7 +9337,6 @@ files = [{file = "setuptools-80.9.0-py3-none-any.whl", hash = "sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922"},{file = "setuptools-80.9.0.tar.gz", hash = "sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c"},]-markers = {evaluation = "platform_system == \"Linux\" and platform_machine == \"x86_64\""}[package.extras]check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\"", "ruff (>=0.8.0) ; sys_platform != \"cygwin\""]@@ -9581,7 +9580,7 @@ description = "Standard library aifc redistribution. \"dead battery\"."optional = falsepython-versions = "*"groups = ["main"]-markers = "python_version >= \"3.13\""+markers = "python_version == \"3.13\""files = [{file = "standard_aifc-3.13.0-py3-none-any.whl", hash = "sha256:f7ae09cc57de1224a0dd8e3eb8f73830be7c3d0bc485de4c1f82b4a7f645ac66"},{file = "standard_aifc-3.13.0.tar.gz", hash = "sha256:64e249c7cb4b3daf2fdba4e95721f811bde8bdfc43ad9f936589b7bb2fae2e43"},@@ -9598,7 +9597,7 @@ description = "Standard library chunk redistribution. \"dead battery\"."optional = falsepython-versions = "*"groups = ["main"]-markers = "python_version >= \"3.13\""+markers = "python_version == \"3.13\""files = [{file = "standard_chunk-3.13.0-py3-none-any.whl", hash = "sha256:17880a26c285189c644bd5bd8f8ed2bdb795d216e3293e6dbe55bbd848e2982c"},{file = "standard_chunk-3.13.0.tar.gz", hash = "sha256:4ac345d37d7e686d2755e01836b8d98eda0d1a3ee90375e597ae43aaf064d654"},@@ -11754,4 +11753,4 @@ third-party-runtimes = ["daytona", "e2b", "modal", "runloop-api-client"][metadata]lock-version = "2.1"python-versions = "^3.12,<3.14"-content-hash = "4640c66849d6436eed73826154e2d8cf88b456a4d1b71efb9438531245845826"+content-hash = "d957f92f0d194e78b1cbf4b5a31c28df83e34e508d2c9810de96204db8e8f158"diff --git a/pyproject.toml b/pyproject.tomlindex 230aac35ce..aec40b3898 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -25,12 +25,12 @@ build = "build_vscode.py" # Build VSCode extension during Poetry build[tool.poetry.dependencies]python = "^3.12,<3.14"-litellm = "^1.74.3, !=1.64.4, !=1.67.*" # avoid 1.64.4 (known bug) & 1.67.* (known bug #10272)-aiohttp = ">=3.9.0,!=3.11.13" # Pin to avoid yanked version 3.11.13-google-generativeai = "*" # To use litellm with Gemini Pro API-google-api-python-client = "^2.164.0" # For Google Sheets API-google-auth-httplib2 = "*" # For Google Sheets authentication-google-auth-oauthlib = "*" # For Google Sheets OAuth+litellm = "^1.74.3, !=1.64.4, !=1.67.*" # avoid 1.64.4 (known bug) & 1.67.* (known bug #10272)+aiohttp = ">=3.9.0,!=3.11.13" # Pin to avoid yanked version 3.11.13+google-generativeai = "*" # To use litellm with Gemini Pro API+google-api-python-client = "^2.164.0" # For Google Sheets API+google-auth-httplib2 = "*" # For Google Sheets authentication+google-auth-oauthlib = "*" # For Google Sheets OAuthtermcolor = "*"docker = "*"fastapi = "*"@@ -39,9 +39,9 @@ types-toml = "*"uvicorn = "*"numpy = "*"json-repair = "*"-browsergym-core = "0.13.3" # integrate browsergym-core as the browsing interface+browsergym-core = "0.13.3" # integrate browsergym-core as the browsing interfacehtml2text = "*"-+deprecated = "*"pexpect = "*"jinja2 = "^3.1.3"python-multipart = "*"