wco_models 3.1.0.302 → 3.1.0.304

data/app/controllers/wco/api_controller.rb

@@ -24,8 +24,11 @@ class Wco::ApiController < ActionController::Base
   end
 
   def decode_simple_api_key
-    if params[:api_key] === WCO_SIMPLE_API_KEY &&
-       params[:api_secret] === WCO_SIMPLE_API_SECRET
+    if params[:api_key].present? &&
+       params[:api_secret].present? &&
+       params[:api_key]    === Wco::Setting.get('WASYACO_SIMPLE_API_KEY') &&
+       params[:api_secret] === Wco::Setting.get('WASYACO_SIMPLE_API_SECRET')
+
       user = User.find_by({ email: 'piousbox@gmail.com' })
       sign_in user
     else

data/app/controllers/wco/application_controller.rb

@@ -25,15 +25,14 @@ class Wco::ApplicationController < ActionController::Base
     out = 5 / 0
   end
 
-  def home
-    authorize! :home, Wco
+  def grapesjs
   end
 
-  def tinymce
+  def home
     authorize! :home, Wco
-    render layout: false
   end
 
+
   def linkedin_cb
     authorize! :open_permission, Wco
     code = params[:code]
@@ -76,6 +75,33 @@ class Wco::ApplicationController < ActionController::Base
     redirect_to url, allow_other_host: true
   end
 
+  def settings
+    authorize! :home, Wco
+    @settings = {}
+    Wco::Setting.all.to_a.map do |item|
+      @settings[item.key] = item.value
+    end
+  end
+
+  def set_settings
+    authorize! :home, Wco
+    params.fetch(:settings, {}).each do |key, value|
+      next unless Wco::Setting::KEYS.include?(key)
+
+      setting = Wco::Setting.find_or_initialize_by(key: key)
+      setting.value = value.strip
+      setting.save!
+    end
+
+    redirect_to settings_path, notice: 'Settings updated.'
+  end
+
+  def tinymce
+    authorize! :home, Wco
+    render layout: false
+  end
+
+
   ##
   ## private
   ##
@@ -125,7 +151,7 @@ class Wco::ApplicationController < ActionController::Base
   end
 
   def my_truthy? which
-    ["1", "t", "T", "true"].include?( which )
+    ["1", "t", "true"].include?( which.downcase )
   end
 
   def set_lists

data/app/controllers/wco/newsproducer_controller.rb

@@ -0,0 +1,22 @@
+
+class Wco::NewsproducerController < Wco::ApplicationController
+
+  def canvas
+    authorize! :home, Wco
+    render layout: false
+    # render 'canvas_minimal', layout: false
+  end
+
+  def canvas_minimal
+    authorize! :home, Wco
+    render 'canvas_minimal', layout: false
+  end
+
+
+  def studio_1
+    authorize! :home, Wco
+    render layout: false
+  end
+
+end
+

data/app/controllers/wco/newsvideos_controller.rb

@@ -81,14 +81,7 @@ class Wco::NewsvideosController < Wco::ApplicationController
       return
     end
 
-    sentences = PragmaticSegmenter::Segmenter.new(text: @newsvideo.body).segment
-    phrases = sentences_to_phrases(sentences)
-    puts! phrases, 'phrases'
-
-    phrases.each do |phrase|
-      newspartial = Wco::Newspartial.new body: phrase, newsvideo: @newsvideo
-      newspartial.save!
-    end
+    @newsvideo.do_split
 
     flash_notice 'Done spliting the video.'
     redirect_to request.referrer
@@ -113,31 +106,6 @@ class Wco::NewsvideosController < Wco::ApplicationController
   ##
   private
 
-  def sentences_to_phrases sentences
-    max_words = 50
-    phrases = []
-    current_phrase = []
-
-    current_word_count = 0
-
-    sentences.each do |sentence|
-      words_in_sentence = sentence.split.size
-
-      # If adding this sentence exceeds the limit, start a new phrase
-      if current_word_count + words_in_sentence > max_words
-        phrases << current_phrase.join(" ")
-        current_phrase = []
-        current_word_count = 0
-      end
-
-      current_phrase << sentence
-      current_word_count += words_in_sentence
-    end
-
-    # Add the last phrase if any
-    phrases << current_phrase.join(" ") unless current_phrase.empty?
-  end
-
   def set_lists
     @tags_list = Wco::Tag.list
   end

data/app/controllers/wco/reports_controller.rb

@@ -52,6 +52,27 @@ class Wco::ReportsController < Wco::ApplicationController
     @new_report = Wco::Report.new
   end
 
+  def rewrite
+    @report = Wco::Report.unscoped.find params[:id]
+    authorize! :update, @report
+
+    out = Wco::AiWriter.do_call("You are a journalist writer. Write an article with the following title:", @report.title)
+    @report.update( body: out )
+
+    flash_notice 'Probably ok'
+    redirect_to request.referrer || '/'
+  end
+
+  def md_to_html
+    @report = Wco::Report.unscoped.find params[:id]
+    authorize! :update, @report
+
+    @report.update( body: CommonMarker.render_html(@report.body) )
+
+    flash_notice 'Probably ok'
+    redirect_to request.referrer || '/'
+  end
+
   def show
     @report = Wco::Report.unscoped.find params[:id]
     authorize! :show, @report

data/app/helpers/wco/application_helper.rb

@@ -2,7 +2,7 @@
 module Wco::ApplicationHelper
 
   def pexels_search_path(opts)
-    "/2025/pexels_example_169.html?pexels_api_key=#{PEXELS_API_KEY}&newsvideo_id=#{opts[:newsvideo_id]}"
+    "/2025/pexels_example_169.html?PEXELS_API_KEY=#{Wco::Setting.get('PEXELS_API_KEY')}&newsvideo_id=#{opts[:newsvideo_id]}"
   end
 
   def my_truthy? which

data/app/models/wco/ai_writer.rb

@@ -10,7 +10,7 @@ class Wco::AiWriter
     response = post(
       "/v1/chat/completions",
       headers: {
-        "Authorization" => "Bearer #{OPENAI_API_KEY}",
+        "Authorization" => "Bearer #{Wco::Setting.get('OPENAI_API_KEY')}",
         "Content-Type" => "application/json"
       },
       body: {
@@ -27,6 +27,7 @@ class Wco::AiWriter
         ]
       }.to_json
     )
+    puts! response, 'response'
 
     response.dig("choices", 0, "message", "content")
   end

data/app/models/wco/leadset.rb

@@ -31,7 +31,7 @@ class Wco::Leadset
 
   field :email
   index({ email: 1 }, { name: 'email' })
-  validates :email, uniqueness: { allow_nil: true } # presence: true
+  # validates :email, uniqueness: { allow_nil: true } # presence: true
 
 
   has_many :appliances,      class_name: '::WcoHosting::Appliance',   inverse_of: :leadset

data/app/models/wco/newspartial.rb

@@ -10,6 +10,8 @@ class Wco::Newspartial
 
   PAGE_PARAM_NAME = 'newspartials_page'
 
+  MAX_WORDS = 20
+
   field :title
   # validates :title, presence: true, uniqueness: true
   # index({ title: 1 }, { unique: true })
@@ -58,7 +60,7 @@ class Wco::Newspartial
   end
 
   def generate_speech
-    out = HTTParty.post( "#{HEAD_TTS_ORIGIN}/v1/synthesize",
+    out = HTTParty.post( "#{Wco::Setting.get('HEAD_TTS_ORIGIN')}/v1/synthesize",
       headers: {
         'Content-Type' => 'application/json',
         'Accept' => 'application/json',
@@ -70,7 +72,7 @@ class Wco::Newspartial
       }.to_json
     );
     out = out.body
-    puts! out, 'out'
+    # puts! out, 'out'
 
     self[:config_json] = out
     tmp = JSON.parse( out )
@@ -93,13 +95,15 @@ class Wco::Newspartial
 
   ##
   ## Can I make do without puppet driver? Probably not: I need the audio worklet.
+  ## uses ishlib3js v0.0.2, not 0.1.0!!!
+  ## @deprecated, this is being brought into wco_models
   ##
   def generate_video
-    cmd = "cd #{ISHLIB3JS_ROOT} ;
+    cmd = "cd #{Wco::Setting.get('ISHLIB3JS_ROOT')} ;
       node ./src/talking_head/example_puppeteer_wired.js \
-        --api_key=#{WCO_SIMPLE_API_KEY} \
-        --api_secret=#{WCO_SIMPLE_API_SECRET} \
-        --wco_origin=#{WCO_ORIGIN} \
+        --api_key=#{Wco::Setting.get('WASYACO_SIMPLE_API_KEY')} \
+        --api_secret=#{Wco::Setting.get('WASYACO_SIMPLE_API_SECRET')} \
+        --wco_origin=#{Wco::Setting.get('WASYACO_ORIGIN')} \
         --w_px=#{newsvideo.w_px} \
         --h_px=#{newsvideo.h_px} \
         --newspartial_id=#{self[:id]} ";

data/app/models/wco/newsvideo.rb

@@ -51,11 +51,24 @@ class Wco::Newsvideo
     Wco::Newsoverlay.where( newsvideo_id: self.id )
   end
 
+  def do_split
+    @newsvideo = self
+
+    sentences = PragmaticSegmenter::Segmenter.new(text: @newsvideo.body).segment
+    phrases = sentences_to_phrases(sentences)
+
+    phrases.each do |phrase|
+      newspartial = Wco::Newspartial.new body: phrase, newsvideo: @newsvideo
+      newspartial.save!
+    end
+  end
+
+
   def generate
     @newsvideo = self
 
     ## put together config, first thing
-    cmd = "cd #{Rails.root.join('tmp')} ; mkdir -p #{@newsvideo.id} ; cd #{@newsvideo.id} ; rm -f videolist.txt audiolist.txt ; "
+    cmd = "cd #{Rails.root.join('tmp')} ; rm -rf #{@newsvideo.id} ; mkdir -p #{@newsvideo.id} ; cd #{@newsvideo.id} ; "
     @newsvideo.newspartials.each_with_index do |part, idx|
       cmd = "#{cmd} echo \"file 'newspartial_#{idx}.mp4' \" >> videolist.txt ; "
       cmd = "#{cmd} echo \"file 'newspartial_#{idx}.wav' \" >> audiolist.txt ; "
@@ -88,11 +101,11 @@ class Wco::Newsvideo
     puts! out, 'out'
 
     ## video concat
-    cmd = <<AOL
+    cmd = <<~AOL
       cd #{Rails.root.join('tmp', @newsvideo.id)} ;
       rm -f video_concat.mp4 ;
       ffmpeg -y -f concat -safe 0 -i videolist.txt -c copy video_concat.mp4 ;
-AOL
+    AOL
     puts "+++ video concat cmd:"
     puts cmd
     out = `#{cmd}`
@@ -100,22 +113,22 @@ AOL
 
     ## audio concat
     audio_filenames = (0...@newsvideo.newspartials.length).map { |i| "newspartial_#{i}.wav" }.join("|")
-    cmd = <<AOL
+    cmd = <<~AOL
       cd #{Rails.root.join('tmp', @newsvideo.id)} ;
       rm -f audio_concat.wav ;
       ffmpeg -y -f concat -safe 0 -i audiolist.txt -c copy audio_concat.wav ;
-AOL
+    AOL
     puts "+++ audio concat cmd:"
     puts cmd
     out = `#{cmd}`
     puts! out, 'out'
 
     ## combine base
-    cmd = <<AOL
+    cmd = <<~AOL
       cd #{Rails.root.join('tmp', @newsvideo.id)} ;
       rm -f output.mp4 ;
       ffmpeg -y -i video_concat.mp4 -i audio_concat.wav -c:v copy -c:a aac combined_base.mp4 ;
-AOL
+    AOL
     puts "+++ combine base cmd:"
     puts cmd
     out = `#{cmd}`
@@ -147,11 +160,11 @@ AOL
     puts ffmpeg_cmd
 
     # combine overlays 2
-    cmd = <<AOL
+    cmd = <<~AOL
       cd #{Rails.root.join('tmp', @newsvideo.id)} ;
       rm -f combined_fin.mp4 ;
       #{ffmpeg_cmd} ;
-AOL
+    AOL
     puts "+++ ffmpeg cmd 2:"
     puts cmd
     out = `#{cmd}`
@@ -168,4 +181,28 @@ AOL
     end
   end
 
+  def sentences_to_phrases sentences
+    phrases = []
+    current_phrase = []
+
+    current_word_count = 0
+
+    sentences.each do |sentence|
+      words_in_sentence = sentence.split.size
+
+      # If adding this sentence exceeds the limit, start a new phrase
+      if current_word_count + words_in_sentence > Wco::Newspartial::MAX_WORDS
+        phrases << current_phrase.join(" ")
+        current_phrase = []
+        current_word_count = 0
+      end
+
+      current_phrase << sentence
+      current_word_count += words_in_sentence
+    end
+
+    # Add the last phrase if any
+    phrases << current_phrase.join(" ") unless current_phrase.empty?
+  end
+
 end

data/app/models/wco/setting.rb

@@ -0,0 +1,24 @@
+
+class Wco::Setting
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'wco_settings'
+
+  KEYS = [ 'HEAD_TTS_ORIGIN', 'ISHLIB3JS_ROOT',
+    'OPENAI_API_KEY', 'PEXELS_API_KEY',
+    'WASYACO_ORIGIN', 'WASYACO_SIMPLE_API_KEY', 'WASYACO_SIMPLE_API_SECRET',
+  ];
+
+  field :key
+  validates :key, inclusion: { in: KEYS }
+  validates :key, uniqueness: true
+
+  field :value
+
+  def self.get which
+    out   = where( key: which ).first&.value
+    out ||= Object.const_defined?(which) && Object.const_get(which)
+    out ||= ENV[which]
+  end
+
+end

data/app/models/wco_email/email_filter.rb

@@ -9,7 +9,7 @@ class WcoEmail::EmailFilter
   PAGE_PARAM_NAME = :filters_page
 
   STATUS_ACTIVE   = 'active'
-  STATUS_INACTIVE = 'inactive'
+  STATUS_DISABLED = 'disabled'
   field :status, type: :string, default: STATUS_ACTIVE
   def self.active; where( :status.in => [ nil, STATUS_ACTIVE ] ); end
 

data/app/views/wco/_main_footer.haml

@@ -20,6 +20,7 @@
                 .d-inline-block= button_to 'Logout', main_app.destroy_user_session_path, :method => :delete, data: { confirm: 'Are you sure?' }
               %li= link_to 'sidekiq', '/sidekiq', target: :_blank
               %li= link_to 'RTEditor', wco.application_tinymce_path, target: :_blank
+              %li= link_to 'GrapesJs', wco.application_grapesjs_path, target: :_blank
 
 
           .col-sm-4
@@ -29,6 +30,7 @@
                 = pp_date Time.now
                 = pp_time Time.now
               %li wco_models: v#{File.read(Gem.loaded_specs["wco_models"].full_gem_path + '/VERSION')}
+              %li= link_to 'settings', wco.settings_path
 
           .col-sm-4
             = render '/wco/profiles/form_extra', profile: @current_profile

data/app/views/wco/application/settings.haml

@@ -0,0 +1,19 @@
+
+.application-settings.maxwidth
+  %h5.text-center Settings
+
+  = form_with url: wco.settings_path do
+    %table.table
+      %thead
+        %tr
+          %th Key
+          %th Value
+      %tbody
+        - Wco::Setting::KEYS.each do |key|
+          %tr
+            %td
+              %strong= key
+            %td
+              = text_field_tag "settings[#{key}]", @settings[key], class: "form-control"
+
+    = submit_tag "UPDATE ALL", class: "btn btn-primary"

data/app/views/wco/newspartials/_show_in_newsvideo.haml

@@ -1,4 +1,5 @@
 
+
 .NewspartialTimelineW
   .zero-height.collapse-expand{ id: "#{newspartial.id.to_s}-wrapped-1" } <>
   .NewspartialTimeline{ style: "height: #{newspartial.duration_ms*HEIGHT_MS}px; min-height: 100px;" }
@@ -15,20 +16,25 @@
       .header.collapse-expand{ id: newspartial.id.to_s }
         Newspartial
         = link_to '[~]', edit_newspartial_path(newspartial)
-        .d-inline-block= button_to 'x', newspartial_path(newspartial), method: :delete, :data => { :confirm => 'Are you sure?' }
         %span{ class: 'gray' } #{newspartial.id}
-        = link_to '[api]', api_newspartial_config_path(newspartial, format: :json, api_key: WCO_SIMPLE_API_KEY, api_secret: WCO_SIMPLE_API_SECRET ), target: :_blank
+        = link_to '[api]', api_newspartial_config_path(newspartial, format: :json, api_key: Wco::Setting.get('WASYACO_SIMPLE_API_KEY'), api_secret:  Wco::Setting.get('WASYACO_SIMPLE_API_SECRET') ), target: :_blank
 
       .full-textC
         .flex-row
+          .d-inline-block= button_to 'x', newspartial_path(newspartial), method: :delete, :data => { :confirm => 'Are you sure?' }
           .a Duration: `#{newspartial.duration_ms}`ms
           .descr= newspartial.body
           .d-flex.flex-column
-            = button_to 'Generate video', newspartial_generate_video_path(newspartial), :data => { :confirm => 'Are you sure?' }
-            .small.gray ISHLIB3JS_ROOT
+
+            -# = button_to 'Generate video', newspartial_generate_video_path(newspartial), :data => { :confirm => 'Are you sure?' }
+            -# .small.gray ISHLIB3JS_ROOT
+
+            = link_to 'Generate video 2', newsproducer_studio_1_path({ newspartial_id: newspartial.id.to_s, wco_origin: request.base_url, api_key: Wco::Setting.get('WASYACO_SIMPLE_API_KEY'), api_secret: Wco::Setting.get('WASYACO_SIMPLE_API_SECRET') }), class: 'btn btn-primary', data: { confirm: 'Are you sure?' }
+
             Video:
             - if newspartial.video
               = image_tag newspartial.video.thumb.url(:thumb), class: 'thumb'
+              = link_to 'view', video_path(newspartial.video)
           .d-flex.flex-column
             = button_to 'Generate speech', newspartial_generate_speech_path(newspartial), :data => { :confirm => 'Are you sure?' }
             .small.gray Requires HeadTTS.git on :8882