dorian-commit 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7eea33291b322da0856645ec3841fc51490ca72d821c48bbf1a29aea1d0e4e
-  data.tar.gz: 047d11c7de11e00d5dd654b9d18bd660bbdc684c29e8bd3cdc7fc6abdfdac953
+  metadata.gz: 1cfd254ac72b0cb783a5617779fb203ed8fe84cec8685702a9f52ab18ac6de0b
+  data.tar.gz: 8158f5df736374fa3c9fc3e203755344dcdd93610d42227c127da25f14d577e1
 SHA512:
-  metadata.gz: a9d82f215a19897a242e50f2ea72347e6bdc623e6a9ad7b324678d2896881f87ef62792111df7453b324cf65394eec170e3327e6bf0d56eaa6e6e975364e9f84
-  data.tar.gz: 9cdf35126c7b589ab989bf23aa20367ef31c928bfdfc2c24e69286c6953d563ae152f06fd409a22962ac6b9fa26355537de1e71b4d7e2aef3fce1397d89a9600
+  metadata.gz: a328add85459b999de4436e92db6ea24cfd03912d3c0672fabe13823d24a88cfbe247db4bb2b0a2c43b1be596e3144ca2cbb5d2e67015bb25cdbcce7b480d1bb
+  data.tar.gz: 9dc85ba07932fc0be0c5781b4c5d6d94bbe5de98d686c61dc8cd234f9982608f350bd3b8436735ca48c483d2466f784c50d09994ac44325b4bf9b30a17adae91

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,7 +24,7 @@ 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
 
@@ -38,6 +39,30 @@ content_4 += parsed.files.map { |file| File.read(file) }.join("\n")
 
 abort "no staged files" if content_2.empty?
 
+encoder = Tiktoken.encoding_for_model("gpt-4o")
+
+content_2_encoded = encoder.encode(content_2)
+
+if content_2_encoded.length > parsed.options.tokens
+  messages_2 = []
+else
+  messages_2 = [
+    { role: :system, content: PROMPT_2 },
+    { role: :user, content: content_2 }
+  ]
+end
+
+content_3_encoded = encoder.encode(content_3)
+
+if content_3_encoded.length > parsed.options.tokens
+  messages_3 = []
+else
+  messages_3 = [
+    { role: :system, content: PROMPT_3 },
+    { role: :user, content: content_3 },
+  ]
+end
+
 if content_4.empty?
   messages_4 = []
 else
@@ -65,10 +90,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.1.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-08-25 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:
     - - ">="