appydave-tools 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1a94de7a92dafeaa54b86843c94dec8b25d108355782ba2f57eaf749a368b26
-  data.tar.gz: 41ad45648a7a1d3e3394092ef7a95a7ee93585d3e6435dfa1c6bb44d880c1b49
+  metadata.gz: 63c99bf6126fd82479ca9280e75f8d5c9226b1e8f6df4f6f581476363fd45245
+  data.tar.gz: 2f171fac8f490c259e6d259c848af330f3b7c4c1a35aea456fcc85251224f69e
 SHA512:
-  metadata.gz: e2f54c832a810f67a6230d38114f49a8877ce45f808daa90a0a1e9f11c6a1d641c69aaccbf38132edcdc628759f43642fd5f69314a586a7bb65716a7b6292dc0
-  data.tar.gz: 1aa6d410e0402e5d035ebd3054419e37e16f5bdee5b729940006b465607b0238ee28c4dec3c374139fd79dc9ec87377f736303ff95fd7d925ab343ed45eefa45
+  metadata.gz: 06227ef4baf7765404e787a91dd53728032cfcea6718b36d19bb378f35b754eabd365d1a2eea270299f6b2fb2ab98bfa529feff71426fd78b0968768c23131b2
+  data.tar.gz: 6ac8d46c1f8afb609faf5145fe864e24b09de807691295eef2613029c0ebcfb30f92adbb60a437e810b14b7ba841e1e1bb5cb1499ca5fab5b7864907e91b4e53

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.10.1](https://github.com/klueless-io/appydave-tools/compare/v0.10.0...v0.10.1) (2024-06-13)
+
+
+### Bug Fixes
+
+* add base model ([b2952d6](https://github.com/klueless-io/appydave-tools/commit/b2952d661c48dd7f8b7f384d365010ef89713758))
+
 # [0.10.0](https://github.com/klueless-io/appydave-tools/compare/v0.9.5...v0.10.0) (2024-06-13)
 
 

data/lib/appydave/tools/cli_actions/prompt_completion_action.rb

@@ -1,24 +1,19 @@
 # frozen_string_literal: true
 
-require 'openai'
-
 module Appydave
   module Tools
     module CliActions
-      # Action to run a completion prompt against the model
+      # PromptCompletionAction is a CLI action for running a completion prompt against the model
       class PromptCompletionAction < BaseAction
-        DEFAULT_MODEL = 'gpt-4o'
-        DEFAULT_PLATFORM = 'openai'
-
         protected
 
         def define_options(opts, options)
           opts.on('-p', '--prompt PROMPT', 'The prompt text') { |v| options[:prompt] = v }
           opts.on('-f', '--file FILE', 'The prompt file') { |v| options[:file] = v }
           opts.on('-o', '--output FILE', 'Output file') { |v| options[:output] = v }
-          opts.on('-c', '--clipboard', 'Copy result to clipboard') { |v| options[:clipboard] = v }
-          opts.on('-m', '--model MODEL', "Model to use (default: #{DEFAULT_MODEL})") { |v| options[:model] = v }
-          opts.on('-k', '--key-value PAIR', 'Key-value pairs for interpolation (format: key1=value1,key2=value2)') { |v| options[:key_value] = v }
+          opts.on('-c', '--clipboard', 'Copy result to clipboard') { |_v| options[:clipboard] = true }
+          opts.on('-m', '--model MODEL', 'Model to use') { |v| options[:model] = v }
+          opts.on('-k', '--placeholders PAIRS', 'Placeholders for interpolation (format: key1=value1,key2=value2)') { |v| options[:placeholders] = v }
         end
 
         def validate_options(options)
@@ -27,52 +22,27 @@ module Appydave
             exit
           end
 
-          if options[:key_value]
-            key_value_pairs = options[:key_value].split(',').to_h { |pair| pair.split('=') }
-            options[:key_value] = key_value_pairs
+          if options[:placeholders]
+            placeholders = options[:placeholders].split(',').to_h { |pair| pair.split('=') }
+            options[:placeholders] = placeholders
           else
-            options[:key_value] = {}
+            options[:placeholders] = {}
           end
         end
 
         def execute(options)
-          prompt_text = options[:prompt] || File.read(options[:file])
-          model = options[:model] || DEFAULT_MODEL
-          key_value_pairs = options[:key_value] || {}
-
-          # Interpolate key-value pairs into the prompt
-          key_value_pairs.each do |key, value|
-            prompt_text.gsub!("{#{key}}", value)
-          end
-
-          puts "Prompt: #{prompt_text}"
-          puts "Model: #{model}"
-          puts "Key-Value Pairs: #{key_value_pairs}"
-
-          # USE Library class to run this type of code
-          # client = OpenAI::Client.new(api_key: ENV['OPENAI_API_KEY'])
-          # response = client.completions(
-          #   engine: model,
-          #   parameters: {
-          #     prompt: prompt_text,
-          #     max_tokens: 100
-          #   }
-          # )
-
-          # result = response['choices'].first['text'].strip
-
-          # if options[:output]
-          #   File.write(options[:output], result)
-          #   puts "Output written to #{options[:output]}"
-          # end
-
-          # if options[:clipboard]
-          #   Clipboard.copy(result)
-          #   puts 'Output copied to clipboard'
-          # end
-
-          puts 'Result:'
-          # puts result unless options[:output]
+          prompt_options = {
+            prompt: options[:prompt],
+            prompt_file: options[:file],
+            platform: options[:platform],
+            model: options[:model],
+            placeholders: options[:placeholders],
+            output_file: options[:output],
+            clipboard: options[:clipboard]
+          }
+
+          completion = Appydave::Tools::PromptTools::PromptCompletion.new(prompt_options)
+          completion.run
         end
       end
     end

data/lib/appydave/tools/prompt_tools/models/llm_info.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module PromptTools
+      module Models
+        # What LLM are we using?
+        class LlmInfo < Appydave::Tools::Types::BaseModel
+          attribute :platform, :string, default: 'openai'
+          attribute :model, :string, default: 'gpt-4o'
+        end
+      end
+    end
+  end
+end

data/lib/appydave/tools/prompt_tools/prompt_completion.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module PromptTools
+      # PromptCompletion is a class for running a completion prompt against the model
+      class PromptCompletion
+        include KLog::Logging
+
+        attr_reader :prompt
+        attr_reader :prompt_file
+        attr_reader :expanded_prompt
+        attr_reader :llm
+        attr_reader :placeholders
+        attr_reader :output_file
+        attr_reader :clipboard
+
+        def initialize(options = {})
+          configure(options)
+
+          validate_options
+        end
+
+        def run
+          result = run_prompt(expand_prompt)
+
+          log.subheading 'Expanded Prompt'
+          puts expanded_prompt
+          log.subheading 'Result'
+          puts result
+
+          if output_file
+            File.write(output_file, result)
+            puts "Output written to #{output_file}"
+          end
+
+          if clipboard
+            Clipboard.copy(result)
+            puts 'Output copied to clipboard'
+          end
+
+          puts result unless output_file
+        end
+
+        private
+
+        def configure(options)
+          @prompt = options.delete(:prompt)
+          @prompt_file = options.delete(:prompt_file)
+          @llm = Appydave::Tools::PromptTools::Models::LlmInfo.new(
+            platform: options.delete(:llm_platform),
+            model: options.delete(:llm_model)
+          )
+          @placeholders = options.delete(:placeholders) || {}
+          @output_file = options.delete(:output_file)
+          @clipboard = options.key?(:clipboard) ? options.delete(:clipboard) : false
+        end
+
+        def validate_options
+          return unless prompt.nil? && prompt_file.nil?
+
+          raise ArgumentError, 'Either prompt or prompt_file must be provided.'
+        end
+
+        def expand_prompt
+          @expanded_prompt ||= begin
+            prompt_content = prompt || File.read(prompt_file)
+            placeholders.each do |key, value|
+              prompt_content.gsub!("{#{key}}", value)
+            end
+            prompt_content
+          end
+        end
+
+        def run_prompt(prompt_content)
+          client = OpenAI::Client.new(access_token: ENV.fetch('OPENAI_ACCESS_TOKEN', nil))
+          response = client.completions(
+            engine: llm_model,
+            prompt: prompt_content,
+            max_tokens: 1000
+          )
+          response['choices'][0]['text'].strip
+        rescue StandardError => e
+          puts "Error: Failed to run prompt. #{e.message}"
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.10.1'
+    VERSION = '0.10.2'
   end
 end

data/lib/appydave/tools.rb

@@ -46,6 +46,9 @@ require 'appydave/tools/bank_reconciliation/clean/read_transactions'
 require 'appydave/tools/bank_reconciliation/clean/mapper'
 require 'appydave/tools/bank_reconciliation/models/transaction'
 
+require 'appydave/tools/prompt_tools/models/llm_info'
+require 'appydave/tools/prompt_tools/prompt_completion'
+
 require 'appydave/tools/subtitle_master/clean'
 
 require 'appydave/tools/youtube_automation/gpt_agent'

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "appydave-tools",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appydave-tools",
-      "version": "0.10.1",
+      "version": "0.10.2",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.3",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "AppyDave YouTube Automation Tools",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appydave-tools
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -191,7 +191,8 @@ files:
 - lib/appydave/tools/gpt_context/file_collector.rb
 - lib/appydave/tools/name_manager/_doc.md
 - lib/appydave/tools/name_manager/project_name.rb
-- lib/appydave/tools/prompt_tools/models/platform_info.rb
+- lib/appydave/tools/prompt_tools/models/llm_info.rb
+- lib/appydave/tools/prompt_tools/prompt_completion.rb
 - lib/appydave/tools/subtitle_master/_doc.md
 - lib/appydave/tools/subtitle_master/clean.rb
 - lib/appydave/tools/types/array_type.rb