Merge branch 'main' into fix/issue-2584-llama4-tool-calling

tests/unit/cli/test_stack_config.py

@@ -15,6 +15,37 @@ from llama_stack.distribution.configure import (
 )
 
 
+@pytest.fixture
+def config_with_image_name_int():
+    return yaml.safe_load(
+        f"""
+        version: {LLAMA_STACK_RUN_CONFIG_VERSION}
+        image_name: 1234
+        apis_to_serve: []
+        built_at: {datetime.now().isoformat()}
+        providers:
+          inference:
+            - provider_id: provider1
+              provider_type: inline::meta-reference
+              config: {{}}
+          safety:
+            - provider_id: provider1
+              provider_type: inline::meta-reference
+              config:
+                llama_guard_shield:
+                  model: Llama-Guard-3-1B
+                  excluded_categories: []
+                  disable_input_check: false
+                  disable_output_check: false
+                enable_prompt_guard: false
+          memory:
+            - provider_id: provider1
+              provider_type: inline::meta-reference
+              config: {{}}
+    """
+    )
+
+
 @pytest.fixture
 def up_to_date_config():
     return yaml.safe_load(
@@ -125,3 +156,8 @@ def test_parse_and_maybe_upgrade_config_old_format(old_config):
 def test_parse_and_maybe_upgrade_config_invalid(invalid_config):
     with pytest.raises(KeyError):
         parse_and_maybe_upgrade_config(invalid_config)
+
+
+def test_parse_and_maybe_upgrade_config_image_name_int(config_with_image_name_int):
+    result = parse_and_maybe_upgrade_config(config_with_image_name_int)
+    assert isinstance(result.image_name, str)