ai_git 0.0.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a43b04eaad5bed61c5dbe62df46fb915e83d0481e274c2f440b3be2bd7966660
-  data.tar.gz: c74c24c20d94f28a58938ec1f8d0a0d323c15a0522fd6d3596b7f8e51323182d
+  metadata.gz: bc3e320bc55f08d7665a8a6ae9123b6b032a4b4a3861cf439b5ff018f14b415a
+  data.tar.gz: 055a7bd2bc06b4d0e18aacb318a6aa6725e1632f0bb1b5c4c3ad2ca5930013ab
 SHA512:
-  metadata.gz: 03cbbe8cf09690cc3db34f98bf42e39479672ce464d65de18a6a25d901ea9c8d35c318a0efa4eac06abc3d1f07d1848be24506ca4c6146facff7e9dcb18a1e80
-  data.tar.gz: 47a3c30cbb3ed60d128db9d68af240b5404096ffc95643766cb873296f8e3f2ccacc5cbc284be4fdc6d984dd1c310ea2ff01873c5442abb86745e1d34be59c19
+  metadata.gz: d90a349b399361d0c52fcaec15fec584bb4251197a8a282a7632b5e1078ec571753f8085c6edddf51edffd0f3d6c10ef24b7922afdd6c69df700b564f1f446e1
+  data.tar.gz: 603b003ec1cefdae26db68cc026ac1d2950ebd00421e9e1c0fe56c663dc8ae202458a8334bfeef1cd6f1e8cfc9a1d29893578e3e1c34c41b239c8245a11dc744

data/bin/ai_git

@@ -3,4 +3,4 @@
 
 require_relative "../lib/ai_git"
 
-AIGit.run
+AIGit.start(ARGV)

data/lib/ai_git/config.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module AIGit
+  module Config
+    PROVIDERS = {
+      "jan" => {
+        default_model: "Jan-v3.5-4B-Q4_K_XL",
+        base_url: "http://127.0.0.1:1337",
+        endpoint: "/v1/chat/completions",
+        request_format: :openai
+      },
+      "ollama" => {
+        default_model: "gemma4:e4b",
+        base_url: "http://localhost:11434",
+        endpoint: "/api/generate",
+        request_format: :ollama
+      }
+    }.freeze
+
+    def self.provider
+      ENV["AI_GIT_AI_PROVIDER"] || "jan"
+    end
+
+    def self.model_name
+      ENV["AI_GIT_MODEL_NAME"] || PROVIDERS[provider][:default_model]
+    end
+
+    def self.base_url
+      ENV["AI_GIT_BASE_URL"] || PROVIDERS[provider][:base_url]
+    end
+
+    def self.endpoint
+      PROVIDERS[provider][:endpoint]
+    end
+
+    def self.request_format
+      PROVIDERS[provider][:request_format]
+    end
+
+    def self.config
+      PROVIDERS[provider]
+    end
+  end
+end

data/lib/ai_git/{ollama.rb → default.rb}

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require "benchmark"
 require "net/http"
 require "uri"
 require "json"
+require_relative "version"
+require_relative "git"
 
 module AIGit
-  module Ollama
+  module Default
     module_function
 
     def escape_json(string)
@@ -75,49 +78,100 @@ module AIGit
         Now generate the commit message:
       PROMPT
 
-      json_body = {
-        model: model_name,
-        prompt: prompt,
-        stream: false,
-        # These parameters help a lot with strictness:
-        temperature: 0.3,
-        top_p: 0.9,
-        stop: ["\n\n\n", "```", "Here is", "The commit message"],
-        num_predict: 400 # Limit output length
-      }.to_json
-
-      uri = URI("http://localhost:11434/api/generate")
-      request = Net::HTTP::Post.new(uri)
-      request["Content-Type"] = "application/json"
-      request.body = json_body
-
-      response = Net::HTTP.start(uri.host, uri.port, read_timeout: 120) do |http|
-        http.request(request)
+      if AIGit::Config.request_format == :ollama
+        json_body = {
+          model: model_name,
+          prompt: prompt,
+          stream: false,
+          temperature: 0.3,
+          top_p: 0.9,
+          stop: ["\n\n\n", "```", "Here is", "The commit message"],
+          num_predict: 400
+        }.to_json
+
+        uri = URI("#{AIGit::Config.base_url}#{AIGit::Config.endpoint}")
+        request = Net::HTTP::Post.new(uri)
+        request["Content-Type"] = "application/json"
+        request.body = json_body
+
+        response = Net::HTTP.start(uri.host, uri.port, read_timeout: 120) do |http|
+          http.request(request)
+        end
+
+        raise "Failed to connect to #{AIGit::Config.provider}. Is it running?" unless response.is_a?(Net::HTTPSuccess)
+
+        data = JSON.parse(response.body)
+        message = data["response"].to_s.strip
+      else # Jan AI
+        json_body = {
+          model: model_name,
+          messages: [{ role: "user", content: prompt }],
+          stream: false,
+          temperature: 0.3
+        }.to_json
+
+        uri = URI("#{AIGit::Config.base_url}#{AIGit::Config.endpoint}")
+        request = Net::HTTP::Post.new(uri)
+        request["Content-Type"] = "application/json"
+        request.body = json_body
+
+        response = Net::HTTP.start(uri.host, uri.port, read_timeout: 120) do |http|
+          http.request(request)
+        end
+
+        raise "Failed to connect to #{AIGit::Config.provider}. Is it running?" unless response.is_a?(Net::HTTPSuccess)
+
+        data = JSON.parse(response.body)
+        message = data["choices"][0]["message"]["content"].to_s.strip
       end
 
-      raise "Failed to connect to Ollama. Is it running?" unless response.is_a?(Net::HTTPSuccess)
-
-      data = JSON.parse(response.body)
-      message = data["response"].to_s.strip
-
-      # Aggressive cleaning
       message = message.gsub(/^(Here is|The commit message is|```|json|markdown)/i, "")
                        .gsub(/^>\s*/, "")
                        .gsub(/\\n/, "\n")
                        .strip
 
-      # Remove common unwanted prefixes/suffixes
       lines = message.lines.map(&:strip)
       lines.reject! { |line| line.match?(/^(Here|Output|Generated|Based on|The changes)/i) }
 
       message = lines.join("\n").strip
 
-      # Ensure it has at least a title
-      if message.lines.count < 1 || message.strip.empty?
-        message = "chore: update code" # fallback
-      end
+      message = "chore: update code" if message.lines.count < 1 || message.strip.empty?
 
       message
     end
+
+    def call
+      provider = AIGit::Config.provider
+      model_name = AIGit::Config.model_name
+
+      staged = AIGit::Git.staged_files
+      abort "Error: No staged files. Use `git add` first." if staged.to_s.strip.empty?
+
+      diff = AIGit::Git.diff
+      branch = AIGit::Git.current_branch
+
+      puts "\e[1mAI Provider:\e[0m #{provider}"
+      puts "\e[1mModel Name:\e[0m #{model_name}"
+      puts "\e[1mStaged Files:\e[0m #{staged}"
+      puts "\e[1mBranch:\e[0m #{branch}"
+      puts "\e[1mAI Generating Commit Message\e[0m"
+
+      result = Benchmark.measure do
+        message = generate_commit_message(diff, model_name)
+        message = message.gsub(/\n{2,}/, "\n")
+
+        puts "\e[1mCommit Message:\e[0m\n\n#{message}\n"
+
+        escaped_msg = message.gsub(/[\\"`$]/) { |c| "\\#{c}" }
+        AIGit::Git.run_command("git", "commit -m \"#{escaped_msg}\"")
+        puts "\e[1mGit Commited\e[0m"
+
+        AIGit::Git.run_command("git", "push -u origin HEAD")
+        puts "\e[1mGit Pushed\e[0m"
+      end
+
+      puts "\e[1mBenchmark\e[0m"
+      puts result
+    end
   end
 end

data/lib/ai_git/review.rb

@@ -0,0 +1,173 @@
+# frozen_string_literal: true
+
+require "benchmark"
+require "net/http"
+require "uri"
+require "json"
+require_relative "version"
+require_relative "git"
+
+module AIGit
+  module Review
+    module_function
+
+    def generate_review(diff, model_name)
+      raise "No staged changes to review" if diff.to_s.strip.empty?
+
+      prompt = <<~PROMPT
+        You are a senior software engineer conducting a thorough code review. Output ONLY the review — no explanations, no markdown preamble, no backticks, no preamble.
+
+        Here are the staged changes:
+        #{diff}
+
+        STRICT OUTPUT FORMAT (follow exactly):
+
+        ## Summary
+        <2–5 bullet points describing what this change does at a high level. Each bullet starts with a verb.>
+
+        ## Suggestions
+        <For each issue or improvement, use this format:>
+
+        **<File and location, e.g. "app/models/user.rb">**
+        - <Concise description of the issue or suggestion. Start with a verb. Be specific.>
+        - <Another suggestion for the same file, if applicable.>
+
+        <Repeat the file block for each file with suggestions. Omit files that look clean.>
+
+        ## Verdict
+        <One of: ✅ Looks good | ⚠️ Minor issues | 🚨 Needs attention>
+        <One sentence explaining the verdict.>
+
+        RULES:
+        - Summary: describe WHAT the change does, not HOW the code looks. Focus on behaviour and intent.
+        - Suggestions: flag real issues — bugs, edge cases, security problems, missing error handling, naming confusion, performance concerns, missing tests. Do NOT invent problems. If a file is clean, omit it entirely.
+        - Be direct and constructive. No filler like "great job" or "consider possibly maybe".
+        - No line should exceed 72 characters.
+        - If the diff is a minor or trivial change (e.g. version bump, typo fix), keep the review brief.
+
+        EXAMPLES OF GOOD OUTPUT:
+
+        ## Summary
+        - Add password reset flow with tokenised email verification
+        - Introduce PasswordResetMailer with expiry-aware token links
+        - Add DB migration for reset_token and reset_token_expires_at columns
+
+        ## Suggestions
+
+        **app/models/user.rb**
+        - Ensure reset_token is invalidated after successful use to
+          prevent token reuse attacks.
+        - Add an index on reset_token column for fast lookup queries.
+
+        **app/controllers/passwords_controller.rb**
+        - Handle the case where the token has expired with a user-facing
+          error message rather than a silent redirect.
+
+        ## Verdict
+        ⚠️ Minor issues
+        Core logic is solid but token invalidation and expiry feedback
+        need addressing before merge.
+
+        ---
+
+        ## Summary
+        - Fix nil guard in ReportGenerator when preferences are absent
+
+        ## Suggestions
+
+        ## Verdict
+        ✅ Looks good
+        Safe defensive fix with no side effects.
+
+        ---
+
+        Now review the staged changes:
+      PROMPT
+
+      if AIGit::Config.request_format == :ollama
+        json_body = {
+          model: model_name,
+          prompt: prompt,
+          stream: false,
+          temperature: 0.2,
+          top_p: 0.9,
+          stop: ["\n\n\n", "```", "Here is", "The review"],
+          num_predict: 600
+        }.to_json
+
+        uri = URI("#{AIGit::Config.base_url}#{AIGit::Config.endpoint}")
+        request = Net::HTTP::Post.new(uri)
+        request["Content-Type"] = "application/json"
+        request.body = json_body
+
+        response = Net::HTTP.start(uri.host, uri.port, read_timeout: 120) do |http|
+          http.request(request)
+        end
+
+        raise "Failed to connect to #{AIGit::Config.provider}. Is it running?" unless response.is_a?(Net::HTTPSuccess)
+
+        data = JSON.parse(response.body)
+        review = data["response"].to_s.strip
+      else # Jan AI
+        json_body = {
+          model: model_name,
+          messages: [{ role: "user", content: prompt }],
+          stream: false,
+          temperature: 0.2
+        }.to_json
+
+        uri = URI("#{AIGit::Config.base_url}#{AIGit::Config.endpoint}")
+        request = Net::HTTP::Post.new(uri)
+        request["Content-Type"] = "application/json"
+        request.body = json_body
+
+        response = Net::HTTP.start(uri.host, uri.port, read_timeout: 120) do |http|
+          http.request(request)
+        end
+
+        raise "Failed to connect to #{AIGit::Config.provider}. Is it running?" unless response.is_a?(Net::HTTPSuccess)
+
+        data = JSON.parse(response.body)
+        review = data["choices"][0]["message"]["content"].to_s.strip
+      end
+
+      review = review.gsub(/^(Here is|The review is|```|json|markdown)/i, "")
+                     .gsub(/^>\s*/, "")
+                     .gsub(/\\n/, "\n")
+                     .strip
+
+      lines = review.lines.map(&:strip)
+      lines.reject! { |line| line.match?(/^(Here|Output|Generated|Based on|The changes)/i) }
+
+      review = lines.join("\n").strip
+      review = "No review generated." if review.empty?
+
+      review
+    end
+
+    def call
+      provider = AIGit::Config.provider
+      model_name = AIGit::Config.model_name
+
+      staged = AIGit::Git.staged_files
+      abort "Error: No staged files. Use `git add` first." if staged.to_s.strip.empty?
+
+      diff = AIGit::Git.diff
+      branch = AIGit::Git.current_branch
+
+      puts "\e[1mAI Provider:\e[0m #{provider}"
+      puts "\e[1mModel Name:\e[0m #{model_name}"
+      puts "\e[1mStaged Files:\e[0m #{staged}"
+      puts "\e[1mBranch:\e[0m #{branch}"
+      puts "\e[1mAI Reviewing Changes\e[0m"
+
+      result = Benchmark.measure do
+        review = generate_review(diff, model_name)
+        puts "\e[1mCode Review:\e[0m\n\n#{review}\n"
+      end
+
+      puts "\e[1mBenchmark\e[0m"
+      puts result
+    end
+  end
+end

data/lib/ai_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AIGit
-  VERSION = "0.0.4"
+  VERSION = "0.2.0"
 end

data/lib/ai_git.rb

@@ -1,42 +1,24 @@
 # frozen_string_literal: true
 
-require "benchmark"
 require_relative "ai_git/version"
+require_relative "ai_git/config"
 require_relative "ai_git/git"
-require_relative "ai_git/ollama"
+require_relative "ai_git/review"
+require_relative "ai_git/default"
 
 module AIGit
   module_function
 
-  def run
-    model_name = ENV["AI_GIT_MODEL_NAME"] || "phi4:14b"
+  SUBCOMMANDS = {
+    "review" => AIGit::Review,
+    "default" => AIGit::Default
+  }.freeze
 
-    staged = AIGit::Git.staged_files
-    abort "Error: No staged files. Use `git add` first." if staged.to_s.strip.empty?
+  def start(args)
+    command = args.first || "default"
 
-    diff = AIGit::Git.diff
-    branch = AIGit::Git.current_branch
+    raise "Unknown subcommand: #{command}" unless SUBCOMMANDS.key?(command)
 
-    puts "\e[1mModel Name:\e[0m #{model_name}"
-    puts "\e[1mStaged Files:\e[0m #{staged}"
-    puts "\e[1mBranch:\e[0m #{branch}"
-    puts "\e[1mAI Generating Commit Message\e[0m"
-
-    result = Benchmark.measure do
-      message = AIGit::Ollama.generate_commit_message(diff, model_name)
-      message = message.gsub(/\n{2,}/, "\n")
-
-      puts "\e[1mCommit Message:\e[0m\n\n#{message}\n"
-
-      escaped_msg = message.gsub(/[\\"`$]/) { |c| "\\#{c}" }
-      AIGit::Git.run_command("git", "commit -m \"#{escaped_msg}\"")
-      puts "\e[1mGit Commited\e[0m"
-
-      AIGit::Git.run_command("git", "push")
-      puts "\e[1mGit Pushed\e[0m"
-    end
-
-    puts "\e[1mBenchmark\e[0m"
-    puts result
+    SUBCOMMANDS[command].call
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ai_git
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Kaíque Kandy Koga
@@ -9,7 +9,7 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description: AI‑powered Git commit + push tool using SLMs
+description: AI‑powered Git using SLMs
 executables:
 - ai_git
 extensions: []
@@ -17,8 +17,10 @@ extra_rdoc_files: []
 files:
 - bin/ai_git
 - lib/ai_git.rb
+- lib/ai_git/config.rb
+- lib/ai_git/default.rb
 - lib/ai_git/git.rb
-- lib/ai_git/ollama.rb
+- lib/ai_git/review.rb
 - lib/ai_git/version.rb
 homepage: https://github.com/kaiquekandykoga/ai_git
 licenses:
@@ -31,7 +33,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '4.0'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -40,5 +42,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 4.0.9
 specification_version: 4
-summary: AI‑powered Git commit + push tool using SLMs
+summary: AI‑powered Git using SLMs
 test_files: []