Move Provider Concerns into folder

Author: sirwolfgang

lib/active_agent/generation_provider/_base_provider.rb

@@ -1,7 +1,5 @@
-# lib/active_agent/generation_provider/base.rb
-
-require_relative "error_handling"
-require_relative "parameter_builder"
+require_relative "concerns/error_handling"
+require_relative "concerns/parameter_builder"
 
 module ActiveAgent
   module GenerationProvider

lib/active_agent/generation_provider/anthropic_provider.rb

@@ -10,9 +10,9 @@
 require "active_agent/action_prompt/action"
 require_relative "_base_provider"
 require_relative "response"
-require_relative "stream_processing"
-require_relative "message_formatting"
-require_relative "tool_management"
+require_relative "concerns/stream_processing"
+require_relative "concerns/message_formatting"
+require_relative "concerns/tool_management"
 
 module ActiveAgent
   module GenerationProvider

lib/active_agent/generation_provider/error_handling.rb renamed to lib/active_agent/generation_provider/concerns/error_handling.rb

@@ -47,7 +47,7 @@ def retry_delay(attempt)
       def handle_generation_error(error)
         error_message = format_error_message(error)
         # Create new error with original backtrace preserved
-        new_error = ActiveAgent::GenerationProvider::Base::GenerationProviderError.new(error_message)
+        new_error = ActiveAgent::GenerationProvider::BaseProvider::GenerationProviderError.new(error_message)
         new_error.set_backtrace(error.backtrace) if error.respond_to?(:backtrace)
 
         # Log detailed error if verbose mode is enabled

lib/active_agent/generation_provider/message_formatting.rb renamed to lib/active_agent/generation_provider/concerns/message_formatting.rb

@@ -9,9 +9,9 @@
 require_relative "_base_provider"
 require_relative "response"
 require_relative "responses_adapter"
-require_relative "stream_processing"
-require_relative "message_formatting"
-require_relative "tool_management"
+require_relative "concerns/stream_processing"
+require_relative "concerns/message_formatting"
+require_relative "concerns/tool_management"
 
 module ActiveAgent
   module GenerationProvider

lib/active_agent/generation_provider/parameter_builder.rb renamed to lib/active_agent/generation_provider/concerns/parameter_builder.rb

@@ -2,8 +2,7 @@
 
 require "test_helper"
 require "active_support/rescuable"
-require "active_agent/generation_provider/base"
-require "active_agent/generation_provider/error_handling"
+require "active_agent/generation_provider/_base_provider"
 
 class ErrorHandlingTest < ActiveSupport::TestCase
   class TestError < StandardError; end
@@ -42,7 +41,7 @@ def operation_that_succeeds_on_retry
 
   test "with_error_handling uses rescue_with_handler" do
     # The default rescue_from StandardError handler will convert to GenerationProviderError
-    error = assert_raises(ActiveAgent::GenerationProvider::Base::GenerationProviderError) do
+    error = assert_raises(ActiveAgent::GenerationProvider::BaseProvider::GenerationProviderError) do
       @provider.with_error_handling do
         @provider.operation_that_fails
       end
@@ -53,7 +52,7 @@ def operation_that_succeeds_on_retry
 
   test "preserves original backtrace" do
     original_line = nil
-    error = assert_raises(ActiveAgent::GenerationProvider::Base::GenerationProviderError) do
+    error = assert_raises(ActiveAgent::GenerationProvider::BaseProvider::GenerationProviderError) do
       @provider.with_error_handling do
         original_line = __LINE__ + 1
         raise TestError, "With backtrace"
@@ -79,7 +78,7 @@ def operation_that_succeeds_on_retry
     @provider.class.retry_on_errors = [ TestError ]
     @provider.class.max_retries = 2
 
-    assert_raises(ActiveAgent::GenerationProvider::Base::GenerationProviderError) do
+    assert_raises(ActiveAgent::GenerationProvider::BaseProvider::GenerationProviderError) do
       @provider.with_error_handling do
         @provider.operation_that_fails
       end
@@ -243,7 +242,7 @@ class VerboseProvider < TestProvider
     @provider.class.retry_on_errors = []
     @provider.class.max_retries = 3
 
-    assert_raises(ActiveAgent::GenerationProvider::Base::GenerationProviderError) do
+    assert_raises(ActiveAgent::GenerationProvider::BaseProvider::GenerationProviderError) do
       @provider.with_error_handling do
         @provider.operation_that_fails
       end
@@ -293,7 +292,7 @@ class VerboseProvider < TestProvider
     @provider.config = { "logger" => logger }
 
     error = TestError.new("Original error")
-    assert_raises(ActiveAgent::GenerationProvider::Base::GenerationProviderError) do
+    assert_raises(ActiveAgent::GenerationProvider::BaseProvider::GenerationProviderError) do
       @provider.send(:handle_generation_error, error)
     end
 
@@ -304,7 +303,7 @@ class VerboseProvider < TestProvider
     # This test would require mocking ActiveSupport::Notifications
     # For now, just ensure the method doesn't error
     error = TestError.new("Test")
-    wrapped = ActiveAgent::GenerationProvider::Base::GenerationProviderError.new("Wrapped")
+    wrapped = ActiveAgent::GenerationProvider::BaseProvider::GenerationProviderError.new("Wrapped")
 
     assert_nothing_raised do
       @provider.send(:instrument_error, error, wrapped)

lib/active_agent/generation_provider/stream_processing.rb renamed to lib/active_agent/generation_provider/concerns/stream_processing.rb

@@ -2,8 +2,7 @@
 
 require "test_helper"
 require "active_agent/action_prompt/message"
-require "active_agent/action_prompt/action"
-require "active_agent/generation_provider/message_formatting"
+require "active_agent/generation_provider/_base_provider"
 
 class MessageFormattingTest < ActiveSupport::TestCase
   class TestProvider