openai-term 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5149ece8753a5a8ea0eb4a1fd22ef8d94c8a24393377a26b97ad34ba253d04eb
-  data.tar.gz: 3986c94d8ca984a3618685ca0fe22564872a67096d56734d6a65704eaacfbeb2
+  metadata.gz: 1b541d1b3b223edaa022070e38cbf187104deed56fe67f321c3197a3ff7c2992
+  data.tar.gz: 5d6f9cf9ee175e59b6b90a790c2ae273a12cad80069ca1662a64b14ba4ecd199
 SHA512:
-  metadata.gz: 76e5e2c1aa675d107551e88d872249387854583b9c1a4b31f8dea43788428a22c1aaa6af112892bb6cc72531e661362a133cc97e90b38500d838066b9cbd6c86
-  data.tar.gz: 8656cf58972c66d8731c09fae0a612b4eda0136522297bf1bcc996b37cc267b990bc6aa696dbb9d56aed2239a83260bf75bbf8300c71dc07bbe025ae1690f8c8
+  metadata.gz: e4de85e3718a0c94b6d8173a25424222e4b496960207151953a07557046ef81be336f495235439c25c31c324e3998de5b5e2c384aa0dc805d6ed95055aebdc00
+  data.tar.gz: 1e0f248ac0d35859d2a2fee6446358205f454f5b4e37b75da83828803f8ca2f512a230f7f139c285e7f1cf7c4748bcfe4e734e21f55011c7c1f55dc573e173e1

data/bin/openai

@@ -5,21 +5,23 @@
 # A modern TUI for interacting with OpenAI's API
 
 require 'optparse'
-require 'openai'
+require 'ruby/openai'
 require 'rcurses'
 require 'json'
 require 'fileutils'
+require 'io/console'
 
-include Rcurses
 include Rcurses::Input
-include Rcurses::Cursor
 
 # Constants
 CONFIG_FILE = File.join(Dir.home, '.openai.conf')
 HISTORY_FILE = File.join(Dir.home, '.openai_history.json')
 DEFAULT_MODEL = "gpt-4-turbo-preview"
 DEFAULT_MAX_TOKENS = 2048
-VERSION = "3.0.1"
+VERSION = "3.0.3"
+REQUEST_TIMEOUT = 30
+MAX_RETRIES = 2
+RETRY_DELAY = 2
 
 # Global variables
 @model = DEFAULT_MODEL
@@ -59,7 +61,7 @@ def parse_options
     opts.on('-c', '--config FILE', 'Config file path') { |c| options[:config] = c }
     opts.on('-q', '--quiet', 'Skip TUI and output to stdout directly') { options[:quiet] = true }
     opts.on('-h', '--help', 'Display help') { puts opts; exit }
-    opts.on('-v', '--version', 'Display version') { puts "OpenAI Terminal 2.1"; exit }
+    opts.on('-v', '--version', 'Display version') { puts "OpenAI Terminal #{VERSION}"; exit }
   end
   
   optparse.parse!
@@ -76,15 +78,30 @@ def load_config(config_path = nil)
   else
     FileUtils.mkdir_p(File.dirname(config_file))
     File.write(config_file, "@ai = 'your-secret-openai-key'")
-    puts "Created config file: #{config_file}"
-    puts "Please edit it and add your OpenAI API key."
-    puts "Get your key from: https://platform.openai.com/api-keys"
+    puts "\nOpenAI Terminal - Configuration Required"
+    puts "=" * 50
+    puts "\nCreated config file: #{config_file}"
+    puts "\nPlease edit it and add your OpenAI API key:"
+    puts "  @ai = \"sk-...\""
+    puts "\nGet your API key from:"
+    puts "  https://platform.openai.com/api-keys"
+    
+    # Only mention RTFM if it exists
+    rtfm_config = File.join(Dir.home, '.rtfm/conf')
+    if File.exist?(rtfm_config)
+      puts "\nTip: If you use RTFM, you can copy the @ai value from:"
+      puts "  #{rtfm_config}"
+    end
+    puts "\nThen run 'openai' again to start the terminal interface."
     exit 1
   end
   
   unless @api_key && @api_key != 'your-secret-openai-key'
-    puts "Error: Invalid API key in #{config_file}"
-    puts "Please add your OpenAI API key to the config file."
+    puts "\nError: Invalid API key in #{config_file}"
+    puts "\nPlease edit the file and add your OpenAI API key:"
+    puts "  @ai = \"sk-...\""
+    puts "\nGet your API key from:"
+    puts "  https://platform.openai.com/api-keys"
     exit 1
   end
 end
@@ -125,44 +142,77 @@ end
 def init_client
   @client = OpenAI::Client.new(
     access_token: @api_key,
-    log_errors: false
+    request_timeout: REQUEST_TIMEOUT
   )
 end
 
+# Retry wrapper for transient API failures
+def with_retry
+  retries = 0
+  begin
+    yield
+  rescue Net::OpenTimeout, Net::ReadTimeout, Errno::ETIMEDOUT => e
+    if retries < MAX_RETRIES
+      retries += 1
+      msg = "Timeout, retrying (#{retries}/#{MAX_RETRIES})..."
+      @chat_pane ? add_to_chat("system", msg.fg(208)) : $stderr.puts(msg)
+      sleep(RETRY_DELAY)
+      retry
+    end
+    raise
+  rescue Faraday::Error => e
+    status = e.respond_to?(:response_status) ? e.response_status : nil
+    if status && [429, 500, 502, 503].include?(status) && retries < MAX_RETRIES
+      retries += 1
+      delay = status == 429 ? RETRY_DELAY * 2 : RETRY_DELAY
+      msg = "HTTP #{status}, retrying (#{retries}/#{MAX_RETRIES})..."
+      @chat_pane ? add_to_chat("system", msg.fg(208)) : $stderr.puts(msg)
+      sleep(delay)
+      retry
+    end
+    raise
+  end
+end
+
 # Setup UI
 def setup_ui
+  unless $stdin.tty?
+    puts "Error: This program requires a TTY terminal"
+    exit 1
+  end
+  
   rows, cols = IO.console.winsize
   
   Rcurses.clear_screen
-  Cursor.hide
+  Rcurses::Cursor.hide
   
   # Create panes - accounting for borders being drawn outside pane geometry
-  @header = Pane.new(1, 1, cols, 1, 255, 24)
+  @header = Rcurses::Pane.new(1, 1, cols, 1, 255, 24)
   @header.border = false  # Top pane doesn't need border
   
-  @chat_pane = Pane.new(1, 3, cols, rows - 7, 255, 232)
+  @chat_pane = Rcurses::Pane.new(1, 3, cols, rows - 7, 255, 232)
   @chat_pane.border = true
   
-  @input_pane = Pane.new(1, rows - 2, cols, 1, 255, 234)
+  @input_pane = Rcurses::Pane.new(1, rows - 2, cols, 1, 255, 234)
   @input_pane.border = true
   
-  @status_pane = Pane.new(1, rows, cols, 1, 255, 236)
+  @status_pane = Rcurses::Pane.new(1, rows, cols, 1, 255, 236)
   
   # Popup panes (created but not displayed initially)
   help_w = cols * 3 / 4
   help_h = rows * 3 / 4
-  @help_pane = Pane.new((cols - help_w) / 2 + 1, (rows - help_h) / 2 + 1, help_w, help_h, 255, 234)
+  @help_pane = Rcurses::Pane.new((cols - help_w) / 2 + 1, (rows - help_h) / 2 + 1, help_w, help_h, 255, 234)
   @help_pane.border = true
   
   model_w = cols / 2
   model_h = rows / 2
-  @model_list_pane = Pane.new((cols - model_w) / 2 + 1, (rows - model_h) / 2 + 1, model_w, model_h, 255, 233)
+  @model_list_pane = Rcurses::Pane.new((cols - model_w) / 2 + 1, (rows - model_h) / 2 + 1, model_w, model_h, 255, 233)
   @model_list_pane.border = true
   
   # Conversation list pane
   conv_w = cols * 3 / 4
   conv_h = rows * 3 / 4
-  @conversation_list_pane = Pane.new((cols - conv_w) / 2 + 1, (rows - conv_h) / 2 + 1, conv_w, conv_h, 255, 235)
+  @conversation_list_pane = Rcurses::Pane.new((cols - conv_w) / 2 + 1, (rows - conv_h) / 2 + 1, conv_w, conv_h, 255, 235)
   @conversation_list_pane.border = true
   
   # Popup state tracking
@@ -291,13 +341,15 @@ def get_openai_response(message, generate_image = false)
   
   begin
     if generate_image
-      response = @client.images.generate(
-        parameters: {
-          prompt: message,
-          n: 1,
-          size: "1024x1024"
-        }
-      )
+      response = with_retry do
+        @client.images.generate(
+          parameters: {
+            prompt: message,
+            n: 1,
+            size: "1024x1024"
+          }
+        )
+      end
       
       url = response.dig("data", 0, "url")
       if url
@@ -316,28 +368,32 @@ def get_openai_response(message, generate_image = false)
         end
       end
       
-      response = @client.chat(
-        parameters: {
-          model: @model,
-          messages: messages,
-          max_tokens: @max_tokens,
-          temperature: @temperature
-        }
-      )
+      response = with_retry do
+        @client.chat(
+          parameters: {
+            model: @model,
+            messages: messages,
+            max_tokens: @max_tokens,
+            temperature: @temperature
+          }
+        )
+      end
       
       content = response.dig("choices", 0, "message", "content")
     else
       # Use completion for older models
       prompt = @current_conversation.map { |m| "#{m['role']}: #{m['content']}" }.join("\n") + "\nassistant:"
       
-      response = @client.completions(
-        parameters: {
-          model: @model,
-          prompt: prompt,
-          max_tokens: @max_tokens,
-          temperature: @temperature
-        }
-      )
+      response = with_retry do
+        @client.completions(
+          parameters: {
+            model: @model,
+            prompt: prompt,
+            max_tokens: @max_tokens,
+            temperature: @temperature
+          }
+        )
+      end
       
       content = response.dig("choices", 0, "text")
     end
@@ -380,7 +436,7 @@ def show_model_selection
   
   # Get available models
   begin
-    models_response = @client.models.list
+    models_response = with_retry { @client.models.list }
     @available_models = models_response["data"]
       .map { |m| m["id"] }
       .select { |id| id.include?("gpt") || id.include?("davinci") || id.include?("curie") }
@@ -933,9 +989,11 @@ def main
   input_loop
   
 ensure
-  save_history if defined?(@conversation_history)
-  Cursor.show if defined?(Cursor)
-  Rcurses.clear_screen if defined?(Rcurses)
+  if @chat_pane  # Only cleanup UI if TUI was initialized
+    save_history if defined?(@conversation_history)
+    Rcurses::Cursor.show if defined?(Rcurses::Cursor)
+    Rcurses.clear_screen if defined?(Rcurses)
+  end
 end
 
 # Run the program

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openai-term
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-15 00:00:00.000000000 Z
+date: 2026-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -40,8 +40,8 @@ dependencies:
         version: '6.0'
 description: 'A modern terminal interface to OpenAI with a full TUI using rcurses.
   Features include interactive chat mode, conversation history, model selection, and
-  more. Version 3.0.1: Fixed compatibility with ruby-openai 3.7.0 which moved from
-  ''ruby/openai'' to ''openai'' require path.'
+  more. Version 3.0.3: Add configurable request timeout and retry logic for transient
+  API failures (timeout, 429, 500/502/503).'
 email: g@isene.com
 executables:
 - openai