Merge pull request #48 from saichandrapandraju/RemoteProviderSpec

Author: saichandrapandraju

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llama-stack-provider-trustyai-garak"
-version = "0.1.4"
+version = "0.1.5"
 description = "Out-Of-Tree Llama Stack provider for Garak Red-teaming"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -11,7 +11,7 @@ authors = [
 ]
 keywords = ["llama-stack", "garak", "red-teaming", "security", "ai-safety"]
 dependencies = [
-    "llama-stack==0.2.22",
+    "llama-stack==0.2.23",
     "greenlet==3.2.4", # because inline/files/localfs errors saying greenlet not found
     "httpx[http2]==0.28.1",
     "garak==0.12.0",

requirements.txt

@@ -1231,9 +1231,9 @@ litellm==1.77.0 \
     --hash=sha256:40c3ad4b4ef8eab109e04e71b62b9eab659d7af763d9e62d1a3a770ca25468ac \
     --hash=sha256:7025a99c88e54209a64c05824ec1fab968343be1ed4be3573afacc92160d561c
     # via garak
-llama-stack==0.2.22 \
-    --hash=sha256:576752dedc9e9f0fb9da69f373d677d8b4f2ae4203428f676fa039b6813d8450 \
-    --hash=sha256:c6bbda6b5a4417b9a73ed36b9d581fd7ec689090ceefd084d9a078e7acbdc670
+llama-stack==0.2.23 \
+    --hash=sha256:43be14d97ca2fff77ca1e42241acb7945a67b7d183e9938bdb7159ee9610982a \
+    --hash=sha256:464d29c1ae3989fce2226513c9c18648f6236cbf5a399d3cf3a6b3dc4435be8c
     # via llama-stack-provider-trustyai-garak (pyproject.toml)
 llama-stack-client==0.2.23 \
     --hash=sha256:68f34e8ac8eea6a73ed9d4977d849992b2d8bd835804d770a11843431cd5bf74 \

src/llama_stack_provider_trustyai_garak/remote/provider.py

@@ -1,18 +1,17 @@
 from llama_stack.providers.datatypes import (
     ProviderSpec,
     Api,
-    AdapterSpec,
-    remote_provider_spec
+    RemoteProviderSpec
 )
 
 def get_provider_spec() -> ProviderSpec:
-    return remote_provider_spec(
+    return RemoteProviderSpec(
             api=Api.eval,
-            adapter=AdapterSpec(
-                adapter_type="trustyai_garak",
-                module="llama_stack_provider_trustyai_garak.remote",
-                pip_packages=["garak", "kfp", "kfp-kubernetes", "kfp-server-api", "boto3"],
-                config_class="llama_stack_provider_trustyai_garak.config.GarakRemoteConfig",
-            ),
-            api_dependencies=[Api.inference, Api.files, Api.benchmarks, Api.safety, Api.telemetry, Api.shields]
+            provider_type="remote::trustyai_garak",
+            config_class="llama_stack_provider_trustyai_garak.config.GarakRemoteConfig",
+            api_dependencies=[Api.inference, Api.files, Api.benchmarks, Api.safety, Api.telemetry, Api.shields],
+            module="llama_stack_provider_trustyai_garak.remote",
+            pip_packages=["garak", "kfp", "kfp-kubernetes", "kfp-server-api", "boto3"],
+            adapter_type="trustyai_garak",
+            description="TrustyAI’s remote provider for Garak vulnerability scanning on Kubeflow Pipelines.",   
         )

tests/test_remote_provider.py

@@ -2,19 +2,18 @@
 
 import pytest
 import json
-import os
-from unittest.mock import Mock, patch, AsyncMock, MagicMock, PropertyMock, call
+from unittest.mock import Mock, patch, AsyncMock, MagicMock
 from datetime import datetime
 
 from llama_stack_provider_trustyai_garak.remote import get_adapter_impl
 from llama_stack_provider_trustyai_garak.remote.garak_remote_eval import GarakRemoteEvalAdapter
 from llama_stack_provider_trustyai_garak.remote.provider import get_provider_spec
 from llama_stack_provider_trustyai_garak.config import GarakRemoteConfig, KubeflowConfig, GarakScanConfig
-from llama_stack_provider_trustyai_garak.errors import GarakError, GarakConfigError, GarakValidationError, BenchmarkNotFoundError
+from llama_stack_provider_trustyai_garak.errors import GarakError, GarakConfigError, GarakValidationError
 
 from llama_stack.apis.datatypes import Api
 from llama_stack.apis.common.job_types import JobStatus
-from llama_stack.apis.eval import BenchmarkConfig, EvaluateResponse
+from llama_stack.apis.eval import EvaluateResponse
 
 
 class TestRemoteProvider:
@@ -25,21 +24,13 @@ def test_get_provider_spec(self):
         spec = get_provider_spec()
 
         assert spec.api == Api.eval
-        # Fix: Access adapter field from the spec
-        assert spec.adapter.adapter_type == "trustyai_garak"
-        assert "garak" in spec.adapter.pip_packages
-        assert "kfp" in spec.adapter.pip_packages
-        assert "kfp-kubernetes" in spec.adapter.pip_packages
-        assert "kfp-server-api" in spec.adapter.pip_packages
-        assert "boto3" in spec.adapter.pip_packages
-        assert spec.adapter.config_class == "llama_stack_provider_trustyai_garak.config.GarakRemoteConfig"
-        assert spec.adapter.module == "llama_stack_provider_trustyai_garak.remote"
-        assert Api.inference in spec.api_dependencies
-        assert Api.files in spec.api_dependencies
-        assert Api.benchmarks in spec.api_dependencies
-        assert Api.safety in spec.api_dependencies
-        assert Api.shields in spec.api_dependencies
-        assert Api.telemetry in spec.api_dependencies
+        assert spec.adapter_type == "trustyai_garak"
+        for package in ["garak", "kfp", "kfp-kubernetes", "kfp-server-api", "boto3"]:
+            assert package in spec.pip_packages, f"{package} not found in pip_packages"
+        assert spec.config_class == "llama_stack_provider_trustyai_garak.config.GarakRemoteConfig"
+        assert spec.module == "llama_stack_provider_trustyai_garak.remote"
+        for api in [Api.inference, Api.files, Api.benchmarks, Api.safety, Api.shields, Api.telemetry]:
+            assert api in spec.api_dependencies, f"{api} not found in api_dependencies"
 
 
 class TestRemoteAdapterCreation: