feat(config): allow disabling strict region validation

(cherry picked from commit 46cfabd2ac0a8c21889d2f523666a2933f732fea)

Author: liulei.88

agentkit/toolkit/cli/cli_config.py

@@ -319,6 +319,25 @@ def _interactive_config(config_file: Optional[str] = None):
         console.print(f"[red]❌ Unknown launch type: {strategy_name}[/red]")
         raise typer.Exit(1)
 
+    # When disabling strict region restrictions, default show global region
+    try:
+        from agentkit.toolkit.config.global_config import get_global_config
+
+        global_conf = get_global_config()
+        disabled = bool(
+            getattr(global_conf.defaults, "disable_region_strict_restrictions", False)
+        )
+        if disabled and isinstance(current_strategy_config_dict, dict):
+            global_region = (global_conf.region or "").strip()
+            if global_region:
+                if "region" in current_strategy_config_dict:
+                    if not current_strategy_config_dict.get("region"):
+                        current_strategy_config_dict["region"] = global_region
+                else:
+                    current_strategy_config_dict["region"] = global_region
+    except Exception:
+        pass
+
     # Generate new strategy config
     strategy_config = generate_config_from_dataclass(
         config_class, current_strategy_config_dict
@@ -472,6 +491,8 @@ def _show_global_config():
     console.print(
         f"  Region:     [yellow]{config.region or '[dim](not set)[/dim]'}[/yellow]"
     )
+    if config.defaults.disable_region_strict_restrictions:
+        console.print("  Disable Region Restrictions: [yellow]True[/yellow]")
     console.print()
 
     # Display Volcengine credentials
@@ -581,22 +602,9 @@ def _set_global_field(field_value: str):
                 )
             config_dict[section][field] = clean_value
         elif field == "cr_public_endpoint_check":
-            clean_value = value.strip().lower() if value is not None else None
-            if clean_value == "":
-                clean_value = None
-            if clean_value is None:
-                config_dict[section][field] = None
-            else:
-                truthy = {"true", "1", "yes", "y"}
-                falsy = {"false", "0", "no", "n"}
-                if clean_value in truthy:
-                    config_dict[section][field] = True
-                elif clean_value in falsy:
-                    config_dict[section][field] = False
-                else:
-                    raise AttributeError(
-                        f"Invalid boolean value for cr_public_endpoint_check: {value}"
-                    )
+            _set_bool_field(config_dict[section], field, value)
+        elif field == "disable_region_strict_restrictions":
+            _set_bool_field(config_dict[section], field, value)
         elif field == "iam_role_policies":
             # Simple list parsing for CLI convenience
             if not value:
@@ -631,3 +639,22 @@ def _set_global_field(field_value: str):
     except Exception as e:
         console.print(f"[red]❌ Failed to set config: {e}[/red]")
         raise typer.Exit(code=1)
+
+
+def _set_bool_field(target_dict: dict, field: str, value: str):
+    """Helper to set boolean field from string value."""
+    clean_value = value.strip().lower() if value is not None else None
+    if clean_value == "":
+        clean_value = None
+
+    if clean_value is None:
+        target_dict[field] = None
+    else:
+        truthy = {"true", "1", "yes", "y"}
+        falsy = {"false", "0", "no", "n"}
+        if clean_value in truthy:
+            target_dict[field] = True
+        elif clean_value in falsy:
+            target_dict[field] = False
+        else:
+            raise AttributeError(f"Invalid boolean value for {field}: {value}")

agentkit/toolkit/cli/interactive_config.py

@@ -107,6 +107,7 @@ def __init__(self):
             dict: self._handle_dict,
             Dict: self._handle_dict,
         }
+        self.current_dataclass_type = None
 
     def _safe_input(self, prompt_text, default: str = "") -> str:
         """Safe input method that protects prompt text from being deleted by Backspace.
@@ -175,6 +176,7 @@ def prefill():
     def generate_config(
         self, dataclass_type: type, existing_config: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
+        self.current_dataclass_type = dataclass_type
         if not is_dataclass(dataclass_type):
             raise ValueError(f"{dataclass_type} must be a dataclass")
 
@@ -270,6 +272,7 @@ def generate_config(
             if not isinstance(value, type(MISSING)):
                 filtered_config[key] = value
 
+        self.current_dataclass_type = None
         return filtered_config
 
     def _prompt_for_field(
@@ -326,7 +329,35 @@ def _prompt_for_field(
             default = None
 
         choices = metadata.get("choices")
-        if choices:
+        # Allow free region input when global defaults disable strict restrictions
+        allow_free_region = False
+        try:
+            from agentkit.toolkit.config.global_config import get_global_config
+
+            global_conf = get_global_config()
+            disabled = bool(
+                getattr(
+                    global_conf.defaults, "disable_region_strict_restrictions", False
+                )
+            )
+            if disabled and name == "region":
+                # Limit to Cloud/Hybrid strategy types only
+                try:
+                    from agentkit.toolkit.config.strategy_configs import (
+                        CloudStrategyConfig,
+                        HybridStrategyConfig,
+                    )
+
+                    allow_free_region = self.current_dataclass_type in (
+                        CloudStrategyConfig,
+                        HybridStrategyConfig,
+                    )
+                except Exception:
+                    allow_free_region = False
+        except Exception:
+            allow_free_region = False
+
+        if choices and not allow_free_region:
             return self._handle_choice_selection(
                 description, default, choices, metadata, current, total
             )

agentkit/toolkit/config/config_validator.py

@@ -88,6 +88,18 @@ def validate_dataclass(config: Any) -> List[str]:
 
         errors: List[str] = []
 
+        # Global flag: disable strict region choices
+        disable_region_restrictions = False
+        try:
+            from agentkit.toolkit.config.global_config import get_global_config
+
+            gc = get_global_config()
+            disable_region_restrictions = bool(
+                getattr(gc.defaults, "disable_region_strict_restrictions", False)
+            )
+        except Exception:
+            disable_region_restrictions = False
+
         for field in fields(config):
             if field.name.startswith("_"):
                 continue
@@ -114,7 +126,11 @@ def validate_dataclass(config: Any) -> List[str]:
                     errors.append(f"{desc}: {msg}")
 
             choices = field.metadata.get("choices")
-            if choices and value:
+            if (
+                choices
+                and value
+                and not (disable_region_restrictions and field.name == "region")
+            ):
                 valid_values = []
                 if isinstance(choices, list):
                     if choices and isinstance(choices[0], dict):

agentkit/toolkit/config/global_config.py

@@ -134,6 +134,7 @@ class Defaults:
         preflight_mode: Optional[str] = None
         cr_public_endpoint_check: Optional[bool] = None
         iam_role_policies: Optional[list] = None
+        disable_region_strict_restrictions: Optional[bool] = None
 
         def to_dict(self):
             data = {}
@@ -145,6 +146,10 @@ def to_dict(self):
                 data["cr_public_endpoint_check"] = self.cr_public_endpoint_check
             if self.iam_role_policies is not None:
                 data["iam_role_policies"] = self.iam_role_policies
+            if self.disable_region_strict_restrictions is not None:
+                data["disable_region_strict_restrictions"] = (
+                    self.disable_region_strict_restrictions
+                )
             return data
 
         @classmethod
@@ -154,6 +159,9 @@ def from_dict(cls, data: dict):
                 preflight_mode=data.get("preflight_mode"),
                 cr_public_endpoint_check=data.get("cr_public_endpoint_check"),
                 iam_role_policies=data.get("iam_role_policies"),
+                disable_region_strict_restrictions=data.get(
+                    "disable_region_strict_restrictions"
+                ),
             )
 
     defaults: "GlobalConfig.Defaults" = field(