ai_git 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3d2a98e6fef0c0ce3deb757a48e43701f1800d8c524f0cea525a92c8b4ae575
-  data.tar.gz: 054d32afa6032a6bdfb2d4946673466b2b65ec6628dfecfb359bf67442c54e4e
+  metadata.gz: bc3e320bc55f08d7665a8a6ae9123b6b032a4b4a3861cf439b5ff018f14b415a
+  data.tar.gz: 055a7bd2bc06b4d0e18aacb318a6aa6725e1632f0bb1b5c4c3ad2ca5930013ab
 SHA512:
-  metadata.gz: b9064aeb4a13c6719a3847a41e07e3a933d2404cd7be169cf7806d6efa5ade9d5c3b0f1ebeb12c9951ac1386ec9fe40af83bc8cba5017829f788e1211bc9f566
-  data.tar.gz: 6eacdb5d1ad3be96c5893466e02e28f2e5886091e5f8ca19fcd6814d31fc2629938bfc18447c3e07b98d6fde28e7582b63f483b0e3631deb0829f2e424d619ad
+  metadata.gz: d90a349b399361d0c52fcaec15fec584bb4251197a8a282a7632b5e1078ec571753f8085c6edddf51edffd0f3d6c10ef24b7922afdd6c69df700b564f1f446e1
+  data.tar.gz: 603b003ec1cefdae26db68cc026ac1d2950ebd00421e9e1c0fe56c663dc8ae202458a8334bfeef1cd6f1e8cfc9a1d29893578e3e1c34c41b239c8245a11dc744

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/default.rb

@@ -78,30 +78,53 @@ module AIGit
         Now generate the commit message:
       PROMPT
 
-      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("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
-
       message = message.gsub(/^(Here is|The commit message is|```|json|markdown)/i, "")
                        .gsub(/^>\s*/, "")
                        .gsub(/\\n/, "\n")
@@ -118,7 +141,8 @@ module AIGit
     end
 
     def call
-      model_name = ENV["AI_GIT_MODEL_NAME"] || "phi4:14b"
+      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?
@@ -126,6 +150,7 @@ module AIGit
       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}"
@@ -141,7 +166,7 @@ module AIGit
         AIGit::Git.run_command("git", "commit -m \"#{escaped_msg}\"")
         puts "\e[1mGit Commited\e[0m"
 
-        AIGit::Git.run_command("git", "push")
+        AIGit::Git.run_command("git", "push -u origin HEAD")
         puts "\e[1mGit Pushed\e[0m"
       end
 

data/lib/ai_git/review.rb

@@ -84,30 +84,53 @@ module AIGit
         Now review the staged changes:
       PROMPT
 
-      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("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.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
 
-      raise "Failed to connect to Ollama. Is it running?" unless response.is_a?(Net::HTTPSuccess)
-
-      data = JSON.parse(response.body)
-      review = data["response"].to_s.strip
-
       review = review.gsub(/^(Here is|The review is|```|json|markdown)/i, "")
                      .gsub(/^>\s*/, "")
                      .gsub(/\\n/, "\n")
@@ -123,7 +146,8 @@ module AIGit
     end
 
     def call
-      model_name = ENV["AI_GIT_MODEL_NAME"] || "phi4:14b"
+      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?
@@ -131,6 +155,7 @@ module AIGit
       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}"

data/lib/ai_git/version.rb

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

data/lib/ai_git.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "ai_git/version"
+require_relative "ai_git/config"
 require_relative "ai_git/git"
 require_relative "ai_git/review"
 require_relative "ai_git/default"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ai_git
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kaíque Kandy Koga
@@ -17,6 +17,7 @@ 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/review.rb
@@ -32,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:
   - - ">="