From e013b9066c2efaefee8c491d441b466a8b379777 Mon Sep 17 00:00:00 2001
From: Xi Yan <xiyan@meta.com>
Date: Mon, 10 Feb 2025 10:47:28 -0800
Subject: [PATCH] fix path

---
 docs/_static/llama-stack-spec.html            | 48 +++++++++----------
 docs/_static/llama-stack-spec.yaml            | 31 ++++++------
 llama_stack/apis/eval_tasks/eval_tasks.py     |  6 +--
 .../distribution/routers/routing_tables.py    |  6 +--
 4 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/docs/_static/llama-stack-spec.html b/docs/_static/llama-stack-spec.html
index 3106bff86..6d3e5b93b 100644
--- a/docs/_static/llama-stack-spec.html
+++ b/docs/_static/llama-stack-spec.html
@@ -1503,7 +1503,7 @@
                 }
             }
         },
-        "/v1/eval/tasks/": {
+        "/v1/eval/tasks": {
             "get": {
                 "responses": {
                     "200": {
@@ -1522,6 +1522,28 @@
                 ],
                 "description": "",
                 "parameters": []
+            },
+            "post": {
+                "responses": {
+                    "200": {
+                        "description": "OK"
+                    }
+                },
+                "tags": [
+                    "EvalTasks"
+                ],
+                "description": "",
+                "parameters": [],
+                "requestBody": {
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/RegisterEvalTaskRequest"
+                            }
+                        }
+                    },
+                    "required": true
+                }
             }
         },
         "/v1/models": {
@@ -2099,30 +2121,6 @@
                 ]
             }
         },
-        "/v1/eval/tasks": {
-            "post": {
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "tags": [
-                    "EvalTasks"
-                ],
-                "description": "",
-                "parameters": [],
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/RegisterEvalTaskRequest"
-                            }
-                        }
-                    },
-                    "required": true
-                }
-            }
-        },
         "/v1/eval/tasks/{task_id}/jobs": {
             "post": {
                 "responses": {
diff --git a/docs/_static/llama-stack-spec.yaml b/docs/_static/llama-stack-spec.yaml
index 9b4220018..aa25c88f8 100644
--- a/docs/_static/llama-stack-spec.yaml
+++ b/docs/_static/llama-stack-spec.yaml
@@ -895,7 +895,7 @@ paths:
             schema:
               $ref: '#/components/schemas/RegisterDatasetRequest'
         required: true
-  /v1/eval/tasks/:
+  /v1/eval/tasks:
     get:
       responses:
         '200':
@@ -908,6 +908,20 @@ paths:
         - EvalTasks
       description: ''
       parameters: []
+    post:
+      responses:
+        '200':
+          description: OK
+      tags:
+        - EvalTasks
+      description: ''
+      parameters: []
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterEvalTaskRequest'
+        required: true
   /v1/models:
     get:
       responses:
@@ -1264,21 +1278,6 @@ paths:
             type: array
             items:
               type: string
-  /v1/eval/tasks:
-    post:
-      responses:
-        '200':
-          description: OK
-      tags:
-        - EvalTasks
-      description: ''
-      parameters: []
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterEvalTaskRequest'
-        required: true
   /v1/eval/tasks/{task_id}/jobs:
     post:
       responses:
diff --git a/llama_stack/apis/eval_tasks/eval_tasks.py b/llama_stack/apis/eval_tasks/eval_tasks.py
index f36d44c88..0a1a27885 100644
--- a/llama_stack/apis/eval_tasks/eval_tasks.py
+++ b/llama_stack/apis/eval_tasks/eval_tasks.py
@@ -25,7 +25,7 @@ class EvalTask(CommonEvalTaskFields, Resource):
     type: Literal[ResourceType.eval_task.value] = ResourceType.eval_task.value
 
     @property
-    def eval_task_id(self) -> str:
+    def task_id(self) -> str:
         return self.identifier
 
     @property
@@ -34,7 +34,7 @@ class EvalTask(CommonEvalTaskFields, Resource):
 
 
 class EvalTaskInput(CommonEvalTaskFields, BaseModel):
-    eval_task_id: str
+    task_id: str
     provider_id: Optional[str] = None
     provider_eval_task_id: Optional[str] = None
 
@@ -45,7 +45,7 @@ class ListEvalTasksResponse(BaseModel):
 
 @runtime_checkable
 class EvalTasks(Protocol):
-    @webmethod(route="/eval/tasks/", method="GET")
+    @webmethod(route="/eval/tasks", method="GET")
     async def list_eval_tasks(self) -> ListEvalTasksResponse: ...
 
     @webmethod(route="/eval/tasks/{task_id}", method="GET")
diff --git a/llama_stack/distribution/routers/routing_tables.py b/llama_stack/distribution/routers/routing_tables.py
index 3f5dea66d..0664e310a 100644
--- a/llama_stack/distribution/routers/routing_tables.py
+++ b/llama_stack/distribution/routers/routing_tables.py
@@ -437,7 +437,7 @@ class EvalTasksRoutingTable(CommonRoutingTableImpl, EvalTasks):
 
     async def register_eval_task(
         self,
-        eval_task_id: str,
+        task_id: str,
         dataset_id: str,
         scoring_functions: List[str],
         metadata: Optional[Dict[str, Any]] = None,
@@ -454,9 +454,9 @@ class EvalTasksRoutingTable(CommonRoutingTableImpl, EvalTasks):
                     "No provider specified and multiple providers available. Please specify a provider_id."
                 )
         if provider_eval_task_id is None:
-            provider_eval_task_id = eval_task_id
+            provider_eval_task_id = task_id
         eval_task = EvalTask(
-            identifier=eval_task_id,
+            identifier=task_id,
             dataset_id=dataset_id,
             scoring_functions=scoring_functions,
             metadata=metadata,