diff --git a/packages/client/src/launchdarkly_ai_server/evaluations/__init__.py b/packages/client/src/launchdarkly_ai_server/evaluations/__init__.py index 40d01469..24a8b86d 100644 --- a/packages/client/src/launchdarkly_ai_server/evaluations/__init__.py +++ b/packages/client/src/launchdarkly_ai_server/evaluations/__init__.py @@ -3,15 +3,11 @@ from .api import ( DEFAULT_BASE_URI, EvaluationsError, - HttpResponse, - LDApiClient, LDApiError, - Transport, - urllib_transport, ) -from .criteria import Criterion, Judge, Scorer, SuccessDirection +from .criteria import Criterion, Judge, Scorer from .module import EvaluationsModule, init_evaluations -from .tools import EvalTool, ToolsClient +from .tools import EvalTool from .types import ( AIConfig, DatasetRow, @@ -35,16 +31,10 @@ "GenerationConfig", "GenerationMode", "GenerationOverrides", - "HttpResponse", "Judge", - "LDApiClient", "LDApiError", "RunSummary", "Scorer", - "SuccessDirection", - "ToolsClient", - "Transport", "Usage", "init_evaluations", - "urllib_transport", ] diff --git a/packages/client/src/launchdarkly_ai_server/evaluations/module.py b/packages/client/src/launchdarkly_ai_server/evaluations/module.py index 61f3919e..d73e8191 100644 --- a/packages/client/src/launchdarkly_ai_server/evaluations/module.py +++ b/packages/client/src/launchdarkly_ai_server/evaluations/module.py @@ -231,10 +231,6 @@ def __init__( self._runner = EvaluationsRunner(api_client) self._tools = ToolsClient(api_client, project_key) - @property - def api(self) -> LDApiClient: - return self._api - @property def project_key(self) -> str: """Project that holds this module's evaluations, tools, and datasets.""" diff --git a/packages/client/tests/test_evaluations.py b/packages/client/tests/test_evaluations.py index 828a19ef..069f1fe9 100644 --- a/packages/client/tests/test_evaluations.py +++ b/packages/client/tests/test_evaluations.py @@ -10,11 +10,10 @@ import launchdarkly_ai_server.lifecycle as lifecycle_module from launchdarkly_ai_server.evaluations import ( DEFAULT_BASE_URI, - HttpResponse, - LDApiClient, LDApiError, Usage, ) +from launchdarkly_ai_server.evaluations.api import HttpResponse, LDApiClient from launchdarkly_ai_server.experimental.evaluations import ( EvalRunResult, EvaluationsError, @@ -75,9 +74,9 @@ def test_init_resolves_credentials_from_env(monkeypatch: pytest.MonkeyPatch) -> evals = init_evaluations(transport=RecordingTransport()) - assert evals.api.api_key == "api-token-from-env" + assert evals._api.api_key == "api-token-from-env" assert evals.sdk_key == "sdk-key-from-env" - assert evals.api.base_uri == DEFAULT_BASE_URI + assert evals._api.base_uri == DEFAULT_BASE_URI assert evals.ui_base_uri == "https://app.launchdarkly.com" @@ -92,7 +91,7 @@ def test_init_prefers_explicit_credentials(monkeypatch: pytest.MonkeyPatch) -> N transport=RecordingTransport(), ) - assert evals.api.api_key == "explicit-token" + assert evals._api.api_key == "explicit-token" assert evals.sdk_key == "explicit-sdk-key" @@ -181,7 +180,7 @@ def request_url(**options: Any) -> str: """Init the harness, send one management API request, return its URL.""" transport = RecordingTransport() evals = init_evaluations(transport=transport, **options) - evals.api.get("projects/proj/evaluations") + evals._api.get("projects/proj/evaluations") return str(transport.requests[0]["url"]) @@ -307,7 +306,7 @@ def test_api_host_env_alone_leaves_ui_host_on_default( evals = init_evaluations(transport=RecordingTransport()) - assert evals.api.base_uri == "https://api.staging.example.com" + assert evals._api.base_uri == "https://api.staging.example.com" assert evals.ui_base_uri == "https://app.launchdarkly.com" diff --git a/packages/client/tests/test_evaluations_run.py b/packages/client/tests/test_evaluations_run.py index b01eec75..2f7edd3e 100644 --- a/packages/client/tests/test_evaluations_run.py +++ b/packages/client/tests/test_evaluations_run.py @@ -12,7 +12,7 @@ import pytest from launchdarkly_ai_server import NativeTool, create_handler -from launchdarkly_ai_server.evaluations import HttpResponse +from launchdarkly_ai_server.evaluations.api import HttpResponse from launchdarkly_ai_server.experimental.evaluations import ( AIConfig, DatasetRow, @@ -4154,7 +4154,7 @@ async def test_inline_upload_is_retried_after_a_server_error() -> None: ] ) evals = init_evaluations(project_key="proj", api_key="token", transport=transport) - evals.api._sleep = lambda _: None + evals._api._sleep = lambda _: None result = await evals.run( key="inline-eval",