-
Notifications
You must be signed in to change notification settings - Fork 211
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.
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
Make app AutoField configurable on first deployment #465
Open
browniebroke
wants to merge
3
commits into
celery:main
Choose a base branch
from
browniebroke:fix/results-auto-field-setting
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
"""Application settings.""" | ||
from __future__ import annotations | ||
|
||
from dataclasses import dataclass | ||
from typing import Any | ||
|
||
from django.conf import settings as django_settings | ||
|
||
# All attributes accessed with this prefix are possible | ||
# to overwrite through django.conf.settings. | ||
SETTINGS_PREFIX = "DJANGO_CELERY_RESULTS_" | ||
|
||
|
||
@dataclass(frozen=True) | ||
class AppSettings: | ||
"""Proxy class to encapsulate all the app settings. | ||
|
||
This instance should be accessed via the singleton | ||
``django_celery_results.conf.app_settings``. | ||
|
||
You shouldn't have to set any of these yourself, the class checks a Django | ||
settings with the same name and use these if defined, defaulting to the | ||
values documented here. | ||
""" | ||
|
||
DJANGO_CELERY_RESULTS_DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' | ||
|
||
def __getattribute__(self, __name: str) -> Any: | ||
"""Check if a Django project settings should override the app default. | ||
|
||
In order to avoid returning any random properties of the Django | ||
settings, we first inspect the prefix. | ||
""" | ||
if ( | ||
__name.startswith(SETTINGS_PREFIX) | ||
and hasattr(django_settings, __name) | ||
): | ||
return getattr(django_settings, __name) | ||
|
||
return super().__getattribute__(__name) | ||
|
||
|
||
app_settings = AppSettings() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
Configuration | ||
============= | ||
|
||
These are the available settings that can be configured in your Django | ||
project's settings module by defining a setting with the same name. | ||
|
||
* ``DJANGO_CELERY_RESULTS_DEFAULT_AUTO_FIELD``: The ``default_auto_field`` used | ||
when first deploying the app, defaults to ``django.db.models.BigAutoField`` | ||
if unspecified. | ||
|
||
This is only used for the first deployment and | ||
and has no effect if changed after this point. If you want to change its | ||
value after the initial deployment, you should migrate back to zero and | ||
re-apply migrations again:: | ||
|
||
$ python manage.py migrate django_celery_results zero | ||
$ python manage.py migrate django_celery_results | ||
|
||
This will drop and recreate all tables used by django-celery-results. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,7 @@ Contents | |
|
||
getting_started | ||
injecting_metadata | ||
configuration | ||
copyright | ||
|
||
.. toctree:: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is another setting
DJANGO_CELERY_RESULTS_TASK_ID_MAX_LENGTH
which should probably be added here but I'd rather do this separately if you don't mind.