From 79b79889bce519fc4bf6f3d19756fc1cb4f0b24e Mon Sep 17 00:00:00 2001
From: Yuan Tang <terrytangyuan@gmail.com>
Date: Wed, 5 Feb 2025 14:40:10 -0500
Subject: [PATCH] Reuse builtin_automatically_routed_apis

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
---
 llama_stack/apis/datatypes.py            | 14 --------------
 llama_stack/cli/stack/list_providers.py  |  4 ++--
 llama_stack/distribution/distribution.py |  6 +++++-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/llama_stack/apis/datatypes.py b/llama_stack/apis/datatypes.py
index 23e8a4834..ccc395b80 100644
--- a/llama_stack/apis/datatypes.py
+++ b/llama_stack/apis/datatypes.py
@@ -9,20 +9,6 @@ from enum import Enum
 from llama_models.schema_utils import json_schema_type
 
 
-@json_schema_type
-class RegisteredApi(Enum):
-    agents = "agents"
-    datasetio = "datasetio"
-    eval = "eval"
-    inference = "inference"
-    post_training = "post_training"
-    safety = "safety"
-    scoring = "scoring"
-    telemetry = "telemetry"
-    tool_runtime = "tool_runtime"
-    vector_io = "vector_io"
-
-
 @json_schema_type
 class Api(Enum):
     inference = "inference"
diff --git a/llama_stack/cli/stack/list_providers.py b/llama_stack/cli/stack/list_providers.py
index a19dc3898..28c821ba9 100644
--- a/llama_stack/cli/stack/list_providers.py
+++ b/llama_stack/cli/stack/list_providers.py
@@ -22,9 +22,9 @@ class StackListProviders(Subcommand):
         self.parser.set_defaults(func=self._run_providers_list_cmd)
 
     def _add_arguments(self):
-        from llama_stack.apis.datatypes import RegisteredApi
+        from llama_stack.distribution.distribution import builtin_automatically_routed_apis
 
-        api_values = [a.value for a in RegisteredApi]
+        api_values = [x.router_api for x in builtin_automatically_routed_apis()]
         self.parser.add_argument(
             "api",
             type=str,
diff --git a/llama_stack/distribution/distribution.py b/llama_stack/distribution/distribution.py
index 2dcf38463..e5aaa06c2 100644
--- a/llama_stack/distribution/distribution.py
+++ b/llama_stack/distribution/distribution.py
@@ -56,7 +56,11 @@ def builtin_automatically_routed_apis() -> List[AutoRoutedApiInfo]:
 
 def providable_apis() -> List[Api]:
     routing_table_apis = set(x.routing_table_api for x in builtin_automatically_routed_apis())
-    return [api for api in Api if api not in routing_table_apis and api != Api.inspect]
+    print(routing_table_apis)
+    print("\n")
+    res = [api for api in Api if api not in routing_table_apis and api != Api.inspect]
+    print(res)
+    return res
 
 
 def get_provider_registry() -> Dict[Api, Dict[str, ProviderSpec]]: