PR feedback: correct v3 video form, correct image size restrictions, use safe article functions for summary

Author: jlchilders11

core/validators.py

@@ -46,5 +46,8 @@ def __call__(self, value):
 # 1 MB max file size
 max_file_size_validator = MaxFileSizeValidator(max_size=1 * 1024 * 1024)
 
+# 1 MB max file size
+downscale_image_file_size_validator = MaxFileSizeValidator(max_size=5 * 1024 * 1024)
+
 # 50 MB allowed for certain large files - to be used on staff-only fields
 large_file_max_size_validator = MaxFileSizeValidator(max_size=50 * 1024 * 1024)

news/forms.py

@@ -1,9 +1,13 @@
 from django import forms
+
+from core.validators import downscale_image_file_size_validator, max_file_size_validator
+
 from .models import BlogPost, Entry, Link, News, Poll, Video
 
 
 class EntryForm(forms.ModelForm):
     title = forms.CharField(widget=forms.TextInput(attrs={"size": 100}))
+    image = forms.ImageField(validators=[max_file_size_validator])
 
     class Meta:
         model = Entry
@@ -48,16 +52,22 @@ class Meta:
 
 # v3-only forms: the v3 create page also captures the AI-assisted `summary`.
 class V3BlogPostForm(BlogPostForm):
+    image = forms.ImageField(validators=[downscale_image_file_size_validator])
+
     class Meta(BlogPostForm.Meta):
         fields = ["title", "publish_at", "content", "summary", "image"]
 
 
 class V3NewsForm(NewsForm):
+    image = forms.ImageField(validators=[downscale_image_file_size_validator])
+
     class Meta(NewsForm.Meta):
         fields = ["title", "publish_at", "content", "summary", "image"]
 
 
 class V3LinkForm(LinkForm):
+    image = forms.ImageField(validators=[downscale_image_file_size_validator])
+
     class Meta(LinkForm.Meta):
         fields = ["title", "publish_at", "external_url", "summary", "image"]
 
@@ -72,3 +82,11 @@ class VideoForm(EntryForm):
     class Meta:
         model = Video
         fields = ["title", "publish_at", "external_url", "image"]
+
+
+class V3VideoForm(EntryForm):
+    image = forms.ImageField(validators=[downscale_image_file_size_validator])
+
+    class Meta:
+        model = Video
+        fields = ["title", "publish_at", "external_url", "summary", "image"]

news/models.py

@@ -15,7 +15,6 @@
 from core.validators import (
     attachment_validator,
     image_validator,
-    max_file_size_validator,
     large_file_max_size_validator,
 )
 
@@ -112,7 +111,7 @@ class AlreadyApprovedError(Exception):
         upload_to="news/%Y/%m/",
         null=True,
         blank=True,
-        validators=[image_validator, max_file_size_validator],
+        validators=[image_validator],
     )
     created_at = models.DateTimeField(default=now)
     approved_at = models.DateTimeField(null=True, blank=True)

news/tasks.py

@@ -9,7 +9,7 @@
 from config.celery import app
 from config.settings import OPENROUTER_API_KEY, OPENROUTER_URL, SUMMARIZATION_MODEL
 from news.constants import CONTENT_SUMMARIZATION_THRESHOLD
-from news.helpers import UnsafeURLError, extract_article, safe_get, extract_content
+from news.helpers import UnsafeURLError, extract_article, safe_get
 from news.utils import set_video_thumbnail
 
 logger = structlog.get_logger(__name__)
@@ -319,11 +319,11 @@ def set_summary_for_link_page(pk: int):
     external_url = page.external_url
     try:
         logger.info(f"Fetching content from {external_url=} for entry.{pk=}")
-        response = requests.get(external_url, timeout=10)
+        response = safe_get(external_url, timeout=10)
         response.raise_for_status()
         markup = response.text
         logger.debug(f"Fetched {len(markup)=} for entry.{pk=}...")
-        content = extract_content(markup)
+        _title, content = extract_article(markup)
         logger.info(f"extracted content from {external_url=}, {markup[:100]=}")
     except requests.RequestException as e:
         logger.error(f"Error fetching content from {external_url=}: {e=}")

news/views.py

@@ -58,10 +58,11 @@
     LinkForm,
     NewsForm,
     PollForm,
+    VideoForm,
     V3BlogPostForm,
     V3LinkForm,
     V3NewsForm,
-    VideoForm,
+    V3VideoForm,
 )
 from .models import BlogPost, Entry, Link, News, Poll, Video
 from .services import news_type_label
@@ -533,7 +534,7 @@ class V3AllTypesCreateView(V3Mixin, AllTypesCreateView):
         "blog": V3BlogPostForm,
         "news": V3NewsForm,
         "link": V3LinkForm,
-        "video": VideoForm,
+        "video": V3VideoForm,
     }
 
     def dispatch(self, request, *args, **kwargs):

templates/news/v3/create.html

@@ -182,7 +182,7 @@ <h1 class="create-post-page__title">Create Post</h1>
             <p class="field__error" id="field-link-description-error" role="alert" x-show="isLink && linkError" x-text="linkError" x-cloak aria-live="polite"></p>
           </div>
 
-          {% include "v3/includes/_field_file.html" with name="image" label="Image" accept="image/png,image/jpeg" preview=True alpine_error="errors.image" error=form.errors.image.0 help_text="This should be a PNG or JPEG format and no longer than 1MB" extra_class="field--file-narrow create-post-page__field-image" %}
+          {% include "v3/includes/_field_file.html" with name="image" label="Image" accept="image/png,image/jpeg" preview=True alpine_error="errors.image" error=form.errors.image.0 help_text="This should be a PNG or JPEG format and no larger than 5MB" extra_class="field--file-narrow create-post-page__field-image" %}
 
           {% include "v3/includes/_field_dropdown.html" with name="related_libraries" label="Related Libraries" options=related_libraries_options placeholder="Select" selected=form.data.related_libraries %}
 
@@ -615,7 +615,7 @@ <h1 class="create-post-page__title">Create Post</h1>
           if (file) {
             const validTypes = ['image/png', 'image/jpeg', 'image/jpg'];
             if (!validTypes.includes(file.type)) this.errors.image = 'Please choose a PNG or JPEG image.';
-            else if (file.size > 1024 * 1024) this.errors.image = 'Image must be 1MB or smaller.';
+            else if (file.size > 5 * 1024 * 1024) this.errors.image = 'Image must be 5MB or smaller.';
           }
 
           if (Object.values(this.errors).some(v => v)) {