hyrum 0.1.0 → 0.2.0

data/lib/hyrum.rb

@@ -2,25 +2,173 @@
 
 require 'optparse'
 require 'zeitwerk'
+require 'dry-struct'
+require 'dry-validation'
+require 'ruby_llm'
+
+# Configure RubyLLM with environment variables
+RubyLLM.configure do |config|
+  config.openai_api_key = ENV['OPENAI_API_KEY'] if ENV['OPENAI_API_KEY']
+  config.anthropic_api_key = ENV['ANTHROPIC_API_KEY'] if ENV['ANTHROPIC_API_KEY']
+  config.gemini_api_key = ENV['GEMINI_API_KEY'] if ENV['GEMINI_API_KEY']
+  config.mistral_api_key = ENV['MISTRAL_API_KEY'] if ENV['MISTRAL_API_KEY']
+  config.deepseek_api_key = ENV['DEEPSEEK_API_KEY'] if ENV['DEEPSEEK_API_KEY']
+  config.perplexity_api_key = ENV['PERPLEXITY_API_KEY'] if ENV['PERPLEXITY_API_KEY']
+  config.openrouter_api_key = ENV['OPENROUTER_API_KEY'] if ENV['OPENROUTER_API_KEY']
+  config.ollama_api_base = 'http://localhost:11434/v1'
+  config.ollama_api_base = ENV['OLLAMA_API_BASE'] if ENV['OLLAMA_API_BASE']
+  config.gpustack_api_base = ENV['GPUSTACK_API_BASE'] if ENV['GPUSTACK_API_BASE']
+  config.gpustack_api_key = ENV['GPUSTACK_API_KEY'] if ENV['GPUSTACK_API_KEY']
+end
+
 loader = Zeitwerk::Loader.for_gem
 loader.setup
 
+module Types
+  include Dry.Types()
+end
+
+class CLIOptions < Dry::Struct
+  attribute :message, Types::String.optional
+  attribute :key, Types::Coercible::Symbol.default(:status)
+  attribute :ai_service, Types::Coercible::Symbol.default(:fake)
+  attribute :ai_model, Types::Coercible::Symbol
+  attribute :number, Types::Integer.default(5)
+  attribute :format, Types::Coercible::Symbol.default(:text)
+  attribute :verbose, Types::Bool.default(false)
+  attribute :validate, Types::Bool.default(false)
+  attribute :min_quality, Types::Integer.default(70)
+  attribute :strict, Types::Bool.default(false)
+  attribute :show_scores, Types::Bool.default(false)
+
+  def self.build_and_validate(input)
+    # apply defaults and coercions
+    cli_options = new(input)
+
+    # validate the options
+    contract_result = CLIOptionsContract.new.call(cli_options.to_h)
+
+    if contract_result.errors.any?
+      error_messages = contract_result.errors.to_h.map do |key, errors|
+        error_text = errors.is_a?(Array) ? errors.join(', ') : errors
+        "Error with #{key}: #{error_text}"
+      end
+      raise Hyrum::ScriptOptionsError, error_messages.join("\n")
+    end
+
+    contract_result
+  end
+end
+
+class GeneratorOptions < Dry::Struct
+  attribute :message, Types::String.optional
+  attribute :key, Types::Coercible::Symbol
+  attribute :ai_service, Types::Coercible::Symbol
+  attribute :ai_model, Types::Coercible::Symbol
+  attribute :number, Types::Integer
+  attribute :verbose, Types::Bool
+
+  def self.from_parent(parent)
+    new(parent.to_h.slice(:message, :key, :ai_service, :ai_model, :number, :verbose))
+  end
+end
+
+class FormatterOptions < Dry::Struct
+  attribute :format, Types::Coercible::Symbol
+  attribute :verbose, Types::Bool
+  attribute :show_scores, Types::Bool
+
+  def self.from_parent(parent)
+    new(parent.to_h.slice(:format, :verbose, :show_scores))
+  end
+end
+
+class ValidatorOptions < Dry::Struct
+  attribute :validate, Types::Bool
+  attribute :min_quality, Types::Integer
+  attribute :strict, Types::Bool
+  attribute :ai_service, Types::Coercible::Symbol
+  attribute :ai_model, Types::Coercible::Symbol
+
+  def self.from_parent(parent)
+    new(parent.to_h.slice(:validate, :min_quality, :strict, :ai_service, :ai_model))
+  end
+end
+
+class CLIOptionsContract < Dry::Validation::Contract
+  params do
+    required(:key).value(:symbol)
+    required(:ai_service).value(:symbol)
+    required(:ai_model).value(:symbol)
+    required(:number).value(:integer)
+    required(:format).value(:symbol)
+    optional(:verbose).value(:bool)
+    optional(:message).maybe(:string)
+    optional(:validate).value(:bool)
+    optional(:min_quality).value(:integer)
+    optional(:strict).value(:bool)
+    optional(:show_scores).value(:bool)
+  end
+
+  rule(:number) do
+    key.failure('must be > 0') if value && value <= 0
+  end
+
+  rule(:min_quality) do
+    key.failure('must be between 0 and 100') if value && (value < 0 || value > 100)
+  end
+end
+
 module Hyrum
+  # rubocop:disable Metrics/MethodLength
   def self.run(args)
-    options = ScriptOptions.new(args).parse
-    generator_opts = options.slice(:message, :key, :ai_service, :ai_model, :number, :verbose)
-    formatter_opts = options.slice(:format, :verbose)
+    parsed_options = ScriptOptions.new(args).parse
+    options = CLIOptions.build_and_validate(parsed_options)
+
+    generator_options = GeneratorOptions.from_parent(options)
+    formatter_options = FormatterOptions.from_parent(options)
+    validator_options = ValidatorOptions.from_parent(options)
 
-    puts "Options: #{options.inspect}" if options[:verbose]
-    formatter = Formats::Formatter.new(formatter_opts)
-    message_generator = Generators::MessageGenerator.create(generator_opts)
+    if options[:verbose]
+      puts "Options: #{options.inspect}"
+      puts "Generator Options: #{generator_options.inspect}"
+      puts "Formatter Options: #{formatter_options.inspect}"
+      puts "Validator Options: #{validator_options.inspect}"
+    end
+
+    # Generate messages
+    formatter = Formats::Formatter.new(formatter_options)
+    message_generator = Generators::MessageGenerator.create(generator_options)
     messages = message_generator.generate
-    output = formatter.format(messages)
+
+    # Validate if requested
+    validation_result = nil
+    if validator_options[:validate]
+      validator = Validators::QualityValidator.new(
+        options[:message],
+        messages,
+        validator_options.to_h
+      )
+      validation_result = validator.validate
+
+      if validation_result.failed? && validator_options[:strict]
+        warn "Quality validation failed:"
+        warn "  Score: #{validation_result.score}/100"
+        warn "  Semantic similarity: #{validation_result.semantic_similarity}%"
+        warn "  Lexical diversity: #{validation_result.lexical_diversity}%"
+        validation_result.warnings.each { |w| warn "  - #{w}" }
+        exit 1
+      end
+    end
+
+    # Format and output
+    output = formatter.format(messages, validation_result)
     puts output
   rescue ScriptOptionsError => e
     puts e.message
-    exit
+    exit 1
   end
+  # rubocop:enable Metrics/MethodLength
 end
 
 loader.eager_load

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: hyrum
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tracy Atteberry
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-openai
+  name: ruby_llm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -45,8 +44,8 @@ executables:
 - hyrum
 extensions: []
 extra_rdoc_files:
-- README.md
 - CHANGELOG.md
+- README.md
 files:
 - CHANGELOG.md
 - README.md
@@ -54,6 +53,7 @@ files:
 - bin/hyrum
 - bin/setup
 - lib/hyrum.rb
+- lib/hyrum/data/fake_messages.json
 - lib/hyrum/formats/formatter.rb
 - lib/hyrum/formats/templates/java.erb
 - lib/hyrum/formats/templates/javascript.erb
@@ -61,10 +61,14 @@ files:
 - lib/hyrum/formats/templates/python.erb
 - lib/hyrum/formats/templates/ruby.erb
 - lib/hyrum/formats/templates/text.erb
+- lib/hyrum/generators/ai_generator.rb
 - lib/hyrum/generators/fake_generator.rb
 - lib/hyrum/generators/message_generator.rb
-- lib/hyrum/generators/openai_generator.rb
 - lib/hyrum/script_options.rb
+- lib/hyrum/validators/lexical_diversity.rb
+- lib/hyrum/validators/quality_validator.rb
+- lib/hyrum/validators/semantic_similarity.rb
+- lib/hyrum/validators/validation_result.rb
 - lib/hyrum/version.rb
 homepage: https://github.com/grymoire7/hyrum
 licenses:
@@ -72,7 +76,6 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   changelog_uri: https://github.com/grymoire7/hyrum/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options:
 - "--title"
 - Hyrum - Hyrum's Law Code Generator
@@ -94,8 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.8
 specification_version: 4
 summary: A simple Ruby gem
 test_files: []

data/lib/hyrum/generators/openai_generator.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require 'openai'
-require 'json'
-require 'erb'
-
-module Hyrum
-  module Generators
-    class OpenaiGenerator
-      attr_reader :options
-
-      def initialize(options)
-        @options = options
-      end
-
-      def generate
-        configure
-
-        response = chat_response
-        puts "OpenAI response: #{JSON.pretty_generate(response)}" if options[:verbose]
-        content = response.dig('choices', 0, 'message', 'content')
-        JSON.parse(content)
-      end
-
-      private
-
-      def prompt
-        prompt = <<~PROMPT
-          Please provide <%= number %> alternative status messages for the following message:
-          `<%= message %>`. The messages should be unique and informative. The messages
-          should be returned as json in the format: `{ "<%= key %>": ['list', 'of', 'messages']}`
-          The key should be `"<%= key %>"` followed by the list of messages.
-        PROMPT
-        erb_hash = { key: options[:key], message: options[:message], number: options[:number] }
-        template = ERB.new(prompt, trim_mode: '-')
-        template.result_with_hash(erb_hash)
-      end
-
-      def chat_response
-        client = OpenAI::Client.new
-        client.chat(parameters: chat_params)
-      rescue OpenAI::Error => e
-        puts "OpenAI::Error: #{e.message}"
-        exit
-      rescue Faraday::Error => e
-        puts "Faraday::Error: #{e.message}"
-        puts "Please check that the #{options[:ai_model]} model is valid."
-        exit
-      end
-
-      def chat_params
-        {
-          model: options[:ai_model],
-          response_format: { type: 'json_object' },
-          messages: [{ role: 'user', content: prompt}],
-          temperature: 0.7
-        }
-      end
-
-      def configure
-        OpenAI.configure do |config|
-          config.access_token = ENV.fetch('OPENAI_ACCESS_TOKEN') if options[:ai_service] == :openai
-          # config.log_errors = true # Use for development
-          config.organization_id = ENV['OPENAI_ORGANIZATION_ID'] if ENV['OPENAI_ORGANIZATION_ID']
-          config.request_timeout = 240
-          if options[:ai_service] == :ollama
-            config.uri_base = ENV['OLLAMA_URL'] || 'http://localhost:11434'
-          end
-        end
-      rescue KeyError => e
-        puts "Error: #{e.message}"
-        puts "Please set the OPENAI_ACCESS_TOKEN environment variable."
-        exit
-      end
-    end
-  end
-end