RubyGems - n2b - Versions diffs - 2.0.0 → 2.1.0 - Mend

n2b 2.0.0 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '059751bf0eb02d00fa853b62ad738a873223766049608e6627c31dfbd1927363'
-  data.tar.gz: 72406255d6d2d63943e1e9dcea7017f8e56d27d9a2b9c7cb4afcd09867ce51f7
+  metadata.gz: 904b66daf8fd1cdb0a4fba961fc0431dbf5bf841c022d3b31b52daa7c549f02d
+  data.tar.gz: e89ae0125af9f1c2c40ac2ad14f0a5ced1dc6bd882e88aa81ccf34b2d958528f
 SHA512:
-  metadata.gz: b3ef595ab79f72892164caf89308cd74264580d297afe0a988cae15614b276507726baa403f2ee87111fa60b9e7ca7dc532fdded04132a6a5ff8b271b3bffb69
-  data.tar.gz: a34b6395591167c64a73db80afd592fa5dca021fe856335137964303c655bd19f09bb145f27fe3f205389311bc8a4a48792168fc66843960bfb523cb22ccfb05
+  metadata.gz: 528eefd2847a246bcc5282b1ea360477737c9c85e8643fadce3be1eaaa6c7b64464e9cdba1d1a59d8bcad4eec25fd912dd5e9d04e1abbd5f31ab39c646b9b363
+  data.tar.gz: abcee779b759722282f5b48046c97418d215e0ff528b9c6ea76be4cca09335256606150eb7c18c3a2bff978559f5560768b0fdf02c35bbcd05a65023de3ff4b0

data/lib/n2b/base.rb CHANGED Viewed

@@ -46,13 +46,19 @@ module N2B
       # Determine if it's effectively a first-time setup for core LLM details
       is_first_time_core_setup = config['llm'].nil?
-      if api_key.nil? || api_key == '' || config['llm'].nil? || reconfigure
+      # Check if configuration is incomplete based on provider type
+      config_incomplete = config['llm'].nil? || reconfigure ||
+                         (config['llm'] == 'vertexai' && (config['vertex_credential_file'].nil? || config['vertex_credential_file'].empty?)) ||
+                         (config['llm'] == 'ollama' && false) || # Ollama doesn't require API key, so never incomplete due to missing key
+                         (['claude', 'openai', 'gemini', 'openrouter'].include?(config['llm']) && (api_key.nil? || api_key == ''))
+      if config_incomplete
         puts "--- N2B Core LLM Configuration ---"
-        print "Choose a language model to use (1:claude, 2:openai, 3:gemini, 4:openrouter, 5:ollama) [current: #{config['llm']}]: "
+        print "Choose a language model to use (1:claude, 2:openai, 3:gemini (API Key), 4:openrouter, 5:ollama, 6:vertexai (Credential File)) [current: #{config['llm']}]: "
         llm_choice = $stdin.gets.chomp
         llm_choice = config['llm'] if llm_choice.empty? && !config['llm'].nil? # Keep current if input is empty
-        unless ['claude', 'openai', 'gemini', 'openrouter', 'ollama', '1', '2', '3', '4', '5'].include?(llm_choice)
+        unless ['claude', 'openai', 'gemini', 'openrouter', 'ollama', 'vertexai', '1', '2', '3', '4', '5', '6'].include?(llm_choice)
           puts "Invalid language model selection. Defaulting to 'claude' or previous if available."
           llm_choice = config['llm'] || 'claude' # Fallback
         end
@@ -60,10 +66,11 @@ module N2B
         selected_llm = case llm_choice
                        when '1', 'claude' then 'claude'
                        when '2', 'openai' then 'openai'
-                       when '3', 'gemini' then 'gemini'
+                       when '3', 'gemini' then 'gemini'    # This is now explicitly API Key based Gemini
                        when '4', 'openrouter' then 'openrouter'
                        when '5', 'ollama' then 'ollama'
-                       else config['llm'] || 'claude' # Should not happen due to validation
+                       when '6', 'vertexai' then 'vertexai'  # New Vertex AI (credential file)
+                       else config['llm'] || 'claude'
                        end
         config['llm'] = selected_llm
@@ -71,18 +78,76 @@ module N2B
           puts "\n--- Ollama Specific Configuration ---"
           puts "Ollama typically runs locally and doesn't require an API key."
-          # Use new model configuration system
           current_model = config['model']
-          model_choice = N2B::ModelConfig.get_model_choice(selected_llm, current_model) # Renamed to model_choice to avoid conflict
+          model_choice = N2B::ModelConfig.get_model_choice(selected_llm, current_model)
           config['model'] = model_choice
           current_ollama_api_url = config['ollama_api_url'] || N2M::Llm::Ollama::DEFAULT_OLLAMA_API_URI
           print "Enter Ollama API base URL [current: #{current_ollama_api_url}]: "
           ollama_api_url_input = $stdin.gets.chomp
           config['ollama_api_url'] = ollama_api_url_input.empty? ? current_ollama_api_url : ollama_api_url_input
-          config.delete('access_key') # Remove access_key if switching to ollama
-        else
-          # Configuration for API key based LLMs
+          config.delete('access_key')
+          config.delete('gemini_credential_file') # old key
+          config.delete('vertex_credential_file') # new key for Vertex
+        elsif selected_llm == 'vertexai'
+          puts "\n--- Vertex AI (Credential File) Specific Configuration ---"
+          current_vertex_credential_file = config['vertex_credential_file']
+          print "Enter your Google Cloud credential file path for Vertex AI #{current_vertex_credential_file ? '[leave blank to keep current]' : ''}: "
+          vertex_credential_file_input = $stdin.gets.chomp
+          if !vertex_credential_file_input.empty?
+            config['vertex_credential_file'] = vertex_credential_file_input
+          elsif current_vertex_credential_file
+            config['vertex_credential_file'] = current_vertex_credential_file
+          else
+            config['vertex_credential_file'] = nil
+          end
+          # Ask for Vertex AI region
+          current_vertex_location = config['vertex_location'] || 'us-central1'
+          puts "\nVertex AI Region Selection:"
+          puts "Common regions:"
+          puts "  1. us-central1 (Iowa, USA) [default]"
+          puts "  2. us-east1 (South Carolina, USA)"
+          puts "  3. us-west1 (Oregon, USA)"
+          puts "  4. europe-west1 (Belgium)"
+          puts "  5. europe-west4 (Netherlands)"
+          puts "  6. asia-northeast1 (Tokyo, Japan)"
+          puts "  7. asia-southeast1 (Singapore)"
+          puts "  8. custom (enter your own region)"
+          print "Choose region (1-8) or enter region name [current: #{current_vertex_location}]: "
+          region_choice = $stdin.gets.chomp
+          if region_choice.empty?
+            config['vertex_location'] = current_vertex_location
+          else
+            case region_choice
+            when '1' then config['vertex_location'] = 'us-central1'
+            when '2' then config['vertex_location'] = 'us-east1'
+            when '3' then config['vertex_location'] = 'us-west1'
+            when '4' then config['vertex_location'] = 'europe-west1'
+            when '5' then config['vertex_location'] = 'europe-west4'
+            when '6' then config['vertex_location'] = 'asia-northeast1'
+            when '7' then config['vertex_location'] = 'asia-southeast1'
+            when '8'
+              print "Enter custom region (e.g., europe-west2): "
+              custom_region = $stdin.gets.chomp
+              config['vertex_location'] = custom_region.empty? ? current_vertex_location : custom_region
+            else
+              # Treat as direct region input
+              config['vertex_location'] = region_choice
+            end
+          end
+          config.delete('access_key')
+          config.delete('ollama_api_url')
+          config.delete('gemini_credential_file') # old key
+          current_model = config['model']
+          model_choice = N2B::ModelConfig.get_model_choice(selected_llm, current_model)
+          config['model'] = model_choice
+        else # API Key based LLMs: claude, openai, gemini (API Key), openrouter
           puts "\n--- #{selected_llm.capitalize} Specific Configuration ---"
           current_api_key = config['access_key']
           print "Enter your #{selected_llm} API key #{ current_api_key.nil? || current_api_key.empty? ? '' : '[leave blank to keep current]' }: "
@@ -94,9 +159,12 @@ module N2B
             puts "API key is required for #{selected_llm}."
             exit 1
           end
+          config.delete('vertex_credential_file') # new key for Vertex
+          config.delete('ollama_api_url')
+          config.delete('gemini_credential_file') # old key
           current_model = config['model']
-          model_choice = N2B::ModelConfig.get_model_choice(selected_llm, current_model) # Renamed
+          model_choice = N2B::ModelConfig.get_model_choice(selected_llm, current_model)
           config['model'] = model_choice
           if selected_llm == 'openrouter'
@@ -336,23 +404,76 @@ module N2B
     def validate_config(config)
       errors = []
-      # Validate LLM configuration
+      # Validate LLM provider selection
       if config['llm'].nil? || config['llm'].empty?
         errors << "LLM provider not specified"
       end
-      # Validate model name
+      # Validate model name (existing logic can likely stay as is)
       if config['model'].nil? || config['model'].empty?
         errors << "Model not specified"
-      elsif config['model'].length < 3
+      elsif config['model'].length < 3 # Example of an existing check
         errors << "Model name '#{config['model']}' seems too short - might be invalid"
-      elsif %w[y n yes no true false].include?(config['model'].downcase)
+      elsif %w[y n yes no true false].include?(config['model'].downcase) # Example
         errors << "Model name '#{config['model']}' appears to be a boolean response rather than a model name"
       end
-      # Validate API key for non-Ollama providers
-      if config['llm'] != 'ollama' && (config['access_key'].nil? || config['access_key'].empty?)
-        errors << "API key missing for #{config['llm']} provider"
+      # Provider-specific validation
+      case config['llm']
+      when 'gemini' # API Key based Gemini
+        if config['access_key'].nil? || config['access_key'].empty?
+          errors << "API key missing for gemini provider"
+        end
+        if config['vertex_credential_file'] && !config['vertex_credential_file'].empty?
+          errors << "Vertex AI credential file should not be present when gemini (API Key) provider is selected"
+        end
+        # Ensure old gemini_credential_file key is also not present
+        if config['gemini_credential_file'] && !config['gemini_credential_file'].empty?
+          errors << "Old gemini_credential_file key should not be present. Use 'gemini' (API key) or 'vertexai' (credential file)."
+        end
+      when 'vertexai' # Credential File based Vertex AI
+        if config['vertex_credential_file'].nil? || config['vertex_credential_file'].empty?
+          errors << "Credential file path for Vertex AI not provided"
+        else
+          # Ensure File.exist? is only called if the path is not nil and not empty
+          unless File.exist?(config['vertex_credential_file'])
+            errors << "Credential file missing or invalid at #{config['vertex_credential_file']} for Vertex AI"
+          end
+        end
+        if config['access_key'] && !config['access_key'].empty?
+          errors << "API key (access_key) should not be present when Vertex AI provider is selected"
+        end
+         # Ensure old gemini_credential_file key is also not present
+        if config['gemini_credential_file'] && !config['gemini_credential_file'].empty?
+          errors << "Old gemini_credential_file key should not be present when Vertex AI is selected."
+        end
+      when 'ollama'
+        # No specific key/credential validation for Ollama here, but ensure others are not present
+        if config['access_key'] && !config['access_key'].empty?
+          errors << "API key (access_key) should not be present when Ollama provider is selected"
+        end
+        if config['vertex_credential_file'] && !config['vertex_credential_file'].empty?
+          errors << "Vertex AI credential file should not be present when Ollama provider is selected"
+        end
+        if config['gemini_credential_file'] && !config['gemini_credential_file'].empty?
+          errors << "Old gemini_credential_file key should not be present when Ollama is selected."
+        end
+        # Ollama specific validations like ollama_api_url could be here if needed
+      when 'claude', 'openai', 'openrouter' # Other API key based providers
+        if config['access_key'].nil? || config['access_key'].empty?
+          errors << "API key missing for #{config['llm']} provider"
+        end
+        if config['vertex_credential_file'] && !config['vertex_credential_file'].empty?
+          errors << "Vertex AI credential file should not be present for #{config['llm']} provider"
+        end
+        if config['gemini_credential_file'] && !config['gemini_credential_file'].empty?
+          errors << "Old gemini_credential_file key should not be present for #{config['llm']} provider."
+        end
+      # else
+        # This case means llm is nil or an unknown provider, already handled by the first check.
       end
       # Validate editor configuration (optional, so more like warnings or info)

data/lib/n2b/cli.rb CHANGED Viewed

@@ -296,13 +296,14 @@ REQUIREMENTS_BLOCK
     end
     def append_to_llm_history_file(commands)
-      File.open(HISTORY_FILE, 'a') do |file|
+      File.open(self.class.history_file, 'a') do |file|
         file.puts(commands)
       end
     end
     def read_llm_history_file
-      history = File.read(HISTORY_FILE) if File.exist?(HISTORY_FILE)
+      history_file_path = self.class.history_file
+      history = File.read(history_file_path) if File.exist?(history_file_path)
       history ||= ''
       # limit to 20 most recent commands
       history.split("\n").last(20).join("\n")
@@ -316,8 +317,10 @@ REQUIREMENTS_BLOCK
                 N2B::Llm::OpenAi.new(config)
               when 'claude'
                 N2B::Llm::Claude.new(config)
-              when 'gemini'
+              when 'gemini' # This is for API Key based Gemini
                 N2B::Llm::Gemini.new(config)
+              when 'vertexai' # This is for Credential File based Vertex AI
+                N2B::Llm::VertexAi.new(config)
               when 'openrouter'
                 N2B::Llm::OpenRouter.new(config)
               when 'ollama'

data/lib/n2b/config/models.yml CHANGED Viewed

@@ -25,9 +25,25 @@ openai:
 gemini:
   suggested:
-    gemini-2.5-flash: "gemini-2.5-flash-preview-05-20"
-    gemini-2.5-pro: "gemini-2.5-pro-preview-05-06"
-  default: "gemini-2.5-flash"
+    gemini-2.0-flash: "gemini-2.0-flash-001"
+    gemini-2.0-flash-lite: "gemini-2.0-flash-lite-001"
+    gemini-2.5-flash: "gemini-2.5-flash-preview"
+    gemini-2.5-pro: "gemini-2.5-pro-preview"
+    # Legacy models (may not be available in all regions)
+    gemini-2.5-flash-05-20: "gemini-2.5-flash-preview-05-20"
+    gemini-2.5-pro-05-06: "gemini-2.5-pro-preview-05-06"
+  default: "gemini-2.0-flash"
+vertexai:
+  suggested:
+    gemini-2.0-flash: "gemini-2.0-flash-001"
+    gemini-2.0-flash-lite: "gemini-2.0-flash-lite-001"
+    gemini-2.5-flash: "gemini-2.5-flash-preview"
+    gemini-2.5-pro: "gemini-2.5-pro-preview"
+    # Legacy models (may not be available in all regions)
+    gemini-2.5-flash-05-20: "gemini-2.5-flash-preview-05-20"
+    gemini-2.5-pro-05-06: "gemini-2.5-pro-preview-05-06"
+  default: "gemini-2.0-flash"
 openrouter:
   suggested:

data/lib/n2b/jira_client.rb CHANGED Viewed

@@ -2,6 +2,7 @@ require 'net/http'
 require 'uri'
 require 'json'
 require 'base64'
+require 'time'
 require_relative 'template_engine'
 module N2B
@@ -390,7 +391,7 @@ module N2B
           else
             formatted_date = created
           end
-        rescue
+        rescue => e
           formatted_date = created
         end

data/lib/n2b/llm/gemini.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'json'
 require 'uri'
+# Removed googleauth require
 require_relative '../model_config'
 module N2B
@@ -9,7 +10,7 @@ module N2B
       API_URI = URI.parse('https://generativelanguage.googleapis.com/v1beta/models')
       def initialize(config)
-        @config = config
+        @config = config # Used for access_key and model
       end
       def get_model_name
@@ -29,6 +30,8 @@ module N2B
         request = Net::HTTP::Post.new(uri)
         request.content_type = 'application/json'
+        # Removed Authorization header and token fetching logic
         request.body = JSON.dump({
           "contents" => [{
             "parts" => [{
@@ -82,6 +85,8 @@ module N2B
         request = Net::HTTP::Post.new(uri)
         request.content_type = 'application/json'
+        # Removed Authorization header and token fetching logic
         request.body = JSON.dump({
           "contents" => [{
             "parts" => [{

data/lib/n2b/llm/vertex_ai.rb ADDED Viewed

@@ -0,0 +1,225 @@
+require 'net/http'
+require 'json'
+require 'uri'
+require 'googleauth' # For service account authentication
+require_relative '../model_config'
+require_relative '../errors'
+module N2B
+  module Llm
+    class VertexAi
+      # Vertex AI API endpoint format
+      DEFAULT_LOCATION = 'us-central1'
+      COMMON_LOCATIONS = [
+        'us-central1',    # Iowa, USA
+        'us-east1',       # South Carolina, USA
+        'us-west1',       # Oregon, USA
+        'europe-west1',   # Belgium
+        'europe-west4',   # Netherlands
+        'asia-northeast1', # Tokyo, Japan
+        'asia-southeast1'  # Singapore
+      ].freeze
+      # HTTP timeout in seconds
+      REQUEST_TIMEOUT = 60
+      def initialize(config)
+        @config = config # Contains 'vertex_credential_file' and 'model'
+        @project_id = nil
+        @location = DEFAULT_LOCATION
+        load_project_info
+      end
+      private
+      def load_project_info
+        # Extract project_id from the credential file
+        credential_data = JSON.parse(File.read(@config['vertex_credential_file']))
+        @project_id = credential_data['project_id']
+        # Allow location override from config, with intelligent defaults
+        @location = determine_location
+      rescue JSON::ParserError => e
+        raise N2B::LlmApiError.new("Invalid JSON in credential file: #{e.message}")
+      rescue Errno::ENOENT => e
+        raise N2B::LlmApiError.new("Credential file not found: #{e.message}")
+      rescue => e
+        raise N2B::LlmApiError.new("Failed to load project info from credential file: #{e.message}")
+      end
+      def determine_location
+        # 1. Use explicit config if provided
+        return @config['vertex_location'] if @config['vertex_location']
+        # 2. Try to detect from project_id patterns (some projects have region hints)
+        # 3. Default to us-central1 but provide helpful error message if it fails
+        DEFAULT_LOCATION
+      end
+      def build_api_uri(model)
+        "https://#{@location}-aiplatform.googleapis.com/v1/projects/#{@project_id}/locations/#{@location}/publishers/google/models/#{model}:generateContent"
+      end
+      public
+      def get_model_name
+        # Resolve model name using the centralized configuration for 'vertexai'
+        model_name = N2B::ModelConfig.resolve_model('vertexai', @config['model'])
+        if model_name.nil? || model_name.empty?
+          # Fallback to default if no model specified for vertexai
+          model_name = N2B::ModelConfig.resolve_model('vertexai', N2B::ModelConfig.default_model('vertexai'))
+        end
+        # If still no model, a generic default could be used, or an error raised.
+        # For now, assume ModelConfig handles returning a usable default or nil.
+        # If ModelConfig.resolve_model can return nil and that's an issue, add handling here.
+        # For example, if model_name is still nil, raise an error or use a hardcoded default.
+        # Let's assume ModelConfig provides a valid model or a sensible default from models.yml.
+        model_name
+      end
+      def make_request(content)
+        model = get_model_name
+        raise N2B::LlmApiError.new("No model configured for Vertex AI.") if model.nil? || model.empty?
+        uri = URI.parse(build_api_uri(model))
+        request = Net::HTTP::Post.new(uri)
+        request.content_type = 'application/json'
+        begin
+          scope = 'https://www.googleapis.com/auth/cloud-platform'
+          authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
+            json_key_io: File.open(@config['vertex_credential_file']),
+            scope: scope
+          )
+          access_token = authorizer.fetch_access_token!['access_token']
+          request['Authorization'] = "Bearer #{access_token}"
+        rescue StandardError => e
+          raise N2B::LlmApiError.new("Vertex AI - Failed to obtain Google Cloud access token: #{e.message}")
+        end
+        request.body = JSON.dump({
+          "contents" => [{
+            "role" => "user",
+            "parts" => [{
+              "text" => content
+            }]
+          }],
+          "generationConfig" => {
+            "responseMimeType" => "application/json" # Requesting JSON output from the LLM
+          }
+        })
+        begin
+          response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.read_timeout = REQUEST_TIMEOUT
+            http.open_timeout = 30
+            http.request(request)
+          end
+        rescue Net::TimeoutError, Net::ReadTimeout, Net::OpenTimeout => e
+          error_msg = "Vertex AI request timed out (region: #{@location}): #{e.message}"
+          error_msg += "\n\nThis might be a region issue. Try reconfiguring with 'n2b -c' and select a different region."
+          error_msg += "\nFor EU users, try: europe-west1 (Belgium) or europe-west4 (Netherlands)"
+          error_msg += "\nCommon regions: #{COMMON_LOCATIONS.join(', ')}"
+          raise N2B::LlmApiError.new(error_msg)
+        rescue => e
+          raise N2B::LlmApiError.new("Vertex AI network error: #{e.message}")
+        end
+        if response.code != '200'
+          error_msg = "Vertex AI LLM API Error: #{response.code} #{response.message} - #{response.body}"
+          if response.code == '404'
+            error_msg += "\n\nThis might be a region or model availability issue. Current region: #{@location}"
+            error_msg += "\nNote: Google models via Vertex AI are not available in all regions."
+            error_msg += "\nTry reconfiguring with 'n2b -c' and:"
+            error_msg += "\n  1. Select a different region (Common regions: #{COMMON_LOCATIONS.join(', ')})"
+            error_msg += "\n  2. Choose a different model (some models are only available in specific regions)"
+          end
+          raise N2B::LlmApiError.new(error_msg)
+        end
+        parsed_response = JSON.parse(response.body)
+        # Vertex AI response structure is the same as Gemini API
+        answer = parsed_response['candidates'].first['content']['parts'].first['text']
+        begin
+          if answer.strip.start_with?('{') && answer.strip.end_with?('}')
+            answer = JSON.parse(answer) # LLM returned JSON as a string
+          else
+            # If not JSON, wrap it as per existing Gemini class (for CLI compatibility)
+            answer = { 'explanation' => answer, 'code' => nil }
+          end
+        rescue JSON::ParserError
+          answer = { 'explanation' => answer, 'code' => nil }
+        end
+        answer
+      end
+      def analyze_code_diff(prompt_content)
+        model = get_model_name
+        raise N2B::LlmApiError.new("No model configured for Vertex AI.") if model.nil? || model.empty?
+        uri = URI.parse(build_api_uri(model))
+        request = Net::HTTP::Post.new(uri)
+        request.content_type = 'application/json'
+        begin
+          scope = 'https://www.googleapis.com/auth/cloud-platform'
+          authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
+            json_key_io: File.open(@config['vertex_credential_file']),
+            scope: scope
+          )
+          access_token = authorizer.fetch_access_token!['access_token']
+          request['Authorization'] = "Bearer #{access_token}"
+        rescue StandardError => e
+          raise N2B::LlmApiError.new("Vertex AI - Failed to obtain Google Cloud access token for diff analysis: #{e.message}")
+        end
+        request.body = JSON.dump({
+          "contents" => [{
+            "role" => "user",
+            "parts" => [{
+              "text" => prompt_content
+            }]
+          }],
+          "generationConfig" => {
+            "responseMimeType" => "application/json" # Expecting JSON response from LLM
+          }
+        })
+        begin
+          response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.read_timeout = REQUEST_TIMEOUT
+            http.open_timeout = 30
+            http.request(request)
+          end
+        rescue Net::TimeoutError, Net::ReadTimeout, Net::OpenTimeout => e
+          error_msg = "Vertex AI diff analysis timed out (region: #{@location}): #{e.message}"
+          error_msg += "\n\nThis might be a region issue. Try reconfiguring with 'n2b -c' and select a different region."
+          error_msg += "\nFor EU users, try: europe-west1 (Belgium) or europe-west4 (Netherlands)"
+          error_msg += "\nCommon regions: #{COMMON_LOCATIONS.join(', ')}"
+          raise N2B::LlmApiError.new(error_msg)
+        rescue => e
+          raise N2B::LlmApiError.new("Vertex AI network error during diff analysis: #{e.message}")
+        end
+        if response.code != '200'
+          error_msg = "Vertex AI LLM API Error for diff analysis: #{response.code} #{response.message} - #{response.body}"
+          if response.code == '404'
+            error_msg += "\n\nThis might be a region or model availability issue. Current region: #{@location}"
+            error_msg += "\nNote: Google models via Vertex AI are not available in all regions."
+            error_msg += "\nTry reconfiguring with 'n2b -c' and:"
+            error_msg += "\n  1. Select a different region (Common regions: #{COMMON_LOCATIONS.join(', ')})"
+            error_msg += "\n  2. Choose a different model (some models are only available in specific regions)"
+          end
+          raise N2B::LlmApiError.new(error_msg)
+        end
+        parsed_response = JSON.parse(response.body)
+        # Return the raw JSON string from the 'text' field, CLI will parse it.
+        parsed_response['candidates'].first['content']['parts'].first['text']
+      end
+    end
+  end
+end

data/lib/n2b/merge_cli.rb CHANGED Viewed

@@ -844,6 +844,7 @@ REQUIREMENTS_BLOCK
             when 'openai' then N2B::Llm::OpenAi.new(config)
             when 'claude' then N2B::Llm::Claude.new(config)
             when 'gemini' then N2B::Llm::Gemini.new(config)
+            when 'vertexai' then N2B::Llm::VertexAi.new(config)
             when 'openrouter' then N2B::Llm::OpenRouter.new(config)
             when 'ollama' then N2B::Llm::Ollama.new(config)
             else raise N2B::Error, "Unsupported LLM service for analysis: #{llm_service_name}"
@@ -1083,6 +1084,8 @@ REQUIREMENTS_BLOCK
               N2B::Llm::Claude.new(config)
             when 'gemini'
               N2B::Llm::Gemini.new(config)
+            when 'vertexai'
+              N2B::Llm::VertexAi.new(config)
             when 'openrouter'
               N2B::Llm::OpenRouter.new(config)
             when 'ollama'

data/lib/n2b/model_config.rb CHANGED Viewed

@@ -17,6 +17,14 @@ module N2B
         'claude' => { 'suggested' => { 'sonnet' => 'claude-3-sonnet-20240229' }, 'default' => 'sonnet' },
         'openai' => { 'suggested' => { 'gpt-4o-mini' => 'gpt-4o-mini' }, 'default' => 'gpt-4o-mini' },
         'gemini' => { 'suggested' => { 'gemini-flash' => 'gemini-2.0-flash' }, 'default' => 'gemini-flash' },
+        'vertexai' => {
+          'suggested' => {
+            'gemini-2.0-flash' => 'gemini-2.0-flash-001',
+            'gemini-2.5-flash' => 'gemini-2.5-flash-preview',
+            'gemini-2.5-flash-05-20' => 'gemini-2.5-flash-preview-05-20'
+          },
+          'default' => 'gemini-2.0-flash'
+        },
         'openrouter' => { 'suggested' => { 'gpt-4o' => 'openai/gpt-4o' }, 'default' => 'gpt-4o' },
         'ollama' => { 'suggested' => { 'llama3' => 'llama3' }, 'default' => 'llama3' }
       }

data/lib/n2b/version.rb CHANGED Viewed

@@ -1,4 +1,4 @@
 # lib/n2b/version.rb
 module N2B
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/n2b.rb CHANGED Viewed

@@ -9,6 +9,7 @@ require 'n2b/version'
 require 'n2b/llm/claude'
 require 'n2b/llm/open_ai'
 require 'n2b/llm/gemini'
+require 'n2b/llm/vertex_ai'
 require 'n2b/errors' # Load custom errors
 require 'n2b/base'
 require 'n2b/cli'

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: n2b
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Stefan Nothegger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2025-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: googleauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- bin/branch-audit.sh
 - bin/n2b
 - bin/n2b-diff
 - bin/n2b-test-github
@@ -99,6 +112,7 @@ files:
 - lib/n2b/llm/ollama.rb
 - lib/n2b/llm/open_ai.rb
 - lib/n2b/llm/open_router.rb
+- lib/n2b/llm/vertex_ai.rb
 - lib/n2b/merge_cli.rb
 - lib/n2b/merge_conflict_parser.rb
 - lib/n2b/message_utils.rb
@@ -133,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: AI-powered development toolkit with merge conflict resolution and Jira integration

data/bin/branch-audit.sh DELETED Viewed

@@ -1,397 +0,0 @@
-#!/bin/bash
-# Branch Audit Script - Safely analyze all branches for unmerged code
-# Author: Augment Agent
-# Purpose: Find valuable code in branches without touching main
-set -e  # Exit on any error
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-# Configuration
-MAIN_BRANCH="main"
-REPORT_FILE="branch_audit_report_$(date +%Y-%m-%d_%H-%M-%S).md"
-TEMP_DIR="temp_branch_audit_$$"
-WORKTREE_DIR="worktree_audit_$$"
-# Arrays to store results
-declare -a MERGEABLE_BRANCHES=()
-declare -a CONFLICTED_BRANCHES=()
-declare -a EMPTY_BRANCHES=()
-declare -a ERROR_BRANCHES=()
-# Cleanup function
-cleanup() {
-    echo -e "${YELLOW}🧹 Cleaning up temporary files...${NC}"
-    if [ -d "$TEMP_DIR" ]; then
-        rm -rf "$TEMP_DIR"
-    fi
-    if [ -d "$WORKTREE_DIR" ]; then
-        git worktree remove "$WORKTREE_DIR" 2>/dev/null || true
-        rm -rf "$WORKTREE_DIR" 2>/dev/null || true
-    fi
-}
-# Set up cleanup trap
-trap cleanup EXIT
-# Function to log with timestamp
-log() {
-    echo -e "${BLUE}[$(date '+%H:%M:%S')]${NC} $1"
-}
-# Function to check if branch exists
-branch_exists() {
-    git show-ref --verify --quiet "refs/heads/$1" 2>/dev/null
-}
-# Function to check if remote branch exists
-remote_branch_exists() {
-    git show-ref --verify --quiet "refs/remotes/$1" 2>/dev/null
-}
-# Function to get unique commits in branch vs main
-get_unique_commits() {
-    local branch="$1"
-    git log --oneline "${MAIN_BRANCH}..${branch}" 2>/dev/null || echo ""
-}
-# Function to get file changes summary
-get_file_changes() {
-    local branch="$1"
-    git diff --name-status "${MAIN_BRANCH}...${branch}" 2>/dev/null || echo ""
-}
-# Function to check if fast-forward merge is possible
-can_fast_forward() {
-    local branch="$1"
-    local merge_base=$(git merge-base "$MAIN_BRANCH" "$branch" 2>/dev/null || echo "")
-    local main_commit=$(git rev-parse "$MAIN_BRANCH" 2>/dev/null || echo "")
-    if [ -z "$merge_base" ] || [ -z "$main_commit" ]; then
-        return 1
-    fi
-    # If merge base equals main commit, then it's a fast-forward
-    [ "$merge_base" = "$main_commit" ]
-}
-# Function to analyze a single branch
-analyze_branch() {
-    local branch="$1"
-    local branch_type="$2"  # "local" or "remote"
-    log "Analyzing ${branch_type} branch: $branch"
-    # Skip main branch and its variants
-    if [[ "$branch" =~ ^(main|master|origin/main|origin/master)$ ]]; then
-        log "Skipping main branch: $branch"
-        return
-    fi
-    # For remote branches, create local tracking branch if needed
-    local local_branch="$branch"
-    if [ "$branch_type" = "remote" ]; then
-        local_branch="${branch#origin/}"
-        if ! branch_exists "$local_branch"; then
-            log "Creating local tracking branch for $branch"
-            git branch "$local_branch" "$branch" 2>/dev/null || {
-                ERROR_BRANCHES+=("$branch (failed to create local branch)")
-                return
-            }
-        fi
-    fi
-    # Get unique commits
-    local unique_commits=$(get_unique_commits "$local_branch")
-    local commit_count=0
-    if [ -n "$unique_commits" ] && [ "$unique_commits" != "" ]; then
-        commit_count=$(echo "$unique_commits" | wc -l | tr -d ' ')
-    fi
-    if [ "$commit_count" -eq 0 ]; then
-        log "Branch $branch has no unique commits"
-        EMPTY_BRANCHES+=("$branch")
-        return
-    fi
-    # Check if fast-forward is possible
-    if can_fast_forward "$local_branch"; then
-        log "✅ Branch $branch can be fast-forward merged ($commit_count commits)"
-        MERGEABLE_BRANCHES+=("$branch|$commit_count|$unique_commits")
-    else
-        log "⚠️  Branch $branch has conflicts or diverged ($commit_count commits)"
-        CONFLICTED_BRANCHES+=("$branch|$commit_count|$unique_commits")
-    fi
-}
-# Main execution starts here
-main() {
-    echo -e "${GREEN}🔍 Starting Branch Audit Analysis${NC}"
-    echo -e "${BLUE}Repository: $(pwd)${NC}"
-    echo -e "${BLUE}Main branch: $MAIN_BRANCH${NC}"
-    echo -e "${BLUE}Report file: $REPORT_FILE${NC}"
-    echo ""
-    # Verify we're in a git repository
-    if ! git rev-parse --git-dir > /dev/null 2>&1; then
-        echo -e "${RED}❌ Error: Not in a git repository${NC}"
-        exit 1
-    fi
-    # Verify main branch exists
-    if ! git show-ref --verify --quiet "refs/heads/$MAIN_BRANCH"; then
-        echo -e "${RED}❌ Error: Main branch '$MAIN_BRANCH' not found${NC}"
-        exit 1
-    fi
-    # Fetch latest from remote
-    log "Fetching latest changes from remote..."
-    git fetch --all --prune
-    # Create temporary directory
-    mkdir -p "$TEMP_DIR"
-    # Get current branch to restore later
-    CURRENT_BRANCH=$(git branch --show-current)
-    # Ensure we're on main branch for analysis
-    log "Switching to main branch for analysis..."
-    git checkout "$MAIN_BRANCH" >/dev/null 2>&1
-    # Get all local branches
-    log "Analyzing local branches..."
-    while IFS= read -r branch; do
-        branch=$(echo "$branch" | sed 's/^[* ] //' | xargs)
-        analyze_branch "$branch" "local"
-    done < <(git branch | grep -v "^\*.*$MAIN_BRANCH$")
-    # Get all remote branches
-    log "Analyzing remote branches..."
-    while IFS= read -r branch; do
-        branch=$(echo "$branch" | sed 's|^  remotes/||' | xargs)
-        # Skip if we already have this as a local branch
-        local_name="${branch#origin/}"
-        if ! branch_exists "$local_name"; then
-            analyze_branch "$branch" "remote"
-        fi
-    done < <(git branch -r | grep -v "HEAD\|$MAIN_BRANCH$")
-    # Restore original branch
-    if [ -n "$CURRENT_BRANCH" ] && [ "$CURRENT_BRANCH" != "$MAIN_BRANCH" ]; then
-        log "Restoring original branch: $CURRENT_BRANCH"
-        git checkout "$CURRENT_BRANCH" >/dev/null 2>&1
-    fi
-    # Generate report
-    generate_report
-    echo ""
-    echo -e "${GREEN}✅ Branch audit completed!${NC}"
-    echo -e "${BLUE}📄 Report saved to: $REPORT_FILE${NC}"
-}
-# Function to generate detailed report
-generate_report() {
-    log "Generating detailed report..."
-    cat > "$REPORT_FILE" << EOF
-# Branch Audit Report
-**Generated:** $(date)
-**Repository:** $(pwd)
-**Main Branch:** $MAIN_BRANCH
-## 📊 Executive Summary
-- **Mergeable Branches (Fast-Forward):** ${#MERGEABLE_BRANCHES[@]}
-- **Conflicted Branches (Manual Review):** ${#CONFLICTED_BRANCHES[@]}
-- **Empty Branches (No Changes):** ${#EMPTY_BRANCHES[@]}
-- **Error Branches:** ${#ERROR_BRANCHES[@]}
-- **Total Analyzed:** $((${#MERGEABLE_BRANCHES[@]} + ${#CONFLICTED_BRANCHES[@]} + ${#EMPTY_BRANCHES[@]} + ${#ERROR_BRANCHES[@]}))
----
-EOF
-    # Mergeable branches section
-    if [ ${#MERGEABLE_BRANCHES[@]} -gt 0 ]; then
-        cat >> "$REPORT_FILE" << EOF
-## ✅ Mergeable Branches (Fast-Forward Possible)
-These branches can be safely merged into main without conflicts:
-EOF
-        for branch_info in "${MERGEABLE_BRANCHES[@]}"; do
-            IFS='|' read -r branch commit_count commits <<< "$branch_info"
-            cat >> "$REPORT_FILE" << EOF
-### 🌿 \`$branch\`
-- **Unique Commits:** $commit_count
-- **File Changes:** $(get_file_changes "$branch" | wc -l) files
-- **Recent Commits:**
-\`\`\`
-$commits
-\`\`\`
-- **Files Modified:**
-\`\`\`
-$(get_file_changes "$branch" | head -10)
-$([ $(get_file_changes "$branch" | wc -l) -gt 10 ] && echo "... and $(($(get_file_changes "$branch" | wc -l) - 10)) more files")
-\`\`\`
-**Recommendation:** ✅ Safe to merge with \`git merge $branch\`
----
-EOF
-        done
-    fi
-    # Conflicted branches section
-    if [ ${#CONFLICTED_BRANCHES[@]} -gt 0 ]; then
-        cat >> "$REPORT_FILE" << EOF
-## ⚠️ Conflicted Branches (Manual Review Required)
-These branches have diverged from main and may have conflicts:
-EOF
-        for branch_info in "${CONFLICTED_BRANCHES[@]}"; do
-            IFS='|' read -r branch commit_count commits <<< "$branch_info"
-            cat >> "$REPORT_FILE" << EOF
-### 🔀 \`$branch\`
-- **Unique Commits:** $commit_count
-- **File Changes:** $(get_file_changes "$branch" | wc -l) files
-- **Recent Commits:**
-\`\`\`
-$commits
-\`\`\`
-- **Files Modified:**
-\`\`\`
-$(get_file_changes "$branch" | head -10)
-$([ $(get_file_changes "$branch" | wc -l) -gt 10 ] && echo "... and $(($(get_file_changes "$branch" | wc -l) - 10)) more files")
-\`\`\`
-**Recommendation:** ⚠️ Manual review required - check for conflicts before merging
----
-EOF
-        done
-    fi
-    # Empty branches section
-    if [ ${#EMPTY_BRANCHES[@]} -gt 0 ]; then
-        cat >> "$REPORT_FILE" << EOF
-## 🗑️ Empty Branches (Safe to Delete)
-These branches have no unique commits compared to main:
-EOF
-        for branch in "${EMPTY_BRANCHES[@]}"; do
-            cat >> "$REPORT_FILE" << EOF
-- \`$branch\` - No unique changes
-EOF
-        done
-        cat >> "$REPORT_FILE" << EOF
-**Cleanup Commands:**
-\`\`\`bash
-# Delete local empty branches
-EOF
-        for branch in "${EMPTY_BRANCHES[@]}"; do
-            if [[ ! "$branch" =~ ^origin/ ]]; then
-                echo "git branch -d $branch" >> "$REPORT_FILE"
-            fi
-        done
-        cat >> "$REPORT_FILE" << EOF
-# Delete remote empty branches (be careful!)
-EOF
-        for branch in "${EMPTY_BRANCHES[@]}"; do
-            if [[ "$branch" =~ ^origin/ ]]; then
-                remote_branch="${branch#origin/}"
-                echo "git push origin --delete $remote_branch" >> "$REPORT_FILE"
-            fi
-        done
-        cat >> "$REPORT_FILE" << EOF
-\`\`\`
----
-EOF
-    fi
-    # Error branches section
-    if [ ${#ERROR_BRANCHES[@]} -gt 0 ]; then
-        cat >> "$REPORT_FILE" << EOF
-## ❌ Error Branches
-These branches encountered errors during analysis:
-EOF
-        for branch in "${ERROR_BRANCHES[@]}"; do
-            cat >> "$REPORT_FILE" << EOF
-- \`$branch\`
-EOF
-        done
-        cat >> "$REPORT_FILE" << EOF
-**Recommendation:** Manual investigation required
----
-EOF
-    fi
-    # Summary and recommendations
-    cat >> "$REPORT_FILE" << EOF
-## 🎯 Recommended Actions
-### Immediate Actions (Safe)
-1. **Merge fast-forward branches:** ${#MERGEABLE_BRANCHES[@]} branches ready
-2. **Delete empty branches:** ${#EMPTY_BRANCHES[@]} branches can be removed
-3. **Review conflicted branches:** ${#CONFLICTED_BRANCHES[@]} branches need manual review
-### Cleanup Script
-\`\`\`bash
-# Run this script to clean up empty branches
-EOF
-    # Generate cleanup commands for empty branches
-    for branch in "${EMPTY_BRANCHES[@]}"; do
-        if [[ ! "$branch" =~ ^origin/ ]]; then
-            echo "git branch -d $branch" >> "$REPORT_FILE"
-        fi
-    done
-    cat >> "$REPORT_FILE" << EOF
-\`\`\`
-### Merge Script for Fast-Forward Branches
-\`\`\`bash
-# Run these commands to merge ready branches
-EOF
-    # Generate merge commands for mergeable branches
-    for branch_info in "${MERGEABLE_BRANCHES[@]}"; do
-        IFS='|' read -r branch commit_count commits <<< "$branch_info"
-        if [[ ! "$branch" =~ ^origin/ ]]; then
-            echo "git merge $branch  # $commit_count commits" >> "$REPORT_FILE"
-        fi
-    done
-    cat >> "$REPORT_FILE" << EOF
-\`\`\`
----
-*Report generated by branch-audit.sh on $(date)*
-EOF
-    log "Report generated: $REPORT_FILE"
-}
-# Run main function
-main "$@"