commitgpt 0.3.8 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5087467607c5fa8e321e66d9515ac5ebd4a65ef513a1cb0dc9a5819db4e72601
-  data.tar.gz: 3e33525a45b3892e4811671dde772df60e230d22b1b011019f3906ab4752ff1e
+  metadata.gz: bc50a5ed7cfb5cc59703014b3b6f58370028dfe2c1bc5c7186e3c6d43a755dd7
+  data.tar.gz: e9dd5c01f7c07062fc803710c79a31ce40ab9a9625918c2753bf59d25b4f9d4b
 SHA512:
-  metadata.gz: c78638efe575fd73035cffee4bd8779eace5552315beb8c5400a6223d99410dd4981fef26c755156920fd65206f99b9c4bdb3530b638afdf2dfbb3bd76e5190c
-  data.tar.gz: f40cc753a3b6849df45d2b8a11b19d008ad20661f4461d5ba61f54a20ce8234592fa6432b64354a7e27bbfd0ffda1dde82fb2f5385bd34dec76fab6bc3012f75
+  metadata.gz: 2005518993b77ff65ab764075016d6c1a8bb1259efff645017ab3f0a23a83f03e1b18fc7df257f497a8ecf5a705d4a0c91c29a5e044d00e9896437faed7cf675
+  data.tar.gz: d290dac27335967df2b7dfdc8309509f7f228ede0d50c7e0b86e99c28cb16b1551d2bb5004ce3d846a183f1fb85beda193d5fec2873ad9e397211fa6e93ceb26

data/README.md

@@ -121,10 +121,13 @@ $ aicm setup
 ```
 
 You'll be guided to:
-1. Choose an AI provider (Presets: Cerebras, OpenAI, Ollama, Groq, etc.)
-2. Enter your API Key (stored securely in `config.local.yml`)
-3. Select a model interactively
-4. Set maximum diff length
+1. Set the model list fetch timeout in seconds (defaults to 30; raise it if a provider is slow to respond)
+2. Choose an AI provider (Presets: Cerebras, OpenAI, Ollama, Groq, etc.)
+3. Enter your API Key (stored securely in `config.local.yml`)
+4. Select a model interactively
+5. Set maximum diff length
+
+The timeout is saved as a top-level `model_fetch_timeout` key in `config.yml` and applies to every provider, including `aicm -p` and `aicm -m`. You can also edit it there directly.
 
 **Note:** Please add `~/.config/commitgpt/config.local.yml` to your `.gitignore` if you are syncing your home directory, as it contains your API keys.
 
@@ -258,13 +261,17 @@ Get an API key at [https://developer.amd.com.cn/radeon/tokenfactory](https://dev
 
 > **Note**: Registration requires **both an email address and a Chinese (+86) mobile phone number**. Without a Chinese phone number you cannot complete sign-up, so this provider is only usable if you have one.
 
+> **Note**: The gateway in front of this endpoint always answers `GET /models` with 403, so models cannot be discovered automatically. CommitGPT ships the list below and offers it directly during setup — no detection request is made for this provider.
+
 ```
-DeepSeek-V4-Flash
-Qwen3.6-35B-A3B
-MiniCPM5-1B
-MiniCPM-V46
+DeepSeek-V4-Flash    # Max Context Length: 1,000,000 tokens
+Qwen3.6-35B-A3B      # Max Context Length:   262,144 tokens
+MiniCPM-V46          # Max Context Length:   262,144 tokens
+MiniCPM5-1B          # Max Context Length:   131,072 tokens
 ```
 
+Setup reports the selected model's context window and suggests a matching `diff_len`, so you don't have to work the number out yourself.
+
 ## How It Works
 This CLI tool runs a `git diff` command to grab all staged changes, sends this to OpenAI's GPT API (or compatible endpoint), and returns an AI-generated commit message. The tool uses the `/v1/chat/completions` endpoint with optimized prompts/system instructions for generating conventional commit messages.
 

data/lib/commitgpt/cli.rb

@@ -63,6 +63,7 @@ module CommitGpt
           shell.say "  Format:    #{format.capitalize.yellow}"
           shell.say "  Base URL:  #{config['base_url']}"
           shell.say "  Diff Len:  #{config['diff_len']}"
+          shell.say "  Timeout:   #{CommitGpt::ConfigManager.get_model_fetch_timeout}s"
           shell.say ''
         end
       rescue StandardError

data/lib/commitgpt/config_manager.rb

@@ -8,6 +8,9 @@ require_relative 'string'
 module CommitGpt
   # Manages configuration files for CommitGPT
   class ConfigManager
+    # Seconds to wait when fetching a provider's model list
+    DEFAULT_MODEL_FETCH_TIMEOUT = 30
+
     class << self
       # Get the config directory path
       def config_dir
@@ -165,6 +168,23 @@ module CommitGpt
         save_main_config(main_config)
       end
 
+      # Get the model list fetch timeout (seconds)
+      def get_model_fetch_timeout
+        return DEFAULT_MODEL_FETCH_TIMEOUT unless config_exists?
+
+        main_config = YAML.load_file(main_config_path)
+        timeout = main_config['model_fetch_timeout'].to_i
+        timeout.positive? ? timeout : DEFAULT_MODEL_FETCH_TIMEOUT
+      end
+
+      # Set the model list fetch timeout (seconds)
+      def set_model_fetch_timeout(seconds)
+        ensure_config_dir
+        main_config = config_exists? ? YAML.load_file(main_config_path) : { 'providers' => [], 'active_provider' => '' }
+        main_config['model_fetch_timeout'] = seconds
+        save_main_config(main_config)
+      end
+
       private
 
       # Merge main config with local config (local overrides main)

data/lib/commitgpt/provider_presets.rb

@@ -3,7 +3,16 @@
 module CommitGpt
   # Provider presets for common AI providers
   PROVIDER_PRESETS = [
-    { label: 'AMD Radeon (China)', value: 'amd', base_url: 'https://developer.amd.com.cn/radeon/api/v1' },
+    # The Azure gateway in front of this endpoint always answers /models with 403,
+    # so the model list is built in and no request is made during setup.
+    # Each value is that model's context window in tokens.
+    { label: 'AMD Radeon (China)', value: 'amd', base_url: 'https://developer.amd.com.cn/radeon/api/v1',
+      models: {
+        'DeepSeek-V4-Flash' => 1_000_000,
+        'MiniCPM-V46' => 262_144,
+        'MiniCPM5-1B' => 131_072,
+        'Qwen3.6-35B-A3B' => 262_144
+      } },
     { label: 'Anthropic Claude', value: 'anthropic', base_url: 'https://api.anthropic.com/v1' },
     { label: 'Cerebras', value: 'cerebras', base_url: 'https://api.cerebras.ai/v1' },
     { label: 'DeepSeek', value: 'deepseek', base_url: 'https://api.deepseek.com' },

data/lib/commitgpt/setup_wizard.rb

@@ -10,8 +10,17 @@ require_relative 'string'
 module CommitGpt
   # Interactive setup wizard for configuring AI providers
   class SetupWizard
-    # Seconds to wait when fetching the provider's model list
-    MODEL_FETCH_TIMEOUT = 30
+    # Diff bytes per context token. Code and CJK pack more bytes into a token
+    # than English prose, so this stays deliberately conservative.
+    DIFF_BYTES_PER_TOKEN = 2
+
+    # Ceiling for the suggested diff length. Past this a single request gets
+    # slow and one commit message stops describing the change usefully, so
+    # chunked mode is the better answer than a bigger window.
+    MAX_SUGGESTED_DIFF_LEN = 131_072
+
+    # Used when the model's context window is unknown
+    FALLBACK_DIFF_LEN = 32_768
 
     def initialize
       @prompt = TTY::Prompt.new
@@ -22,6 +31,7 @@ module CommitGpt
       ConfigManager.ensure_config_dir
       ConfigManager.generate_default_configs unless ConfigManager.config_exists?
 
+      prompt_model_fetch_timeout
       provider_choice = select_provider
       configure_provider(provider_choice)
     end
@@ -47,13 +57,13 @@ module CommitGpt
       provider = config['providers'].find { |p| p['name'] == selected }
 
       # Fetch models and let user select
-      models = fetch_models_with_timeout(provider['base_url'], provider['api_key'])
+      models = fetch_models_with_timeout(provider['base_url'], provider['api_key'], preset_models(selected))
       return if models.nil?
 
       model = select_model(models, provider['model'])
 
       # Prompt for diff length
-      diff_len = prompt_diff_len(provider['diff_len'] || 32_768)
+      diff_len = prompt_diff_len(default_diff_len(selected, model, provider['diff_len']))
 
       # Update config
       ConfigManager.update_provider(selected, { 'model' => model, 'diff_len' => diff_len })
@@ -77,7 +87,8 @@ module CommitGpt
       end
 
       # Fetch models and let user select
-      models = fetch_models_with_timeout(provider_config['base_url'], provider_config['api_key'])
+      models = fetch_models_with_timeout(provider_config['base_url'], provider_config['api_key'],
+                                         preset_models(provider_config['name']))
       return if models.nil?
 
       model = select_model(models, provider_config['model'])
@@ -150,14 +161,14 @@ module CommitGpt
       return if api_key.nil? # User cancelled
 
       # Fetch models with timeout
-      models = fetch_models_with_timeout(base_url, api_key)
+      models = fetch_models_with_timeout(base_url, api_key, preset_models(provider_name))
       return if models.nil?
 
       # Let user select model
       model = select_model(models, existing_provider&.dig('model'))
 
       # Prompt for diff length
-      diff_len = prompt_diff_len(existing_provider&.dig('diff_len') || 32_768)
+      diff_len = prompt_diff_len(default_diff_len(provider_name, model, existing_provider&.dig('diff_len')))
 
       # Save configuration
       ConfigManager.update_provider(
@@ -183,14 +194,14 @@ module CommitGpt
         q.default 'http://localhost:8080/v1'
       end
 
-      api_key = @prompt.mask('Enter your API key (optional):') { |q| q.echo false }
+      api_key = @prompt.mask('Enter your API key (optional):') { |q| q.echo false }.to_s
 
       # Fetch models
       models = fetch_models_with_timeout(base_url, api_key)
       return if models.nil?
 
       model = select_model(models)
-      diff_len = prompt_diff_len(32_768)
+      diff_len = prompt_diff_len(FALLBACK_DIFF_LEN)
 
       # Add to presets dynamically (just for this session)
       # Save to config
@@ -232,29 +243,89 @@ module CommitGpt
 
     # Prompt for API key
     def prompt_api_key(_provider_name, existing_key)
-      message = if existing_key && !existing_key.empty?
+      has_existing = existing_key && !existing_key.empty?
+
+      message = if has_existing
                   'Enter your API key (press Enter to keep existing):'
                 else
                   'Enter your API key:'
                 end
 
-      key = @prompt.mask(message) { |q| q.echo false }
+      # mask returns nil, not '', when the input is empty
+      key = @prompt.mask(message) { |q| q.echo false }.to_s
 
       # If user pressed Enter and there's an existing key, use it
-      if key.empty? && existing_key && !existing_key.empty?
-        existing_key
-      else
-        key
+      key.empty? && has_existing ? existing_key : key
+    end
+
+    # Ask how long to wait when fetching the model list, and persist it
+    def prompt_model_fetch_timeout
+      current = ConfigManager.get_model_fetch_timeout
+
+      seconds = @prompt.ask('Set the timeout (seconds) for fetching the model list:') do |q|
+        q.default current.to_s
+        q.convert :int
+        q.validate ->(input) { input.to_i.positive? }
+        q.messages[:valid?] = 'Timeout must be a positive number of seconds'
       end
+
+      seconds = current unless seconds.is_a?(Integer) && seconds.positive?
+      ConfigManager.set_model_fetch_timeout(seconds)
+      seconds
     end
 
-    # Fetch models from provider with timeout
-    def fetch_models_with_timeout(base_url, api_key)
+    # Built-in models a preset declares, as { model => context tokens }
+    def preset_model_table(provider_name)
+      models = PROVIDER_PRESETS.find { |p| p[:value] == provider_name }&.dig(:models)
+      models unless models.nil? || models.empty?
+    end
+
+    # Built-in model list for a preset, if it declares one
+    def preset_models(provider_name)
+      preset_model_table(provider_name)&.keys
+    end
+
+    # Context window of a built-in model, in tokens
+    def model_context_tokens(provider_name, model)
+      preset_model_table(provider_name)&.dig(model)
+    end
+
+    # Default diff length for a model, derived from its context window when
+    # known, and reported so the number is not a mystery. Numbers are printed
+    # undelimited because they get typed straight into the next prompt.
+    def default_diff_len(provider_name, model, existing)
+      context_tokens = model_context_tokens(provider_name, model)
+      return existing || FALLBACK_DIFF_LEN if context_tokens.nil?
+
+      fits = context_tokens * DIFF_BYTES_PER_TOKEN
+      suggested = [fits, MAX_SUGGESTED_DIFF_LEN].min
+      capped = ' (capped; larger diffs use chunked mode)' if suggested < fits
+
+      puts "\n#{model} context window: #{context_tokens} tokens (~#{fits} bytes of diff)".gray
+      puts "  Suggested max diff length: #{suggested} bytes#{capped}".gray
+
+      # Only a value the user actually chose outranks the suggestion
+      customized = existing && existing != FALLBACK_DIFF_LEN
+      customized ? existing : suggested
+    end
+
+    # Fetch models from provider with timeout.
+    # A preset that declares :models has no usable /models endpoint, so its
+    # built-in list is offered directly and no request is made.
+    def fetch_models_with_timeout(base_url, api_key, builtin_models = nil)
+      if builtin_models
+        puts 'Using the built-in model list (this provider does not expose /models).'.gray
+        return builtin_models
+      end
+
+      timeout = ConfigManager.get_model_fetch_timeout
       puts 'Fetching available models...'.gray
 
       models = nil
+      failure = nil
+
       begin
-        Timeout.timeout(MODEL_FETCH_TIMEOUT) do
+        Timeout.timeout(timeout) do
           headers = {
             'Content-Type' => 'application/json',
             'User-Agent' => "Ruby/#{RUBY_VERSION}"
@@ -264,27 +335,23 @@ module CommitGpt
           response = HTTParty.get("#{base_url}/models", headers: headers)
 
           if response.code == 200
-            models = response['data'] || []
-            models = models.map { |m| m['id'] }.compact.sort
+            models = (response['data'] || []).map { |m| m['id'] }.compact.sort
           else
-            puts "✖ Failed to fetch models: HTTP #{response.code}".red
-            return nil
+            failure = "Failed to fetch models: HTTP #{response.code}"
           end
         end
       rescue Timeout::Error
-        puts "✖ Connection timeout (#{MODEL_FETCH_TIMEOUT}s). Please check your network, base_url, and api_key.".red
-        exit(0)
+        failure = "Connection timeout (#{timeout}s). Please check your network, base_url, and api_key."
       rescue StandardError => e
-        puts "✖ Error fetching models: #{e.message}".red
-        exit(0)
+        failure = "Error fetching models: #{e.message}"
       end
 
-      if models.nil? || models.empty?
-        puts '✖ No models found. Please check your configuration.'.red
-        exit(0)
-      end
+      failure ||= 'No models found. Please check your configuration.' if models.nil? || models.empty?
+      return models if failure.nil?
 
-      models
+      puts "✖ #{failure}".red
+      puts "  Run 'aicm setup' again to raise the timeout.".gray if failure.start_with?('Connection timeout')
+      exit(0)
     end
 
     # Let user select a model
@@ -312,7 +379,7 @@ module CommitGpt
     end
 
     # Prompt for diff length
-    def prompt_diff_len(default = 32_768)
+    def prompt_diff_len(default = FALLBACK_DIFF_LEN)
       answer = @prompt.ask('Set the maximum diff length (Bytes) for generating commit message:') do |q|
         q.default default.to_s
         q.convert :int

data/lib/commitgpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CommitGpt
-  VERSION = '0.3.8'
+  VERSION = '0.3.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commitgpt
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.10
 platform: ruby
 authors:
 - Peng Zhang