dorian-commit 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7eea33291b322da0856645ec3841fc51490ca72d821c48bbf1a29aea1d0e4e
-  data.tar.gz: 047d11c7de11e00d5dd654b9d18bd660bbdc684c29e8bd3cdc7fc6abdfdac953
+  metadata.gz: 96ab8fd00e486fb48cb313023efd6ecf14763427593916b018304628f468eb05
+  data.tar.gz: 3bae8a19f1e528450a06600b08a7b4e6e63ad9e80dd742b79984edde5a08f1f2
 SHA512:
-  metadata.gz: a9d82f215a19897a242e50f2ea72347e6bdc623e6a9ad7b324678d2896881f87ef62792111df7453b324cf65394eec170e3327e6bf0d56eaa6e6e975364e9f84
-  data.tar.gz: 9cdf35126c7b589ab989bf23aa20367ef31c928bfdfc2c24e69286c6953d563ae152f06fd409a22962ac6b9fa26355537de1e71b4d7e2aef3fce1397d89a9600
+  metadata.gz: be08309f81e4dfa4100f8186e7de3a3cd4e6b95dbb2dab6b17f434918f92c8e73e30b2830ffaaa9d84c87318c4beaa181a2004bb92f7f3e1a65991646a62c901
+  data.tar.gz: 7eca41f69e2d35094437282a05dcd0c26b64c0a8ddf35f23e71f554765c4e7ea9fce849396bfe27c93b218915e120d220892e50f7fec9f9f63e1d2fcc5906a59

data/bin/commit

@@ -5,6 +5,7 @@ require "dorian/arguments"
 require "git"
 require "json"
 require "net/http"
+require "tiktoken_ruby"
 require "uri"
 
 TOKEN_FILE = File.join(Dir.home, ".commit")
@@ -23,12 +24,25 @@ PROMPT_2 = "for the following diff:"
 PROMPT_3 = "for the following git status:"
 PROMPT_4 = "for the following comment:"
 
-parsed = Dorian::Arguments.parse(version: { alias: :v }, help: { alias: :h })
+parsed =
+  Dorian::Arguments.parse(
+    tokens: {
+      type: :integer,
+      alias: :t,
+      default: 1000
+    },
+    version: {
+      alias: :v
+    },
+    help: {
+      alias: :h
+    }
+  )
 
 abort parsed.help if parsed.options.help
 
 if parsed.options.version
-  abort File.read(File.expand_path("../../VERSION", __FILE__))
+  abort File.read(File.expand_path("../VERSION", __dir__))
 end
 
 content_2 = `git diff --staged`
@@ -38,14 +52,32 @@ content_4 += parsed.files.map { |file| File.read(file) }.join("\n")
 
 abort "no staged files" if content_2.empty?
 
-if content_4.empty?
-  messages_4 = []
-else
-  messages_4 = [
-    { role: :system, content: PROMPT_4 },
-    { role: :user, content: content_4 }
-  ]
-end
+encoder = Tiktoken.encoding_for_model("gpt-4o")
+
+content_2_encoded = encoder.encode(content_2)
+
+messages_2 =
+  if content_2_encoded.length > parsed.options.tokens
+    []
+  else
+    [{ role: :system, content: PROMPT_2 }, { role: :user, content: content_2 }]
+  end
+
+content_3_encoded = encoder.encode(content_3)
+
+messages_3 =
+  if content_3_encoded.length > parsed.options.tokens
+    []
+  else
+    [{ role: :system, content: PROMPT_3 }, { role: :user, content: content_3 }]
+  end
+
+messages_4 =
+  if content_4.empty?
+    []
+  else
+    [{ role: :system, content: PROMPT_4 }, { role: :user, content: content_4 }]
+  end
 
 uri = URI.parse("https://api.openai.com/v1/chat/completions")
 
@@ -65,10 +97,8 @@ request.body = {
   model: "gpt-4o",
   messages: [
     { role: :system, content: PROMPT_1 },
-    { role: :system, content: PROMPT_2 },
-    { role: :user, content: content_2 },
-    { role: :system, content: PROMPT_3 },
-    { role: :user, content: content_3 },
+    *messages_2,
+    *messages_3,
     *messages_4
   ]
 }.to_json

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dorian-commit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dorian-arguments
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dorian-arguments
+  name: tiktoken_ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -57,9 +71,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.3.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="