openaiext 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4622de30e5df0ef4fd41d49f329dd9ec64ca84f87bf8be59dbf3301e75b99429
-  data.tar.gz: fbd7a1741c752c1852f7d7962aaa44bb2dcbf641029de864963783d3b3d2f6a4
+  metadata.gz: 321e5e7aaba2691bcc8f5fbf258bd33551920d474cee4bcdfcdde4dae744b937
+  data.tar.gz: 9bc3fe053ae856d540925b6dc2815cf345383572cf2243c886589119649424ef
 SHA512:
-  metadata.gz: bd2d2f0ccda1be4e864414de652fbb628f16b172e786d6f8ba45266009829ceda9dacd9996a9af12bf2be63f2eb322363374942b5d6ddbac3edbca5bc61edbdb
-  data.tar.gz: 0ad5bb389487ccd355ae6cb0ac23080eb713b465434b189fe7c86ecedab1301ad7dbd7106ca24c2e5f26c8e2a1223b44a827774df8b14d6d007020fad428b1c4
+  metadata.gz: a244914cf823cb4fc0c6d1ec678858ad8a0467c015c6535cfcde6fa1756d1f4a67b0ecd1b4a23c8aff35d0dc3e84f01e0af0aa1fd6571c60b1a5033a02d2c448
+  data.tar.gz: 207768e9d24034baea6278ff4c4f3fc03a664bc29d82904f65f143ca3e3a6cf2f7563bc77765ec0c5298685c0301f8abbacf03711c5c529f79ad6b4e8258937f

data/lib/openaiext/agent.rb

@@ -36,7 +36,7 @@ module OpenAIExt
 
       params[:additional_messages] = [{ role: :user, content: additional_message }] unless additional_message.nil?
 
-      params[:model] = model || @assistant['model']
+      params[:model] = OpenAIExt::Model.select(model) || @assistant['model']
 
       run_id = @openai_client.runs.create(thread_id: @thread['id'], parameters: params)['id']
 

data/lib/openaiext/model.rb

@@ -0,0 +1,24 @@
+module OpenAIExt
+  module Model
+    GPT_BASIC_MODEL = ENV.fetch('OPENAI_GPT_BASIC_MODEL', 'gpt-4o-mini')
+    GPT_ADVANCED_MODEL = ENV.fetch('OPENAI_GPT_ADVANCED_MODEL', 'gpt-4o-2024-08-06')
+
+    O1_BASIC_MODEL = ENV.fetch('OPENAI_O1_BASIC_MODEL', 'o1-mini')
+    O1_ADVANCED_MODEL = ENV.fetch('OPENAI_O1_ADVANCED_MODEL', 'o1-preview')
+
+    def self.select(model)
+      case model
+      when :gpt_basic
+        GPT_BASIC_MODEL
+      when :gpt_advanced
+        GPT_ADVANCED_MODEL
+      when :o1_basic
+        O1_BASIC_MODEL
+      when :o1_advanced
+        O1_ADVANCED_MODEL
+      else
+        model
+      end
+    end
+  end
+end

data/lib/openaiext.rb

@@ -1,16 +1,11 @@
 require 'openai'
 
+require 'openaiext/model'
 require 'openaiext/messages'
 require 'openaiext/response_extender'
 require 'openaiext/agent'
 
 module OpenAIExt
-  GPT_BASIC_MODEL = ENV.fetch('OPENAI_GPT_BASIC_MODEL', 'gpt-4o-mini')
-  GPT_ADVANCED_MODEL = ENV.fetch('OPENAI_GPT_ADVANCED_MODEL', 'gpt-4o-2024-08-06')
-
-  O1_BASIC_MODEL = ENV.fetch('OPENAI_O1_BASIC_MODEL', 'o1-mini')
-  O1_ADVANCED_MODEL = ENV.fetch('OPENAI_O1_ADVANCED_MODEL', 'o1-preview')
-  
   MAX_TOKENS = ENV.fetch('OPENAI_MAX_TOKENS', 16_383).to_i
 
   def self.embeddings(input, model: 'text-embedding-3-large')
@@ -24,16 +19,16 @@ module OpenAIExt
     chat(messages: [{ role: :user, content: message_content }], model:, response_format:, max_tokens:, store:, tools:, auto_run_functions:, function_context:)    
   end  
 
-  def self.single_prompt(prompt:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, store: true, metadata: nil, tools: nil, auto_run_functions: false, function_context: nil)
-    chat(messages: [{ user: prompt }], model:, response_format:, max_tokens:, store:, tools:, auto_run_functions:, function_context:)
+  def self.single_prompt(prompt:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, store: true, metadata: nil, tools: nil, auto_run_functions: false, function_context: nil, temperature: nil, top_p: nil, frequency_penalty: nil, presence_penalty: nil)
+    chat(messages: [{ user: prompt }], model:, response_format:, max_tokens:, store:, tools:, auto_run_functions:, function_context:, temperature:, top_p:, frequency_penalty:, presence_penalty:)
   end
 
-  def self.single_chat(system:, user:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, store: true, metadata: nil, tools: nil, auto_run_functions: false, function_context: nil)
-    chat(messages: [{ system: }, { user: }], model:, response_format:, max_tokens:, store:, tools:, auto_run_functions:, function_context:)
+  def self.single_chat(system:, user:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, store: true, metadata: nil, tools: nil, auto_run_functions: false, function_context: nil, temperature: nil, top_p: nil, frequency_penalty: nil, presence_penalty: nil)
+    chat(messages: [{ system: }, { user: }], model:, response_format:, max_tokens:, store:, tools:, auto_run_functions:, function_context:, temperature:, top_p:, frequency_penalty:, presence_penalty:)
   end
 
-  def self.chat(messages:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, store: true, metadata: nil, tools: nil, auto_run_functions: false, function_context: nil)
-    model = select_model(model)
+  def self.chat(messages:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, store: true, metadata: nil, tools: nil, auto_run_functions: false, function_context: nil, temperature: nil, top_p: nil, frequency_penalty: nil, presence_penalty: nil)
+    model = OpenAIExt::Model.select(model)
     is_o1_model = model.start_with?('o1')
 
     messages = OpenAIExt::Messages.new(messages) unless messages.is_a?(OpenAIExt::Messages)
@@ -48,6 +43,11 @@ module OpenAIExt
     parameters[:response_format] = { type: 'json_object' } if response_format.eql?(:json)
     parameters[:tools] = tools if tools
 
+    parameters[:temperature] = temperature if temperature
+    parameters[:top_p] = top_p if top_p
+    parameters[:frequency_penalty] = frequency_penalty if frequency_penalty
+    parameters[:presence_penalty] = presence_penalty if presence_penalty
+
     begin
       response = OpenAI::Client.new.chat(parameters:)
     rescue => e
@@ -69,19 +69,4 @@ module OpenAIExt
   end
 
   def self.models = OpenAI::Client.new.models.list
-
-  def self.select_model(model)
-    case model
-    when :gpt_basic
-      GPT_BASIC_MODEL
-    when :gpt_advanced
-      GPT_ADVANCED_MODEL
-    when :o1_basic
-      O1_BASIC_MODEL
-    when :o1_advanced
-      O1_ADVANCED_MODEL
-    else
-      model
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openaiext
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Gedean Dias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-12 00:00:00.000000000 Z
+date: 2024-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -62,6 +62,7 @@ files:
 - lib/openaiext.rb
 - lib/openaiext/agent.rb
 - lib/openaiext/messages.rb
+- lib/openaiext/model.rb
 - lib/openaiext/response_extender.rb
 homepage: https://github.com/gedean/openaiext
 licenses: