ruby-openai-swarm 0.2.9 → 0.3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df40e898023940bd9fa16596e947caf353dc8ce3edeee3d442cb871a8e5bbba0
-  data.tar.gz: c180214e63813c09bea2c986a3c7c1729f458f66a807a2b578d4f71b8b39374b
+  metadata.gz: 98aa27742c5ae980d9c1c8b9457beb2e61a4ff3a1548790d4205cd0f68cef039
+  data.tar.gz: 37d7a5280f47c2a454a2aba4a5f64587787f1e829fc07b6c27accc90f63f91f8
 SHA512:
-  metadata.gz: 6e16aa9fa53293212ccdb96dba442da4e48db77dd217b749b9bfd80a4711324ac3adaf6bc11b28e27ea348d0a055921d7e1f98fa70dbecb0c4d17bcd7514473b
-  data.tar.gz: 8450574be9da37c9c5fcd67e25ba564795f5b475fe78df337a69561ca2f8b5f09ea100b01d3547b1a6dcb510c56614db6f2a3148693588d6b6e432386cd6231c
+  metadata.gz: 0d671ef9fa72e895bfd3b3e62561fccfc3894a6f19605dd43e68da14b0c9f958d22559da8d9eecd981277a7db035ed39c17535f261cf40849f16a95ac6884516
+  data.tar.gz: 96c6229510613dbb8b858200916bb9ab22583b7918d604adae0b1bc85bb5b89cfae28a6c833b8c16b2acc1758d1d89643c61f240c896ff6d1d3153536801b46d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-openai-swarm (0.2.9)
+    ruby-openai-swarm (0.3.0.1)
       ruby-openai (~> 7.3)
 
 GEM

data/examples/airline/main.rb

@@ -65,4 +65,4 @@ params:
 GUIDE_EXAMPLES
 puts guide_examples
 
-OpenAISwarm::Repl.run_demo_loop(triage_agent, context_variables: context_variables, debug: env_debug)
+OpenAISwarm::Repl.run_demo_loop(triage_agent, context_variables: context_variables, stream: true, debug: env_debug)

data/examples/basic/function_calling.rb

@@ -46,6 +46,7 @@ Details:
 	     Example: “What’s the weather in NYC?”
 	     Action: Calls get_weather with location “New York City”.
 	     Response: Only provides weather details.
+
 	2. Multiple Function Calls
 	     Example: “Tell me the weather in New York and the latest news headlines.”
 	     Action: Calls get_weather for weather and get_news for news.
@@ -58,4 +59,19 @@ GUIDE_EXAMPLES
 
 puts guide_examples
 
-OpenAISwarm::Repl.run_demo_loop(agent, stream: true, debug: env_debug)
+# OpenAISwarm::Repl.run_demo_loop(agent, stream: true, debug: env_debug)
+
+OpenAISwarm.new.run_and_stream(
+  agent: agent,
+  debug: true,
+  messages: [{"role" => "user", "content" => "Tell me the weather in New York and the latest news headlines."}]
+) do |chunk|
+  if chunk.key?("content") && !chunk["content"].nil?
+    puts ">>>#{chunk}"
+  end
+
+  if chunk.key?('response')
+    binding.pry
+    # log_llm_request(chunk['response'])
+  end
+end

data/lib/ruby-openai-swarm/agent.rb

@@ -3,7 +3,9 @@ module OpenAISwarm
     attr_accessor :name, :model, :instructions,
                   :functions, :tool_choice,
                   :parallel_tool_calls,
+                  :strategy,
                   :noisy_tool_calls,
+                  :temperature,
                   :resource
     # These attributes can be read and written externally. They include:
     # - name: The name of the agent.
@@ -19,18 +21,22 @@ module OpenAISwarm
       instructions: "You are a helpful agent.",
       functions: [],
       tool_choice: nil,
+      temperature: nil,
       parallel_tool_calls: true,
       resource: nil,
-      noisy_tool_calls: []
+      noisy_tool_calls: [],
+      strategy: {}
     )
       @name = name
       @model = model
       @instructions = instructions
       @functions = functions
       @tool_choice = tool_choice
+      @temperature = temperature
       @parallel_tool_calls = parallel_tool_calls
       @resource = resource
       @noisy_tool_calls = noisy_tool_calls
+      @strategy = Agents::StrategyOptions.new(strategy)
     end
   end
 end

data/lib/ruby-openai-swarm/agents/change_tracker.rb

@@ -0,0 +1,24 @@
+module OpenAISwarm
+  module Agents
+    class ChangeTracker
+      attr_reader :current_agent, :previous_agent
+
+      def initialize(agent)
+        update(agent)
+      end
+
+      def update(agent)
+        @previous_agent = @current_agent
+        @current_agent = agent
+      end
+
+      def agent_changed?
+        previous_agent&.name != current_agent&.name
+      end
+
+      def switch_agent_reset_message?
+        agent_changed? && current_agent.strategy.switch_agent_reset_message
+      end
+    end
+  end
+end

data/lib/ruby-openai-swarm/agents/strategy_options.rb

@@ -0,0 +1,11 @@
+module OpenAISwarm
+  module Agents
+    class StrategyOptions
+      attr_accessor :switch_agent_reset_message
+
+      def initialize(strategy = {})
+        @switch_agent_reset_message = strategy[:switch_agent_reset_message] || false
+      end
+    end
+  end
+end

data/lib/ruby-openai-swarm/core.rb

@@ -14,7 +14,8 @@ module OpenAISwarm
       @logger = OpenAISwarm::Logger.instance.logger
     end
 
-    def get_chat_completion(agent, history, context_variables, model_override, stream, debug)
+    def get_chat_completion(agent_tracker, history, context_variables, model_override, stream, debug)
+      agent = agent_tracker.current_agent
       context_variables = context_variables.dup
       instructions = agent.instructions.respond_to?(:call) ? agent.instructions.call(context_variables) : agent.instructions
       messages = [{ role: 'system', content: instructions }] + history
@@ -41,6 +42,7 @@ module OpenAISwarm
       # create_params[:functions] = tools unless tools.empty?
       # create_params[:function_call] = agent.tool_choice if agent.tool_choice
 
+      create_params[:temperature] = agent.temperature if agent.temperature
       create_params[:tool_choice] = agent.tool_choice if agent.tool_choice
       create_params[:parallel_tool_calls] = agent.parallel_tool_calls if tools.any?
 
@@ -146,6 +148,7 @@ module OpenAISwarm
     end
 
     def run(agent:, messages:, context_variables: {}, model_override: nil, stream: false, debug: false, max_turns: Float::INFINITY, execute_tools: true)
+      agent_tracker = OpenAISwarm::Agents::ChangeTracker.new(agent)
       if stream
         return run_and_stream(
           agent: agent,
@@ -164,8 +167,11 @@ module OpenAISwarm
       init_len = messages.length
 
       while history.length - init_len < max_turns && active_agent
+        agent_tracker.update(active_agent)
+        history = OpenAISwarm::Util.latest_role_user_message(history) if agent_tracker.switch_agent_reset_message?
+
         completion = get_chat_completion(
-          active_agent,
+          agent_tracker,
           history,
           context_variables,
           model_override,
@@ -204,16 +210,21 @@ module OpenAISwarm
       )
     end
 
+    # TODO(Grayson): a lot of copied code here that will be refactored
     def run_and_stream(agent:, messages:, context_variables: {}, model_override: nil, debug: false, max_turns: Float::INFINITY, execute_tools: true)
+      agent_tracker = OpenAISwarm::Agents::ChangeTracker.new(agent)
       active_agent = agent
       context_variables = context_variables.dup
       history = messages.dup
       init_len = messages.length
 
       while history.length - init_len < max_turns && active_agent
+        agent_tracker.update(active_agent)
+        history = OpenAISwarm::Util.latest_role_user_message(history) if agent_tracker.switch_agent_reset_message?
+
         message = OpenAISwarm::Util.message_template(agent.name)
         completion = get_chat_completion(
-          active_agent,
+          agent_tracker,
           history,
           context_variables,
           model_override,

data/lib/ruby-openai-swarm/util.rb

@@ -1,5 +1,13 @@
 module OpenAISwarm
   module Util
+    class << self
+      def latest_role_user_message(history)
+        return history if history.empty?
+        filtered_messages = symbolize_keys_to_string(history.dup)
+        last_user_message = filtered_messages.reverse.find { |msg| msg['role'] == 'user' }
+        last_user_message ? [last_user_message] : history
+      end
+    end
     def self.debug_print(debug, *args)
       return unless debug
       timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")

data/lib/ruby-openai-swarm/version.rb

@@ -1,3 +1,3 @@
 module OpenAISwarm
-  VERSION = "0.2.9"
+  VERSION = "0.3.0.1"
 end

data/lib/ruby-openai-swarm.rb

@@ -1,6 +1,8 @@
 require 'ruby-openai-swarm/version'
 require 'ruby-openai-swarm/core_ext'
 require 'ruby-openai-swarm/agent'
+require 'ruby-openai-swarm/agents/change_tracker'
+require 'ruby-openai-swarm/agents/strategy_options'
 require 'ruby-openai-swarm/response'
 require 'ruby-openai-swarm/result'
 require 'ruby-openai-swarm/util'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-openai-swarm
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0.1
 platform: ruby
 authors:
 - Grayson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-14 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -106,6 +106,8 @@ files:
 - examples/weather_agent/run.rb
 - lib/ruby-openai-swarm.rb
 - lib/ruby-openai-swarm/agent.rb
+- lib/ruby-openai-swarm/agents/change_tracker.rb
+- lib/ruby-openai-swarm/agents/strategy_options.rb
 - lib/ruby-openai-swarm/configuration.rb
 - lib/ruby-openai-swarm/core.rb
 - lib/ruby-openai-swarm/core_ext.rb