swarm_sdk 2.7.3 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d0b44f3edf346a30b0442027c9ca2e8cf06e3e2c074c89f483c0eab0964a592
-  data.tar.gz: b7c690fd69303078c70c252a09a9e4f46b63f0f4a438a3fc9188cacc30e44109
+  metadata.gz: 6aaba8cabb5957715e88ee02e40e9492fe3546791c806d1ddaff95e967f77aba
+  data.tar.gz: 752d15e6e69bb1a9941212d1c33622d678dcc0dc734b88b77a845c7fca4e982b
 SHA512:
-  metadata.gz: e0881dd9ae7fefc423bdbad4d56d535be627b622f2301eae1c12858d8198f7f55472198f6413535bccd768b17368233ac24ca5d2ab58417cbee9a7a68e8cdc79
-  data.tar.gz: a2af0ea8bf741a017196ce6db4d17a7b1bdc9fed2e517c35ae17c2336b950d25300186970f15b746fbc7dfd5c2679a53b9596d9f675c5a44089dc10672d542a0
+  metadata.gz: 36532a008bbb328cddf60bca55d7d8e210b2c0701ca546190164a16067d3878e26c6c4a6d347e9f262669c34289bad7ac0ddd714062a6d4ab9807e0ef5fd9dc5
+  data.tar.gz: e7e512794d27d5bd378ea1c96e66f18683cbab8c95e3820672bd74174e0fd5963894958a61aa2e7cf40485c908a7a7adf6a7cbda9d7bfdd480ccd0c3156e4d15

data/lib/swarm_sdk/agent/chat_helpers/llm_configuration.rb

@@ -117,6 +117,9 @@ module SwarmSDK
         def build_custom_context(provider:, base_url:, timeout:)
           RubyLLM.context do |config|
             config.request_timeout = timeout
+            # Set read_timeout to match request_timeout for streaming support
+            # This ensures long gaps between chunks (model thinking) don't cause timeouts
+            config.read_timeout = SwarmSDK.config.llm_read_timeout || timeout
 
             configure_provider_base_url(config, provider, base_url) if base_url
           end

data/lib/swarm_sdk/config.rb

@@ -56,6 +56,15 @@ module SwarmSDK
       gpustack_api_key: [:gpustack_api_key, "GPUSTACK_API_KEY"],
     }.freeze
 
+    # RubyLLM connection settings that proxy to RubyLLM.config
+    # Maps SwarmSDK config key => [RubyLLM config key, ENV variable, default value]
+    RUBYLLM_CONNECTION_MAPPINGS = {
+      llm_request_timeout: [:request_timeout, "SWARM_SDK_LLM_REQUEST_TIMEOUT", 300],
+      llm_read_timeout: [:read_timeout, "SWARM_SDK_LLM_READ_TIMEOUT", nil], # nil = use request_timeout
+      llm_open_timeout: [:open_timeout, "SWARM_SDK_LLM_OPEN_TIMEOUT", 30],
+      llm_write_timeout: [:write_timeout, "SWARM_SDK_LLM_WRITE_TIMEOUT", 30],
+    }.freeze
+
     # SwarmSDK defaults that can be overridden
     # Maps config key => [ENV variable, default proc]
     DEFAULTS_MAPPINGS = {
@@ -152,6 +161,46 @@ module SwarmSDK
       end
     end
 
+    # ========== RubyLLM Connection Accessors (with RubyLLM proxying) ==========
+
+    # @!method llm_request_timeout
+    #   Get the LLM request timeout (seconds)
+    #   @return [Integer] The timeout (default: 300)
+    #
+    # @!method llm_read_timeout
+    #   Get the LLM read timeout (seconds) - time to wait between chunks
+    #   @return [Integer, nil] The timeout (nil = use request_timeout)
+    #
+    # @!method llm_open_timeout
+    #   Get the LLM connection open timeout (seconds)
+    #   @return [Integer] The timeout (default: 30)
+    #
+    # @!method llm_write_timeout
+    #   Get the LLM write timeout (seconds)
+    #   @return [Integer] The timeout (default: 30)
+
+    RUBYLLM_CONNECTION_MAPPINGS.each_key do |config_key|
+      ruby_llm_key, _env_key, default_value = RUBYLLM_CONNECTION_MAPPINGS[config_key]
+
+      # Getter with default fallback
+      define_method(config_key) do
+        ensure_env_loaded!
+        if @explicit_values.key?(config_key)
+          @explicit_values[config_key]
+        elsif @env_values.key?(config_key)
+          @env_values[config_key]
+        else
+          default_value
+        end
+      end
+
+      # Setter with RubyLLM proxying
+      define_method("#{config_key}=") do |value|
+        @explicit_values[config_key] = value
+        RubyLLM.config.public_send("#{ruby_llm_key}=", value)
+      end
+    end
+
     # ========== Defaults Accessors (with module constant fallback) ==========
 
     # @!method default_model
@@ -256,6 +305,18 @@ module SwarmSDK
         RubyLLM.config.public_send("#{ruby_llm_key}=", value)
       end
 
+      # Load RubyLLM connection settings and proxy to RubyLLM
+      RUBYLLM_CONNECTION_MAPPINGS.each do |config_key, (ruby_llm_key, env_key, _default)|
+        next if @explicit_values.key?(config_key)
+        next unless ENV.key?(env_key)
+
+        value = parse_env_value(ENV[env_key], config_key)
+        @env_values[config_key] = value
+
+        # Proxy to RubyLLM
+        RubyLLM.config.public_send("#{ruby_llm_key}=", value)
+      end
+
       # Load defaults (no RubyLLM proxy)
       DEFAULTS_MAPPINGS.each do |config_key, (env_key, _default_proc)|
         next if @explicit_values.key?(config_key)

data/lib/swarm_sdk/tools/delegate.rb

@@ -84,6 +84,11 @@ module SwarmSDK
         desc: "Message to send to the agent - can be a work request, question, or collaboration message",
         required: true
 
+      param :reset_context,
+        type: "boolean",
+        desc: "Reset the agent's conversation history before sending the message. Use it to recover from 'prompt too long' errors or other 4XX errors.",
+        required: false
+
       # Override name to return custom delegation tool name
       def name
         @tool_name
@@ -92,8 +97,9 @@ module SwarmSDK
       # Execute delegation with pre/post hooks
       #
       # @param message [String] Message to send to the agent
+      # @param reset_context [Boolean] Whether to reset the agent's conversation history before delegation
       # @return [String] Result from delegate agent or error message
-      def execute(message:)
+      def execute(message:, reset_context: false)
         # Access swarm infrastructure
         call_stack = @swarm.delegation_call_stack
         hook_registry = @swarm.hook_registry
@@ -140,10 +146,10 @@ module SwarmSDK
         # Determine delegation type and proceed
         delegation_result = if @delegate_chat
           # Delegate to agent
-          delegate_to_agent(message, call_stack)
+          delegate_to_agent(message, call_stack, reset_context: reset_context)
         elsif swarm_registry&.registered?(@delegate_target)
           # Delegate to registered swarm
-          delegate_to_swarm(message, call_stack, swarm_registry)
+          delegate_to_swarm(message, call_stack, swarm_registry, reset_context: reset_context)
         else
           raise ConfigurationError, "Unknown delegation target: #{@delegate_target}"
         end
@@ -222,13 +228,15 @@ module SwarmSDK
       #
       # @param message [String] Message to send to the agent
       # @param call_stack [Array] Delegation call stack for circular dependency detection
+      # @param reset_context [Boolean] Whether to reset the agent's conversation history before delegation
       # @return [String] Result from agent
-      def delegate_to_agent(message, call_stack)
+      def delegate_to_agent(message, call_stack, reset_context: false)
         # Push delegate target onto call stack to track delegation chain
         call_stack.push(@delegate_target)
         begin
-          # Clear conversation if preserve_context is false
-          @delegate_chat.clear_conversation unless @preserve_context
+          # Clear conversation if reset_context is true OR if preserve_context is false
+          # reset_context takes precedence as it's an explicit request
+          @delegate_chat.clear_conversation if reset_context || !@preserve_context
 
           response = @delegate_chat.ask(message, source: "delegation")
           response.content
@@ -243,20 +251,24 @@ module SwarmSDK
       # @param message [String] Message to send to the swarm
       # @param call_stack [Array] Delegation call stack for circular dependency detection
       # @param swarm_registry [SwarmRegistry] Registry for sub-swarms
+      # @param reset_context [Boolean] Whether to reset the swarm's conversation history before delegation
       # @return [String] Result from swarm's lead agent
-      def delegate_to_swarm(message, call_stack, swarm_registry)
+      def delegate_to_swarm(message, call_stack, swarm_registry, reset_context: false)
         # Load sub-swarm (lazy load + cache)
         subswarm = swarm_registry.load_swarm(@delegate_target)
 
         # Push delegate target onto call stack to track delegation chain
         call_stack.push(@delegate_target)
         begin
+          # Reset swarm if reset_context is true
+          swarm_registry.reset(@delegate_target) if reset_context
+
           # Execute sub-swarm's lead agent
           lead_agent = subswarm.agents[subswarm.lead_agent]
           response = lead_agent.ask(message, source: "delegation")
           result = response.content
 
-          # Reset if keep_context: false
+          # Reset if keep_context: false (standard behavior)
           swarm_registry.reset_if_needed(@delegate_target)
 
           result

data/lib/swarm_sdk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwarmSDK
-  VERSION = "2.7.3"
+  VERSION = "2.7.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swarm_sdk
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.5
 platform: ruby
 authors:
 - Paulo Arruda
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.6
+        version: 1.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.6
+        version: 1.9.7
 - !ruby/object:Gem::Dependency
   name: ruby_llm_swarm-mcp
   requirement: !ruby/object:Gem::Requirement