chore: resolve merge conflict with main and regenerate lockfiles

Resolved conflict in src/ogx_api/pyproject.toml keeping pydantic>=2.13.4
from this PR and jsonschema>=4.26.0 from recently merged #5959.
Regenerated both uv.lock files.

Signed-off-by: Sébastien Han <seb@redhat.com>

Author: leseb

.github/workflows/stale_bot.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Stale Action
-        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+        uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
         with:
           stale-issue-label: 'stale'
           stale-issue-message: >

pyproject.toml

@@ -65,7 +65,7 @@ dependencies = [
     "termcolor",
     "tiktoken",
     "uvicorn>=0.34.0",                                # server
-    "opentelemetry-sdk>=1.30.0",                      # server
+    "opentelemetry-sdk>=1.42.1",                      # server
     "opentelemetry-exporter-otlp-proto-http>=1.30.0", # server
     "opentelemetry-distro>=0.60b1",                  # optional CLI instrumentation; only pre-releases on PyPI (latest 0.60b1)
     "aiosqlite>=0.21.0",                              # server - for metadata store
@@ -82,9 +82,9 @@ client = [
 ]
 starter = [
     "aiohttp",
-    "anthropic",
+    "anthropic>=0.104.1",
     "autoevals",
-    "boto3>=1.43.9",
+    "boto3>=1.43.15",
     "chardet",
     "chromadb-client",
     "datasets>=4.0.0",
@@ -143,7 +143,7 @@ dev = [
     "ruamel.yaml",                   # needed for openapi generator
     "openapi-spec-validator>=0.7.2",
     "ogx-client>=1.0.2",
-    "boto3>=1.43.9",
+    "boto3>=1.43.15",
     "torch>=2.6.0",
 ]
 # Type checking dependencies - includes type stubs and optional runtime dependencies
@@ -162,11 +162,11 @@ type_checking = [
     "streamlit",
     "streamlit-option-menu",
     "pandas",
-    "anthropic",
+    "anthropic>=0.104.1",
     "databricks-sdk",
     "fairscale",
     "torchtune",
-    "trl",
+    "trl>=1.5.0",
     "peft",
     "datasets",
     "together",
@@ -197,7 +197,7 @@ test-common = [
 # These are the dependencies required for running unit tests.
 unit = [
     {include-group = "test-common"},
-    "anthropic",
+    "anthropic>=0.104.1",
     "blobfile",
     "coverage",
     "databricks-sdk",

src/ogx/cli/stack/run.py

@@ -17,7 +17,12 @@
 from termcolor import cprint
 
 from ogx.cli.subcommand import Subcommand
+from ogx.core.datatypes import StackConfig
+from ogx.core.distribution import builtin_automatically_routed_apis, get_provider_registry
+from ogx.core.resolver import validate_and_prepare_providers
+from ogx.core.server.server import remove_disabled_providers
 from ogx.core.stack import run_config_from_dynamic_config_spec
+from ogx.core.utils.config import redact_sensitive_fields
 from ogx.core.utils.config_dirs import DISTRIBS_BASE_DIR, UI_LOGS_DIR
 from ogx.core.utils.config_resolution import resolve_config_or_distro
 from ogx.log import get_logger
@@ -52,22 +57,25 @@ def add_run_arguments(parser: argparse.ArgumentParser) -> None:
         default=None,
         help="Run a stack with only a list of providers. This list is formatted like: api1=provider1,api1=provider2,api2=provider3. Where there can be multiple providers per API.",
     )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Validate the config without starting the server.",
+    )
 
 
 def run_stack_cmd(args: argparse.Namespace, parser: argparse.ArgumentParser) -> None:
     import yaml
 
     from ogx.core.configure import parse_and_maybe_upgrade_config
 
-    if args.enable_ui:
+    if args.enable_ui and not args.dry_run:
         env_port = os.getenv("OGX_PORT")
         ui_port = args.port or (int(env_port) if env_port else None) or 8321
         _start_ui_development_server(ui_port)
 
     if args.config:
         try:
-            from ogx.core.utils.config_resolution import resolve_config_or_distro
-
             config_file = resolve_config_or_distro(args.config)
         except ValueError as e:
             parser.error(str(e))
@@ -108,9 +116,30 @@ def run_stack_cmd(args: argparse.Namespace, parser: argparse.ArgumentParser) ->
         except AttributeError as e:
             parser.error(f"failed to parse config file '{config_file}':\n {e}")
 
+    if args.dry_run:
+        if not config_file:
+            parser.error("--dry-run requires a config file or --providers")
+        _dry_run_validate(config, config_file)
+        return
+
     _uvicorn_run(config_file, args, parser)
 
 
+def _dry_run_validate(config: StackConfig, config_file: Path) -> None:
+    routed_apis = builtin_automatically_routed_apis()
+    validate_and_prepare_providers(
+        run_config=config,
+        provider_registry=get_provider_registry(),
+        routing_table_apis={x.routing_table_api for x in routed_apis},
+        router_apis={x.router_api for x in routed_apis},
+    )
+    logger.info("Config validation passed", config_file=config_file)
+
+    safe_config = redact_sensitive_fields(config.model_dump(mode="json"))
+    clean_config = remove_disabled_providers(safe_config)
+    print(yaml.dump(clean_config, indent=2, default_flow_style=False, sort_keys=False))
+
+
 def _uvicorn_run(config_file: Path | None, args: argparse.Namespace, parser: argparse.ArgumentParser) -> None:
     if not config_file:
         parser.error("Config file is required")

src/ogx/providers/remote/inference/bedrock/bedrock.py

@@ -4,6 +4,7 @@
 # This source code is licensed under the terms described in the LICENSE file in
 # the root directory of this source tree.
 
+import asyncio
 from collections.abc import AsyncIterator, Iterable
 from typing import TYPE_CHECKING, Any, NoReturn
 
@@ -175,8 +176,9 @@ async def check_model_availability(self, model: str) -> bool:
 
     async def shutdown(self) -> None:
         if self._sigv4_http_client is not None:
-            await self._sigv4_http_client.aclose()
+            await asyncio.shield(self._sigv4_http_client.aclose())
             self._sigv4_http_client = None
+        await super().shutdown()
 
     async def openai_embeddings(
         self,

src/ogx_api/pyproject.toml

@@ -32,9 +32,9 @@ dependencies = [
     "openai>=2.30.0",
     "fastapi>=0.115.0,<1.0",
     "pydantic>=2.13.4",
-    "jsonschema",
+    "jsonschema>=4.26.0",
     "opentelemetry-sdk>=1.30.0",
-    "opentelemetry-exporter-otlp-proto-http>=1.30.0",
+    "opentelemetry-exporter-otlp-proto-http>=1.42.1",
 ]
 
 [project.urls]

src/ogx_api/uv.lock

@@ -244,6 +244,7 @@ def test_providers_flag_generates_config_with_api_keys():
         image_type=None,
         distro_name=None,
         enable_ui=False,
+        dry_run=False,
     )
 
     # Mock _uvicorn_run to prevent starting a server