Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions packages/client/src/launchdarkly_ai_server/evaluations/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -35,16 +31,10 @@
"GenerationConfig",
"GenerationMode",
"GenerationOverrides",
"HttpResponse",
"Judge",
"LDApiClient",
"LDApiError",
"RunSummary",
"Scorer",
"SuccessDirection",
"ToolsClient",
"Transport",
"Usage",
"init_evaluations",
"urllib_transport",
]
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down
13 changes: 6 additions & 7 deletions packages/client/tests/test_evaluations.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"


Expand All @@ -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"


Expand Down Expand Up @@ -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"])


Expand Down Expand Up @@ -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"


Expand Down
4 changes: 2 additions & 2 deletions packages/client/tests/test_evaluations_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down
Loading