From d6887f46c62e045040861c36de423bb9aaef9112 Mon Sep 17 00:00:00 2001 From: Ashwin Bharambe Date: Fri, 21 Mar 2025 12:11:50 -0700 Subject: [PATCH] fix: a couple of tests were broken and not yet exercised by our per-PR test workflow --- .../scoring/basic/scoring_fn/ifeval_scoring_fn.py | 3 ++- tests/integration/providers/test_providers.py | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/llama_stack/providers/inline/scoring/basic/scoring_fn/ifeval_scoring_fn.py b/llama_stack/providers/inline/scoring/basic/scoring_fn/ifeval_scoring_fn.py index f06333795..6ff856684 100644 --- a/llama_stack/providers/inline/scoring/basic/scoring_fn/ifeval_scoring_fn.py +++ b/llama_stack/providers/inline/scoring/basic/scoring_fn/ifeval_scoring_fn.py @@ -10,7 +10,6 @@ from llama_stack.apis.scoring import ScoringResultRow from llama_stack.apis.scoring_functions import ScoringFnParams from llama_stack.providers.utils.scoring.base_scoring_fn import RegisteredBaseScoringFn -from ..utils.ifeval_utils import INSTRUCTION_DICT, INSTRUCTION_LIST from .fn_defs.ifeval import ( ifeval, ) @@ -33,6 +32,8 @@ class IfEvalScoringFn(RegisteredBaseScoringFn): scoring_fn_identifier: Optional[str] = None, scoring_params: Optional[ScoringFnParams] = None, ) -> ScoringResultRow: + from ..utils.ifeval_utils import INSTRUCTION_DICT, INSTRUCTION_LIST + assert scoring_fn_identifier is not None, "Scoring function identifier not found." fn_def = self.supported_fn_defs_registry[scoring_fn_identifier] if scoring_params is not None: diff --git a/tests/integration/providers/test_providers.py b/tests/integration/providers/test_providers.py index 748a831b9..8b153411c 100644 --- a/tests/integration/providers/test_providers.py +++ b/tests/integration/providers/test_providers.py @@ -12,11 +12,12 @@ from llama_stack import LlamaStackAsLibraryClient class TestProviders: @pytest.mark.asyncio - def test_list(self, llama_stack_client: LlamaStackAsLibraryClient | LlamaStackClient): + def test_providers(self, llama_stack_client: LlamaStackAsLibraryClient | LlamaStackClient): provider_list = llama_stack_client.providers.list() assert provider_list is not None + assert len(provider_list) > 0 - @pytest.mark.asyncio - def test_inspect(self, llama_stack_client: LlamaStackAsLibraryClient | LlamaStackClient): - provider_list = llama_stack_client.providers.retrieve("ollama") - assert provider_list is not None + for provider in provider_list: + pid = provider.provider_id + provider = llama_stack_client.providers.retrieve(pid) + assert provider is not None