Updated the configuration files to include the preprocessor resource.

docs/source/distributions/self_hosted_distro/ollama.md

@@ -19,6 +19,7 @@ The `llamastack/distribution-ollama` distribution consists of the following prov
 | datasetio | `remote::huggingface`, `inline::localfs` |
 | eval | `inline::meta-reference` |
 | inference | `remote::ollama` |
+| preprocessing | `inline::basic`, `inline::simple_chunking` |
 | safety | `inline::llama-guard` |
 | scoring | `inline::basic`, `inline::llm-as-judge`, `inline::braintrust` |
 | telemetry | `inline::meta-reference` |

llama_stack/distribution/routers/routing_tables.py

@@ -558,8 +558,11 @@ class PreprocessorsRoutingTable(CommonRoutingTableImpl, Preprocessors):
         self,
         preprocessor_id: str,
         provider_id: Optional[str] = None,
+        provider_preprocessor_id: Optional[str] = None,
         metadata: Optional[Dict[str, Any]] = None,
     ) -> Preprocessor:
+        if provider_preprocessor_id is None:
+            provider_preprocessor_id = preprocessor_id
         if provider_id is None:
             if len(self.impls_by_provider_id) == 1:
                 provider_id = list(self.impls_by_provider_id.keys())[0]
@@ -569,11 +572,10 @@ class PreprocessorsRoutingTable(CommonRoutingTableImpl, Preprocessors):
                 )
         preprocessor = Preprocessor(
             identifier=preprocessor_id,
-            provider_resource_id=preprocessor_id,
+            provider_resource_id=provider_preprocessor_id,
             provider_id=provider_id,
             metadata=metadata,
         )
-        preprocessor.provider_id = provider_id
         await self.register_object(preprocessor)
         return preprocessor
 

llama_stack/templates/bedrock/run.yaml

@@ -130,5 +130,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/cerebras/run.yaml

@@ -127,5 +127,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/ci-tests/run.yaml

@@ -215,5 +215,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

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

@@ -116,5 +116,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/dell/run.yaml

@@ -107,5 +107,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/dev/run.yaml

@@ -359,5 +359,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/fireworks/run-with-safety.yaml

@@ -229,5 +229,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/fireworks/run.yaml

@@ -218,5 +218,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/groq/run.yaml

@@ -152,5 +152,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/hf-endpoint/run-with-safety.yaml

@@ -124,5 +124,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/hf-endpoint/run.yaml

@@ -114,5 +114,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/hf-serverless/run-with-safety.yaml

@@ -124,5 +124,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/hf-serverless/run.yaml

@@ -114,5 +114,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

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

@@ -126,5 +126,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

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

@@ -115,5 +115,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/meta-reference-quantized-gpu/run.yaml

@@ -117,5 +117,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/nvidia/run.yaml

@@ -220,5 +220,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/ollama/build.yaml

@@ -29,4 +29,7 @@ distribution_spec:
     - inline::code-interpreter
     - inline::rag-runtime
     - remote::model-context-protocol
+    preprocessing:
+    - inline::basic
+    - inline::simple_chunking
 image_type: conda

llama_stack/templates/ollama/ollama.py

@@ -35,6 +35,7 @@ def get_distribution_template() -> DistributionTemplate:
             "inline::rag-runtime",
             "remote::model-context-protocol",
         ],
+        "preprocessing": ["inline::basic", "inline::simple_chunking"],
     }
     name = "ollama"
     inference_provider = Provider(

llama_stack/templates/ollama/run-with-safety.yaml

@@ -5,6 +5,7 @@ apis:
 - datasetio
 - eval
 - inference
+- preprocessing
 - safety
 - scoring
 - telemetry
@@ -85,6 +86,13 @@ providers:
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
     config: {}
+  preprocessing:
+  - provider_id: basic
+    provider_type: inline::basic
+    config: {}
+  - provider_id: simple_chunking
+    provider_type: inline::simple_chunking
+    config: {}
 metadata_store:
   type: sqlite
   db_path: ${env.SQLITE_STORE_DIR:~/.llama/distributions/ollama}/registry.db
@@ -119,5 +127,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/ollama/run.yaml

@@ -5,6 +5,7 @@ apis:
 - datasetio
 - eval
 - inference
+- preprocessing
 - safety
 - scoring
 - telemetry
@@ -82,6 +83,13 @@ providers:
   - provider_id: model-context-protocol
     provider_type: remote::model-context-protocol
     config: {}
+  preprocessing:
+  - provider_id: basic
+    provider_type: inline::basic
+    config: {}
+  - provider_id: simple_chunking
+    provider_type: inline::simple_chunking
+    config: {}
 metadata_store:
   type: sqlite
   db_path: ${env.SQLITE_STORE_DIR:~/.llama/distributions/ollama}/registry.db
@@ -108,5 +116,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/remote-vllm/run-with-safety.yaml

@@ -126,5 +126,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/remote-vllm/run.yaml

@@ -115,5 +115,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/sambanova/run.yaml

@@ -171,5 +171,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/tgi/run-with-safety.yaml

@@ -114,5 +114,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/tgi/run.yaml

@@ -113,5 +113,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/together/run-with-safety.yaml

@@ -226,5 +226,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/together/run.yaml

@@ -215,5 +215,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321

llama_stack/templates/vllm-gpu/run.yaml

@@ -117,5 +117,6 @@ tool_groups:
   provider_id: rag-runtime
 - toolgroup_id: builtin::code_interpreter
   provider_id: code-interpreter
+preprocessors: []
 server:
   port: 8321