fix distro codegen deps

.pre-commit-config.yaml

@@ -8,6 +8,8 @@ repos:
     rev: v5.0.0  # Latest stable version
     hooks:
     -   id: check-merge-conflict
+    -   id: trailing-whitespace
+        exclude: '\.py$'  # Exclude Python files as Ruff already handles them
     -   id: check-added-large-files
         args: ['--maxkb=1000']
     -   id: end-of-file-fixer
@@ -83,11 +85,8 @@ repos:
       - id: distro-codegen
         name: Distribution Template Codegen
         additional_dependencies:
-          - rich
-          - pydantic
-          - jinja2
           - uv==0.6.0
-        entry: uv run python -m llama_stack.scripts.distro_codegen
+        entry: uv run --extra codegen python -m llama_stack.scripts.distro_codegen
         language: python
         pass_filenames: false
         require_serial: true

llama_stack/providers/inline/tool_runtime/code_interpreter/__init__.py

@@ -4,13 +4,14 @@
 # This source code is licensed under the terms described in the LICENSE file in
 # the root directory of this source tree.
 
-from .code_interpreter import CodeInterpreterToolRuntimeImpl
 from .config import CodeInterpreterToolConfig
 
 __all__ = ["CodeInterpreterToolConfig", "CodeInterpreterToolRuntimeImpl"]
 
 
 async def get_provider_impl(config: CodeInterpreterToolConfig, _deps):
+    from .code_interpreter import CodeInterpreterToolRuntimeImpl
+
     impl = CodeInterpreterToolRuntimeImpl(config)
     await impl.initialize()
     return impl

pyproject.toml

@@ -75,6 +75,11 @@ docs = [
     "sphinxcontrib.mermaid",
     "tomli",
 ]
+codegen = [
+    "rich",
+    "pydantic",
+    "jinja2",
+]
 
 [project.urls]
 Homepage = "https://github.com/meta-llama/llama-stack"

uv.lock

@@ -871,6 +871,11 @@ dependencies = [
 ]
 
 [package.optional-dependencies]
+codegen = [
+    { name = "jinja2" },
+    { name = "pydantic" },
+    { name = "rich" },
+]
 dev = [
     { name = "black" },
     { name = "fastapi" },
@@ -923,6 +928,7 @@ requires-dist = [
     { name = "groq", marker = "extra == 'test'" },
     { name = "httpx" },
     { name = "huggingface-hub" },
+    { name = "jinja2", marker = "extra == 'codegen'" },
     { name = "jsonschema" },
     { name = "llama-stack-client", specifier = ">=0.1.4" },
     { name = "lm-format-enforcer", marker = "extra == 'test'", specifier = ">=0.10.9" },
@@ -935,12 +941,14 @@ requires-dist = [
     { name = "pre-commit", marker = "extra == 'dev'" },
     { name = "prompt-toolkit" },
     { name = "pydantic", specifier = ">=2" },
+    { name = "pydantic", marker = "extra == 'codegen'" },
     { name = "pytest", marker = "extra == 'dev'" },
     { name = "pytest-asyncio", marker = "extra == 'dev'" },
     { name = "pytest-html", marker = "extra == 'dev'" },
     { name = "python-dotenv" },
     { name = "requests" },
     { name = "rich" },
+    { name = "rich", marker = "extra == 'codegen'" },
     { name = "ruamel-yaml", marker = "extra == 'dev'" },
     { name = "ruff", marker = "extra == 'dev'" },
     { name = "setuptools" },