From b3060ce8a1bbe972b2ef1c69ae287f5a29686a85 Mon Sep 17 00:00:00 2001
From: Xi Yan <xiyan@meta.com>
Date: Tue, 18 Mar 2025 21:52:00 -0700
Subject: [PATCH] delete

---
 llama_stack/distribution/routers/__init__.py         |  5 -----
 .../providers/inline/eval/meta_reference/__init__.py |  1 -
 .../providers/utils/common/data_schema_validator.py  |  2 --
 .../templates/open-benchmark/open_benchmark.py       | 12 +++++++-----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/llama_stack/distribution/routers/__init__.py b/llama_stack/distribution/routers/__init__.py
index 6e2287b87..a9a4f87c8 100644
--- a/llama_stack/distribution/routers/__init__.py
+++ b/llama_stack/distribution/routers/__init__.py
@@ -14,7 +14,6 @@ from .routing_tables import (
     BenchmarksRoutingTable,
     DatasetsRoutingTable,
     ModelsRoutingTable,
-    ScoringFunctionsRoutingTable,
     ShieldsRoutingTable,
     ToolGroupsRoutingTable,
     VectorDBsRoutingTable,
@@ -47,10 +46,8 @@ async def get_routing_table_impl(
 async def get_auto_router_impl(api: Api, routing_table: RoutingTable, deps: Dict[str, Any]) -> Any:
     from .routers import (
         DatasetIORouter,
-        EvalRouter,
         InferenceRouter,
         SafetyRouter,
-        ScoringRouter,
         ToolRuntimeRouter,
         VectorIORouter,
     )
@@ -60,8 +57,6 @@ async def get_auto_router_impl(api: Api, routing_table: RoutingTable, deps: Dict
         "inference": InferenceRouter,
         "safety": SafetyRouter,
         "datasetio": DatasetIORouter,
-        "scoring": ScoringRouter,
-        "eval": EvalRouter,
         "tool_runtime": ToolRuntimeRouter,
     }
     api_to_deps = {
diff --git a/llama_stack/providers/inline/eval/meta_reference/__init__.py b/llama_stack/providers/inline/eval/meta_reference/__init__.py
index e2a7fc2cd..576a5682b 100644
--- a/llama_stack/providers/inline/eval/meta_reference/__init__.py
+++ b/llama_stack/providers/inline/eval/meta_reference/__init__.py
@@ -20,7 +20,6 @@ async def get_provider_impl(
         config,
         deps[Api.datasetio],
         deps[Api.datasets],
-        deps[Api.scoring],
         deps[Api.inference],
         deps[Api.agents],
     )
diff --git a/llama_stack/providers/utils/common/data_schema_validator.py b/llama_stack/providers/utils/common/data_schema_validator.py
index 3f8c4b111..95663a4e9 100644
--- a/llama_stack/providers/utils/common/data_schema_validator.py
+++ b/llama_stack/providers/utils/common/data_schema_validator.py
@@ -5,14 +5,12 @@
 # the root directory of this source tree.
 
 from enum import Enum
-from typing import Any, Dict, List
 
 from llama_stack.apis.common.type_system import (
     ChatCompletionInputType,
     CompletionInputType,
     StringType,
 )
-from llama_stack.distribution.datatypes import Api
 
 
 class ColumnName(Enum):
diff --git a/llama_stack/templates/open-benchmark/open_benchmark.py b/llama_stack/templates/open-benchmark/open_benchmark.py
index 1009efa43..aa53f85a1 100644
--- a/llama_stack/templates/open-benchmark/open_benchmark.py
+++ b/llama_stack/templates/open-benchmark/open_benchmark.py
@@ -30,12 +30,14 @@ from llama_stack.providers.remote.vector_io.pgvector.config import (
 from llama_stack.providers.utils.inference.model_registry import ProviderModelEntry
 from llama_stack.templates.template import (
     DistributionTemplate,
-    RunConfigSettings,
     get_model_registry,
+    RunConfigSettings,
 )
 
 
-def get_inference_providers() -> Tuple[List[Provider], Dict[str, List[ProviderModelEntry]]]:
+def get_inference_providers() -> (
+    Tuple[List[Provider], Dict[str, List[ProviderModelEntry]]]
+):
     # in this template, we allow each API key to be optional
     providers = [
         (
@@ -116,7 +118,9 @@ def get_distribution_template() -> DistributionTemplate:
         Provider(
             provider_id="sqlite-vec",
             provider_type="inline::sqlite-vec",
-            config=SQLiteVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"),
+            config=SQLiteVectorIOConfig.sample_run_config(
+                f"~/.llama/distributions/{name}"
+            ),
         ),
         Provider(
             provider_id="${env.ENABLE_CHROMADB+chromadb}",
@@ -208,7 +212,6 @@ def get_distribution_template() -> DistributionTemplate:
     ]
 
     # TODO(xiyan): fix this back as registerable resources
-    default_benchmarks = []
     # default_benchmarks = [
     #     BenchmarkInput(
     #         benchmark_id="meta-reference-simpleqa",
@@ -255,7 +258,6 @@ def get_distribution_template() -> DistributionTemplate:
                 default_tool_groups=default_tool_groups,
                 default_shields=[ShieldInput(shield_id="meta-llama/Llama-Guard-3-8B")],
                 default_datasets=default_datasets,
-                default_benchmarks=default_benchmarks,
             ),
         },
         run_config_env_vars={