-
Notifications
You must be signed in to change notification settings - Fork 14
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
fix: [AXM-748] fix problem block offline generations #2579
Changes from all commits
87393cd
1072927
1c30aea
4de60bd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
""" | ||
from celery import shared_task | ||
from edx_django_utils.monitoring import set_code_owner_attribute | ||
from django.http.response import Http404 | ||
from opaque_keys.edx.keys import CourseKey, UsageKey | ||
|
||
from xmodule.modulestore.django import modulestore | ||
|
@@ -17,16 +18,20 @@ | |
def generate_offline_content_for_course(course_id): | ||
""" | ||
Generates offline content for all supported XBlocks in the course. | ||
|
||
Blocks that are closed to responses won't be processed. | ||
""" | ||
course_key = CourseKey.from_string(course_id) | ||
for offline_supported_block_type in OFFLINE_SUPPORTED_XBLOCKS: | ||
for xblock in modulestore().get_items(course_key, qualifiers={'category': offline_supported_block_type}): | ||
html_data = XBlockRenderer(str(xblock.location)).render_xblock_from_lms() | ||
generate_offline_content_for_block.apply_async([str(xblock.location), html_data]) | ||
if not hasattr(xblock, 'closed') or not xblock.closed(): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What xBlock closed mean? please mention this in docstring |
||
block_id = str(xblock.location) | ||
html_data = XBlockRenderer(block_id).render_xblock_from_lms() | ||
generate_offline_content_for_block.apply_async([block_id, html_data]) | ||
|
||
|
||
@shared_task( | ||
autoretry_for=(Exception,), | ||
autoretry_for=(Exception, Http404), | ||
retry_backoff=RETRY_BACKOFF_INITIAL_TIMEOUT, | ||
retry_kwargs={'max_retries': MAX_RETRY_ATTEMPTS} | ||
) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
|
||
from django.contrib.auth import get_user_model | ||
from django.core.files.storage import default_storage | ||
from django.http.response import Http404 | ||
|
||
from zipfile import ZipFile | ||
|
||
|
@@ -36,6 +37,11 @@ def generate_offline_content(xblock, html_data): | |
try: | ||
save_xblock_html(tmp_dir, xblock, html_data) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should rename this function and call it sanitize or prepare xblock html data There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. But this function actually saves the rendered xblock html to the index.html file. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, let's leave it for now |
||
create_zip_file(tmp_dir, base_path, f'{xblock.location.block_id}.zip') | ||
except Http404: | ||
log.error( | ||
f'Block {xblock.location.block_id} cannot be fetched from course' | ||
f' {xblock.location.course_key} during offline content generation.' | ||
) | ||
finally: | ||
shutil.rmtree(tmp_dir, ignore_errors=True) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If there's return on line 31, it's better to make celery task return result in all outcomes, the best option is to return True/False depending on the task result There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh, thanks, added |
||
|
||
|
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 will be a conflict with #2576
Let's merge this fix firstly and then rebase the mentioned PR