Merge remote-tracking branch 'upstream/main' into rm-build

This commit is contained in:
Charlie Doern 2025-12-01 13:52:18 -05:00
commit 39ad54696c
81 changed files with 585 additions and 4236 deletions

View file

@ -22,7 +22,6 @@ from llama_stack.core.datatypes import (
Provider,
SafetyConfig,
ShieldInput,
TelemetryConfig,
ToolGroupInput,
VectorStoresConfig,
)
@ -184,7 +183,6 @@ class RunConfigSettings(BaseModel):
default_benchmarks: list[BenchmarkInput] | None = None
vector_stores_config: VectorStoresConfig | None = None
safety_config: SafetyConfig | None = None
telemetry: TelemetryConfig = Field(default_factory=lambda: TelemetryConfig(enabled=True))
storage_backends: dict[str, Any] | None = None
storage_stores: dict[str, Any] | None = None
@ -284,7 +282,6 @@ class RunConfigSettings(BaseModel):
"server": {
"port": 8321,
},
"telemetry": self.telemetry.model_dump(exclude_none=True) if self.telemetry else None,
}
if self.vector_stores_config: