wco_models 3.1.0.312 → 3.1.0.314

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4c36c9a95197b089d3a733fbdb9cb20160205d64a86a86ebd19114e667bdc5d
-  data.tar.gz: a6f9f64d6768de1debc1850885951a3640413c2999f2c64e391db015a9b9b11a
+  metadata.gz: 702f87e01cf8d48d84cb1c0cc9d6c084f86663f4e685024229d862382f3ea744
+  data.tar.gz: daf2ffd2b25049f26b84501687413cd307d79b3cee5399bf3115f047ee6bbed9
 SHA512:
-  metadata.gz: a0646fa441c8d26c3338fc51816401fe0ccc591e428f25c3429befabe1860915baba33a86e1835c95baf925b62a1a318228cd9c980c773f968b9d01d7ba51ae8
-  data.tar.gz: '09f82b2e7b79093b15c259976a9af9da76d20ad356775cbc91bc5431dacd5b6bad1cf78b765df3a8d26ca591448bb5074d1b8c80462d1f22180d2a204184068e'
+  metadata.gz: 8049284e53db198d9e4df32bf270b48b2441eeafce4d1a6461f9008f424cd15af375869dbd89ef54240847778359a7793ae78b0afe8aaf71cf05674dbb7f603a
+  data.tar.gz: 077aa431a75eb8c8231c6ebc4278922271c9b1ad6ee740d4999e32ab7e2c23cba61fdae3bd72afe5b2d2f7413ba71bfaffba5d0056bdb1f28ac043e07136242b

data/README.txt

@@ -18,15 +18,30 @@ Some infrastructure is driven by ansible - therefore, local python3 and ansible
 
 = Develop / Use =
 
+
+  cmd = "#{cmd} [ -f newspartial_#{idx}.mp4 ] || ffmpeg -y -i newspartial_#{idx}.webm -r 24 -pix_fmt yuv420p newspartial_#{idx}.mp4 ; "
+
+
   == Image to video ==
 
     ffmpeg -loop 1 -i $inn -c:v libx264 -t 3 -pix_fmt yuv420p output.mp4
 
-    ## unnecessary:
-    ffmpeg -loop 1 -i "$inn" -vf "scale=iw:ih" -c:v libx264 -t 3 -pix_fmt yuv420p output.mp4
-    ## odd pixel:
-    ffmpeg -loop 1 -i "$inn" -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" -c:v libx264 -t 3 -pix_fmt yuv420p output.mp4
+    ## illustrative image to video, sized
+
+    export width=848
+    export height=480
+    export duration_sec=3
+    magick "$inn" -resize "${width}x${height}^" -gravity center -extent "${width}x${height}" "$inn"
+    ffmpeg -loop 1 -i $inn -c:v libx264 -t $duration_sec -pix_fmt yuv420p $inn-out.mp4
+
+    ## image in a news studio
 
+    export image=image.jpg ; \
+    export video_base=base_4_5sec.mp4 ; \
+    rm output.mp4 ; \
+    ffmpeg -i $video_base -i $image \
+      -filter_complex "[1:v]scale='min(iw,420)':-1,pad=iw+20:ih+20:10:10:black[img];[0:v][img]overlay=(W-w)/2:(H-h)/2-50" \
+      -c:v libx264 -pix_fmt yuv420p -c:a copy output.mp4
 
 = Test =
 

data/app/assets/stylesheets/wco/main.scss

@@ -28,6 +28,10 @@ textarea {
   background: pink;
 }
 
+.align-right {
+  text-align: right;
+}
+
 /* B */
 
 .blue {

data/app/assets/stylesheets/wco/newsvideos.scss

@@ -30,8 +30,13 @@
 
 .NewsoverlayTimeline {
   border: 5px solid green;
+  background: white;
   position: absolute;
   left: 230px;
+
+  &:hover {
+    z-index: 5;
+  }
 }
 
 .NewspartialTimelineW {
@@ -47,8 +52,11 @@
   width: 400px;
 
   .full-text {
-    position: absolute;
-    left: 300px;
+    // position: absolute;
+    // left: 300px;
+
+    float: left;
+    margin-left: 300px;
 
     .header {
       background: #efefef;

data/app/controllers/wco/api/leads_controller.rb

@@ -1,8 +1,7 @@
 
 class Wco::Api::LeadsController < Wco::ApiController
 
-  skip_before_action :decode_jwt
-  before_action      :check_credentials, only: [ :by_email ]
+  before_action :decode_secret, only: [ :by_email ]
 
   def by_email
     @lead = Wco::Lead.find_or_create_by_email( params[:email] )
@@ -10,6 +9,7 @@ class Wco::Api::LeadsController < Wco::ApiController
   end
 
   ## select2-leads-ajax
+  ## session is present
   def index
     authorize! :index, Wco::Lead
     @leads = Wco::Lead.all
@@ -21,8 +21,11 @@ class Wco::Api::LeadsController < Wco::ApiController
         { name:  /#{q}/i },
       );
     end
+
+    @leads = @leads.limit(100)
   end
 
+  ## session is present
   def index_hash
     authorize! :index, Wco::Lead
     @leads = Wco::Lead.find( params[:lead_ids].split(',') )

data/app/controllers/wco/api/newspartials_controller.rb

@@ -1,11 +1,11 @@
 
 class Wco::Api::NewspartialsController < Wco::ApiController
 
-  skip_before_action :decode_jwt
-  skip_before_action :verify_authenticity_token
   before_action :decode_simple_api_key
 
-
+  ##
+  ## PUT config, actually
+  ##
   def add_config
     puts! params, 'api newspartials#add_config params'
 
@@ -44,9 +44,20 @@ class Wco::Api::NewspartialsController < Wco::ApiController
     end
   end
 
+  ## syncronous, everyone waits.
+  def generate_speech
+    @newspartial = Wco::Newspartial.unscoped.find params[:id]
+    @newspartial.generate_speech
+    render json: { status: :ok }
+  end
+
   def show_config
     @newspartial = Wco::Newspartial.find params[:id]
-    render json: @newspartial.speech_json
+    config = JSON.parse @newspartial.speech_json
+    config[:w_px] = @newspartial.newsvideo.w_px
+    config[:h_px] = @newspartial.newsvideo.h_px
+    config[:slug] = "#{@newspartial.newsvideo.slug}::#{@newspartial.slug}"
+    render json: config
   end
 
 end

data/app/controllers/wco/api/newsproducer_controller.rb

@@ -0,0 +1,26 @@
+
+class Wco::Api::NewsproducerController < Wco::ApiController
+
+  before_action :decode_simple_api_key
+
+  ## trash
+  def canvas
+    authorize! :home, Wco
+    # render 'canvas_minimal'
+  end
+
+  ## trash
+  def canvas_minimal
+    authorize! :home, Wco
+    render 'canvas_minimal'
+  end
+
+  ##
+  ## current
+  ##
+  def studio_1
+    authorize! :home, Wco
+  end
+
+end
+

data/app/controllers/wco/api/newsvideos_controller.rb

@@ -1,11 +1,21 @@
 
-
 class Wco::Api::NewsvideosController < Wco::ApiController
 
-  skip_before_action :decode_jwt
-  skip_before_action :verify_authenticity_token
   before_action :decode_simple_api_key
 
+  ##
+  ## 2026-08-12 _vp_ continue
+  ##
+  def generate
+    @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
+
+    Rails.env.production? ?
+      Wco::NewsvideoGenerateJob.perform_async(@newsvideo.id.to_s) :
+      Wco::NewsvideoGenerateJob.perform_sync( @newsvideo.id.to_s)
+
+    render json: { status: :ok, message: 'Scheduled the generation' }
+  end
+
   ##
   ## the other one is used, not this one. Because I don't want to deal with api keys.
   ##
@@ -20,4 +30,8 @@ class Wco::Api::NewsvideosController < Wco::ApiController
     # redirect_to action: 'show', newsvideo_id: params[:id]
   end
 
+  def show
+    @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
+  end
+
 end

data/app/controllers/wco/api/tags_controller.rb

@@ -1,6 +1,8 @@
 
 class Wco::Api::TagsController < Wco::ApiController
 
+  before_action :decode_jwt
+
   def index
     authorize! :index, Wco::Tag
     @tags = Wco::Tag.all()

data/app/controllers/wco/api/videos_controller.rb

@@ -1,19 +1,19 @@
 
 class Wco::Api::VideosController < Wco::ApiController
 
-  skip_before_action :decode_jwt
-  skip_before_action :verify_authenticity_token, only: [:create]
   before_action :decode_simple_api_key
 
   def create
     # puts! params, 'api videos#create params'
+    authorize! :create, Wco::Video
+    old_videos = Wco::Video.where({ newspartial_id: params[:newspartial_id] }).map { |v| v.delete }
+    puts! old_videos, 'deleted old videos'
 
     @video = Wco::Video.new({ name: params[:name],
       thumb: params[:thumb],
       video: params[:video],
       newspartial_id: params[:newspartial_id],
     })
-    authorize! :create, @video
 
     if @video.save
       puts! @video, 'Created @video.'

data/app/controllers/wco/api_controller.rb

@@ -2,14 +2,21 @@
 class Wco::ApiController < ActionController::Base
   layout false
 
-  before_action :decode_jwt
+  skip_before_action :verify_authenticity_token
 
   ##
   ## private
   ##
   private
 
-  def check_credentials
+  def decode_jwt
+    out = JWT.decode params[:jwt_token], nil, false
+    email = out[0]['email']
+    user = User.find_by({ email: email })
+    sign_in user
+  end
+
+  def decode_secret
     if params[:secret].blank? ||
        params[:secret] != AWS_SES_LAMBDA_SECRET
 
@@ -18,13 +25,6 @@ class Wco::ApiController < ActionController::Base
     end
   end
 
-  def decode_jwt
-    out = JWT.decode params[:jwt_token], nil, false
-    email = out[0]['email']
-    user = User.find_by({ email: email })
-    sign_in user
-  end
-
   def decode_simple_api_key
     if params[:api_key].present? &&
        params[:api_secret].present? &&

data/app/controllers/wco/leadsets_controller.rb

@@ -20,13 +20,17 @@ class Wco::LeadsetsController < Wco::ApplicationController
   end
 
   def destroy
-    leadsets = Leadset.find( params[:leadset_ids] )
+    authorize! :create, Wco::Leadset
+    leadsets = Wco::Leadset.find( params[:leadset_ids] ) rescue []
     @results = []
     leadsets.each do |leadset|
-      @results.push leadset.discard
+      @results.push leadset.destroy
     end
-    flash[:notice] = "Discard outcome: #{@results.inspect}."
-    redirect_to action: 'index'
+    if params[:id]
+      @results.push Wco::Leadset.find(params[:id]).destroy
+    end
+    flash[:notice] = "destroy outcome: #{@results.inspect}."
+    redirect_to request.referrer || { action: 'index' }
   end
 
   def edit

data/app/controllers/wco/newsvideos_controller.rb

@@ -4,7 +4,82 @@ require 'pragmatic_segmenter'
 class Wco::NewsvideosController < Wco::ApplicationController
 
   before_action :set_lists
-  skip_before_action :verify_authenticity_token, only: [ :generate_illustration ]
+  skip_before_action :verify_authenticity_token, only: [ :add_image_as_overlay, :generate_illustration ]
+
+  def add_image_as_overlay
+    duration_sec = 3
+
+    @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
+    authorize! :edit, @newsvideo
+
+    workdir    = Rails.root.join('tmp', @newsvideo.id.to_s)
+    FileUtils.mkdir_p(workdir)
+
+    w_px = @newsvideo.w_px
+    h_px = @newsvideo.h_px
+    fps  = @newsvideo.fps
+
+    input = workdir.join("overlay_#{@newsvideo.next_overlay_ms}.jpg")
+    URI.open(params[:image_url]) do |src|
+      File.binwrite(input, src.read)
+    end
+
+    image_path = workdir.join("overlay_#{@newsvideo.next_overlay_ms}_#{w_px}x#{h_px}.jpg")
+    cmd = <<~CMD
+      magick #{input} \
+        -resize "#{w_px}x#{h_px}^" \
+        -gravity center \
+        -crop "#{w_px}x#{h_px}+0+0" \
+        +repage \
+        -quality 95 \
+        #{image_path}
+    CMD
+    puts "+++ magick cmd:"
+    puts cmd
+    out = `#{cmd}`
+    puts! out, 'out'
+
+    video_path = workdir.join("overlay_#{@newsvideo.next_overlay_ms}.mp4")
+    cmd = <<~CMD
+      ffmpeg -y \
+        -loop 1 \
+        -i #{image_path} \
+        -t #{duration_sec} \
+        -r #{fps} \
+        -c:v libx264 \
+        -pix_fmt yuv420p \
+        -vf "scale=#{w_px}:#{h_px}" \
+        #{video_path}
+    CMD
+    puts "+++ ffmpeg cmd:"
+    puts cmd
+    out = `#{cmd}`
+    puts! out, 'out'
+
+    @video = Wco::Video.new name: "#{@newsvideo.title} overlay #{@newsvideo.next_overlay_ms}"
+    @video.video = File.open(video_path)
+    @video.thumb = File.open(image_path)
+    @video.tags = [ Wco::Tag.illustration, Wco::Tag.find_or_create_by({ slug: @newsvideo.slug }) ]
+    flag = @video.save
+    if !flag
+      puts "Could not create video:"
+      puts @video.errors.full_messages.join(", ")
+    end
+
+    @overlay = Wco::Newsoverlay.new({ duration_ms: duration_sec * 1000,
+                                      newsvideo: @newsvideo,
+                                      start_at_ms: @newsvideo.next_overlay_ms,
+                                      video: @video,
+                                   });
+    if @overlay.save
+      @newsvideo.update( next_overlay_ms: @newsvideo.next_overlay_ms + @overlay.duration_ms )
+    else
+      puts "Could not create overlay:"
+      puts @overlay.errors.full_messages.join(", ")
+    end
+
+    render json: { status: :ok }
+  end
 
   def create
     params[:newsvideo][:tag_ids]&.delete ''
@@ -39,6 +114,32 @@ class Wco::NewsvideosController < Wco::ApplicationController
     render json: { status: :ok, message: 'Scheduled the generation' }
   end
 
+  def generate_all_audio
+    @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
+    authorize! :edit, @newsvideo
+
+    cmd = "cd #{PUPPETEER_ROOT} ; yarn run newsvideo_generate_all_audio #{@newsvideo.id}"
+    puts "+++ puppeteer cmd:"
+    puts cmd
+    out = `#{cmd}`
+    puts! out, 'out'
+
+    render json: { status: :ok }
+  end
+
+  def generate_all_video
+    @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
+    authorize! :edit, @newsvideo
+
+    cmd = "cd #{PUPPETEER_ROOT} ; yarn run newsvideo_generate_all_video #{@newsvideo.id}"
+    puts "+++ puppeteer cmd:"
+    puts cmd
+    out = `#{cmd}`
+    puts! out, 'out'
+
+    render json: { status: :ok }
+  end
+
   def generate_illustration
     @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
     authorize! :edit, @newsvideo

data/app/models/wco/newspartial.rb

@@ -10,7 +10,7 @@ class Wco::Newspartial
 
   PAGE_PARAM_NAME = 'newspartials_page'
 
-  MAX_WORDS = 20
+  MAX_WORDS = 30
 
   field :title
   # validates :title, presence: true, uniqueness: true
@@ -23,6 +23,8 @@ class Wco::Newspartial
   belongs_to :newsvideo
   has_one :video
 
+  field :slug, type: :string
+
   has_mongoid_attached_file :audio,
     :storage => :s3,
     :s3_credentials => ::S3_CREDENTIALS,
@@ -66,13 +68,15 @@ class Wco::Newspartial
         'Accept' => 'application/json',
       }, body: {
         input: body,
-        voice: "af_bella",
+        # voice: "am_fenrir", # good?
+        # "af_bella" # bad
+        voice: "af_jessica", # good
         language: "en-us",
         audioEncoding: "wav",
       }.to_json
     );
     out = out.body
-    # puts! out, 'out'
+    puts! out, 'out'
 
     self[:config_json] = out
     tmp = JSON.parse( out )