wco_models 3.1.0.83 → 3.1.0.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 136fd63ec2289135d50625c8ee250e34de0ba12757cec2a0d535264d8b3af9b4
-  data.tar.gz: f696b308e67bd35b454f11880fbf876d378c603983ae941396605ba0ca8e5a4a
+  metadata.gz: b766aa1273a9c863ee71e44e96308ac8ff2de76e4a29079bcf58a23cdc50298b
+  data.tar.gz: 5c032aa7fac857e68baf760863d0d3de1831de98e1cbf52397c117fa2db41454
 SHA512:
-  metadata.gz: 125155b3a50dc0c7ae25c9dcb0f642ef3127bf13a3fa11040c91240deab4ef7bfd787d0ec73065b6c31f25a111c524637822d45bc0c6739ab8676833e826cd9d
-  data.tar.gz: e8c8f58699d02a209e9be4bfa177a987e40d67daa22db0535ade103f55dc4874ef8fb45c412ab1da49b5723996b4c734ce5cec1f48172bb6a41a22b5b73c2bae
+  metadata.gz: 0f539fda62b5de3856bc7fab46585ad1ffe13be1a9f8285e70d11b2bf327d3887a2f5e63815887abb5ea79164ffc733392f6fa69d9931882428f74cacbed2dbc
+  data.tar.gz: 98d693ef2b7b0b762b6677e42f1ba2c414f3195b1ea00f009bf55b09e1a03618bf1164e4cef342dca3032baa34294a1c29dacc511c9595ac0b866d510924ba03

data/app/controllers/wco/office_action_templates_controller.rb

@@ -1,7 +1,4 @@
 
-OAT  = Wco::OfficeActionTemplate
-OATT = Wco::OfficeActionTemplateTie
-
 class Wco::OfficeActionTemplatesController < Wco::ApplicationController
 
   before_action :set_lists

data/app/controllers/wco/office_actions_controller.rb

@@ -1,7 +1,4 @@
 
-OAT = Wco::OfficeActionTemplate
-OA  = Wco::OfficeAction
-
 class Wco::OfficeActionsController < Wco::ApplicationController
 
   before_action :set_lists

data/app/models/wco/headline.rb

@@ -12,7 +12,8 @@ class Wco::Headline
   field :name
   validates :name, presence: true, uniqueness: true
 
-  belongs_to :site, class_name: 'Wco::Site'
+  ## @TODO: remove this entirely. 2024-01-16
+  belongs_to :site, class_name: 'Wco::Site', optional: true
 
   has_and_belongs_to_many :tags, class_name: 'Wco::Tag'
 

data/app/models/wco/office_action.rb

@@ -23,9 +23,25 @@ class Wco::OfficeAction
 
   field :perform_at, type: :time
 
+  def do_run
+    sch = self
+    sch.update!({ status: STATUS_INACTIVE })
+
+    eval( sch.tmpl.action_exe )
+
+    # schedule next actions & update the action
+    sch.tmpl.ties.each do |tie|
+      next_sch = self.class.find_or_initialize_by({
+        office_action_template_id: tie.next_tmpl.id,
+      })
+      next_sch.perform_at = eval(tie.next_at_exe)
+      next_sch.status     = STATUS_ACTIVE
+      next_sch.save!
+    end
+  end
+
   def to_s
     slug
   end
-
 end
-
+OA ||= Wco::OfficeAction

data/app/models/wco/office_action_template.rb

@@ -38,4 +38,4 @@ class Wco::OfficeActionTemplate
   end
 
 end
-OAT = Wco::OfficeActionTemplate
+OAT ||= Wco::OfficeActionTemplate

data/app/models/wco/office_action_template_tie.rb

@@ -7,10 +7,10 @@ class Wco::OfficeActionTemplateTie
   attr_accessor :to_delete
 
   belongs_to :office_action_template,      class_name: 'OfficeActionTemplate', inverse_of: :ties
-  def oat; office_action_template; end
+  def tmpl; office_action_template; end
 
   belongs_to :next_office_action_template, class_name: 'OfficeActionTemplate', inverse_of: :prev_ties
-  def next_oat; next_office_action_template; end
+  def next_tmpl; next_office_action_template; end
   # def tmpl;     next_office_action_template; end
 
 
@@ -18,3 +18,4 @@ class Wco::OfficeActionTemplateTie
   validates :next_at_exe, presence: true
 
 end
+OATT ||= Wco::OfficeActionTemplateTie

data/app/models/wco/publisher.rb

@@ -28,6 +28,7 @@ class Wco::Publisher
     @headers = {}
     @ctx     = OpenStruct.new
 
+    puts! context_eval, 'context_eval'
     eval( context_eval )
     puts! @ctx, '@ctx'
 
@@ -38,11 +39,14 @@ class Wco::Publisher
     out = Wco::HTTParty.post( "#{@site.origin}#{post_path}", {
       body: body.to_json,
       headers: @headers,
-      basic_auth: { username: site.username, password: site.password },
+      basic_auth: { username: @site.username, password: @site.password },
     })
     puts! out.response, 'out'
+    if out.code != 201
+      raise "#do_run exception: #{out.body}"
+    end
 
-    eval( after_eval )
+    eval( after_eval ) if after_eval.present?
   end
 
 

data/app/models/wco/report.rb

@@ -1,9 +1,7 @@
 
 ##
+## @report.body.split("\n\n").map { |ttt| "<p>#{ttt}</p>" }.join
 ##
-##
-# @report.body.split("\n\n").map { |ttt| "<p>#{ttt}</p>" }.join
-#
 class Wco::Report
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -21,19 +19,10 @@ class Wco::Report
   field :slug
   validates :slug, presence: true, uniqueness: true
   index({ :slug => 1 }, { :unique => true })
-  before_validation :set_slug, :on => :create
+  before_validation :set_slug, on: :create
 
   field :body
 
-  # field :raw_json, type: :object, default: '{}'
-
-  # field :is_trash, :type => Boolean, :default => false
-  # index({ :is_trash => 1, :is_public => 1 })
-
-  # field :is_public, :type => Boolean, :default => true
-  # index({ :is_public => 1 })
-  # scope :public, ->{ where({ is_public: true }) }
-
   field :x, :type => Float
   field :y, :type => Float
   field :z, :type => Float

data/app/views/wco/office_action_templates/_ties.haml

@@ -1,5 +1,5 @@
 
-- oat ||= nil
+- tmpl ||= nil
 - depth ||= 5
 - depth = depth - 1
 
@@ -10,9 +10,9 @@
       %li
         = tie.next_at_exe
         %br
-        = link_to '[~]', edit_office_action_template_path(tie.next_oat)
-        = link_to tie.next_oat, office_action_template_path(tie.next_oat)
-        - if tie.next_oat == oat
+        = link_to '[~]', edit_office_action_template_path(tie.next_tmpl)
+        = link_to tie.next_tmpl, office_action_template_path(tie.next_tmpl)
+        - if tie.next_tmpl == tmpl
           <b>[Same]</b>
-        - elsif tie.next_oat.ties.present?
-          = render '/wco/office_action_templates/ties', ties: tie.next_oat.ties, depth: depth, oat: tie.next_oat
+        - elsif tie.next_tmpl.ties.present?
+          = render '/wco/office_action_templates/ties', ties: tie.next_tmpl.ties, depth: depth, tmpl: tie.next_tmpl

data/app/views/wco/office_actions/_index.haml

@@ -7,6 +7,8 @@
        
       = link_to oa.slug, office_action_path(oa)
       %ul
+        %li
+          .gray.mini= oa.id
         %li <b>status:</b> #{oa.status}
         %li
           <b>tmpl:</b>

data/lib/tasks/office_tasks.rake

@@ -2,34 +2,26 @@
 require 'business_time'
 require 'httparty'
 
-namespace :office do
+namespace :wco do
 
-  desc 'run_office_actions'
+
+  desc 'run office actions'
   task run_office_actions: :environment do
+    puts! "Starting wco_email:run_office_actions..."
     while true do
 
-      OA  = Wco::OfficeAction
-      OAT = Wco::OfficeActionTemplate
-
-      OA.active.where( :perform_at.lte => Time.now ).each do |oa|
-        puts "+++ +++ Office Action: #{oa}"
+      schs = Wco::OfficeAction.active.where({ :perform_at.lte => Time.now })
+      print "[#{schs.length}]" if schs.length != 0
+      schs.each do |sch|
 
-        oa.update({ status: INACTIVE })
-        oa.tmpl.do_run
-        oa.tmpl.ties.each do |tie|
-          next_oa = OA.find_or_initialize_by({
-            office_action_template_id: tie.next_oat.id,
-          })
-          next_oa.perform_at = eval( tie.next_at_exe )
-          next_oa.status     = ACTIVE
-          next_oa.save!
-        end
+        sch.do_run
 
-        print '^'
+        print "[#{sch.id}]^"
+        sleep 15
       end
 
       print '.'
-      sleep Rails.env.production? ? 60 : 5 # seconds
+      sleep 15
     end
   end
 

data/lib/wco/ai_writer.rb

@@ -21,6 +21,7 @@ class Wco::AiWriter
     })
     out = JSON.parse out.response.body
     out.deep_symbolize_keys!
+    puts! out, 'chatgpt response'
     out = out[:choices][0][:message][:content]
     return out
   end
@@ -28,25 +29,24 @@ class Wco::AiWriter
 
 
   def self.run_headline headline
-    prompt = "Rephrase the following article title using one sentence: #{headline.name}"
+    prompt = "Rephrase the following article title using less than 250 characters: #{headline.name}"
     new_title = self.run_prompt prompt
-    puts! new_title, 'new_title'
+    new_title = new_title[0..255]
+    # puts! new_title, 'new_title'
 
     prompt = "Write an article about the following topic: #{headline.name}"
     new_body = self.run_prompt prompt
     new_body.gsub!("\r", '')
     new_body = new_body.split("\n\n").map { |ppp| "<p>#{ppp}</p>" }.join
     new_body = new_body.gsub("\n", "<br />")
-    puts! new_body[0...200], 'new_body'
+    # puts! new_body[0...200], 'new_body'
 
     report = Wco::Report.create!({
       title: new_title,
-      slug: new_title,
+      # slug:  new_title,
       body:  new_body,
     })
 
-    # headline.delete
-
     return report
   end
   def run_headline h; self.class.run_headline h; end

data/lib/wco_models.rb

@@ -24,6 +24,7 @@ require 'sass-rails'
 require 'stripe'
 
 require "wco/engine"
+require 'wco/ai_writer'
 
 ACTIVE   = 'active'
 INACTIVE = 'inactive'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.83
+  version: 3.1.0.86
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3