ruby-openai-swarm 0.3.0 → 0.3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161226570a77888c84129d825b862ab7868f1d9f54b233eee7ab13950427678e
-  data.tar.gz: e976c2a6bb9dae417b53fdc8f3f8216d3346a295b7e18838d89d24faff5612ce
+  metadata.gz: 98aa27742c5ae980d9c1c8b9457beb2e61a4ff3a1548790d4205cd0f68cef039
+  data.tar.gz: 37d7a5280f47c2a454a2aba4a5f64587787f1e829fc07b6c27accc90f63f91f8
 SHA512:
-  metadata.gz: 65cb09238a9e1ee5fb57d2cd9e73b56d0259bafc3dc19290e449a5db75fefce0d0cf92e65a946f525c5e6571db70e813edaa11a26c436d2a3c28c3baa88bff9f
-  data.tar.gz: d90997ebfbbf64a4d9a815510db0653e07f73f2c7b53e5d5837bcfc760589ecabeca2aba87a799b92f67c1c7c82baa3cd64c44445390e6896bae16d8a5aa67e9
+  metadata.gz: 0d671ef9fa72e895bfd3b3e62561fccfc3894a6f19605dd43e68da14b0c9f958d22559da8d9eecd981277a7db035ed39c17535f261cf40849f16a95ac6884516
+  data.tar.gz: 96c6229510613dbb8b858200916bb9ab22583b7918d604adae0b1bc85bb5b89cfae28a6c833b8c16b2acc1758d1d89643c61f240c896ff6d1d3153536801b46d

data/Gemfile.lock

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

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

@@ -36,7 +36,7 @@ module OpenAISwarm
       @parallel_tool_calls = parallel_tool_calls
       @resource = resource
       @noisy_tool_calls = noisy_tool_calls
-      @strategy = AgentStrategyOptions.new(strategy)
+      @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

@@ -148,7 +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::AgentChangeTracker.new(agent)
+      agent_tracker = OpenAISwarm::Agents::ChangeTracker.new(agent)
       if stream
         return run_and_stream(
           agent: agent,
@@ -168,7 +168,7 @@ module OpenAISwarm
 
       while history.length - init_len < max_turns && active_agent
         agent_tracker.update(active_agent)
-        history = [history.first] if agent_tracker.switch_agent_reset_message?
+        history = OpenAISwarm::Util.latest_role_user_message(history) if agent_tracker.switch_agent_reset_message?
 
         completion = get_chat_completion(
           agent_tracker,
@@ -212,7 +212,7 @@ module OpenAISwarm
 
     # 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::AgentChangeTracker.new(agent)
+      agent_tracker = OpenAISwarm::Agents::ChangeTracker.new(agent)
       active_agent = agent
       context_variables = context_variables.dup
       history = messages.dup
@@ -220,7 +220,7 @@ module OpenAISwarm
 
       while history.length - init_len < max_turns && active_agent
         agent_tracker.update(active_agent)
-        history = [history.first] if agent_tracker.switch_agent_reset_message?
+        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(

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.3.0"
+  VERSION = "0.3.0.1"
 end

data/lib/ruby-openai-swarm.rb

@@ -1,8 +1,8 @@
 require 'ruby-openai-swarm/version'
 require 'ruby-openai-swarm/core_ext'
 require 'ruby-openai-swarm/agent'
-require 'ruby-openai-swarm/agent_change_tracker'
-require 'ruby-openai-swarm/agent_strategy_options'
+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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-openai-swarm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.0.1
 platform: ruby
 authors:
 - Grayson
@@ -106,8 +106,8 @@ files:
 - examples/weather_agent/run.rb
 - lib/ruby-openai-swarm.rb
 - lib/ruby-openai-swarm/agent.rb
-- lib/ruby-openai-swarm/agent_change_tracker.rb
-- lib/ruby-openai-swarm/agent_strategy_options.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

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

@@ -1,22 +0,0 @@
-module OpenAISwarm
-  class AgentChangeTracker
-    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

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

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