Merge branch 'development' of ssh://git.biggo.com:222/Funmula/dive-mcp-host into development

Author: LouisFunmula

dive_mcp_host/httpd/routers/model_verify.py

@@ -15,7 +15,7 @@
 from pydantic.alias_generators import to_camel
 
 from dive_mcp_host.host.conf import HostConfig, LogConfig
-from dive_mcp_host.host.conf.llm import LLMConfig, LLMConfigTypes
+from dive_mcp_host.host.conf.llm import LLMConfigTypes
 from dive_mcp_host.host.errors import ThreadQueryError
 from dive_mcp_host.host.host import DiveMcpHost
 from dive_mcp_host.host.tools.misc import TestTool
@@ -399,7 +399,7 @@ async def _check_tools_in_prompt(
 class ModelVerifyRequest(BaseModel):
     """Model verify request."""
 
-    model_settings: LLMConfig | None = Field(alias="modelSettings", default=None)
+    model_settings: LLMConfigTypes | None = Field(alias="modelSettings", default=None)
 
 
 def get_verify_subjects(llm_config: LLMConfigTypes) -> list[VERIFY_SUBJECTS]:

tests/test_providers.py

@@ -189,6 +189,7 @@ async def test_host_google(echo_tool_stdio_config: dict[str, ServerConfig]) -> N
 @pytest.mark.asyncio
 async def test_bedrock(echo_tool_stdio_config: dict[str, ServerConfig]) -> None:
     """Test the host context initialization."""
+    # claude-3-7-sonnet
     if (key_id := environ.get("BEDROCK_ACCESS_KEY_ID")) and (
         access_key := environ.get("BEDROCK_SECRET_ACCESS_KEY")
     ):
@@ -214,6 +215,32 @@ async def test_bedrock(echo_tool_stdio_config: dict[str, ServerConfig]) -> None:
 
     await _run_the_test(config)
 
+    # claude-sonnet-4
+    if (key_id := environ.get("BEDROCK_ACCESS_KEY_ID")) and (
+        access_key := environ.get("BEDROCK_SECRET_ACCESS_KEY")
+    ):
+        token = environ.get("BEDROCK_SESSION_TOKEN")
+        config = HostConfig(
+            llm=LLMBedrockConfig(
+                model="us.anthropic.claude-sonnet-4-20250514-v1:0",
+                model_provider="bedrock",
+                credentials=Credentials(
+                    access_key_id=SecretStr(key_id),
+                    secret_access_key=SecretStr(access_key),
+                    session_token=SecretStr(token or ""),
+                ),
+                region="us-east-1",
+            ),
+            mcp_servers=echo_tool_stdio_config,
+        )
+    else:
+        pytest.skip(
+            "need environment variable BEDROCK_ACCESS_KEY_ID,"
+            " BEDROCK_SECRET_ACCESS_KEY, BEDROCK_SESSION_TOKEN to run this test"
+        )
+
+    await _run_the_test(config)
+
 
 @pytest.mark.asyncio
 async def test_mistralai(echo_tool_stdio_config: dict[str, ServerConfig]) -> None: