Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
848 changes: 378 additions & 470 deletions Cargo.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"""Dynamo runtime configuration ArgGroup."""

import argparse
import os
from typing import List, Optional

from dynamo._core import get_reasoning_parser_names, get_tool_parser_names
Expand Down Expand Up @@ -48,6 +49,12 @@ class DynamoRuntimeConfig(ConfigBase):
# default; when set, these surface env vars that the Rust runtime reads
# directly (see lib/runtime/src/pipeline/network/ingress/shared_tcp_endpoint.rs).
engine_request_limit: Optional[int] = None
tcp_tls_cert_path: Optional[str] = None
tcp_tls_key_path: Optional[str] = None
tcp_tls_ca_cert_path: Optional[str] = None
tcp_tls_insecure: bool = False
tcp_tls_server_name: Optional[str] = None
tcp_tls_handshake_timeout_secs: Optional[int] = None

def validate(self) -> None:
self.namespace = get_worker_namespace(self.namespace)
Expand All @@ -61,6 +68,28 @@ def validate(self) -> None:
f"--engine-request-limit must be a positive integer, got {self.engine_request_limit}"
)

# Propagate TCP TLS CLI flags to env vars so the Rust runtime picks them up.
if self.tcp_tls_cert_path:
os.environ["DYN_TCP_TLS_CERT_PATH"] = self.tcp_tls_cert_path
if self.tcp_tls_key_path:
os.environ["DYN_TCP_TLS_KEY_PATH"] = self.tcp_tls_key_path
if self.tcp_tls_ca_cert_path:
os.environ["DYN_TCP_TLS_CA_CERT_PATH"] = self.tcp_tls_ca_cert_path
if self.tcp_tls_insecure:
os.environ["DYN_TCP_TLS_INSECURE"] = "1"
else:
os.environ.pop("DYN_TCP_TLS_INSECURE", None)
if self.tcp_tls_server_name:
os.environ["DYN_TCP_TLS_SERVER_NAME"] = self.tcp_tls_server_name
if self.tcp_tls_handshake_timeout_secs is not None:
if self.tcp_tls_handshake_timeout_secs <= 0:
raise ValueError(
f"--tcp-tls-handshake-timeout must be a positive integer, got {self.tcp_tls_handshake_timeout_secs}"
)
os.environ["DYN_TCP_TLS_HANDSHAKE_TIMEOUT_SECS"] = str(
self.tcp_tls_handshake_timeout_secs
)
Comment thread
walkoss marked this conversation as resolved.
Resolved

def _validate_output_modalities(self) -> None:
"""Validate --output-modalities values."""
if not self.output_modalities:
Expand Down Expand Up @@ -298,3 +327,53 @@ def add_arguments(self, parser: argparse.ArgumentParser) -> None:
"semaphore size). Enables worker-side request rejection when set. "
"Disabled by default.",
)

add_argument(
g,
flag_name="--tcp-tls-cert-path",
env_var="DYN_TCP_TLS_CERT_PATH",
default=None,
help="Path to PEM certificate for the TCP server.",
)

add_argument(
g,
flag_name="--tcp-tls-key-path",
env_var="DYN_TCP_TLS_KEY_PATH",
default=None,
help="Path to PEM private key for the TCP server certificate.",
)

add_argument(
g,
flag_name="--tcp-tls-ca-cert-path",
env_var="DYN_TCP_TLS_CA_CERT_PATH",
default=None,
help="Path to PEM CA certificate used by this node to verify the TCP peer's certificate.",
)

add_negatable_bool_argument(
g,
flag_name="--tcp-tls-insecure",
env_var="DYN_TCP_TLS_INSECURE",
default=False,
help="Disable TCP TLS certificate verification. For local development only.",
)

add_argument(
g,
flag_name="--tcp-tls-server-name",
env_var="DYN_TCP_TLS_SERVER_NAME",
default=None,
help="Override TLS SNI server name for TCP connections (useful when connecting by IP).",
)

add_argument(
g,
flag_name="--tcp-tls-handshake-timeout",
env_var="DYN_TCP_TLS_HANDSHAKE_TIMEOUT_SECS",
default=None,
arg_type=int,
dest="tcp_tls_handshake_timeout_secs",
help="TLS handshake timeout in seconds (default: 3).",
)
27 changes: 27 additions & 0 deletions components/src/dynamo/frontend/frontend_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ class FrontendConfig(RouterConfigBase, KvRouterConfigBase, AicPerfConfigBase):
http_port: int
tls_cert_path: Optional[pathlib.Path]
tls_key_path: Optional[pathlib.Path]
tcp_tls_cert_path: Optional[str] = None
tcp_tls_key_path: Optional[str] = None
tcp_tls_ca_cert_path: Optional[str] = None

namespace: Optional[str] = None
namespace_prefix: Optional[str] = None
Expand Down Expand Up @@ -246,6 +249,30 @@ def add_arguments(self, parser) -> None:
arg_type=pathlib.Path,
)

add_argument(
g,
flag_name="--tcp-tls-cert-path",
env_var="DYN_TCP_TLS_CERT_PATH",
default=None,
help="Path to PEM certificate for the TCP server.",
)

add_argument(
g,
flag_name="--tcp-tls-key-path",
env_var="DYN_TCP_TLS_KEY_PATH",
default=None,
help="Path to PEM private key for the TCP server certificate.",
)

add_argument(
g,
flag_name="--tcp-tls-ca-cert-path",
env_var="DYN_TCP_TLS_CA_CERT_PATH",
default=None,
help="Path to PEM CA certificate used to verify the TCP peer's certificate.",
)
Comment thread
walkoss marked this conversation as resolved.
Resolved

# Router options (shared with dynamo.router)
RouterArgGroup().add_arguments(parser)

Expand Down
6 changes: 6 additions & 0 deletions components/src/dynamo/frontend/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,12 @@ def signal_handler():
kwargs["tls_cert_path"] = config.tls_cert_path
if config.tls_key_path:
kwargs["tls_key_path"] = config.tls_key_path
if config.tcp_tls_cert_path:
os.environ["DYN_TCP_TLS_CERT_PATH"] = config.tcp_tls_cert_path
if config.tcp_tls_key_path:
os.environ["DYN_TCP_TLS_KEY_PATH"] = config.tcp_tls_key_path
if config.tcp_tls_ca_cert_path:
os.environ["DYN_TCP_TLS_CA_CERT_PATH"] = config.tcp_tls_ca_cert_path
Comment thread
walkoss marked this conversation as resolved.
Resolved
Comment thread
walkoss marked this conversation as resolved.
Resolved
Comment thread
walkoss marked this conversation as resolved.
Resolved
if config.namespace:
kwargs["namespace"] = config.namespace
if config.namespace_prefix:
Expand Down
Loading
Loading