From 6efa21fc0ac2935bb2cba7686916ef3ac440dcef Mon Sep 17 00:00:00 2001 From: SAY-5 Date: Mon, 11 May 2026 12:10:09 -0700 Subject: [PATCH] fix: introduce DomainError for invalid domain name in _AllowedDomainNames _AllowedDomainNames.valid_name raised ZoneError(domain_name=...), but ZoneError.__init__ only accepts zone_name. Passing an invalid domain name therefore raised TypeError instead of the intended validation error. Add a DomainError class that mirrors ZoneError but uses the domain context, and switch valid_name to raise it. The error message still flows through allowed_name_error_message with context='domain' so users see a consistent validation message. Resolves #5044. Signed-off-by: SAY-5 --- .../fluent/core/services/solution_variables.py | 17 +++++++++++++++-- .../core/services/solution_variables_v1.py | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/ansys/fluent/core/services/solution_variables.py b/src/ansys/fluent/core/services/solution_variables.py index 1364c42ecdb..81ab61d66f4 100644 --- a/src/ansys/fluent/core/services/solution_variables.py +++ b/src/ansys/fluent/core/services/solution_variables.py @@ -331,6 +331,19 @@ def __init__(self, zone_name: str, allowed_values: List[str]): ) +class DomainError(ValueError): + """Exception class for errors in Domain name.""" + + def __init__(self, domain_name: str, allowed_values: List[str]): + """Initialize DomainError.""" + self.domain_name = domain_name + super().__init__( + allowed_name_error_message( + context="domain", trial_name=domain_name, allowed_values=allowed_values + ) + ) + + class _AllowedNames: def is_valid(self, name): """Check whether a given name is valid or not.""" @@ -426,11 +439,11 @@ def valid_name(self, domain_name): Raises ------ - ZoneError + DomainError If the given domain name is invalid. """ if not self.is_valid(domain_name): - raise ZoneError( + raise DomainError( domain_name=domain_name, allowed_values=self(), ) diff --git a/src/ansys/fluent/core/services/solution_variables_v1.py b/src/ansys/fluent/core/services/solution_variables_v1.py index e962fab57fb..6a23d19852c 100644 --- a/src/ansys/fluent/core/services/solution_variables_v1.py +++ b/src/ansys/fluent/core/services/solution_variables_v1.py @@ -45,6 +45,7 @@ InvalidSolutionVariableNameError = _v0.InvalidSolutionVariableNameError ZoneError = _v0.ZoneError +DomainError = _v0.DomainError _AllowedNames = _v0._AllowedNames _AllowedSvarNames = _v0._AllowedSvarNames _AllowedZoneNames = _v0._AllowedZoneNames