Skip to content
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

Jump to bottom

safely convert ini parameters to bool, int, list and dict #104

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

safely convert ini parameters to bool, int, list and dict #104

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3d49b8d
safely convert ini parameters to bool and int
kkvilekval Mar 20, 2024
1855c90
added gitlab-ci
kkvilekval Mar 20, 2024
2daf286
bump-version
kkvilekval Mar 20, 2024
04482bb
uses stages
kkvilekval Mar 20, 2024
d69eb19
Update .gitlab-ci.yml file
kkvilekval Mar 20, 2024
398b9d1
typo
kkvilekval Mar 20, 2024
01f883a
bump version; user build
kkvilekval Mar 20, 2024
16c4dd8
install build
kkvilekval Mar 20, 2024
38ed887
added json5 decoding for structures
kkvilekval May 22, 2024
8bcc9f0
bump version
kkvilekval May 22, 2024
62110dc
use ast literal_eval
kkvilekval May 23, 2024
80863e8
version bump
kkvilekval May 24, 2024
c33729e
remove redundant converstion
kkvilekval Jul 20, 2024
ee3042d
catch all ast errors
kkvilekval Jul 23, 2024
37d6880
bump
kkvilekval Jul 23, 2024
656744f
parens about exc
kkvilekval Jul 23, 2024
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
14 changes: 13 additions & 1 deletion pyramid_celery/loaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,18 @@ def get_route_config(parser, section):
return config


def safe_conversion(value):
"""convert a string to a more specific type"""
if value.lower() in ("true", "false"):
return bool(value)
Comment on lines +97 to +98
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this, I suggest using pyramid.settings.asbool to consider the full range of supported "bool-like" values.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did consider this, however, this is trying to replicate what you might use in celeryconfig.py, but with values you would find in the ini file.

For example in celeryconfig.py you might write
task_acks_late = True
so in the ini you would need to write
task_acks_late = true

Pyramid asbool will also convert integer and other values to a boolean which may or may not work similarly to setting them celeryconfig.py

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point about the integer. Better to stay safe with the explicit bool-like strings. 👍

try:
if float(value).is_integer():
return int(value)
return float(value)
except ValueError:
return value


class INILoader(celery.loaders.base.BaseLoader):
ConfigParser = configparser.SafeConfigParser

Expand All @@ -106,7 +118,7 @@ def read_configuration(self, fail_silently=True):
config_dict = {}

for key, value in self.parser.items('celery'):
config_dict[key] = value
config_dict[key] = safe_conversion(value)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might need to consider applying this to other structures below?
For example, a lot of Task result backend settings tend to have very nested dict definitions.


if celery_version.major > 6:
# TODO: Check for invalid settings
Expand Down