aia 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae5c7e9497837763b36226f8fc44aeb7dffe692c964e450938ff83aea043c10a
-  data.tar.gz: b839a219cb3f6e5b34d9aa02ff7f3ced77ff039816b6b2a3d9ef79076d32c302
+  metadata.gz: 41c2c4e145f3bc6789b0de6e444a7d71352abd3bdf9e97ad487539271db28584
+  data.tar.gz: 8057296778317494811114aa4692755ab45038dbccf06f14e47d43d7afe8b3d6
 SHA512:
-  metadata.gz: 7df6fe4bbf0fd2ce33b9827390340d3cf1f8fd5ad5b4f52ceb343769dee6d699ab87c5dd2686472cd480bf5ac1e20b612f5c69e70b72eab68735560601423d7c
-  data.tar.gz: 9fa99822319f6e3ff213f62ba0c26121c045e4fa96035596df46b4d723df72cecb19c1abb98f760e6b435941a3cc9b869f6401da771452c3d226930b4f4ea104
+  metadata.gz: e76f4aff3f181f6bcb710241fae8f41b0642bb2250f0dafd8fcf54220d044f01a9698288bbdbae5ac0c62b8b4834b262ed55b25e11dfa09252118f0be4cc2664
+  data.tar.gz: 0c61d610e09ae223ea8694fc18700cb5aa73a14a098a2038f9ab8f2e8c8879f50b210c516f0e4cc53309de1e7f272f85646550296a31830585b749935c26a687

data/.version

@@ -1 +1 @@
-0.9.17
+0.9.18

data/lib/aia/ruby_llm_adapter.rb

@@ -243,10 +243,6 @@ module AIA
 
 
     def chat(prompt)
-      puts "[DEBUG RubyLLMAdapter.chat] Received prompt class: #{prompt.class}" if AIA.config.debug
-      puts "[DEBUG RubyLLMAdapter.chat] Prompt inspect: #{prompt.inspect[0..500]}..." if AIA.config.debug
-      puts "[DEBUG RubyLLMAdapter.chat] Models: #{@models.inspect}" if AIA.config.debug
-
       result = if @models.size == 1
         # Single model - use the original behavior
         single_model_chat(prompt, @models.first)
@@ -255,42 +251,29 @@ module AIA
         multi_model_chat(prompt)
       end
 
-      puts "[DEBUG RubyLLMAdapter.chat] Returning result class: #{result.class}" if AIA.config.debug
-      puts "[DEBUG RubyLLMAdapter.chat] Result inspect: #{result.inspect[0..500]}..." if AIA.config.debug
       result
     end
 
     def single_model_chat(prompt, model_name)
-      puts "[DEBUG single_model_chat] Model name: #{model_name}" if AIA.config.debug
       chat_instance = @chats[model_name]
-      puts "[DEBUG single_model_chat] Chat instance: #{chat_instance.class}" if AIA.config.debug
-
       modes = chat_instance.model.modalities
-      puts "[DEBUG single_model_chat] Modalities: #{modes.inspect}" if AIA.config.debug
 
       # TODO: Need to consider how to handle multi-mode models
       result = if modes.text_to_text?
-        puts "[DEBUG single_model_chat] Using text_to_text_single" if AIA.config.debug
         text_to_text_single(prompt, model_name)
       elsif modes.image_to_text?
-        puts "[DEBUG single_model_chat] Using image_to_text_single" if AIA.config.debug
         image_to_text_single(prompt, model_name)
       elsif modes.text_to_image?
-        puts "[DEBUG single_model_chat] Using text_to_image_single" if AIA.config.debug
         text_to_image_single(prompt, model_name)
       elsif modes.text_to_audio?
-        puts "[DEBUG single_model_chat] Using text_to_audio_single" if AIA.config.debug
         text_to_audio_single(prompt, model_name)
       elsif modes.audio_to_text?
-        puts "[DEBUG single_model_chat] Using audio_to_text_single" if AIA.config.debug
         audio_to_text_single(prompt, model_name)
       else
-        puts "[DEBUG single_model_chat] No matching modality!" if AIA.config.debug
         # TODO: what else can be done?
         "Error: No matching modality for model #{model_name}"
       end
 
-      puts "[DEBUG single_model_chat] Result class: #{result.class}" if AIA.config.debug
       result
     end
 
@@ -672,29 +655,15 @@ module AIA
       chat_instance = @chats[model_name]
       text_prompt = extract_text_prompt(prompt)
 
-      puts "[DEBUG RubyLLMAdapter] Sending to model #{model_name}: #{text_prompt[0..100]}..." if AIA.config.debug
-
       response = if AIA.config.context_files.empty?
                    chat_instance.ask(text_prompt)
                  else
                    chat_instance.ask(text_prompt, with: AIA.config.context_files)
                  end
 
-      # Debug output to understand the response structure
-      puts "[DEBUG RubyLLMAdapter] Response class: #{response.class}" if AIA.config.debug
-      puts "[DEBUG RubyLLMAdapter] Response inspect: #{response.inspect[0..500]}..." if AIA.config.debug
-
-      if response.respond_to?(:content)
-        puts "[DEBUG RubyLLMAdapter] Response content: #{response.content[0..200]}..." if AIA.config.debug
-      else
-        puts "[DEBUG RubyLLMAdapter] Response (no content method): #{response.to_s[0..200]}..." if AIA.config.debug
-      end
-
       # Return the full response object to preserve token information
       response
     rescue StandardError => e
-      puts "[DEBUG RubyLLMAdapter] Error in text_to_text_single: #{e.class} - #{e.message}" if AIA.config.debug
-      puts "[DEBUG RubyLLMAdapter] Backtrace: #{e.backtrace[0..5].join("\n")}" if AIA.config.debug
       e.message
     end
 

data/lib/extensions/ruby_llm/provider_fix.rb

@@ -1,34 +1,79 @@
 # lib/extensions/ruby_llm/provider_fix.rb
 #
-# Monkey patch to fix LM Studio compatibility with RubyLLM Provider
+# Monkey patch to fix LM Studio compatibility with RubyLLM
 # LM Studio sometimes returns response.body as a String that fails JSON parsing
 # This causes "String does not have #dig method" errors in parse_error
 
+# Load RubyLLM first to ensure Provider class exists
+require 'ruby_llm'
+
 module RubyLLM
-  class Provider
+  module ProviderErrorFix
     # Override the parse_error method to handle String responses from LM Studio
+    # Parses error response from provider API.
+    #
+    # Supports two error formats:
+    # 1. OpenAI standard: {"error": {"message": "...", "type": "...", "code": "..."}}
+    # 2. Simple format: {"error": "error message"}
+    #
+    # @param response [Faraday::Response] The HTTP response
+    # @return [String, nil] The error message or nil if parsing fails
+    #
+    # @example OpenAI format
+    #   response = double(body: '{"error": {"message": "Rate limit exceeded"}}')
+    #   parse_error(response) #=> "Rate limit exceeded"
+    #
+    # @example Simple format (LM Studio, some local providers)
+    #   response = double(body: '{"error": "Token limit exceeded"}')
+    #   parse_error(response) #=> "Token limit exceeded"
     def parse_error(response)
       return if response.body.empty?
 
       body = try_parse_json(response.body)
-
-      # Be more explicit about type checking to prevent String#dig errors
       case body
       when Hash
-        # Only call dig if we're certain it's a Hash
-        body.dig('error', 'message')
+        # Handle both formats:
+        # - {"error": "message"}          (LM Studio, some providers)
+        # - {"error": {"message": "..."}} (OpenAI standard)
+        error_value = body['error']
+        return nil unless error_value
+
+        case error_value
+        when Hash
+          error_value['message']
+        when String
+          error_value
+        else
+          error_value.to_s if error_value
+        end
       when Array
-        # Only call dig on array elements if they're Hashes
         body.filter_map do |part|
-          part.is_a?(Hash) ? part.dig('error', 'message') : part.to_s
+          next unless part.is_a?(Hash)
+
+          error_value = part['error']
+          next unless error_value
+
+          case error_value
+          when Hash then error_value['message']
+          when String then error_value
+          else error_value.to_s if error_value
+          end
         end.join('. ')
       else
-        # For Strings or any other type, convert to string
         body.to_s
       end
     rescue StandardError => e
-      # Fallback in case anything goes wrong
-      "Error parsing response: #{e.message}"
+      RubyLLM.logger.debug "Error parsing response: #{e.message}"
+      nil
     end
   end
-end
+end
+
+# Apply the prepend to all Provider subclasses
+# LM Studio uses the OpenAI provider, so we need to prepend to all provider classes
+RubyLLM::Provider.prepend(RubyLLM::ProviderErrorFix)
+
+# Also prepend to all registered provider classes
+RubyLLM::Provider.providers.each do |slug, provider_class|
+  provider_class.prepend(RubyLLM::ProviderErrorFix)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aia
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors:
 - Dewayne VanHoozer