Merge remote-tracking branch 'origin/release-0.5.x' into fix-6193-repair

Signed-off-by: Sumanth Kamenani <skamenan@redhat.com>

# Conflicts:
#	.github/workflows/pypi.yml
#	scripts/integration-tests.sh

Author: skamenan7

.github/workflows/pypi.yml

@@ -514,7 +514,7 @@ jobs:
           fi
 
           if [ -d "dist-client-python" ] && ls dist-client-python/*.whl 1>/dev/null 2>&1; then
-            python -c "import ogx_client; print(f'ogx_client imported successfully from {ogx_client.__file__}')"
+            python -c "import importlib, importlib.util; modules = ('llama_stack_client', 'ogx_client'); imported = next((importlib.import_module(name) for name in modules if importlib.util.find_spec(name)), None); assert imported is not None, 'No supported Python client module found'; print(f'{imported.__name__} imported successfully from {imported.__file__}')"
           fi
 
       - name: Verify TypeScript package
@@ -540,7 +540,7 @@ jobs:
   publish-packages:
     name: Publish ${{ matrix.package }}
     if: |
-      github.repository_owner == 'llamastack' &&
+      github.repository_owner == 'ogx-ai' &&
       (inputs.dry_run || 'test-pypi') != 'build-only' && (
         github.event_name == 'workflow_dispatch' ||
         github.event.action == 'published' ||
@@ -737,7 +737,7 @@ jobs:
       always() &&
       needs.compute-version.result == 'success' &&
       (needs.publish-packages.result == 'success' || needs.publish-packages.result == 'skipped') &&
-      github.repository_owner == 'llamastack' &&
+      github.repository_owner == 'ogx-ai' &&
       (inputs.dry_run || 'test-pypi') != 'build-only' &&
       (inputs.packages || 'all') != 'clients-only' && (
         github.event_name == 'workflow_dispatch' ||

containers/Containerfile

@@ -27,6 +27,10 @@ ARG PYPI_VERSION=""
 ARG TEST_PYPI_VERSION=""
 ARG KEEP_WORKSPACE=""
 ARG DISTRO_NAME="starter"
+# Tolerate failures of the OpenTelemetry per-library bootstrap. This release
+# branch is a pre-rename backfill whose pinned deps can conflict with the latest
+# auto-instrumentation packages.
+ARG OTEL_BEST_EFFORT="1"
 ARG RUN_CONFIG_PATH=""
 ARG UV_HTTP_TIMEOUT=500
 ARG UV_EXTRA_INDEX_URL=""
@@ -112,6 +116,7 @@ RUN set -eux; \
     else \
         if [ -n "$PYPI_VERSION" ]; then \
             uv pip install --no-cache "llama-stack==$PYPI_VERSION"; \
+            uv pip install --no-cache "llama-stack-api==$PYPI_VERSION"; \
         else \
             uv pip install --no-cache llama-stack; \
         fi; \
@@ -130,10 +135,20 @@ RUN set -eux; \
         printf '%s\n' "$deps" | xargs -L1 uv pip install --no-cache; \
     fi
 
-# Install OpenTelemetry auto-instrumentation support
+# Install OpenTelemetry auto-instrumentation support.
+# The base distro/exporter install is required. The per-library bootstrap
+# (opentelemetry-bootstrap -a install) selects the latest instrumentation
+# packages, which can conflict with the pinned dependencies of older releases.
 RUN set -eux; \
     pip install --no-cache opentelemetry-distro opentelemetry-exporter-otlp; \
-    opentelemetry-bootstrap -a install
+    if ! opentelemetry-bootstrap -a install; then \
+        if [ "$OTEL_BEST_EFFORT" = "1" ]; then \
+            echo "opentelemetry-bootstrap failed; continuing without full auto-instrumentation (OTEL_BEST_EFFORT=1)" >&2; \
+        else \
+            echo "opentelemetry-bootstrap failed" >&2; \
+            exit 1; \
+        fi; \
+    fi
 
 # Cleanup
 RUN set -eux; \

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0", "setuptools-scm>=8.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
-fallback_version = "0.5.2"
+fallback_version = "0.5.3"
 
 [tool.uv]
 required-version = ">=0.7.0"
@@ -62,7 +62,7 @@ dependencies = [
 
 [project.optional-dependencies]
 client = [
-    "llama-stack-client==0.5.2", # Optional for library-only usage
+    "llama-stack-client==0.5.3", # Optional for library-only usage
 ]
 oci = [
     "numpy>=2.3.2",
@@ -116,7 +116,7 @@ type_checking = [
     "lm-format-enforcer",
     "mcp>=1.23.0",
     "ollama",
-    "llama-stack-client==0.5.2",
+    "llama-stack-client==0.5.3",
 ]
 # These are the dependencies required for running unit tests.
 unit = [

scripts/integration-tests.sh

@@ -238,6 +238,8 @@ run_client_ts_tests() {
 
     pushd tests/integration/client-typescript >/dev/null
 
+    local ts_client_package_name="llama-stack-client"
+
     # Determine if TS_CLIENT_PATH is a directory path or an npm version
     if [[ -d "$TS_CLIENT_PATH" ]]; then
         # It's a directory path - use local checkout
@@ -246,6 +248,7 @@ run_client_ts_tests() {
             popd >/dev/null
             return 1
         fi
+        ts_client_package_name=$(node -p "require(process.argv[1]).name" "$TS_CLIENT_PATH/package.json")
         echo "Using local llama-stack-client-typescript from: $TS_CLIENT_PATH"
 
         # Build the TypeScript client first
@@ -265,7 +268,7 @@ run_client_ts_tests() {
         # Then install the local checkout under the legacy package name used by
         # release-0.5 integration tests. The latest checkout may publish as ogx-client.
         echo "Installing llama-stack-client from: $TS_CLIENT_PATH"
-        npm install "llama-stack-client@file:${TS_CLIENT_PATH}" --silent
+        npm install "llama-stack-client@file:${TS_CLIENT_PATH}" --silent --ignore-scripts
     else
         # It's an npm version specifier - install from npm
         echo "Installing llama-stack-client@${TS_CLIENT_PATH} from npm"
@@ -279,9 +282,9 @@ run_client_ts_tests() {
 
     # Verify installation
     echo "Verifying llama-stack-client installation..."
-    if npm list llama-stack-client 2>/dev/null | grep -q llama-stack-client; then
+    if npm list llama-stack-client 2>/dev/null | grep -q llama-stack-client || npm list "$ts_client_package_name" 2>/dev/null | grep -q "$ts_client_package_name"; then
         echo "✅ llama-stack-client successfully installed"
-        npm list llama-stack-client
+        npm list llama-stack-client || npm list "$ts_client_package_name"
     else
         echo "❌ llama-stack-client not found in node_modules"
         echo "Installed packages:"

src/llama_stack_api/pyproject.toml

@@ -90,7 +90,7 @@ llama_stack_api = ["py.typed", "**/*.json", "**/*.yaml"]
 
 [tool.setuptools_scm]
 root = "../.."
-fallback_version = "0.5.2"
+fallback_version = "0.5.3"
 
 [tool.ruff]
 line-length = 120

tests/integration/client-typescript/__tests__/inference.test.ts

@@ -14,6 +14,9 @@
 import { createTestClient, requireTextModel, isPrematureCloseError } from '../setup';
 
 describe('Inference API - Chat Completions', () => {
+  const streamingTest =
+    process.env['LLAMA_STACK_TS_SKIP_STREAMING_TESTS'] === '1' ? test.skip : test;
+
   // Test cases matching llama-stack/tests/integration/test_cases/inference/chat_completion.json
   const chatCompletionTestCases = [
     {
@@ -80,7 +83,7 @@ describe('Inference API - Chat Completions', () => {
     },
   );
 
-  test.each(streamingTestCases)('chat completion streaming: $id', async ({ question, expected, testId }) => {
+  streamingTest.each(streamingTestCases)('chat completion streaming: $id', async ({ question, expected, testId }) => {
     const client = createTestClient(testId);
     const textModel = requireTextModel();
 

tests/integration/client-typescript/__tests__/responses.test.ts

@@ -14,6 +14,9 @@
 import { createTestClient, requireTextModel, getResponseOutputText, isPrematureCloseError } from '../setup';
 
 describe('Responses API - Basic', () => {
+  const streamingTest =
+    process.env['LLAMA_STACK_TS_SKIP_STREAMING_TESTS'] === '1' ? test.skip : test;
+
   // Test cases matching llama-stack/tests/integration/responses/fixtures/test_cases.py
   const basicTestCases = [
     {
@@ -70,7 +73,7 @@ describe('Responses API - Basic', () => {
     expect(nextOutputText).toContain(expected.toUpperCase());
   });
 
-  test.each(basicTestCases)('streaming basic response: $id', async ({ input, expected, testId }) => {
+  streamingTest.each(basicTestCases)('streaming basic response: $id', async ({ input, expected, testId }) => {
     // Modify test_id for streaming variant
     const streamingTestId = testId.replace(
       'test_response_non_streaming_basic',