Skip to content

Commit 97ff9b5

Browse files
committed
fix uts
1 parent d079638 commit 97ff9b5

File tree

4 files changed

+16
-40
lines changed

4 files changed

+16
-40
lines changed

docs/docs/providers/eval/index.mdx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22
description: |
33
Evaluations
44
5+
<<<<<<< HEAD
56
<<<<<<< HEAD
67
Llama Stack Evaluation API for running evaluations on model and agent candidates.
78
=======
89
Llama Stack Evaluation API for running evaluations on model and agent candidates."
910
>>>>>>> eb10a349 (clean)
11+
=======
12+
Llama Stack Evaluation API for running evaluations on model and agent candidates."
13+
>>>>>>> 94479abf (fix uts)
1014
sidebar_label: Eval
1115
title: Eval
1216
---
@@ -17,6 +21,6 @@ title: Eval
1721

1822
Evaluations
1923

20-
Llama Stack Evaluation API for running evaluations on model and agent candidates.
24+
Llama Stack Evaluation API for running evaluations on model and agent candidates.
2125

2226
This section contains documentation for all available providers for the **eval** API.

src/llama_stack/providers/utils/job_scheduler/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
│ B. Vector IO (depends on inference, job_scheduler) │
3333
│ ├─ deps = { │
3434
│ │ Api.inference: <impl>, │
35-
│ │ Api.job_scheduler: <scheduler_impl>
35+
│ │ Api.job_scheduler: <scheduler>
3636
│ │ } │
3737
│ ├─ get_provider_impl(config, deps) │
3838
│ │ ├─ adapter = FaissVectorIOAdapter( │

src/llama_stack/providers/utils/job_scheduler/__init__.py

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,10 @@
77
from .api import JobStatus, Scheduler
88
from .config import CelerySchedulerConfig, InlineSchedulerConfig, SchedulerConfig
99

10-
11-
async def scheduler_impl(config: SchedulerConfig) -> Scheduler:
12-
"""
13-
Factory function to instantiate scheduler implementations.
14-
15-
Args:
16-
config: Scheduler configuration (InlineSchedulerConfig or CelerySchedulerConfig)
17-
18-
Returns:
19-
Scheduler: An initialized scheduler instance
20-
21-
Raises:
22-
ValueError: If the config type is unknown
23-
"""
24-
impl: Scheduler
25-
if isinstance(config, InlineSchedulerConfig):
26-
from .inline import InlineSchedulerImpl
27-
28-
impl = InlineSchedulerImpl(config)
29-
elif isinstance(config, CelerySchedulerConfig):
30-
from .celery import CelerySchedulerImpl
31-
32-
impl = CelerySchedulerImpl(config)
33-
else:
34-
raise ValueError(f"Unknown scheduler config type: {type(config)}")
35-
36-
await impl.initialize()
37-
return impl
38-
39-
4010
__all__ = [
4111
"JobStatus",
4212
"Scheduler",
4313
"SchedulerConfig",
4414
"InlineSchedulerConfig",
4515
"CelerySchedulerConfig",
46-
"scheduler_impl",
4716
]

tests/unit/providers/utils/test_job_scheduler.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
import pytest
1313

1414
from llama_stack.core.storage.datatypes import KVStoreReference, SqliteKVStoreConfig
15-
from llama_stack.providers.utils.job_scheduler import (
16-
InlineSchedulerConfig,
17-
scheduler_impl,
18-
)
15+
from llama_stack.providers.utils.job_scheduler import InlineSchedulerConfig
1916
from llama_stack.providers.utils.kvstore import register_kvstore_backends
2017

2118

@@ -45,7 +42,9 @@ def scheduler_config():
4542

4643
async def test_scheduler_api_exists(scheduler_config):
4744
"""Test that scheduler API is properly defined."""
48-
scheduler = await scheduler_impl(scheduler_config)
45+
from llama_stack.providers.utils.job_scheduler.inline import InlineSchedulerImpl
46+
47+
scheduler = InlineSchedulerImpl(scheduler_config)
4948

5049
# Verify all required methods exist
5150
assert hasattr(scheduler, "initialize")
@@ -61,7 +60,9 @@ async def test_scheduler_api_exists(scheduler_config):
6160

6261
async def test_scheduler_not_implemented(scheduler_config):
6362
"""Test that scheduler methods raise NotImplementedError."""
64-
scheduler = await scheduler_impl(scheduler_config)
63+
from llama_stack.providers.utils.job_scheduler.inline import InlineSchedulerImpl
64+
65+
scheduler = InlineSchedulerImpl(scheduler_config)
6566

6667
# Test that all methods raise NotImplementedError
6768
with pytest.raises(NotImplementedError, match="not yet available"):
@@ -94,7 +95,9 @@ async def test_scheduler_not_implemented(scheduler_config):
9495

9596
async def test_two_phase_initialization_pattern(scheduler_config):
9697
"""Test that the two-phase initialization pattern is supported."""
97-
scheduler = await scheduler_impl(scheduler_config)
98+
from llama_stack.providers.utils.job_scheduler.inline import InlineSchedulerImpl
99+
100+
scheduler = InlineSchedulerImpl(scheduler_config)
98101

99102
# Mock the methods to test the pattern
100103
scheduler.initialize = AsyncMock()

0 commit comments

Comments
 (0)