Skip to content

Use Claude Code, Codex, VSCode, Pi, and OpenCode (and 6 other harnesses) for free (1.3B+ free tokens) from your terminal, app, IDE, or phone, and now from the browser with native browser sessions (multi-harness + multi-model) like OpenClaw (voice supported + ToS friendly)

Python

Phase 3: Fix encapsulation violations

Cursor Agent72b7e3499943
diff --git a/api/dependencies.py b/api/dependencies.py
index 3d26a1b5..636c8264 100644
--- a/api/dependencies.py
+++ b/api/dependencies.py
@@ -31,12 +31,11 @@ def get_provider() -> BaseProvider:
base_url=NVIDIA_NIM_BASE_URL,
rate_limit=settings.provider_rate_limit,
rate_window=settings.provider_rate_window,
- nim_settings=settings.nim,
http_read_timeout=settings.http_read_timeout,
http_write_timeout=settings.http_write_timeout,
http_connect_timeout=settings.http_connect_timeout,
)
- _provider = NvidiaNimProvider(config)
+ _provider = NvidiaNimProvider(config, nim_settings=settings.nim)
logger.info("Provider initialized: %s", settings.provider_type)
elif settings.provider_type == "open_router":
from providers.open_router import OpenRouterProvider
@@ -46,7 +45,6 @@ def get_provider() -> BaseProvider:
base_url="https://openrouter.ai/api/v1",
rate_limit=settings.provider_rate_limit,
rate_window=settings.provider_rate_window,
- nim_settings=settings.nim,
http_read_timeout=settings.http_read_timeout,
http_write_timeout=settings.http_write_timeout,
http_connect_timeout=settings.http_connect_timeout,
@@ -61,7 +59,6 @@ def get_provider() -> BaseProvider:
base_url=settings.lm_studio_base_url,
rate_limit=settings.provider_rate_limit,
rate_window=settings.provider_rate_window,
- nim_settings=settings.nim,
http_read_timeout=settings.http_read_timeout,
http_write_timeout=settings.http_write_timeout,
http_connect_timeout=settings.http_connect_timeout,
diff --git a/messaging/tree_data.py b/messaging/tree_data.py
index e0c4edfe..233e0631 100644
--- a/messaging/tree_data.py
+++ b/messaging/tree_data.py
@@ -131,6 +131,10 @@ class MessageTree:
logger.debug(f"Created MessageTree with root {self.root_id}")
+ def set_current_task(self, task: Optional[asyncio.Task]) -> None:
+ """Set the current processing task. Caller must hold lock."""
+ self._current_task = task
+
@property
def is_processing(self) -> bool:
"""Check if tree is currently processing a message."""
diff --git a/messaging/tree_processor.py b/messaging/tree_processor.py
index 9ecf09e7..e4fa79b8 100644
--- a/messaging/tree_processor.py
+++ b/messaging/tree_processor.py
@@ -114,8 +114,10 @@ class TreeQueueProcessor:
# Process next node (outside lock)
node = tree.get_node(next_node_id)
if node:
- tree._current_task = asyncio.create_task(
- self.process_node(tree, node, processor)
+ tree.set_current_task(
+ asyncio.create_task(
+ self.process_node(tree, node, processor)
+ )
)
# Notify that this node has started processing and refresh queue positions.
@@ -152,8 +154,10 @@ class TreeQueueProcessor:
# Process outside the lock
node = tree.get_node(node_id)
if node:
- tree._current_task = asyncio.create_task(
- self.process_node(tree, node, processor)
+ tree.set_current_task(
+ asyncio.create_task(
+ self.process_node(tree, node, processor)
+ )
)
return False
diff --git a/providers/base.py b/providers/base.py
index 355ad315..8d4cd57a 100644
--- a/providers/base.py
+++ b/providers/base.py
@@ -3,23 +3,20 @@
from abc import ABC, abstractmethod
from typing import Any, AsyncIterator, Optional
-from pydantic import BaseModel, Field
-
-from config.nim import NimSettings
+from pydantic import BaseModel
class ProviderConfig(BaseModel):
"""Configuration for a provider.
Base fields apply to all providers. Provider-specific parameters
- (e.g. NIM temperature, top_p) are passed via nim_settings.
+ (e.g. NIM temperature, top_p) are passed by the provider constructor.
"""
api_key: str
base_url: Optional[str] = None
rate_limit: Optional[int] = None
rate_window: int = 60
- nim_settings: NimSettings = Field(default_factory=NimSettings)
http_read_timeout: float = 300.0
http_write_timeout: float = 10.0
http_connect_timeout: float = 2.0
diff --git a/providers/nvidia_nim/client.py b/providers/nvidia_nim/client.py
index 41f57e72..4acdf201 100644
--- a/providers/nvidia_nim/client.py
+++ b/providers/nvidia_nim/client.py
@@ -2,6 +2,7 @@
from typing import Any
+from config.nim import NimSettings
from providers.openai_compat import OpenAICompatibleProvider
from providers.base import ProviderConfig
@@ -11,13 +12,13 @@ from .request import build_request_body
class NvidiaNimProvider(OpenAICompatibleProvider):
"""NVIDIA NIM provider using official OpenAI client."""
- def __init__(self, config: ProviderConfig):
+ def __init__(self, config: ProviderConfig, *, nim_settings: NimSettings):
super().__init__(
config,
provider_name="NIM",
base_url=config.base_url or "https://integrate.api.nvidia.com/v1",
api_key=config.api_key,
- nim_settings=config.nim_settings,
+ nim_settings=nim_settings,
)
def _build_request_body(self, request: Any) -> dict:
diff --git a/tests/conftest.py b/tests/conftest.py
index 6f672116..71f8086c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -29,13 +29,12 @@ def provider_config():
base_url="https://test.api.nvidia.com/v1",
rate_limit=10,
rate_window=60,
- nim_settings=NimSettings(),
)
@pytest.fixture
def nim_provider(provider_config):
- return NvidiaNimProvider(provider_config)
+ return NvidiaNimProvider(provider_config, nim_settings=NimSettings())
@pytest.fixture
@@ -54,7 +53,6 @@ def lmstudio_provider(provider_config):
base_url="http://localhost:1234/v1",
rate_limit=provider_config.rate_limit,
rate_window=provider_config.rate_window,
- nim_settings=provider_config.nim_settings,
)
return LMStudioProvider(lmstudio_config)
diff --git a/tests/test_lmstudio.py b/tests/test_lmstudio.py
index 2c99bd4f..2db20299 100644
--- a/tests/test_lmstudio.py
+++ b/tests/test_lmstudio.py
@@ -7,7 +7,6 @@ from unittest.mock import AsyncMock, MagicMock, patch
from providers.base import ProviderConfig
from providers.lmstudio import LMStudioProvider
from providers.lmstudio.request import LMSTUDIO_DEFAULT_MAX_TOKENS
-from config.nim import NimSettings
class AsyncStreamMock:
@@ -102,7 +101,6 @@ def lmstudio_config():
base_url="http://localhost:1234/v1",
rate_limit=10,
rate_window=60,
- nim_settings=NimSettings(),
)
@@ -141,7 +139,6 @@ def test_init_with_empty_api_key():
base_url="http://localhost:1234/v1",
rate_limit=10,
rate_window=60,
- nim_settings=NimSettings(),
)
with patch("providers.openai_compat.AsyncOpenAI"):
provider = LMStudioProvider(config)
@@ -655,7 +652,6 @@ def test_init_base_url_strips_trailing_slash():
base_url="http://localhost:1234/v1/",
rate_limit=10,
rate_window=60,
- nim_settings=NimSettings(),
)
with patch("providers.openai_compat.AsyncOpenAI"):
provider = LMStudioProvider(config)
diff --git a/tests/test_nvidia_nim.py b/tests/test_nvidia_nim.py
index d5037760..355781fd 100644
--- a/tests/test_nvidia_nim.py
+++ b/tests/test_nvidia_nim.py
@@ -54,7 +54,11 @@ def mock_rate_limiter():
async def test_init(provider_config):
"""Test provider initialization."""
with patch("providers.openai_compat.AsyncOpenAI") as mock_openai:
- provider = NvidiaNimProvider(provider_config)
+ from config.nim import NimSettings
+
+ provider = NvidiaNimProvider(
+ provider_config, nim_settings=NimSettings()
+ )
assert provider._api_key == "test_key"
assert provider._base_url == "https://test.api.nvidia.com/v1"
mock_openai.assert_called_once()
@@ -64,6 +68,7 @@ async def test_init(provider_config):
async def test_init_uses_configurable_timeouts():
"""Test that provider passes configurable read/write/connect timeouts to client."""
from providers.base import ProviderConfig
+ from config.nim import NimSettings
config = ProviderConfig(
api_key="test_key",
@@ -73,7 +78,7 @@ async def test_init_uses_configurable_timeouts():
http_connect_timeout=5.0,
)
with patch("providers.openai_compat.AsyncOpenAI") as mock_openai:
- NvidiaNimProvider(config)
+ NvidiaNimProvider(config, nim_settings=NimSettings())
call_kwargs = mock_openai.call_args[1]
timeout = call_kwargs["timeout"]
assert timeout.read == 600.0
diff --git a/tests/test_open_router.py b/tests/test_open_router.py
index 07573281..4fcd3604 100644
--- a/tests/test_open_router.py
+++ b/tests/test_open_router.py
@@ -6,7 +6,6 @@ from unittest.mock import MagicMock, AsyncMock, patch
from providers.open_router import OpenRouterProvider
from providers.open_router.request import OPENROUTER_DEFAULT_MAX_TOKENS
from providers.base import ProviderConfig
-from config.nim import NimSettings
class MockMessage:
@@ -39,7 +38,6 @@ def open_router_config():
base_url="https://openrouter.ai/api/v1",
rate_limit=10,
rate_window=60,
- nim_settings=NimSettings(),
)
diff --git a/tests/test_streaming_errors.py b/tests/test_streaming_errors.py
index 9513bf30..1b5c0fda 100644
--- a/tests/test_streaming_errors.py
+++ b/tests/test_streaming_errors.py
@@ -33,9 +33,8 @@ def _make_provider():
base_url="https://test.api.nvidia.com/v1",
rate_limit=10,
rate_window=60,
- nim_settings=NimSettings(),
)
- return NvidiaNimProvider(config)
+ return NvidiaNimProvider(config, nim_settings=NimSettings())
def _make_request(model="test-model", stream=True):
diff --git a/tests/test_subagent_interception.py b/tests/test_subagent_interception.py
index f0b009bd..b3fc3b2b 100644
--- a/tests/test_subagent_interception.py
+++ b/tests/test_subagent_interception.py
@@ -4,13 +4,14 @@ from unittest.mock import MagicMock
from providers.nvidia_nim import NvidiaNimProvider
from providers.common import ContentBlockManager
from providers.base import ProviderConfig
+from config.nim import NimSettings
@pytest.mark.asyncio
async def test_task_tool_interception():
# Setup provider
config = ProviderConfig(api_key="test")
- provider = NvidiaNimProvider(config)
+ provider = NvidiaNimProvider(config, nim_settings=NimSettings())
# Mock request and sse builder with real ContentBlockManager
request = MagicMock()