ai-chat 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece58b865d212ce788931ee3e7322b457bbe6ed8495e4374b55ecf697b44e55c
-  data.tar.gz: dd4bf5e24a5190eba63c662d93dcaaad24886b7f16cfbec5aebc37a9f3530cd9
+  metadata.gz: 1693a4828234dc84df802bd990518caf2bb235ce71753b471216b143aa90eff0
+  data.tar.gz: 574821abde32e11bd88a2651d4e0b1ed88a1fc6f76703024f2bbde4622b6306a
 SHA512:
-  metadata.gz: dcb3587c00724b1da3d04adb2b9a7413225680b80971bd08db127edab6d7f18e52958b7511f3aa7e13cb95f40961f8889cae3f0cc892913930547d5a7887d452
-  data.tar.gz: e831f86fecfa31cf28df66910fc6ca98c66a9ad8290709431a0e5e9b8a6e31965ba7af9d5a00dbcf3f907427abe8901abf23a1cd136b26bc2ebffe260b6334ed
+  metadata.gz: 6046630107863b4f79b17b1c95384af5335a3769800fe8dfa8dbb5a5a28dea4ed3797b1d40e391f79c4567fb83eaef18eba3cbb3ef4f5bab796a0cda2af3d393
+  data.tar.gz: f8836dfc5b2c50c2682a865f97e52f5f5e6f6569a1b1a4de09619f3d9a12ee9184c8e9fd06f5004c5f3d62171adef1aaa8fa929336e5c335c29ffe72e25648d2

data/ai-chat.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "ai-chat"
-  spec.version = "0.5.0"
+  spec.version = "0.5.3"
   spec.authors = ["Raghu Betina", "Jelani Woods"]
   spec.email = ["raghu@firstdraft.com", "jelani@firstdraft.com"]
   spec.homepage = "https://github.com/firstdraft/ai-chat"
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
     "source_code_uri" => "https://github.com/firstdraft/ai-chat"
   }
 
-  spec.required_ruby_version = "~> 3.2"
+  spec.required_ruby_version = ">= 3.2"
   spec.add_runtime_dependency "openai", "~> 0.34"
   spec.add_runtime_dependency "marcel", "~> 1.0"
   spec.add_runtime_dependency "base64", "~> 0.1", "> 0.1.1"

data/lib/ai/chat.rb

@@ -11,8 +11,6 @@ require "fileutils"
 require "tty-spinner"
 require "timeout"
 
-require_relative "http"
-
 module AI
   # :reek:MissingSafeMethod { exclude: [ generate! ] }
   # :reek:TooManyMethods
@@ -20,24 +18,23 @@ module AI
   # :reek:InstanceVariableAssumption
   # :reek:IrresponsibleModule
   class Chat
-    include AI::Http
-
     # :reek:Attribute
-    attr_accessor :background, :code_interpreter, :conversation_id, :image_generation, :image_folder, :messages, :model, :proxy, :reasoning_effort, :web_search
-    attr_reader :client, :last_response_id, :schema, :schema_file
+    attr_accessor :background, :code_interpreter, :conversation_id, :image_generation, :image_folder, :messages, :model, :reasoning_effort, :web_search
+    attr_reader :client, :last_response_id, :proxy, :schema, :schema_file
 
-    PROXY_URL = "https://prepend.me/"
+    BASE_PROXY_URL = "https://prepend.me/api.openai.com/v1"
 
     def initialize(api_key: nil, api_key_env_var: "OPENAI_API_KEY")
       @api_key = api_key || ENV.fetch(api_key_env_var)
+      @proxy = false
       @messages = []
       @reasoning_effort = nil
       @model = "gpt-5.2"
       @client = OpenAI::Client.new(api_key: @api_key)
       @last_response_id = nil
-      @proxy = false
       @image_generation = false
       @image_folder = "./images"
+      @api_key_validated = false
     end
 
     def self.generate_schema!(description, location: "schema.json", api_key: nil, api_key_env_var: "OPENAI_API_KEY", proxy: false)
@@ -45,34 +42,25 @@ module AI
       prompt_path = File.expand_path("../prompts/schema_generator.md", __dir__)
       system_prompt = File.read(prompt_path)
 
-      json = if proxy
-        uri = URI(PROXY_URL + "api.openai.com/v1/responses")
-        parameters = {
-          model: "gpt-5.2",
-          input: [
-            {role: :system, content: system_prompt},
-            {role: :user, content: description}
-          ],
-          text: {format: {type: "json_object"}},
-          reasoning: {effort: "high"}
-        }
+      options = {
+        api_key: api_key,
+        base_url: proxy ? BASE_PROXY_URL : nil
+      }.compact
 
-        send_request(uri, content_type: "json", parameters: parameters, method: "post")
-      else
-        client = OpenAI::Client.new(api_key: api_key)
-        response = client.responses.create(
-          model: "gpt-5.2",
-          input: [
-            {role: :system, content: system_prompt},
-            {role: :user, content: description}
-          ],
-          text: {format: {type: "json_object"}},
-          reasoning: {effort: "high"}
-        )
+      client = OpenAI::Client.new(**options)
+      response = client.responses.create(
+        model: "gpt-5.2",
+        input: [
+          {role: :system, content: system_prompt},
+          {role: :user, content: description}
+        ],
+        text: {format: {type: "json_object"}},
+        reasoning: {effort: "high"}
+      )
+
+      output_text = response.output_text
+      json = JSON.parse(output_text)
 
-        output_text = response.output_text
-        JSON.parse(output_text)
-      end
       content = JSON.pretty_generate(json)
       if location
         path = Pathname.new(location)
@@ -146,7 +134,7 @@ module AI
     # :reek:NilCheck
     # :reek:TooManyStatements
     def generate!
-      validate_api_key
+      validate_api_key unless @api_key_validated
       response = create_response
       parse_response(response)
 
@@ -167,6 +155,19 @@ module AI
       parse_response(response)
     end
 
+    def proxy=(value)
+      @proxy = value
+      if value
+        @client = OpenAI::Client.new(
+          api_key: @api_key,
+          base_url: BASE_PROXY_URL
+        )
+      else
+        @client = OpenAI::Client.new(api_key: @api_key)
+      end
+      value
+    end
+
     def schema=(value)
       if value.is_a?(String)
         parsed = JSON.parse(value, symbolize_names: true)
@@ -191,29 +192,7 @@ module AI
     def get_items(order: :asc)
       raise "No conversation_id set. Call generate! first to create a conversation." unless conversation_id
 
-      raw_items = if proxy
-        uri = URI(PROXY_URL + "api.openai.com/v1/conversations/#{conversation_id}/items?order=#{order}")
-        response_hash = send_request(uri, content_type: "json", method: "get")
-
-        if response_hash.key?(:data)
-          response_hash.dig(:data).map do |hash|
-            # Transform values to allow expected symbols that non-proxied request returns
-
-            hash.transform_values! do |value|
-              if hash.key(value) == :type
-                value.to_sym
-              else
-                value
-              end
-            end
-          end
-          response_hash
-        end
-        # Convert to Struct to allow same interface as non-proxied request
-        create_deep_struct(response_hash)
-      else
-        client.conversations.items.list(conversation_id, order: order)
-      end
+      raw_items = client.conversations.items.list(conversation_id, order: order)
 
       Items.new(raw_items, conversation_id: conversation_id)
     end
@@ -229,8 +208,8 @@ module AI
       attrs << [:@conversation_id, @conversation_id]
       attrs << [:@last_response_id, @last_response_id] if @last_response_id
 
-      # 3. Messages (the main content, without response details)
-      display_messages = @messages.map { |msg| msg.except(:response) }
+      # 3. Messages (the main content, without response details, with truncated data URIs)
+      display_messages = @messages.map { |msg| AI.truncate_data_uris(msg.except(:response)) }
       attrs << [:@messages, display_messages]
 
       # 4. Optional features (only if enabled/changed from default)
@@ -249,11 +228,11 @@ module AI
     end
 
     def inspect
-      ai(plain: !$stdout.tty?, multiline: true)
+      AI.amazing_print(self, plain: !$stdout.tty?, multiline: true)
     end
 
     def to_html
-      AI.wrap_html(ai(html: true, multiline: true))
+      AI.wrap_html(AI.amazing_print(self, html: true, multiline: true))
     end
 
     def pretty_inspect
@@ -280,14 +259,8 @@ module AI
     end
 
     def create_conversation
-      self.conversation_id = if proxy
-        uri = URI(PROXY_URL + "api.openai.com/v1/conversations")
-        response = send_request(uri, content_type: "json", method: "post")
-        response.dig(:id)
-      else
-        conversation = client.conversations.create
-        conversation.id
-      end
+      conversation = client.conversations.create
+      self.conversation_id = conversation.id
     end
 
     # :reek:TooManyStatements
@@ -307,50 +280,22 @@ module AI
       messages_to_send = prepare_messages_for_api
       parameters[:input] = strip_responses(messages_to_send) unless messages_to_send.empty?
 
-      if proxy
-        uri = URI(PROXY_URL + "api.openai.com/v1/responses")
-        send_request(uri, content_type: "json", parameters: parameters, method: "post")
-      else
-        client.responses.create(**parameters)
-      end
+      client.responses.create(**parameters)
     end
 
     # :reek:NilCheck
     # :reek:TooManyStatements
     def parse_response(response)
-      if proxy && response.is_a?(Hash)
-        response_messages = response.dig(:output).select do |output|
-          output.dig(:type) == "message"
-        end
+      text_response = response.output_text
+      response_id = response.id
+      response_status = response.status
+      response_model = response.model
+      response_usage = response.usage.to_h.slice(:input_tokens, :output_tokens, :total_tokens)
 
-        message_contents = response_messages.map do |message|
-          message.dig(:content)
-        end.flatten
-
-        output_texts = message_contents.select do |content|
-          content[:type] == "output_text"
-        end
-
-        text_response = output_texts.map { |output| output[:text] }.join
-        response_id = response.dig(:id)
-        response_status = response.dig(:status).to_sym
-        response_model = response.dig(:model)
-        response_usage = response.dig(:usage)&.slice(:input_tokens, :output_tokens, :total_tokens)
-
-        if response.key?(:conversation)
-          self.conversation_id = response.dig(:conversation, :id)
-        end
-      else
-        text_response = response.output_text
-        response_id = response.id
-        response_status = response.status
-        response_model = response.model
-        response_usage = response.usage.to_h.slice(:input_tokens, :output_tokens, :total_tokens)
-
-        if response.conversation
-          self.conversation_id = response.conversation.id
-        end
+      if response.conversation
+        self.conversation_id = response.conversation.id
       end
+
       image_filenames = extract_and_save_images(response) + extract_and_save_files(response)
 
       chat_response = {
@@ -579,30 +524,20 @@ module AI
     def extract_and_save_images(response)
       image_filenames = []
 
-      image_outputs = if proxy
-        response.dig(:output).select { |output|
-          output.dig(:type) == "image_generation_call"
-        }
-      else
-        response.output.select { |output|
+      image_outputs = response.output.select { |output|
           output.respond_to?(:type) && output.type == :image_generation_call
         }
-      end
 
       return image_filenames if image_outputs.empty?
 
-      response_id = proxy ? response.dig(:id) : response.id
+      response_id = response.id
       subfolder_path = create_images_folder(response_id)
 
       image_outputs.each_with_index do |output, index|
-        if proxy
-          next unless output.key?(:result) && output.dig(:result)
-        else
-          next unless output.respond_to?(:result) && output.result
-        end
+        next unless output.respond_to?(:result) && output.result
 
         warn_if_file_fails_to_save do
-          result = proxy ? output.dig(:result) : output.result
+          result = output.result
           image_data = Base64.strict_decode64(result)
 
           filename = "#{(index + 1).to_s.rjust(3, "0")}.png"
@@ -634,27 +569,20 @@ module AI
     end
 
     def validate_api_key
-      openai_api_key_used = @api_key.start_with?("sk-proj")
-      proxy_api_key_used = !openai_api_key_used
-      proxy_enabled = proxy
-      proxy_disabled = !proxy
-
-      if openai_api_key_used && proxy_enabled
-        raise WrongAPITokenUsedError, <<~STRING
-          It looks like you're using an official API key from OpenAI with proxying enabled. When proxying is enabled you must use an OpenAI API key from prepend.me. Please disable proxy or update your API key before generating a response.
+      # Simple API call to validate the token
+      client.models.list
+      @api_key_validated = true
+    rescue OpenAI::Errors::AuthenticationError
+      message = if proxy
+         <<~STRING
+          It looks like you're using an invalid API key. Proxying is enabled, so you must use an OpenAI API key from prepend.me. Please disable proxy or update your API key before generating a response.
         STRING
-      elsif proxy_api_key_used && proxy_disabled
-        raise WrongAPITokenUsedError, <<~STRING
-          It looks like you're using an unofficial OpenAI API key from prepend.me. When using an unofficial API key you must enable proxy before generating a response. Proxying is currently disabled, please enable it before generating a response.
-
-          Example:
-
-            chat = AI::Chat.new
-            chat.proxy = true
-            chat.user(...)
-            chat.generate!
+      else
+        <<~STRING
+          It looks like you're using an invalid API key. Check to make sure your API key is valid before generating a response.
         STRING
       end
+      raise WrongAPITokenUsedError, message, cause: nil
     end
 
     # :reek:FeatureEnvy
@@ -664,72 +592,40 @@ module AI
     def extract_and_save_files(response)
       filenames = []
 
-      if proxy
-        message_outputs = response.dig(:output).select do |output|
-          output.dig(:type) == "message"
-        end
+      message_outputs = response.output.select do |output|
+        output.respond_to?(:type) && output.type == :message
+      end
 
-        outputs_with_annotations = message_outputs.map do |message|
-          message.dig(:content).find do |content|
-            content.dig(:annotations).length.positive?
-          end
-        end.compact
-      else
-        message_outputs = response.output.select do |output|
-          output.respond_to?(:type) && output.type == :message
+      outputs_with_annotations = message_outputs.map do |message|
+        message.content.find do |content|
+          content.respond_to?(:annotations) && content.annotations.length.positive?
         end
-
-        outputs_with_annotations = message_outputs.map do |message|
-          message.content.find do |content|
-            content.respond_to?(:annotations) && content.annotations.length.positive?
-          end
-        end.compact
-      end
+      end.compact
 
       return filenames if outputs_with_annotations.empty?
 
-      response_id = proxy ? response.dig(:id) : response.id
+      response_id = response.id
       subfolder_path = create_images_folder(response_id)
 
-      if proxy
-        annotations = outputs_with_annotations.map do |output|
-          output.dig(:annotations).find do |annotation|
-            annotation.key?(:filename)
-          end
-        end.compact
-
-        annotations.each do |annotation|
-          container_id = annotation.dig(:container_id)
-          file_id = annotation.dig(:file_id)
-          filename = annotation.dig(:filename)
-
-          warn_if_file_fails_to_save do
-            file_content = retrieve_file(file_id, container_id: container_id)
-            file_path = File.join(subfolder_path, filename)
-            File.binwrite(file_path, file_content)
-            filenames << file_path
-          end
+      annotations = outputs_with_annotations.map do |output|
+        output.annotations.find do |annotation|
+          annotation.respond_to?(:filename)
         end
-      else
-        annotations = outputs_with_annotations.map do |output|
-          output.annotations.find do |annotation|
-            annotation.respond_to?(:filename)
-          end
-        end.compact
-
-        annotations.each do |annotation|
-          container_id = annotation.container_id
-          file_id = annotation.file_id
-          filename = annotation.filename
-
-          warn_if_file_fails_to_save do
-            file_content = retrieve_file(file_id, container_id: container_id)
-            file_path = File.join(subfolder_path, filename)
-            File.binwrite(file_path, file_content.read)
-            filenames << file_path
-          end
+      end.compact
+
+      annotations.each do |annotation|
+        container_id = annotation.container_id
+        file_id = annotation.file_id
+        filename = annotation.filename
+
+        warn_if_file_fails_to_save do
+          file_content = retrieve_file(file_id, container_id: container_id)
+          file_path = File.join(subfolder_path, filename)
+          File.binwrite(file_path, file_content.read)
+          filenames << file_path
         end
       end
+
       filenames
     end
 
@@ -790,22 +686,12 @@ module AI
     end
 
     def retrieve_response(response_id)
-      if proxy
-        uri = URI(PROXY_URL + "api.openai.com/v1/responses/#{response_id}")
-        send_request(uri, content_type: "json", method: "get")
-      else
-        client.responses.retrieve(response_id)
-      end
+      client.responses.retrieve(response_id)
     end
 
     def retrieve_file(file_id, container_id: nil)
-      if proxy
-        uri = URI(PROXY_URL + "api.openai.com/v1/containers/#{container_id}/files/#{file_id}/content")
-        send_request(uri, method: "get")
-      else
-        container_content = client.containers.files.content
-        container_content.retrieve(file_id, container_id: container_id)
-      end
+      container_content = client.containers.files.content
+      container_content.retrieve(file_id, container_id: container_id)
     end
   end
 end

data/lib/ai/items.rb

@@ -29,7 +29,7 @@ module AI
 
     def build_output(html: false, plain: false)
       box = build_box
-      items_output = data.ai(html: html, plain: plain, limit: 100, indent: 2, index: true)
+      items_output = AI.amazing_print(data, html: html, plain: plain, limit: 100, indent: 2, index: true)
 
       if html
         "<pre>#{box}</pre>\n#{items_output}"

data/lib/ai/message.rb

@@ -3,7 +3,7 @@
 module AI
   class Message < Hash
     def inspect
-      ai(plain: !$stdout.tty?, index: false)
+      AI.amazing_print(display_hash, plain: !$stdout.tty?, index: false)
     end
 
     def pretty_inspect
@@ -17,7 +17,13 @@ module AI
     end
 
     def to_html
-      AI.wrap_html(ai(html: true, index: false))
+      AI.wrap_html(AI.amazing_print(display_hash, html: true, index: false))
+    end
+
+    private
+
+    def display_hash
+      AI.truncate_data_uris(to_h)
     end
   end
 end

data/lib/ai-chat.rb

@@ -1,10 +1,43 @@
 module AI
-  HTML_PRE_STYLE = "background-color: #1e1e1e; color: #d4d4d4; padding: 1em; white-space: pre-wrap; word-wrap: break-word;"
+  HTML_PRE_STYLE = "background-color: #1e1e1e; color: #d4d4d4; padding: 1em; " \
+                   "border-radius: 4px; overflow-x: auto; " \
+                   "white-space: pre-wrap; word-wrap: break-word;"
 
-  def self.wrap_html(html)
-    html = html.gsub("<pre>", "<pre style=\"#{HTML_PRE_STYLE}\">")
+  def self.wrap_html(content)
+    html = "<pre style=\"#{HTML_PRE_STYLE}\">#{content}</pre>"
     html.respond_to?(:html_safe) ? html.html_safe : html
   end
+
+  # Use AmazingPrint::Inspector directly to avoid conflicts with awesome_print gem
+  # which also defines an `ai` method on Object
+  def self.amazing_print(object, **options)
+    AmazingPrint::Inspector.new(**options).awesome(object)
+  end
+
+  # Recursively truncate base64 data URIs in nested structures for cleaner output
+  def self.truncate_data_uris(obj)
+    case obj
+    when Hash
+      obj.transform_values { |v| truncate_data_uris(v) }
+    when Array
+      obj.map { |v| truncate_data_uris(v) }
+    when String
+      truncate_data_uri(obj)
+    else
+      obj
+    end
+  end
+
+  def self.truncate_data_uri(str)
+    return str unless str.is_a?(String) && str.start_with?("data:") && str.include?(";base64,")
+
+    match = str.match(/\A(data:[^;]+;base64,)(.+)\z/)
+    return str unless match
+
+    prefix = match[1]
+    data = match[2]
+    "#{prefix}#{data[0, 20]}... (#{data.length} chars)"
+  end
 end
 
 require_relative "ai/message"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ai-chat
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Raghu Betina
@@ -157,7 +157,6 @@ files:
 - lib/ai-chat.rb
 - lib/ai/amazing_print.rb
 - lib/ai/chat.rb
-- lib/ai/http.rb
 - lib/ai/items.rb
 - lib/ai/message.rb
 - lib/prompts/schema_generator.md
@@ -176,7 +175,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -185,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.1
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A beginner-friendly Ruby interface for OpenAI's API
 test_files: []

data/lib/ai/http.rb

@@ -1,45 +0,0 @@
-require "net/http"
-module AI
-  module Http
-    def send_request(uri, method:, content_type: nil, parameters: nil)
-      Net::HTTP.start(uri.host, 443, use_ssl: true) do |http|
-        headers = {
-          "Authorization" => "Bearer #{@api_key}"
-        }
-        if content_type
-          headers.store("Content-Type", "application/json")
-        end
-        net_http_method = "Net::HTTP::#{method.downcase.capitalize}"
-        client = Kernel.const_get(net_http_method)
-        request = client.new(uri, headers)
-
-        if parameters
-          request.body = parameters.to_json
-        end
-        response = http.request(request)
-
-        # Handle proxy server 503 HTML response
-        begin
-          if content_type
-            return JSON.parse(response.body, symbolize_names: true)
-          else
-            return response.body
-          end
-        rescue JSON::ParserError, TypeError => e
-          raise JSON::ParserError, "Failed to parse response from proxy: #{e.message}"
-        end
-      end
-    end
-
-    def create_deep_struct(value)
-      case value
-      when Hash
-        OpenStruct.new(value.transform_values { |hash_value| send __method__, hash_value })
-      when Array
-        value.map { |element| send __method__, element }
-      else
-        value
-      end
-    end
-  end
-end