Merge pull request #81 from m-misiura/get_ready_for_lls_0.5.x

feat: add llama-stack 0.5.x compatibility with request objects

Author: m-misiura

pyproject.toml

@@ -1,13 +1,12 @@
 [project]
 name = "llama-stack-provider-lmeval"
-version = "0.4.2"
+version = "0.5.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
     "llama-stack",
-    # Pinned to 35.0.0a1 as required by LLS 0.4.x; monitor for stable release
-    "kubernetes==35.0.0a1",
+    "kubernetes==35.0.0",
     "fastapi",
     "opentelemetry-api",
     "opentelemetry-exporter-otlp",
@@ -17,7 +16,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = ["pytest", "pytest-cov", "black", "isort", "ruff", "llama-stack==0.3.5"]
+dev = ["pytest", "pytest-cov", "black", "isort", "ruff", "llama-stack==0.5.0"]
 
 [dependency-groups]
 dev = ["pytest", "pytest-cov", "black", "isort", "pre-commit", "ruff", "mypy", "types-PyYAML", "types-requests"]

src/llama_stack_provider_lmeval/compat.py

@@ -14,15 +14,29 @@
         Eval,
         EvalCandidate,
         EvaluateResponse,
+        EvaluateRowsRequest,
         Job,
+        JobCancelRequest,
+        JobResultRequest,
         JobStatus,
+        JobStatusRequest,
         ListBenchmarksResponse,
         ProviderSpec,
         RemoteProviderSpec,
+        RunEvalRequest,
         ScoringResult,
         json_schema_type,
     )
-except ModuleNotFoundError:  # Legacy llama_stack layout
+    from llama_stack_api.eval.compat import (
+        resolve_evaluate_rows_request,
+        resolve_job_cancel_request,
+        resolve_job_result_request,
+        resolve_job_status_request,
+        resolve_run_eval_request,
+    )
+except ModuleNotFoundError:  # Legacy llama_stack layout (pre-0.5.x)
+    # Note: Request objects (RunEvalRequest, etc.) were introduced in 0.5.x
+    # Legacy versions only support individual parameter style
     from llama_stack.apis.benchmarks import Benchmark, ListBenchmarksResponse
     from llama_stack.apis.common.job_types import Job, JobStatus
     from llama_stack.apis.datatypes import Api
@@ -40,6 +54,20 @@
     )
     from llama_stack.schema_utils import json_schema_type
 
+    # Request objects don't exist in pre-0.5.x, set to None
+    RunEvalRequest = None  # type: ignore
+    EvaluateRowsRequest = None  # type: ignore
+    JobStatusRequest = None  # type: ignore
+    JobCancelRequest = None  # type: ignore
+    JobResultRequest = None  # type: ignore
+
+    # Compat resolve functions don't exist in pre-0.5.x, set to None
+    resolve_run_eval_request = None  # type: ignore
+    resolve_evaluate_rows_request = None  # type: ignore
+    resolve_job_status_request = None  # type: ignore
+    resolve_job_cancel_request = None  # type: ignore
+    resolve_job_result_request = None  # type: ignore
+
 __all__ = [
     "Api",
     "Benchmark",
@@ -48,11 +76,21 @@
     "Eval",
     "EvalCandidate",
     "EvaluateResponse",
+    "EvaluateRowsRequest",
     "Job",
+    "JobCancelRequest",
+    "JobResultRequest",
     "JobStatus",
+    "JobStatusRequest",
     "ListBenchmarksResponse",
     "ProviderSpec",
     "RemoteProviderSpec",
+    "RunEvalRequest",
     "ScoringResult",
     "json_schema_type",
+    "resolve_evaluate_rows_request",
+    "resolve_job_cancel_request",
+    "resolve_job_result_request",
+    "resolve_job_status_request",
+    "resolve_run_eval_request",
 ]