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

Author: LouisFunmula

dive_mcp_host/host/conf/llm.py

@@ -2,6 +2,7 @@
 
 from typing import Annotated, Literal, Self
 
+from httpx import AsyncClient, Client
 from pydantic import (
     BaseModel,
     BeforeValidator,
@@ -80,6 +81,7 @@ class LLMConfiguration(BaseModel):
     """Configuration for the LLM model."""
 
     base_url: str | None = Field(default=None, alias="baseURL")
+    skip_tls_verify: bool | None = Field(default=None)
     temperature: float | None = Field(default=0)
     top_p: float | None = Field(default=None)
 
@@ -90,6 +92,8 @@ def to_load_model_kwargs(self) -> dict:
         kwargs = {}
         if self.base_url:
             kwargs["base_url"] = self.base_url
+        if self.skip_tls_verify:
+            kwargs["skip_tls_verify"] = self.skip_tls_verify
         if self.temperature:
             kwargs["temperature"] = self.temperature
         if self.top_p:
@@ -125,6 +129,16 @@ def to_load_model_kwargs(self: LLMConfig) -> dict:
         remove_keys = []
         if self.model_provider == "openai" and self.model == "o3-mini":
             remove_keys.extend(["temperature", "top_p"])
+        if kwargs.get("skip_tls_verify"):
+            if self.model_provider == "ollama":
+                kwargs.update({"client_kwargs": {"verify": False}})
+            elif self.model_provider == "openai":
+                kwargs.update(
+                    {
+                        "http_client": Client(verify=False),  # noqa: S501
+                        "http_async_client": AsyncClient(verify=False),  # noqa: S501
+                    }
+                )
         for key in remove_keys:
             kwargs.pop(key, None)
         return to_snake_dict(kwargs)

dive_mcp_host/host/tools/server_session_store.py

@@ -43,7 +43,7 @@ class _SessionStoreItem:
 
     async def waiting_loop(self) -> None:
         while True:
-            await asyncio.sleep(1)
+            await asyncio.sleep(60)
             if (
                 time.time() - self.active_ts > MAX_IDLE_TIME
                 and len(self.client_tasks) == 0

tests/test_models.py

@@ -1,3 +1,4 @@
+from ssl import CERT_NONE
 from typing import Any
 
 import pytest
@@ -189,3 +190,43 @@ def test_model_single_config_validate() -> None:
     assert config.azure_deployment == "fake"
     assert config.api_key == SecretStr("fake")
     assert config.api_version == "2023-03-15-preview"
+
+
+def test_openai_skip_tls_verify() -> None:
+    """Test the OpenAI skip TLS verify."""
+    config = LLMConfig(
+        model="gpt-4o",
+        model_provider="openai",
+        api_key=SecretStr("fake"),
+        configuration=LLMConfiguration(
+            skip_tls_verify=True,
+        ),
+    )
+    model = load_model(
+        config.model_provider, config.model, **(config.to_load_model_kwargs())
+    )
+    assert (
+        model.client._client._client._transport._pool._ssl_context.verify_mode  # type: ignore
+        == CERT_NONE
+    )
+    assert (
+        model.async_client._client._client._transport._pool._ssl_context.verify_mode  # type: ignore
+        == CERT_NONE
+    )
+
+
+def test_ollama_skip_tls_verify() -> None:
+    """Test the Ollama skip TLS verify."""
+    config = LLMConfig(
+        model="llama3.1",
+        model_provider="ollama",
+        api_key=SecretStr("fake"),
+        configuration=LLMConfiguration(
+            skip_tls_verify=True,
+        ),
+    )
+    model = load_model(
+        config.model_provider, config.model, **(config.to_load_model_kwargs())
+    )
+
+    assert model._client._client._transport._pool._ssl_context.verify_mode == CERT_NONE  # type: ignore