utils 0.64.0 → 0.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c80c59e58b4eddfd99b4890f90e9b79197a3058650355e93317234ffdacb21
-  data.tar.gz: 6b169b24ba94fd2c8fa1d64c53d69b3d93c4c60ca5ee8bf85098492f9d446904
+  metadata.gz: 8d1633f8d2d41b4f3498a2f8c25abd00d14800cba7d3266e3c95ee23f50c47e8
+  data.tar.gz: d928e826ea6a28690d62d7f7051c2424708230e859b787d7914472bfa315dda4
 SHA512:
-  metadata.gz: 3f0e39525fe0f42fe02cd834f436b09084d72532e47ee720eea97652420cf2f2502c47a265479c1a3501107fa945ec6433ff053cba78b6a148d7a4ffd797cfd1
-  data.tar.gz: b370aea11cc359cbf88261f305b2574764243d23c4f402fab14a5e1caf13b3328069a1e6dac82cf5809da6fc4c74fd51d830177d1a38a9ab5d6c961641d9e7e6
+  metadata.gz: c80fbe8111a06467d7c02868e010e911c06785783364f1f3047b76f88e0f90a7f70a57b49375fb4351d332068fb04f5cc00c86884918d2477ea5837b6543b7e4
+  data.tar.gz: 9b46861f764339dc572741b124c574683d2cbd3f2144751f196c1a96bbe7d9a6115f9ac908b1c0ec22168c48a77253ecee005c75a13f1ad3712ab52adf80b18b

data/Rakefile

@@ -28,7 +28,7 @@ GemHadar do
   dependency 'mize',           '~> 0.6'
   dependency 'search_ui',      '~> 0.0'
   dependency 'all_images',     '~> 0.5.0'
-  dependency 'ollama-ruby'
+  dependency 'ollama-ruby',    '~> 1.4.0'
   dependency 'kramdown-ansi',  '~> 0.0.1'
   dependency 'simplecov'
   dependency 'debug'

data/bin/changes

@@ -3,6 +3,8 @@
 require 'ollama'
 include Ollama
 require 'tins/xt'
+require 'utils'
+include Utils::XDGConfig
 
 def x(cmd)
   output = `#{cmd}`
@@ -43,48 +45,23 @@ def compute_change(range_from, range_to)
     EOT
   end
 
-  base_url = ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
-  model    = ENV.fetch('OLLAMA_MODEL', 'llama3.1')
+  config = xdg_config('changes')
 
-  system = <<~EOT
-    You are a Ruby programmer generating a change log entry in markdown syntax,
-    summarizing the code changes for a new version in a professional way.
-  EOT
-
-  prompt = <<~EOT
-    - Summarize the changes in the following git log messages as bullet points.
-    - Don't mention the version of the change set
-    - Skip bullet points about version bumps.
-    - List significant changes as bullet points using markdown when applicable.
-    - Mark all names and values for variables, methods, functions, and
-      constants, you see in the messages  as markdown code surrounded by
-      backtick characters.
-    - Mark all version numbers you see in the messages as markdown bold
-     surrounded by two asterisk characters.
-    - Don't refer to single commits by sha1 hash.
-    - Don't add information about changes you are not sure about.
-    - Don't output any additional chatty remarks, notes, introductions,
-      communications, etc.
-
-    #{log}
-  EOT
+  base_url      = ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
+  model         = ENV.fetch('OLLAMA_MODEL', 'llama3.1')
+  system        = File.read("#{config}/system.txt")
+  prompt        = File.read("#{config}/prompt.txt") + "\n\n#{log}\n"
+  client_config = Client::Config.load_from_json("#{config}/client.json")
+  client_config.base_url = base_url
 
   if ENV['DEBUG'].to_i == 1
     STDERR.puts "system:\n#{system}"
     STDERR.puts "prompt:\n#{prompt}"
   end
 
-  options = Ollama::Options.new(
-    num_ctx: 16384,
-    num_predict: 1024,
-    temperature: 0,
-    #seed: 1337,
-    top_p: 1,
-    min_p: 0.1,
-  )
-
-  ollama = Client.new(base_url:, read_timeout: 120)
-  changes = ollama.generate(model:, system:, prompt:, options:, stream: false)
+  ollama  = Client.configure_with(client_config)
+  options = Options.load_from_json "#{config}/options.json"
+  changes = ollama.generate(model:, system:, prompt:, options:, stream: false, think: false)
   changes = changes.response.gsub(/\t/, '  ')
 
   return <<~EOT

data/bin/code_comment

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'utils'
 require 'ollama'
 include Ollama
+require 'utils'
+include Utils::XDGConfig
 
 def fetch_method(filename_linenumber)
   result = ''
@@ -31,7 +32,7 @@ method_indent       = method[/\A( *)/, 1].size
 #file                = fetch_file(filename_linenumber)
 files               = Dir['{lib,spec,test}/**/*.rb']
 base_url            = ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
-model               = ENV.fetch('OLLAMA_MODEL', 'llama3.2')
+model               = ENV.fetch('OLLAMA_MODEL', 'llama3.1')
 #file                = File.read(file_name)
 #call_sites          = %x(cscope -L -3 "#{method_name}" $(find . -name '*.rb') | awk '{ print $1 ":" $3 }').lines.map(&:chomp).uniq
 #methods             = call_sites.map { fetch_method(_1) } * ?\n
@@ -167,6 +168,9 @@ if ENV['DEBUG'].to_i == 1
   end
 end
 
-ollama   = Client.new(base_url:, read_timeout: 120)
+config = xdg_config('code_comment')
+client_config = Client::Config.load_from_json "#{config}/client.json"
+client_config.base_url = base_url
+ollama   = Client.configure_with(client_config)
 response = ollama.generate(model:, system:, prompt:, options:, stream: false).response
 puts response.gsub(/^/) { ' ' * method_indent }

data/bin/commit_message

@@ -1,11 +1,9 @@
 #!/usr/bin/env ruby
 
-config =
-  if (xdg = ENV['XDG_CONFIG_HOME'].to_s.strip).size == 0
-    File.join(ENV.fetch('HOME'), '.config', 'commit_message')
-  else
-    File.join(xdg, 'commit_message')
-  end
+require 'utils'
+include Utils::XDGConfig
+
+config = xdg_config('commit_message')
 
 branch = `git rev-parse --abbrev-ref HEAD`.chomp
 exec 'ollama_cli', '-M', "#{config}/options.json", '-P', "branch=#{branch}",

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.64.0'
+  VERSION         = '0.65.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/utils/xdg_config.rb

@@ -0,0 +1,10 @@
+module Utils::XDGConfig
+  def xdg_config(name)
+    @config and return @config
+    @config = if xdg = ENV['XDG_CONFIG_HOME'].full?
+                File.join(xdg, name)
+              else
+                File.join(ENV.fetch('HOME'), '.config', name)
+              end
+  end
+end

data/lib/utils.rb

@@ -9,6 +9,7 @@ module Utils
   require 'utils/probe_server'
   require 'utils/ssh_tunnel_specification'
   require 'utils/line_blamer'
+  require 'utils/xdg_config'
 
   require 'utils/xt/source_location_extension'
   class ::Object

data/utils.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.64.0 ruby lib
+# stub: utils 0.65.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.64.0".freeze
+  s.version = "0.65.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.description = "This ruby gem provides some useful command line utilities".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ascii7".freeze, "blameline".freeze, "changes".freeze, "classify".freeze, "code_comment".freeze, "commit_message".freeze, "create_cstags".freeze, "create_tags".freeze, "discover".freeze, "edit".freeze, "edit_wait".freeze, "enum".freeze, "git-empty".freeze, "git-versions".freeze, "json_check".freeze, "long_lines".freeze, "myex".freeze, "number_files".freeze, "on_change".freeze, "path".freeze, "print_method".freeze, "probe".freeze, "rd2md".freeze, "search".freeze, "sedit".freeze, "serve".freeze, "ssh-tunnel".freeze, "strip_spaces".freeze, "sync_dir".freeze, "untest".freeze, "utils-utilsrc".freeze, "vcf2alias".freeze, "yaml_check".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze]
-  s.files = [".github/dependabot.yml".freeze, ".github/workflows/codeql-analysis.yml".freeze, ".utilsrc".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/changes".freeze, "bin/classify".freeze, "bin/code_comment".freeze, "bin/commit_message".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/print_method".freeze, "bin/probe".freeze, "bin/rd2md".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/sync_dir".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vcf2alias".freeze, "bin/yaml_check".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "tests/test_helper.rb".freeze, "tests/utils_test.rb".freeze, "utils.gemspec".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xdg_config.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze]
+  s.files = [".github/dependabot.yml".freeze, ".github/workflows/codeql-analysis.yml".freeze, ".utilsrc".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/changes".freeze, "bin/classify".freeze, "bin/code_comment".freeze, "bin/commit_message".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/print_method".freeze, "bin/probe".freeze, "bin/rd2md".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/sync_dir".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vcf2alias".freeze, "bin/yaml_check".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xdg_config.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "tests/test_helper.rb".freeze, "tests/utils_test.rb".freeze, "utils.gemspec".freeze]
   s.homepage = "http://github.com/flori/utils".freeze
   s.licenses = ["GPL-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "Utils - Some useful command line utilities".freeze, "--main".freeze, "README.md".freeze]
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<mize>.freeze, ["~> 0.6".freeze])
   s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.0".freeze])
   s.add_runtime_dependency(%q<all_images>.freeze, ["~> 0.5.0".freeze])
-  s.add_runtime_dependency(%q<ollama-ruby>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.4.0".freeze])
   s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.0.1".freeze])
   s.add_runtime_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<debug>.freeze, [">= 0".freeze])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.64.0
+  version: 0.65.0
 platform: ruby
 authors:
 - Florian Frank
@@ -167,16 +167,16 @@ dependencies:
   name: ollama-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: kramdown-ansi
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +271,7 @@ extra_rdoc_files:
 - lib/utils/probe_server.rb
 - lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
+- lib/utils/xdg_config.rb
 - lib/utils/xt/source_location_extension.rb
 files:
 - ".github/dependabot.yml"
@@ -326,6 +327,7 @@ files:
 - lib/utils/probe_server.rb
 - lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
+- lib/utils/xdg_config.rb
 - lib/utils/xt/source_location_extension.rb
 - tests/test_helper.rb
 - tests/utils_test.rb