Merge branch 'main' into chunk-ui

llama_stack/distributions/postgres-demo/postgres_demo.py

@@ -123,7 +123,7 @@ def get_distribution_template() -> DistributionTemplate:
                             config=dict(
                                 service_name="${env.OTEL_SERVICE_NAME:=\u200b}",
                                 sinks="${env.TELEMETRY_SINKS:=console,otel_trace}",
-                                otel_trace_endpoint="${env.OTEL_TRACE_ENDPOINT:=http://localhost:4318/v1/traces}",
+                                otel_exporter_otlp_endpoint="${env.OTEL_EXPORTER_OTLP_ENDPOINT:=http://localhost:4318/v1/traces}",
                             ),
                         )
                     ],

llama_stack/distributions/postgres-demo/run.yaml

@@ -55,7 +55,7 @@ providers:
     config:
       service_name: "${env.OTEL_SERVICE_NAME:=\u200B}"
       sinks: ${env.TELEMETRY_SINKS:=console,otel_trace}
-      otel_trace_endpoint: ${env.OTEL_TRACE_ENDPOINT:=http://localhost:4318/v1/traces}
+      otel_exporter_otlp_endpoint: ${env.OTEL_EXPORTER_OTLP_ENDPOINT:=http://localhost:4318/v1/traces}
   tool_runtime:
   - provider_id: brave-search
     provider_type: remote::brave-search

pyproject.toml

@@ -2,6 +2,9 @@
 requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 
+[tool.uv]
+required-version = ">=0.7.0"
+
 [project]
 name = "llama_stack"
 version = "0.2.17"
@@ -65,14 +68,14 @@ dev = [
     "pytest-cov",
     "pytest-html",
     "pytest-json-report",
-    "pytest-socket",      # For blocking network access in unit tests
+    "pytest-socket", # For blocking network access in unit tests
-    "nbval",              # For notebook testing
+    "nbval", # For notebook testing
     "black",
     "ruff",
     "types-requests",
     "types-setuptools",
     "pre-commit",
-    "ruamel.yaml",        # needed for openapi generator
+    "ruamel.yaml", # needed for openapi generator
 ]
 # These are the dependencies required for running unit tests.
 unit = [