Merge remote-tracking branch 'origin/main' into openai/mcp

Author: tconley1428

temporalio/bridge/src/envconfig.rs

@@ -89,19 +89,14 @@ fn load_client_config_inner(
     py: Python,
     config_source: Option<DataSource>,
     config_file_strict: bool,
-    disable_file: bool,
     env_vars: Option<HashMap<String, String>>,
 ) -> PyResult<PyObject> {
-    let core_config = if disable_file {
-        CoreClientConfig::default()
-    } else {
-        let options = LoadClientConfigOptions {
-            config_source,
-            config_file_strict,
-        };
-        core_load_client_config(options, env_vars.as_ref())
-            .map_err(|e| ConfigError::new_err(format!("{e}")))?
+    let options = LoadClientConfigOptions {
+        config_source,
+        config_file_strict,
     };
+    let core_config = core_load_client_config(options, env_vars.as_ref())
+        .map_err(|e| ConfigError::new_err(format!("{e}")))?;
 
     core_config_to_dict(py, &core_config)
 }
@@ -130,12 +125,11 @@ fn load_client_connect_config_inner(
 }
 
 #[pyfunction]
-#[pyo3(signature = (path, data, disable_file, config_file_strict, env_vars = None))]
+#[pyo3(signature = (path, data, config_file_strict, env_vars = None))]
 pub fn load_client_config(
     py: Python,
     path: Option<String>,
     data: Option<Vec<u8>>,
-    disable_file: bool,
     config_file_strict: bool,
     env_vars: Option<HashMap<String, String>>,
 ) -> PyResult<PyObject> {
@@ -153,7 +147,6 @@ pub fn load_client_config(
         py,
         config_source,
         config_file_strict,
-        disable_file,
         env_vars,
     )
 }

temporalio/envconfig.py

@@ -24,7 +24,7 @@
 class ClientConfigTLSDict(TypedDict, total=False):
     """Dictionary representation of TLS config for TOML."""
 
-    disabled: bool
+    disabled: Optional[bool]
     server_name: str
     server_ca_cert: Mapping[str, str]
     client_cert: Mapping[str, str]
@@ -105,8 +105,8 @@ class ClientConfigTLS:
         Experimental API.
     """
 
-    disabled: bool = False
-    """If true, TLS is explicitly disabled."""
+    disabled: Optional[bool] = None
+    """If True, TLS is explicitly disabled. If False, TLS is explicitly enabled. If None, TLS behavior was not configured."""
     server_name: Optional[str] = None
     """SNI override."""
     server_root_ca_cert: Optional[DataSource] = None
@@ -119,7 +119,7 @@ class ClientConfigTLS:
     def to_dict(self) -> ClientConfigTLSDict:
         """Convert to a dictionary that can be used for TOML serialization."""
         d: ClientConfigTLSDict = {}
-        if self.disabled:
+        if self.disabled is not None:
             d["disabled"] = self.disabled
         if self.server_name is not None:
             d["server_name"] = self.server_name
@@ -138,7 +138,7 @@ def set_source(
 
     def to_connect_tls_config(self) -> Union[bool, temporalio.service.TLSConfig]:
         """Create a `temporalio.service.TLSConfig` from this profile."""
-        if self.disabled:
+        if self.disabled is True:
             return False
 
         return temporalio.service.TLSConfig(
@@ -154,7 +154,7 @@ def from_dict(d: Optional[ClientConfigTLSDict]) -> Optional[ClientConfigTLS]:
         if not d:
             return None
         return ClientConfigTLS(
-            disabled=d.get("disabled", False),
+            disabled=d.get("disabled"),
             server_name=d.get("server_name"),
             # Note: Bridge uses snake_case, but TOML uses kebab-case which is
             # converted to snake_case. Core has server_ca_cert, client_key.
@@ -238,7 +238,10 @@ def to_client_connect_config(self) -> ClientConnectConfig:
             config["namespace"] = self.namespace
         if self.api_key is not None:
             config["api_key"] = self.api_key
+            # Enable TLS with default TLS options
+            config["tls"] = True
         if self.tls is not None:
+            # Use specified TLS options
             config["tls"] = self.tls.to_connect_tls_config()
         if self.grpc_meta:
             config["rpc_metadata"] = self.grpc_meta
@@ -333,7 +336,6 @@ def from_dict(
     def load(
         *,
         config_source: Optional[DataSource] = None,
-        disable_file: bool = False,
         config_file_strict: bool = False,
         override_env_vars: Optional[Mapping[str, str]] = None,
     ) -> ClientConfig:
@@ -348,8 +350,6 @@ def load(
             config_source: If present, this is used as the configuration source
                 instead of default file locations. This can be a path to the file
                 or the string/byte contents of the file.
-            disable_file: If true, file loading is disabled. This is only used
-                when ``config_source`` is not present.
             config_file_strict: If true, will TOML file parsing will error on
                 unrecognized keys.
             override_env_vars: The environment variables to use for locating the
@@ -364,7 +364,6 @@ def load(
         loaded_profiles = _bridge_envconfig.load_client_config(
             path=path,
             data=data,
-            disable_file=disable_file,
             config_file_strict=config_file_strict,
             env_vars=override_env_vars,
         )