Skip to content

input: improve setting/property validation errors #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkloetzke merged 1 commit into from
Feb 10, 2026
Merged

input: improve setting/property validation errors #697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions pym/bob/input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,8 @@ def merge(self, other):
self.__updater(self.__schema.validate(other) if self.__mangle else other)

def validate(self, data):
try:
self.__schema.validate(data)
return True
except schema.SchemaError:
return False
self.__schema.validate(data)
return True

def Scm(spec, env, overrides, recipeSet):
def _substitute(k, v):
Expand Down Expand Up @@ -3252,6 +3249,14 @@ def validate(self, data):
raise schema.SchemaError(None, "Int value must not be negative")
return data

def wrapValidator(validator, message):
def wrapper(data):
if validator(data):
return True
else:
raise schema.SchemaError(message)
return wrapper


class LayersConfig:
def __init__(self):
Expand Down Expand Up @@ -4251,8 +4256,9 @@ def __createSchemas(self):
schema.Optional('packageAuditFiles') : AuditFilesValidator("packageAuditFiles"),
}
for (name, prop) in self.__properties.items():
classSchemaSpec[schema.Optional(name)] = schema.Schema(prop.validate,
error="property '"+name+"' has an invalid type")
classSchemaSpec[schema.Optional(name)] = schema.Schema(
wrapValidator(prop.validate,
"property '"+name+"' has an invalid type"))

self.__classSchema = (schema.Schema(classSchemaSpec), self.__pluginPropDeps)

Expand All @@ -4267,8 +4273,9 @@ def __createSchemas(self):
schema.Optional('require') : schema.Schema([str]),
}
for (name, setting) in self.__settings.items():
userConfigSchemaSpec[schema.Optional(name)] = schema.Schema(setting.validate,
error="setting '"+name+"' has an invalid type")
userConfigSchemaSpec[schema.Optional(name)] = schema.Schema(
wrapValidator(setting.validate,
"setting '"+name+"' has an invalid type"))
self.__userConfigSchema = (schema.Schema(userConfigSchemaSpec), self.__pluginSettingsDeps)


Expand Down