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

Add check to call render on the response if it has a render method #11762

Merged
merged 3 commits into from
Feb 22, 2024
Merged

Add check to call render on the response if it has a render method #11762

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb86130
Add condition check before calling render on response
KshitijThareja Jan 21, 2024
716eb84
Check if response.render is callable
KshitijThareja Jan 22, 2024
1540ece
Add a check for response.content
KshitijThareja Jan 25, 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
3 changes: 2 additions & 1 deletion kolibri/core/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@ def cache_no_user_data(view_func):
_response = local()

def render_and_cache(response, cache_key):
response.render()
if hasattr(response, "render") and callable(response.render):
response.render()
etag = hashlib.md5(
kolibri_version.encode("utf-8") + str(response.content).encode("utf-8")
Copy link
Member

Choose a reason for hiding this comment

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

For response objects without a render function, is content guaranteed to be defined? Or will it just be null?

I wonder if it might be better to not cache an etag in this case.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For such a case, we can check if content is defined for response object or not, after checking for the render method. This way, we'll only cache the etag if both the attributes are defined for a particular response object.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can check if response.content is defined and not null and then cache the etag, else we can return None for render_and_cache function. Should I proceed with these changes?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, I think that seems right.

Copy link
Member

Choose a reason for hiding this comment

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

I did a double check, and Django accepts the etag generating function returning None in the case that an etag does not exist for the resource, which seems right: https://docs.djangoproject.com/en/1.11/topics/conditional-view-processing/#the-condition-decorator

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the confirmation :)
I'll move forward with the changes in that case. Will make a commit in some time 👍🏻

).hexdigest()
Expand Down
Loading