lato_cms 3.2.6 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdc7dae92de55a7a6e1e1290ee957bbf0b63fdf16404524c3f1803bd68123d0e
-  data.tar.gz: 1bc853f4846e25c41db7bddc0d53ac55f05699a06cf97a221abf6b7573458a7e
+  metadata.gz: 9a5b87d2c477cafb579b7ceea01c41e72071b3a789f425e184acbe99592f63ab
+  data.tar.gz: 123893a3b2a7c226c4910f41ab931b5bf7fd28b30b883293d811e6fc439d0155
 SHA512:
-  metadata.gz: 0117c7af5986170ce154bee821263a5ac8da6759d71a8fd682624e59b84d31a4f368d15d8c12d05549cd38d08baee38aa5a09550cad85a2bfaf9e30071baa50a
-  data.tar.gz: f18ef5c8dcaf4c2a3e2cd66e031bd2853eca12e69fc9aab6afcbe93989a90de362948317a526a45c08fe0ba38a647220505f95282e7e2b1910bc32c864386ca0
+  metadata.gz: 23968a738f1d1295e172d546617950e2b49c900b45ac6399080a01380c97ae7ebba48414277c58565205f8229dd758b798a286a3dfb6eac55d3c1091258fad12
+  data.tar.gz: 0a3d712b435da91e70a4a90edd8cefad81fa8105dface4946c4776490b920d3f2259c4857619d99af374e84b181aea38bc0524b2df1ef6f22532f80a141d16c5

data/README.md

@@ -43,6 +43,39 @@ import "lato_cms/application";
 // ....
 ```
 
+## Media URLs
+
+By default a media URL is an Active Storage **redirect** URL: Rails answers 302 with a
+signed address that expires. On a remote service (S3 and friends) that is what you want —
+the file then comes from the service itself.
+
+On a **disk** service it is the wrong trade: the redirect costs a second request, and its
+target is served `private, must-revalidate`, so no browser, proxy or CDN can keep it. A
+video of a few dozen MB is then downloaded again on every visit, from a thread of your app
+server. Switch the mode:
+
+```ruby
+LatoCms.configure do |config|
+  config.media_url_mode = :proxy
+end
+```
+
+Media URLs (the blob and every variant) then point at Active Storage's proxy controller:
+no redirect, and `Cache-Control: public, immutable`, which a cache in front of the app can
+actually use. The address carries the signature of the blob, so a replaced file is a
+different address and can never be served stale.
+
+⚠️ **`:proxy` needs something in front that splits byte ranges** — nginx with `slice`,
+or a CDN that does the same. Active Storage's proxy controller serves one range at a
+time, holding it in memory, and answers **416** to anything above
+`streaming_chunk_max_size` (100 MB by default). A `<video>` opens with `Range: bytes=0-`,
+that is the whole file: above that size the browser reads the 416 as "format not
+supported", and below it the app loads tens of MB into memory per request. With slices of
+1 MB neither happens. Without such a front, stay on `:redirect`.
+
+Both modes ask for an `inline` disposition: a media of the library is content to show, and
+the default for a video would otherwise turn opening its address into a download.
+
 ## Development
 
 Clone repository, install dependencies, run migrations and start:

data/app/controllers/lato_cms/media_controller.rb

@@ -81,16 +81,17 @@ module LatoCms
       end
     end
 
-    # Regenerates one translatable attribute (alt_text or title, see the
-    # route constraint) with the LLM. Runs as a Lato::Operation (see
-    # GenerateMediaTextJob) rather than inline: an LLM call can take a while,
-    # and blocking the request risks timing it out. The admin instead lands on
-    # a live progress page.
+    # Regenerates the translatable attributes (alt_text and title, or a single
+    # one — see the route constraint) with the LLM. Runs as a Lato::Operation
+    # (see GenerateMediaTextJob) rather than inline: an LLM call can take a
+    # while, and blocking the request risks timing it out. The admin instead
+    # lands on a live progress page.
     def regenerate_text_action
       @media = query_media.find(params[:id])
-      attribute = params[:attribute].to_s
+      attributes = params[:attribute] == "all" ? LatoCms.config.llm_media_attributes : [params[:attribute]]
+      attributes = attributes.map(&:to_s).select { |attribute| LatoCms.config.llm_generates?(attribute) }
 
-      unless @media.image? && LatoCms.config.llm_generates?(attribute)
+      unless @media.image? && attributes.any?
         respond_to do |format|
           message = t("lato_cms.media_text_regenerate_unavailable")
           format.html { redirect_to lato_cms.media_update_path(@media), alert: message }
@@ -99,7 +100,7 @@ module LatoCms
         return
       end
 
-      operation = Lato::Operation.generate("LatoCms::GenerateMediaTextJob", { media_id: @media.id, attributes: [attribute] }, @session.user_id)
+      operation = Lato::Operation.generate("LatoCms::GenerateMediaTextJob", { media_id: @media.id, attributes: attributes }, @session.user_id)
 
       if operation.start
         redirect_to lato.operation_path(operation)

data/app/jobs/lato_cms/generate_media_text_job.rb

@@ -1,9 +1,10 @@
 module LatoCms
   # Generates alt text and/or title for an image Media via an OpenAI-compatible
-  # LLM, one LLM call per attribute (each has its own prompt, see
-  # LatoCms::Config#llm_prompt). `attributes` defaults to every attribute
-  # enabled in config (the automatic post-upload run); the manual "Regenerate
-  # with AI" buttons pass the single attribute they sit next to.
+  # LLM in a single call, whatever the number of attributes: the image travels
+  # in the request, so one call per attribute meant uploading it twice (see
+  # Media#generate_texts!). `attributes` defaults to every attribute enabled in
+  # config, which is what both the automatic post-upload run and the
+  # "Regenerate with AI" action ask for.
   #
   # Doubles as a plain background job (post-upload call site, see
   # Media#enqueue_text_generation: fire-and-forget, best effort, never blocks
@@ -19,7 +20,7 @@ module LatoCms
       return unless media
 
       attributes = Array(params[:attributes]).presence || LatoCms.config.llm_media_attributes
-      attributes.each { |attribute| media.generate_text!(attribute, raise_on_error: operation?) }
+      media.generate_texts!(attributes, raise_on_error: operation?)
       save_operation_output_message(I18n.t("lato_cms.media_text_regenerated")) if operation?
     end
   end

data/app/models/lato_cms/media.rb

@@ -154,11 +154,27 @@ module LatoCms
     end
 
     def url
-      Rails.application.routes.url_helpers.rails_blob_path(file, only_path: true) if file.attached?
+      attachment_url(file) if file.attached?
     end
 
     def poster_url
-      Rails.application.routes.url_helpers.rails_blob_path(poster_file, only_path: true) if poster_file.attached?
+      attachment_url(poster_file) if poster_file.attached?
+    end
+
+    # The URL of an attachment or of one of its variants, in the mode the host
+    # app asked for (see LatoCms::Config::MEDIA_URL_MODES).
+    #
+    # `inline` in both modes: a media of the library is content to show — a
+    # picture in a page, a video in a player — and the default disposition of a
+    # video is `attachment`, which turns opening its address into a download.
+    # Whoever wants a download asks for it explicitly, as the panel does.
+    def attachment_url(attachable)
+      helpers = Rails.application.routes.url_helpers
+      if LatoCms.config.media_url_proxy?
+        helpers.rails_storage_proxy_path(attachable, only_path: true, disposition: :inline)
+      else
+        helpers.rails_blob_path(attachable, only_path: true, disposition: :inline)
+      end
     end
 
     # Swaps the underlying file while keeping the same record, so every field
@@ -196,50 +212,68 @@ module LatoCms
       Rails.logger.warn("LatoCms: failed to generate video poster for media #{id}: #{e.message}")
     end
 
-    # Asks the configured OpenAI-compatible LLM for `attribute` (alt_text or
-    # title) in every configured locale and merges it in (existing
-    # translations for locales the LLM didn't return are kept, the rest are
-    # replaced individually). No-op unless the LLM is configured and enabled
-    # for that attribute (see LatoCms::Config#llm_generates?) and this media
-    # is an image, since the LLM has to look at the file.
+    # Asks the configured OpenAI-compatible LLM for the given attributes
+    # (alt_text, title, or both) in every configured locale and merges the
+    # result in — existing translations for locales the LLM didn't return are
+    # kept, the rest are replaced individually. Attributes switched off in
+    # config are skipped; no-op unless the LLM is configured and this media is
+    # an image, since the model has to look at the file.
+    #
+    # All the requested attributes travel in ONE request: the image is the
+    # expensive part of the payload (it goes as a base64 data URI, see
+    # request_completion), so asking per attribute uploaded the same file twice
+    # and paid for it twice.
     #
     # Best effort by default (`raise_on_error: false`): any failure is logged
     # and swallowed, since the automatic post-upload call site (see
     # GenerateMediaTextJob) must never break the upload over a flaky LLM. The
-    # manual "Regenerate with AI" actions run as a Lato::Operation the admin
-    # is actively watching, so they pass `raise_on_error: true` to have
-    # failures surface there instead of disappearing silently.
-    def generate_text!(attribute, raise_on_error: false)
-      attribute = attribute.to_s
-      raise ArgumentError, "unknown translatable attribute: #{attribute}" unless TRANSLATABLE_ATTRIBUTES.include?(attribute)
-      return unless image? && file.attached? && LatoCms.config.llm_generates?(attribute)
+    # manual "Regenerate with AI" action runs as a Lato::Operation the admin is
+    # actively watching, so it passes `raise_on_error: true` to have failures
+    # surface there instead of disappearing silently.
+    def generate_texts!(attributes = LatoCms.config.llm_media_attributes, raise_on_error: false)
+      attributes = Array(attributes).map(&:to_s)
+      unknown = attributes - TRANSLATABLE_ATTRIBUTES
+      raise ArgumentError, "unknown translatable attribute: #{unknown.join(", ")}" if unknown.any?
+
+      attributes = attributes.select { |attribute| LatoCms.config.llm_generates?(attribute) }
+      return if attributes.empty? || !image? || !file.attached?
 
       begin
-        translations = parse_translations(request_completion(llm_prompt(attribute)))
-        raise "The LLM returned no usable #{attribute.humanize.downcase}" if translations.blank?
+        generated = parse_translations(request_completion(llm_prompt(*attributes)), attributes)
+        raise "The LLM returned no usable #{attributes.to_sentence}" if generated.blank?
 
-        public_send("#{attribute}_translations=", translations_of(attribute).merge(translations))
+        generated.each { |attribute, translations| public_send("#{attribute}_translations=", translations_of(attribute).merge(translations)) }
         save!
       rescue StandardError => e
-        Rails.logger.warn("LatoCms: failed to generate #{attribute} for media #{id}: #{e.message}")
+        Rails.logger.warn("LatoCms: failed to generate #{attributes.join(", ")} for media #{id}: #{e.message}")
         raise if raise_on_error
       end
     end
 
-    # Full prompt sent for `attribute`: the custom-or-default task prompt (see
-    # LatoCms::Config#llm_prompt) with {languages}/{urls} substituted, plus the
-    # engine's fixed response-format contract, appended here rather than left
-    # to the prompt so parsing never depends on how a custom prompt is worded.
-    def llm_prompt(attribute)
+    def generate_text!(attribute, raise_on_error: false)
+      generate_texts!([attribute], raise_on_error: raise_on_error)
+    end
+
+    # Full prompt sent for `attributes`: one custom-or-default task prompt per
+    # attribute (see LatoCms::Config#llm_prompt) with {languages}/{urls}
+    # substituted, plus the engine's fixed response-format contract, appended
+    # here rather than left to the prompts so parsing never depends on how a
+    # custom one is worded.
+    def llm_prompt(*attributes)
+      attributes = attributes.flatten.map(&:to_s).presence || LatoCms.config.llm_media_attributes.map(&:to_s)
       variables = {
         "languages" => llm_locales.join(", "),
         "urls" => usage_urls.presence&.join(", ") || "none"
       }
       placeholders = /\{(#{LatoCms::Config::LLM_PROMPT_VARIABLES.join("|")})\}/
-      task = LatoCms.config.llm_prompt(attribute).gsub(placeholders) { variables[Regexp.last_match(1)] }
+      tasks = attributes.map do |attribute|
+        task = LatoCms.config.llm_prompt(attribute).gsub(placeholders) { variables[Regexp.last_match(1)] }
+        "#{attribute}: #{task}"
+      end
 
-      "#{task}\n\nRespond with a single JSON object only, no markdown, no extra text, with exactly these " \
-      "keys: #{llm_locales.join(", ")}. Each value is the text written in that language."
+      "#{tasks.join("\n\n")}\n\nRespond with a single JSON object only, no markdown, no extra text, with exactly " \
+      "these keys: #{attributes.join(", ")}. Each value is an object with exactly these keys: " \
+      "#{llm_locales.join(", ")}, each holding the text written in that language."
     end
 
     # Fixed small variant used across admin UI (Media index, picker grid, field
@@ -248,9 +282,7 @@ module LatoCms
     def thumbnail_url
       return nil unless image? && file.attached? && file.variable?
 
-      Rails.application.routes.url_helpers.rails_representation_path(
-        file.variant(resize_to_fill: [200, 200]), only_path: true
-      )
+      attachment_url(file.variant(resize_to_fill: [200, 200]))
     rescue StandardError => e
       Rails.logger.error("LatoCms: Failed to build thumbnail for media #{id}: #{e.message}")
       nil
@@ -263,9 +295,7 @@ module LatoCms
       return nil unless image? && file.attached?
       return url unless file.variable?
 
-      Rails.application.routes.url_helpers.rails_representation_path(
-        file.variant(resize_to_limit: [1200, 1200]), only_path: true
-      )
+      attachment_url(file.variant(resize_to_limit: [1200, 1200]))
     rescue StandardError => e
       Rails.logger.error("LatoCms: Failed to build preview for media #{id}: #{e.message}")
       url
@@ -278,12 +308,11 @@ module LatoCms
     def variant_urls(sizes_config)
       return {} if sizes_config.blank? || !sizes_config.respond_to?(:each_pair) || !file.attached? || !file.variable?
 
-      url_helpers = Rails.application.routes.url_helpers
       sizes_config.each_with_object({}) do |(name, opts), acc|
         transformation = self.class.variant_transformation(opts)
         next if transformation.blank?
 
-        acc[name] = url_helpers.rails_representation_path(file.variant(transformation), only_path: true)
+        acc[name] = attachment_url(file.variant(transformation))
       end
     rescue StandardError => e
       Rails.logger.error("LatoCms: Failed to build image variants for media #{id}: #{e.message}")
@@ -354,11 +383,18 @@ module LatoCms
       }])
     end
 
-    def parse_translations(content)
+    # { attribute => { locale => text } }, keeping only what was asked for and
+    # what the app is configured to speak.
+    def parse_translations(content, attributes)
       return {} if content.blank?
 
       parsed = JSON.parse(content[/\{.*\}/m] || content)
-      parsed.slice(*llm_locales).transform_values(&:to_s)
+      parsed.slice(*attributes).each_with_object({}) do |(attribute, translations), result|
+        next unless translations.is_a?(Hash)
+
+        translations = translations.slice(*llm_locales).transform_values(&:to_s).compact_blank
+        result[attribute] = translations if translations.any?
+      end
     rescue JSON::ParserError
       {}
     end

data/app/views/lato_cms/media/_form_update.html.erb

@@ -33,6 +33,24 @@
           <%= lato_form_item_input_text form, :name, required: true %>
         </div>
 
+        <%# One action for every attribute the LLM is enabled for: the image
+            travels in the request, so asking per attribute uploaded the same
+            file once per attribute. %>
+        <% llm_attributes = media.image? ? LatoCms.config.llm_media_attributes : [] %>
+        <% if llm_attributes.any? %>
+          <div class="d-flex justify-content-end mb-2">
+            <%= link_to t("lato_cms.media_text_regenerate"), lato_cms.media_regenerate_text_action_path(media, attribute: "all"),
+              class: "btn btn-sm btn-outline-secondary",
+              data: {
+                lato_action_target: "trigger",
+                turbo_method: :post,
+                turbo_frame: "lato_operation",
+                turbo_confirm: t("lato_cms.media_text_regenerate_confirm", fields: llm_attributes.map { |attribute| t("lato_cms.media_#{attribute}").downcase }.join(", ")),
+                action_title: t("lato_cms.media_text_regenerate")
+              } %>
+          </div>
+        <% end %>
+
         <% if media.image? %>
           <%= render "lato_cms/media/translations_field", form: form, media: media, attribute: "alt_text" %>
         <% end %>

data/app/views/lato_cms/media/_translations_field.html.erb

@@ -1,24 +1,10 @@
 <%# One tab per configured locale for a translatable Media attribute
-    (alt_text/title), with its own "Regenerate with AI" button when the LLM
-    is configured and enabled for that attribute. Images only: the LLM has
-    to look at the file to describe it. %>
+    (alt_text/title). The "Regenerate with AI" action is not here: it covers
+    every enabled attribute in one LLM call (see _form_update). %>
 <% label = t("lato_cms.media_#{attribute}") %>
 
 <div class="mb-3">
-  <div class="d-flex align-items-center justify-content-between">
-    <label class="form-label mb-0"><%= label %></label>
-    <% if media.image? && LatoCms.config.llm_generates?(attribute) %>
-      <%= link_to t("lato_cms.media_text_regenerate"), lato_cms.media_regenerate_text_action_path(media, attribute: attribute),
-        class: "btn btn-sm btn-outline-secondary",
-        data: {
-          lato_action_target: "trigger",
-          turbo_method: :post,
-          turbo_frame: "lato_operation",
-          turbo_confirm: t("lato_cms.media_text_regenerate_confirm", field: label.downcase),
-          action_title: "#{t('lato_cms.media_text_regenerate')} - #{label}"
-        } %>
-    <% end %>
-  </div>
+  <label class="form-label"><%= label %></label>
 
   <ul class="nav nav-tabs">
     <% LatoCms.config.locales.each_with_index do |locale, index| %>

data/config/locales/en.yml

@@ -105,7 +105,7 @@ en:
     media_alt_text: Alt text
     media_title: Title
     media_text_regenerate: Regenerate with AI
-    media_text_regenerate_confirm: "This will overwrite the current %{field} in every language with a new AI-generated one. Continue?"
+    media_text_regenerate_confirm: "This will overwrite the current values of %{fields} in every language with AI-generated ones. Continue?"
     media_text_regenerated: Text regenerated
     media_text_regenerate_unavailable: AI generation is only available for images, and only when an LLM is configured and enabled for this field
     media_text_regenerate_failed: Failed to start AI generation

data/config/locales/it.yml

@@ -105,7 +105,7 @@ it:
     media_alt_text: Testo alternativo
     media_title: Titolo
     media_text_regenerate: Rigenera con AI
-    media_text_regenerate_confirm: "Il %{field} attuale in ogni lingua verrà sostituito con uno generato dall'AI. Continuare?"
+    media_text_regenerate_confirm: "I valori attuali di %{fields} in ogni lingua verranno sostituiti con testi generati dall'AI. Continuare?"
     media_text_regenerated: Testo rigenerato
     media_text_regenerate_unavailable: La generazione AI è disponibile solo per le immagini e solo se un LLM è configurato e abilitato per questo campo
     media_text_regenerate_failed: Impossibile avviare la generazione AI

data/config/routes.rb

@@ -34,7 +34,7 @@ LatoCms::Engine.routes.draw do
     get ':id/update', to: 'media#update', as: :media_update
     patch ':id/update', to: 'media#update_action', as: :media_update_action
     patch ':id/replace-file', to: 'media#replace_file_action', as: :media_replace_file_action
-    post ':id/regenerate/:attribute', to: 'media#regenerate_text_action', as: :media_regenerate_text_action, constraints: { attribute: /alt_text|title/ }
+    post ':id/regenerate/:attribute', to: 'media#regenerate_text_action', as: :media_regenerate_text_action, constraints: { attribute: /alt_text|title|all/ }
     delete ':id', to: 'media#destroy_action', as: :media_destroy_action
   end
 end

data/lib/lato_cms/config.rb

@@ -3,8 +3,19 @@ module LatoCms
   # This class contains the default configuration of the engine.
   ##
   class Config
-    attr_accessor :locales, :templates_path, :admin_roles, :llm_api_url, :llm_model, :llm_api_key,
-                  :llm_generate_alt_text, :llm_generate_title, :llm_alt_text_prompt, :llm_title_prompt
+    attr_accessor :locales, :templates_path, :admin_roles, :media_url_mode, :llm_api_url, :llm_model,
+                  :llm_api_key, :llm_generate_alt_text, :llm_generate_title, :llm_alt_text_prompt,
+                  :llm_title_prompt
+
+    # How the URLs of media files are built (see LatoCms::Media#url).
+    # - :redirect — Rails answers 302 with a signed URL that expires; on a
+    #   remote service (S3 and friends) the file then comes from the service
+    #   itself, which is what you want there.
+    # - :proxy — the file is served through the app, with no redirect and with
+    #   `Cache-Control: public, immutable`, so browsers and any cache in front
+    #   can keep it. On a disk service this is strictly better: the redirect
+    #   costs a second request and its target can be cached by nobody.
+    MEDIA_URL_MODES = %i[redirect proxy].freeze
 
     # Placeholders substituted at request time in both default and custom LLM
     # prompts (see LatoCms::Media#llm_prompt):
@@ -37,6 +48,11 @@ module LatoCms
       # (create, update, delete) and translation links.
       @admin_roles = { none: 0, operator: 1, admin: 2 }
 
+      # Default is :redirect, which is how it always worked: switching the way
+      # every media URL is built is a decision for the host app, not something
+      # an upgrade should do on its own. See MEDIA_URL_MODES.
+      @media_url_mode = :redirect
+
       # Optional OpenAI-compatible endpoint used to auto-generate alt text and
       # title for uploaded images (see LatoCms::Media#generate_text!). All
       # three must be set for the feature to activate; unset by default.
@@ -56,6 +72,10 @@ module LatoCms
       @llm_title_prompt = nil
     end
 
+    def media_url_proxy?
+      media_url_mode.to_sym == :proxy
+    end
+
     def llm_configured?
       llm_api_url.present? && llm_model.present? && llm_api_key.present?
     end

data/lib/lato_cms/version.rb

@@ -1,3 +1,3 @@
 module LatoCms
-  VERSION = "3.2.6"
+  VERSION = "3.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lato_cms
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.3.1
 platform: ruby
 authors:
 - Gregorio Galante