chore: Rename RagTool FileSearchTool

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>

llama_stack/distributions/ci-tests/build.yaml

@@ -48,7 +48,7 @@ distribution_spec:
     tool_runtime:
     - provider_type: remote::brave-search
     - provider_type: remote::tavily-search
-    - provider_type: inline::rag-runtime
+    - provider_type: inline::file_search-runtime
     - provider_type: remote::model-context-protocol
     batches:
     - provider_type: inline::reference

llama_stack/distributions/ci-tests/run.yaml

@@ -216,8 +216,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
   batches:
@@ -263,8 +263,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: tavily-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/dell/build.yaml

@@ -26,7 +26,7 @@ distribution_spec:
     tool_runtime:
     - provider_type: remote::brave-search
     - provider_type: remote::tavily-search
-    - provider_type: inline::rag-runtime
+    - provider_type: inline::file_search-runtime
 image_type: venv
 additional_pip_packages:
 - aiosqlite

llama_stack/distributions/dell/dell.py

@@ -45,7 +45,7 @@ def get_distribution_template() -> DistributionTemplate:
         "tool_runtime": [
             BuildProvider(provider_type="remote::brave-search"),
             BuildProvider(provider_type="remote::tavily-search"),
-            BuildProvider(provider_type="inline::rag-runtime"),
+            BuildProvider(provider_type="inline::file_search-runtime"),
         ],
     }
     name = "dell"
@@ -99,8 +99,8 @@ def get_distribution_template() -> DistributionTemplate:
             provider_id="brave-search",
         ),
         ToolGroupInput(
-            toolgroup_id="builtin::rag",
-            provider_id="rag-runtime",
+            toolgroup_id="builtin::file_search",
+            provider_id="file_search-runtime",
         ),
     ]
 

llama_stack/distributions/dell/run-with-safety.yaml

@@ -87,8 +87,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
 storage:
   backends:
     kv_default:
@@ -133,8 +133,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: brave-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/dell/run.yaml

@@ -83,8 +83,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
 storage:
   backends:
     kv_default:
@@ -124,8 +124,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: brave-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/meta-reference-gpu/build.yaml

@@ -24,7 +24,7 @@ distribution_spec:
     tool_runtime:
     - provider_type: remote::brave-search
     - provider_type: remote::tavily-search
-    - provider_type: inline::rag-runtime
+    - provider_type: inline::file_search-runtime
     - provider_type: remote::model-context-protocol
 image_type: venv
 additional_pip_packages:

llama_stack/distributions/meta-reference-gpu/meta_reference.py

@@ -47,7 +47,7 @@ def get_distribution_template() -> DistributionTemplate:
         "tool_runtime": [
             BuildProvider(provider_type="remote::brave-search"),
             BuildProvider(provider_type="remote::tavily-search"),
-            BuildProvider(provider_type="inline::rag-runtime"),
+            BuildProvider(provider_type="inline::file_search-runtime"),
             BuildProvider(provider_type="remote::model-context-protocol"),
         ],
     }
@@ -93,8 +93,8 @@ def get_distribution_template() -> DistributionTemplate:
             provider_id="tavily-search",
         ),
         ToolGroupInput(
-            toolgroup_id="builtin::rag",
-            provider_id="rag-runtime",
+            toolgroup_id="builtin::file_search",
+            provider_id="file_search-runtime",
         ),
     ]
 

llama_stack/distributions/meta-reference-gpu/run-with-safety.yaml

@@ -98,8 +98,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
 storage:
@@ -146,8 +146,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: tavily-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/meta-reference-gpu/run.yaml

@@ -88,8 +88,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
 storage:
@@ -131,8 +131,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: tavily-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/nvidia/build.yaml

@@ -20,7 +20,7 @@ distribution_spec:
     scoring:
     - provider_type: inline::basic
     tool_runtime:
-    - provider_type: inline::rag-runtime
+    - provider_type: inline::file_search-runtime
     files:
     - provider_type: inline::localfs
 image_type: venv

llama_stack/distributions/nvidia/nvidia.py

@@ -28,7 +28,7 @@ def get_distribution_template(name: str = "nvidia") -> DistributionTemplate:
             BuildProvider(provider_type="remote::nvidia"),
         ],
         "scoring": [BuildProvider(provider_type="inline::basic")],
-        "tool_runtime": [BuildProvider(provider_type="inline::rag-runtime")],
+        "tool_runtime": [BuildProvider(provider_type="inline::file_search-runtime")],
         "files": [BuildProvider(provider_type="inline::localfs")],
     }
 
@@ -68,8 +68,8 @@ def get_distribution_template(name: str = "nvidia") -> DistributionTemplate:
 
     default_tool_groups = [
         ToolGroupInput(
-            toolgroup_id="builtin::rag",
-            provider_id="rag-runtime",
+            toolgroup_id="builtin::file_search",
+            provider_id="file_search-runtime",
         ),
     ]
 

llama_stack/distributions/nvidia/run-with-safety.yaml

@@ -81,8 +81,8 @@ providers:
   - provider_id: basic
     provider_type: inline::basic
   tool_runtime:
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   files:
   - provider_id: meta-reference-files
     provider_type: inline::localfs
@@ -129,8 +129,8 @@ registered_resources:
   scoring_fns: []
   benchmarks: []
   tool_groups:
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/nvidia/run.yaml

@@ -70,8 +70,8 @@ providers:
   - provider_id: basic
     provider_type: inline::basic
   tool_runtime:
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   files:
   - provider_id: meta-reference-files
     provider_type: inline::localfs
@@ -108,8 +108,8 @@ registered_resources:
   scoring_fns: []
   benchmarks: []
   tool_groups:
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/open-benchmark/build.yaml

@@ -28,7 +28,7 @@ distribution_spec:
     tool_runtime:
     - provider_type: remote::brave-search
     - provider_type: remote::tavily-search
-    - provider_type: inline::rag-runtime
+    - provider_type: inline::file_search-runtime
     - provider_type: remote::model-context-protocol
 image_type: venv
 additional_pip_packages:

llama_stack/distributions/open-benchmark/open_benchmark.py

@@ -118,7 +118,7 @@ def get_distribution_template() -> DistributionTemplate:
         "tool_runtime": [
             BuildProvider(provider_type="remote::brave-search"),
             BuildProvider(provider_type="remote::tavily-search"),
-            BuildProvider(provider_type="inline::rag-runtime"),
+            BuildProvider(provider_type="inline::file_search-runtime"),
             BuildProvider(provider_type="remote::model-context-protocol"),
         ],
     }
@@ -155,8 +155,8 @@ def get_distribution_template() -> DistributionTemplate:
             provider_id="tavily-search",
         ),
         ToolGroupInput(
-            toolgroup_id="builtin::rag",
-            provider_id="rag-runtime",
+            toolgroup_id="builtin::file_search",
+            provider_id="file_search-runtime",
         ),
     ]
 

llama_stack/distributions/open-benchmark/run.yaml

@@ -118,8 +118,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
 storage:
@@ -244,8 +244,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: tavily-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/postgres-demo/build.yaml

@@ -14,7 +14,7 @@ distribution_spec:
     tool_runtime:
     - provider_type: remote::brave-search
     - provider_type: remote::tavily-search
-    - provider_type: inline::rag-runtime
+    - provider_type: inline::file_search-runtime
     - provider_type: remote::model-context-protocol
 image_type: venv
 additional_pip_packages:

llama_stack/distributions/postgres-demo/postgres_demo.py

@@ -45,7 +45,7 @@ def get_distribution_template() -> DistributionTemplate:
         "tool_runtime": [
             BuildProvider(provider_type="remote::brave-search"),
             BuildProvider(provider_type="remote::tavily-search"),
-            BuildProvider(provider_type="inline::rag-runtime"),
+            BuildProvider(provider_type="inline::file_search-runtime"),
             BuildProvider(provider_type="remote::model-context-protocol"),
         ],
     }
@@ -67,8 +67,8 @@ def get_distribution_template() -> DistributionTemplate:
             provider_id="tavily-search",
         ),
         ToolGroupInput(
-            toolgroup_id="builtin::rag",
-            provider_id="rag-runtime",
+            toolgroup_id="builtin::file_search",
+            provider_id="file_search-runtime",
         ),
     ]
 

llama_stack/distributions/postgres-demo/run.yaml

@@ -54,8 +54,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
 storage:
@@ -107,8 +107,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: tavily-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/starter-gpu/build.yaml

@@ -49,7 +49,7 @@ distribution_spec:
     tool_runtime:
     - provider_type: remote::brave-search
     - provider_type: remote::tavily-search
-    - provider_type: inline::rag-runtime
+    - provider_type: inline::file_search-runtime
     - provider_type: remote::model-context-protocol
     batches:
     - provider_type: inline::reference

llama_stack/distributions/starter-gpu/run.yaml

@@ -219,8 +219,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
   batches:
@@ -266,8 +266,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: tavily-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/starter/build.yaml

@@ -49,7 +49,7 @@ distribution_spec:
     tool_runtime:
     - provider_type: remote::brave-search
     - provider_type: remote::tavily-search
-    - provider_type: inline::rag-runtime
+    - provider_type: inline::file_search-runtime
     - provider_type: remote::model-context-protocol
     batches:
     - provider_type: inline::reference

llama_stack/distributions/starter/run.yaml

@@ -216,8 +216,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
   batches:
@@ -263,8 +263,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: tavily-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/starter/starter.py

@@ -141,7 +141,7 @@ def get_distribution_template(name: str = "starter") -> DistributionTemplate:
         "tool_runtime": [
             BuildProvider(provider_type="remote::brave-search"),
             BuildProvider(provider_type="remote::tavily-search"),
-            BuildProvider(provider_type="inline::rag-runtime"),
+            BuildProvider(provider_type="inline::file_search-runtime"),
             BuildProvider(provider_type="remote::model-context-protocol"),
         ],
         "batches": [
@@ -164,8 +164,8 @@ def get_distribution_template(name: str = "starter") -> DistributionTemplate:
             provider_id="tavily-search",
         ),
         ToolGroupInput(
-            toolgroup_id="builtin::rag",
-            provider_id="rag-runtime",
+            toolgroup_id="builtin::file_search",
+            provider_id="file_search-runtime",
         ),
     ]
     default_shields = [

llama_stack/distributions/watsonx/build.yaml

@@ -23,7 +23,7 @@ distribution_spec:
     tool_runtime:
     - provider_type: remote::brave-search
     - provider_type: remote::tavily-search
-    - provider_type: inline::rag-runtime
+    - provider_type: inline::file_search-runtime
     - provider_type: remote::model-context-protocol
     files:
     - provider_type: inline::localfs

llama_stack/distributions/watsonx/run.yaml

@@ -83,8 +83,8 @@ providers:
     config:
       api_key: ${env.TAVILY_SEARCH_API_KEY:=}
       max_results: 3
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
+  - provider_id: file_search-runtime
+    provider_type: inline::file_search-runtime
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
   files:
@@ -125,8 +125,8 @@ registered_resources:
   tool_groups:
   - toolgroup_id: builtin::websearch
     provider_id: tavily-search
-  - toolgroup_id: builtin::rag
-    provider_id: rag-runtime
+  - toolgroup_id: builtin::file_search
+    provider_id: file_search-runtime
 server:
   port: 8321
 telemetry:

llama_stack/distributions/watsonx/watsonx.py

@@ -33,7 +33,7 @@ def get_distribution_template(name: str = "watsonx") -> DistributionTemplate:
         "tool_runtime": [
             BuildProvider(provider_type="remote::brave-search"),
             BuildProvider(provider_type="remote::tavily-search"),
-            BuildProvider(provider_type="inline::rag-runtime"),
+            BuildProvider(provider_type="inline::file_search-runtime"),
             BuildProvider(provider_type="remote::model-context-protocol"),
         ],
         "files": [BuildProvider(provider_type="inline::localfs")],
@@ -51,8 +51,8 @@ def get_distribution_template(name: str = "watsonx") -> DistributionTemplate:
             provider_id="tavily-search",
         ),
         ToolGroupInput(
-            toolgroup_id="builtin::rag",
-            provider_id="rag-runtime",
+            toolgroup_id="builtin::file_search",
+            provider_id="file_search-runtime",
         ),
     ]