last_llm 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d78bc33e36c3ef1607bf80d2c705270be6cbbb52461d5fed514472883362887a
-  data.tar.gz: e9334a1daeac0a22c2f52062607aebd218d84aa99f36660ec3bfe2cecb46cb79
+  metadata.gz: e8d63b9fe1cfc2adcf7d290b1deee351c2dbdde0922931f6bdc950b47e882884
+  data.tar.gz: 2ce5e77677f5734d6aa300083e1d62345e7da9b57db87dec88b4eb0945f5a35f
 SHA512:
-  metadata.gz: c51e25832988833bb611154577739ebce7a294e6d2559cc7c0abb77139133baff47054db9fd64dab0e546aaa0448e84d5d1fdd4dbebdefd88474a9933aa84794
-  data.tar.gz: 315701e1f58d1ce6ad780f7a68e3bb254f71f35837e0648d4126285e00e51d1cb50a7eda065e2f60bf2d63cd6a3dfeddf60b739c057b9b1929d7d5bbb66f6893
+  metadata.gz: 99ebc99586238fa7bdc6464d01dba3ec0bb933488f2a9b61ca2201f93e97689cca59893628185649524582d4fa2da9be86867ebb7a4373b8b32ca0cc5e1459ea
+  data.tar.gz: ed0ebd17190f1797ff6f45523461fca9813066aedbb05fa13e7e9660cad567aa10d1f082655ab6d5c498116a330347a4f998d6e0118ee5cf940a76d81b3fff3e

data/lib/last_llm/providers/anthropic.rb

@@ -6,7 +6,23 @@ module LastLLM
   module Providers
     # Anthropic provider implementation
     class Anthropic < LastLLM::Provider
+      # API Configuration
       BASE_ENDPOINT = 'https://api.anthropic.com'
+      DEFAULT_MODEL = 'claude-3-5-haiku-latest'
+      API_VERSION = '2023-06-01'
+
+      # LLM Default Parameters
+      DEFAULT_TEMPERATURE = 0.2
+      DEFAULT_TOP_P = 0.8
+      DEFAULT_MAX_TOKENS = 4096
+      DEFAULT_MAX_TOKENS_OBJECT = 8192
+
+      # Response Configuration
+      SUCCESS_STATUS = 200
+
+      # Error Status Codes
+      UNAUTHORIZED_STATUS = 401
+      BAD_REQUEST_STATUS = 400
 
       def initialize(config)
         super(:anthropic, config)
@@ -14,31 +30,9 @@ module LastLLM
       end
 
       def generate_text(prompt, options = {})
-        options = options.dup
-        messages = format_messages(prompt, options)
-
-        body = {
-          model: options[:model] || @config[:model] || 'claude-3-5-haiku-latest',
-          messages: messages,
-          max_tokens: options[:max_tokens] || 8192,
-          temperature: options[:temperature] || 0.2,
-          top_p: options[:top_p] || 0.8,
-          stream: false
-        }
-
-        # Add system parameter if system prompt is provided
-        body[:system] = options[:system_prompt] if options[:system_prompt]
-
-        response = @conn.post('/v1/messages') do |req|
-          req.body = body.compact
+        make_request(prompt, options) do |result|
+          result.dig(:content, 0, :text).to_s
         end
-
-        result = parse_response(response)
-        content = result.dig(:content, 0, :text)
-
-        content.to_s
-      rescue Faraday::Error => e
-        handle_request_error(e)
       end
 
       def generate_object(prompt, schema, options = {})
@@ -47,31 +41,12 @@ module LastLLM
         formatted_prompt = LastLLM::StructuredOutput.format_prompt(prompt, schema)
 
         options[:system_prompt] = system_prompt
+        options[:max_tokens] ||= DEFAULT_MAX_TOKENS_OBJECT
 
-        body = {
-          model: options[:model] || @config[:model] || 'claude-3-5-haiku-latest',
-          messages: [{ role: 'user', content: formatted_prompt }],
-          max_tokens: options[:max_tokens] || 8192,
-          system: options[:system_prompt],
-          temperature: options[:temperature] || 0.2,
-          top_p: options[:top_p] || 0.8,
-          stream: false
-        }.compact
-
-        response = @conn.post('/v1/messages') do |req|
-          req.body = body
+        make_request(formatted_prompt, options) do |result|
+          content = result.dig(:content, 0, :text)
+          parse_json_response(content)
         end
-
-        result = parse_response(response)
-        content = result.dig(:content, 0, :text)
-
-        begin
-          JSON.parse(content, symbolize_names: true)
-        rescue JSON::ParserError => e
-          raise ApiError, "Invalid JSON response: #{e.message}"
-        end
-      rescue Faraday::Error => e
-        handle_request_error(e)
       end
 
       # Format a tool for Anthropic tools format
@@ -98,6 +73,31 @@ module LastLLM
 
       private
 
+      def make_request(prompt, options = {})
+        messages = format_messages(prompt, options)
+
+        body = {
+          model: options[:model] || @config[:model] || DEFAULT_MODEL,
+          messages: messages,
+          max_tokens: options[:max_tokens] || DEFAULT_MAX_TOKENS,
+          temperature: options[:temperature] || DEFAULT_TEMPERATURE,
+          top_p: options[:top_p] || DEFAULT_TOP_P,
+          stream: false
+        }
+
+        # Add system parameter if system prompt is provided
+        body[:system] = options[:system_prompt] if options[:system_prompt]
+
+        response = @conn.post('/v1/messages') do |req|
+          req.body = body.compact
+        end
+
+        result = parse_response(response)
+        yield(result)
+      rescue Faraday::Error => e
+        handle_request_error(e)
+      end
+
       def format_messages(prompt, options)
         if prompt.is_a?(Array) && prompt.all? { |m| m.is_a?(Hash) && m[:role] && m[:content] }
           # Extract system message if present
@@ -115,9 +115,23 @@ module LastLLM
         end
       end
 
+      def parse_json_response(content)
+        begin
+          JSON.parse(content, symbolize_names: true)
+        rescue JSON::ParserError => e
+          raise ApiError, "Invalid JSON response: #{e.message}"
+        end
+      end
+
       def setup_authorization(conn)
         conn.headers['x-api-key'] = @config[:api_key]
-        conn.headers['anthropic-version'] = '2023-06-01'
+        conn.headers['anthropic-version'] = API_VERSION
+      end
+
+      def handle_request_error(e)
+        message = "Anthropic API request failed: #{e.message}"
+        status = e.respond_to?(:response) && e.response.respond_to?(:status) ? e.response.status : nil
+        raise LastLLM::ApiError.new(message, status)
       end
     end
   end

data/lib/last_llm/providers/deepseek.rb

@@ -2,120 +2,131 @@
 
 require 'last_llm/providers/constants'
 
-# Deepseek provider implementation
-class Deepseek < LastLLM::Provider
-  BASE_ENDPOINT = 'https://api.deepseek.com'
+module LastLLM
+  module Providers
+    # Deepseek provider implementation
+    class Deepseek < LastLLM::Provider
+      # API Configuration
+      BASE_ENDPOINT = 'https://api.deepseek.com'
+      DEFAULT_MODEL = 'deepseek-chat'
+
+      # LLM Default Parameters
+      DEFAULT_TEMPERATURE = 0.7
+      DEFAULT_TOP_P = 0.8
+      DEFAULT_TEMPERATURE_OBJECT = 0.2
+
+      # Response Configuration
+      SUCCESS_STATUS = 200
+
+      # Error Status Codes
+      UNAUTHORIZED_STATUS = 401
+      BAD_REQUEST_STATUS = 400
+
+      def initialize(config)
+        super(Constants::DEEPSEEK, config)
+        @conn = connection(config[:base_url] || BASE_ENDPOINT)
+      end
 
-  def initialize(config)
-    super(Constants::DEEPSEEK, config)
-    @conn = connection(config[:base_url] || BASE_ENDPOINT)
-  end
+      def generate_text(prompt, options = {})
+        make_request(prompt, options) do |result|
+          result.dig(:choices, 0, :message, :content).to_s
+        end
+      end
 
-  def generate_text(prompt, options = {})
-    messages = format_messages(prompt, options)
-
-    response = @conn.post('/v1/chat/completions') do |req|
-      req.body = {
-        model: options[:model] || @config[:model] || 'deepseek-chat',
-        messages: messages,
-        temperature: options[:temperature] || 0.7,
-        top_p: options[:top_p] || 0.8,
-        max_tokens: options[:max_tokens],
-        stream: false
-      }.compact
-    end
+      def generate_object(prompt, schema, options = {})
+        system_prompt = 'You are a helpful assistant that responds with valid JSON.'
+        formatted_prompt = LastLLM::StructuredOutput.format_prompt(prompt, schema)
 
-    result = parse_response(response)
-    content = result.dig(:choices, 0, :message, :content)
+        options = options.dup
+        options[:system_prompt] = system_prompt
+        options[:temperature] ||= DEFAULT_TEMPERATURE_OBJECT
 
-    content.to_s
-  rescue Faraday::Error => e
-    handle_request_error(e)
-  end
-
-  def generate_object(prompt, schema, options = {})
-    system_prompt = 'You are a helpful assistant that responds with valid JSON.'
-    formatted_prompt = LastLLM::StructuredOutput.format_prompt(prompt, schema)
-
-    messages = [
-      { role: 'system', content: system_prompt },
-      { role: 'user', content: formatted_prompt }
-    ]
-
-    response = @conn.post('/v1/chat/completions') do |req|
-      req.body = {
-        model: options[:model] || @config[:model] || 'deepseek-chat',
-        messages: messages,
-        temperature: options[:temperature] || 0.2,
-        top_p: options[:top_p] || 0.8,
-        stream: false
-      }.compact
-    end
+        make_request(formatted_prompt, options) do |result|
+          content = result.dig(:choices, 0, :message, :content)
+          parse_json_response(content)
+        end
+      end
 
-    result = parse_response(response)
-    content = result.dig(:choices, 0, :message, :content)
-
-    begin
-      JSON.parse(content, symbolize_names: true)
-    rescue JSON::ParserError => e
-      # Try to clean markdown code blocks and parse again
-      content.gsub!("```json\n", '').gsub!("\n```", '')
-      begin
-        JSON.parse(content, symbolize_names: true)
-      rescue JSON::ParserError
-        raise LastLLM::ApiError, "Invalid JSON response: #{e.message}"
+      # Format a tool for Deepseek function calling
+      # @param tool [LastLLM::Tool] The tool to format
+      # @return [Hash] The tool in Deepseek format
+      def self.format_tool(tool)
+        {
+          type: 'function',
+          function: {
+            name: tool.name,
+            description: tool.description,
+            parameters: tool.parameters
+          }
+        }
       end
-    end
-  rescue Faraday::Error => e
-    handle_request_error(e)
-  end
 
-  private
-
-  def format_messages(prompt, options)
-    if prompt.is_a?(Array) && prompt.all? { |m| m.is_a?(Hash) && m[:role] && m[:content] }
-      prompt
-    elsif options[:system_prompt]
-      [
-        { role: 'system', content: options[:system_prompt] },
-        { role: 'user', content: prompt.to_s }
-      ]
-    else
-      [{ role: 'user', content: prompt.to_s }]
-    end
-  end
+      # Execute a tool from a Deepseek response
+      # @param tool [LastLLM::Tool] The tool to execute
+      # @param response [Hash] The Deepseek response containing tool call information
+      # @return [Hash, nil] The result of the function call or nil if the tool wasn't called
+      def self.execute_tool(tool, response)
+        tool_call = response.dig(:choices, 0, :message, :tool_calls)&.first
+        return nil unless tool_call && tool_call[:function][:name] == tool.name
 
-  # Format a tool for Deepseek function calling
-  # @param tool [LastLLM::Tool] The tool to format
-  # @return [Hash] The tool in Deepseek format
-  def self.format_tool(tool)
-    {
-      type: 'function',
-      function: {
-        name: tool.name,
-        description: tool.description,
-        parameters: tool.parameters
-      }
-    }
-  end
+        arguments = JSON.parse(tool_call[:function][:arguments], symbolize_names: true)
+        tool.call(arguments)
+      end
 
-  # Execute a tool from a Deepseek response
-  # @param tool [LastLLM::Tool] The tool to execute
-  # @param response [Hash] The Deepseek response containing tool call information
-  # @return [Hash, nil] The result of the function call or nil if the tool wasn't called
-  def self.execute_tool(tool, response)
-    tool_call = response.dig(:choices, 0, :message, :tool_calls)&.first
-    return nil unless tool_call && tool_call[:function][:name] == tool.name
+      private
+
+      def make_request(prompt, options = {})
+        messages = format_messages(prompt, options)
+
+        response = @conn.post('/v1/chat/completions') do |req|
+          req.body = {
+            model: options[:model] || @config[:model] || DEFAULT_MODEL,
+            messages: messages,
+            temperature: options[:temperature] || DEFAULT_TEMPERATURE,
+            top_p: options[:top_p] || DEFAULT_TOP_P,
+            max_tokens: options[:max_tokens],
+            stream: false
+          }.compact
+        end
+
+        result = parse_response(response)
+        yield(result)
+      rescue Faraday::Error => e
+        handle_request_error(e)
+      end
 
-    arguments = JSON.parse(tool_call[:function][:arguments], symbolize_names: true)
-    tool.call(arguments)
-  end
-end
+      def format_messages(prompt, options)
+        if prompt.is_a?(Array) && prompt.all? { |m| m.is_a?(Hash) && m[:role] && m[:content] }
+          prompt
+        elsif options[:system_prompt]
+          [
+            { role: 'system', content: options[:system_prompt] },
+            { role: 'user', content: prompt.to_s }
+          ]
+        else
+          [{ role: 'user', content: prompt.to_s }]
+        end
+      end
 
-# Also define it in the LastLLM::Providers namespace for consistency
-module LastLLM
-  module Providers
-    # Reference to the Deepseek class defined above
-    Deepseek = ::Deepseek
+      def parse_json_response(content)
+        begin
+          JSON.parse(content, symbolize_names: true)
+        rescue JSON::ParserError => e
+          # Try to clean markdown code blocks and parse again
+          content.gsub!("```json\n", '').gsub!("\n```", '')
+          begin
+            JSON.parse(content, symbolize_names: true)
+          rescue JSON::ParserError
+            raise LastLLM::ApiError, "Invalid JSON response: #{e.message}"
+          end
+        end
+      end
+
+      def handle_request_error(error)
+        message = "Deepseek API request failed: #{error.message}"
+        status = error.respond_to?(:response) && error.response.respond_to?(:status) ? error.response.status : nil
+        raise LastLLM::ApiError.new(message, status)
+      end
+    end
   end
 end