Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@
from data_designer.engine.model_provider import ModelProviderRegistry, resolve_model_provider_registry
from data_designer_nemo.errors import NDDInternalError, NDDInvalidConfigError
from data_designer_nemo.sdk_translation import sync_to_async_sdk
from nemo_platform import (
APIConnectionError,
APITimeoutError,
AsyncNeMoPlatform,
NeMoPlatform,
NotFoundError,
PermissionDeniedError,
)
from nemo_platform.types.inference import ModelProvider as NMPModelProvider
from nemo_platform import AsyncNeMoPlatform, NeMoPlatform
from nemo_platform_plugin.client.adapter import client_from_platform
from nemo_platform_plugin.client.errors import NemoTransportError, NotFoundError, PermissionDeniedError
from nemo_platform_plugin.models.client import AsyncModelsClient, ModelsClient
from nemo_platform_plugin.models.types import ModelProvider as NMPModelProvider

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -183,9 +179,10 @@ async def _add_provider(
if nmp_provider is None:
return

models = client_from_platform(self.sdk, AsyncModelsClient)
ndd_provider = NDDModelProvider(
name=user_supplied_provider_name,
endpoint=self.sdk.models.get_provider_route_openai_url(nmp_provider),
endpoint=models.get_provider_route_openai_url(nmp_provider),
extra_headers={k: v for k, v in self.sdk.default_headers.items() if isinstance(v, str)},
)
providers = (ndd_provider, nmp_provider)
Expand All @@ -202,7 +199,7 @@ async def _get_nmp_provider(
f"Cannot access provider {user_supplied_provider_name!r}. Check that it exists and you have access to it."
)
self.inaccessible_providers.add(user_supplied_provider_name)
except (APIConnectionError, APITimeoutError) as e:
except NemoTransportError as e:
logger.debug(
"Error connecting while retrieving model provider",
extra={"provider_name": provider_name, "workspace": workspace},
Expand Down Expand Up @@ -265,14 +262,11 @@ async def make_model_provider_registry(


def get_nmp_provider(sdk: NeMoPlatform, workspace: str, provider_name: str) -> NMPModelProvider:
return sdk.inference.providers.retrieve(
workspace=workspace,
name=provider_name,
)
models = client_from_platform(sdk, ModelsClient)
return models.get_provider(workspace=workspace, name=provider_name).data()


async def get_nmp_provider_async(sdk: AsyncNeMoPlatform, workspace: str, provider_name: str) -> NMPModelProvider:
return await sdk.inference.providers.retrieve(
workspace=workspace,
name=provider_name,
)
models = client_from_platform(sdk, AsyncModelsClient)
response = await models.get_provider(workspace=workspace, name=provider_name)
return response.data()
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

from unittest.mock import AsyncMock, MagicMock, patch

import pytest
from data_designer_nemo.model_provider import get_nmp_provider, get_nmp_provider_async
from nemo_platform_plugin.models.client import AsyncModelsClient, ModelsClient


def test_get_nmp_provider_uses_models_client() -> None:
sdk = MagicMock()
provider = MagicMock()
response = MagicMock()
response.data.return_value = provider
models = MagicMock()
models.get_provider.return_value = response

with patch("data_designer_nemo.model_provider.client_from_platform", return_value=models) as make_client:
result = get_nmp_provider(sdk, "workspace", "provider")

make_client.assert_called_once_with(sdk, ModelsClient)
models.get_provider.assert_called_once_with(workspace="workspace", name="provider")
assert result is provider


@pytest.mark.asyncio
async def test_get_nmp_provider_async_uses_models_client() -> None:
sdk = MagicMock()
provider = MagicMock()
response = MagicMock()
response.data.return_value = provider
models = MagicMock()
models.get_provider = AsyncMock(return_value=response)

with patch("data_designer_nemo.model_provider.client_from_platform", return_value=models) as make_client:
result = await get_nmp_provider_async(sdk, "workspace", "provider")

make_client.assert_called_once_with(sdk, AsyncModelsClient)
models.get_provider.assert_awaited_once_with(workspace="workspace", name="provider")
assert result is provider
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@
"""

from nemo_platform import AsyncNeMoPlatform
from nemo_platform._exceptions import NotFoundError, PermissionDeniedError
from nemo_platform.types.models import ModelEntity
from nemo_platform_plugin.client.adapter import client_from_platform
from nemo_platform_plugin.client.errors import NotFoundError as ClientNotFoundError
from nemo_platform_plugin.client.errors import PermissionDeniedError as ClientPermissionDeniedError
from nemo_platform_plugin.client.errors import NotFoundError, PermissionDeniedError
from nemo_platform_plugin.files.client import AsyncFilesClient
from nemo_platform_plugin.models.client import AsyncModelsClient
from nemo_platform_plugin.models.types import ModelEntity
from nmp.common.entities.utils import parse_entity_ref
from nmp.customization_common.schemas.file_io import FileSetRef

Expand All @@ -31,9 +30,9 @@ async def check_dataset_access(sdk: AsyncNeMoPlatform, dataset_uri: str, default
files = client_from_platform(sdk, AsyncFilesClient)
try:
await files.get_fileset(workspace=workspace, name=ref.name)
except ClientPermissionDeniedError:
except PermissionDeniedError:
raise PermissionError(f"Access denied to dataset fileset '{workspace}/{ref.name}'") from None
except ClientNotFoundError:
except NotFoundError:
raise ValueError(
f"Dataset fileset '{ref.name}' not found in workspace '{workspace}'. Verify the dataset exists."
) from None
Expand All @@ -46,8 +45,14 @@ async def fetch_model_entity(
) -> ModelEntity:
"""Retrieve a model entity by reference string."""
resolved_ref = parse_entity_ref(model_ref, default_workspace)
models = client_from_platform(sdk, AsyncModelsClient)
try:
return await sdk.models.retrieve(name=resolved_ref.name, workspace=resolved_ref.workspace, verbose=True)
response = await models.get_model(
name=resolved_ref.name,
workspace=resolved_ref.workspace,
query_params={"verbose": True},
)
return response.data()
except PermissionDeniedError:
raise PermissionError(f"Access denied to model '{resolved_ref.workspace}/{resolved_ref.name}'") from None
except NotFoundError:
Expand Down
Loading
Loading