promptspec 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 022ef82dfab3a71fccb829c8358442d8ef7f77026d637bfad15586adef3dfce5
-  data.tar.gz: 990779a5f40d7baffe57dbc186198541ea96bd316328741e352b823f6e3b587c
+  metadata.gz: ff9862c476f10363aff3327d9f365b0dce6a3d09967569d6336bdd78b7897571
+  data.tar.gz: 33b50174079b344a29d8d230ba844bc363fd43cb8fb2d63f9fdf70c11ad48821
 SHA512:
-  metadata.gz: 391028f8084149662b27a3bca42bf6a7e8d1ff06e0ad043e9c5b82390186d6804416d153be55160d096b4e9fafa0239cd74d1777d74a46ad48276b6d045c23e4
-  data.tar.gz: 5fb14570770bf048e695ee101a5a8043d5eec74dcb245f1ac369573a4c1f10cb796d2c5d4c35f8ac4aa97505e4c798978e48b86590bba05e8fbc278d16a2f88f
+  metadata.gz: cebe769d93847ca3e7383283a6cddd37d0235f53de7d6595b4c9ce642f4626b92d5e46dd25dd200d9a75ee6025e9e4172c8b932f3e47cdd38af75457eaee4c7a
+  data.tar.gz: ca1d578071ceeefcaffe5af466d974327fe99faa75289aa3590df3f6065aec45c1b60734ca7ada1db979ab2c18e0c49db15a5c8e96dedb8d4f9c8e42b274dedd

data/lib/promptspec.rb

@@ -6,13 +6,7 @@ require 'net/http'
 require 'uri'
 
 class PromptSpec
-  class Error < StandardError; end
-  class FileNotFoundError < Error; end
-  class ParseError < Error; end
-  class RequiredParameterError < Error; end
-  class EndpointError < Error; end
-
-  attr_reader :file_path, :validate_required_params
+  attr_reader :file_path, :validate_required_params, :parameters, :yaml_content
 
   def initialize(file_path, validate_required_params: true)
     @file_path = file_path
@@ -21,8 +15,9 @@ class PromptSpec
   end
 
   def call(**parameters)
-    validate_required_inputs!(parameters) if validate_required_params
-    parse_prompt_messages(parameters)
+    @parameters = parameters
+    validate_required_inputs! if @validate_required_params
+    parse_prompt_messages
     construct_endpoint_request
   end
 
@@ -36,21 +31,20 @@ class PromptSpec
     raise ParseError, "YAML parsing error: #{e.message}"
   end
 
-  def validate_required_inputs!(parameters)
+  def validate_required_inputs!
     required_params = @yaml_content.dig('parameters', 'required') || []
-    missing_params = required_params - parameters.keys.map(&:to_s)
+    missing_params = required_params - @parameters.keys.map(&:to_s)
     raise RequiredParameterError, "Missing required parameters: #{missing_params.join(', ')}" unless missing_params.empty?
   end
 
-  def parse_prompt_messages(parameters)
-    messages = @yaml_content['prompt']['messages'].map do |message|
+  def parse_prompt_messages
+    @yaml_content['prompt']['messages'].each do |message|
       content = message['content']
-      parameters.each do |key, value|
-        content.gsub!("{#{key}}", value.to_s)
+      @parameters.each do |key, value|
+        content.gsub!("{#{key}}", value.to_s) if content.include?("{#{key}}")
       end
-      { role: message['role'], content: content }
+      message['content'] = content
     end
-    @yaml_content['prompt']['messages'] = messages
   end
 
   def construct_endpoint_request
@@ -73,11 +67,9 @@ class PromptSpec
   end
 
   def construct_default_endpoint
-    @model = @yaml_content['prompt']['model']
+    @model ||= @yaml_content['prompt']['model']
     case @model
-    when 'gpt-4'
-      'https://api.openai.com/v1/chat/completions'
-    when 'gpt-3.5-turbo'
+    when 'gpt-4', 'gpt-4-0613', 'gpt-4-32k', 'gpt-4-32k-0613', 'gpt-3.5-turbo', 'gpt-3.5-turbo-16k', 'gpt-3.5-turbo-0613', 'gpt-3.5-turbo-16k-0613'
       'https://api.openai.com/v1/chat/completions'
     else
       raise EndpointError, "Unknown model: #{model}"
@@ -85,14 +77,20 @@ class PromptSpec
   end
 
   def construct_headers
-    # Placeholder logic for constructing headers
-    headers = @yaml_content['headers'] || {}
-    if @model == 'gpt-4' && headers.empty?
-      api_key = ENV['OPENAI_API_KEY']
-      raise EndpointError, "Missing OpenAI API Key" unless api_key
-      headers['Authorization'] = "Bearer #{api_key}"
+    @headers ||= begin
+      headers = @yaml_content.fetch('headers', {})
+
+      if headers.empty?
+        case @model
+        when 'gpt-4', 'gpt-4-0613', 'gpt-4-32k', 'gpt-4-32k-0613', 'gpt-3.5-turbo', 'gpt-3.5-turbo-16k', 'gpt-3.5-turbo-0613', 'gpt-3.5-turbo-16k-0613'
+          api_key = ENV['OPENAI_API_KEY']
+          headers['Authorization'] = "Bearer #{api_key}" if api_key
+        # Add more cases here for other providers
+        end
+      end
+
+      headers['Content-Type'] = 'application/json' unless headers.key?('Content-Type')
+      headers
     end
-    headers['Content-Type'] = 'application/json'
-    headers
   end
-end
+end

data/promptspec.gemspec

@@ -1,7 +1,7 @@
 # promptspec.gemspec
 Gem::Specification.new do |spec|
   spec.name          = "promptspec"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.6"
   spec.authors       = ["Hyperaide, John Paul, Daniel Paul"]
   spec.email         = ["jp@hyperaide.com"]
 
@@ -14,7 +14,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "yaml", "~> 0.1.0"
-  spec.add_runtime_dependency "erb", "~> 2.2.0"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: promptspec
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Hyperaide, John Paul, Daniel Paul
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: erb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement