aia 0.5.16 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8b6a3c91dad9236a014bbe130c6f359ba3121a8e731398304f6d6305158138
-  data.tar.gz: ce833e093f76d57388296361371484e1ce75c48442f4199895135f24ab3a8289
+  metadata.gz: 299a84f02f8f0fd0d2d26e8dd0c371e22bf7b19330c858273731eae0a017b965
+  data.tar.gz: 64a39d4045392d1e207e6e21714925cb9cf28c68dba92df8b516efff7525b57f
 SHA512:
-  metadata.gz: bfd04950aeb63e7d35f1063d8264fcdbd5e66d09ddf0ca9776caacfe978c4340a00b3e26ccadd728f0b83d9278eedc391b72c942e357a95acd6e39f6aab93f4d
-  data.tar.gz: 7e4f2a9698906c61d84eb4d19f9d059867579e922da77e1a7ddb55fe1dc50a6784b1f7e831ea6c3daf68a3e5078c21ec61514dafee29b135bc7ebf9c55a585c8
+  metadata.gz: d687ba13fa6a323046fd592efa9697502ba2ababe06623814ada87a5df430809bb9e54cd7da5d82c24b49d09641e59d8c77f0ed70fd4d3ae63878d2beaacc283
+  data.tar.gz: 2c5e3d861ec585231206a2e92a973100f1228f4eddbc5066782e0ace4a6bb76de2dd5530df9e29d87e9dd3b5aa82c03fb5002c83fda6c2b1272918d9ed3a04c4

data/.version

@@ -0,0 +1 @@
+0.5.18

data/CHANGELOG.md

@@ -1,6 +1,14 @@
-## [Unreleased]
+## Unreleased
 
-## [0.5.16] 2024-04-02
+### [0.5.18] 2024-10-26
+- updated dependencies; using prompt_manager v0.4.2
+
+## Released
+
+### [0.5.17] 2024-05-17
+- removed replaced `semver` with `versionaire`
+
+### [0.5.16] 2024-04-02
 - fixed prompt pipelines
 - added //next and //pipeline directives as shortcuts to //config [next,pipeline]
 - Added new backend "client" as an internal OpenAI client
@@ -10,82 +18,82 @@
 - Added --image_size and --image_quality (--is --iq)
 
 
-## [0.5.15] 2024-03-30
+### [0.5.15] 2024-03-30
 - Added the ability to accept piped in text to be appeded to the end of the prompt text: curl $URL | aia ad_hoc
 - Fixed bugs with entering directives as follow-up prompts during a chat session
 
-## [0.5.14] 2024-03-09
+### [0.5.14] 2024-03-09
 - Directly access OpenAI to do text to speech when using the `--speak` option
 - Added --voice to specify which voice to use
 - Added --speech_model to specify which TTS model to use
 
-## [0.5.13] 2024-03-03
+### [0.5.13] 2024-03-03
 - Added CLI-utility `llm` as a backend processor
 
-## [0.5.12] 2024-02-24
+### [0.5.12] 2024-02-24
 - Happy Birthday Ruby!
 - Added --next CLI option
 - Added --pipeline CLI option
 
-## [0.5.11] 2024-02-18
+### [0.5.11] 2024-02-18
 - allow directives to return information that is inserted into the prompt text
 - added //shell command directive
 - added //ruby ruby_code directive
 - added //include path_to_file directive
 
-## [0.5.10] 2024-02-03
+### [0.5.10] 2024-02-03
 - Added --roles_dir to isolate roles from other prompts if desired
 - Changed --prompts to --prompts_dir to be consistent
 - Refactored common fzf usage into its own tool class
 
-## [0.5.9] 2024-02-01
+### [0.5.9] 2024-02-01
 - Added a "I'm working" spinner thing when "--verbose" is used as an indication that the backend is in the process of composing its response to the prompt.
 
-## [0.5.8] 2024-01-17
+### [0.5.8] 2024-01-17
 - Changed the behavior of the --dump option.  It must now be followed by path/to/file.ext where ext is a supported config file format: yml, yaml, toml
 
-## [0.5.7] 2024-01-15
+### [0.5.7] 2024-01-15
 - Added ERB processing to the config_file
 
-## [0.5.6] 2024-01-15
+### [0.5.6] 2024-01-15
 - Adding processing for directives, shell integration and erb to the follow up prompt in a chat session
 - some code refactoring.
 
-## [0.5.3] 2024-01-14
+### [0.5.3] 2024-01-14
 - adding ability to render markdown to the terminal using the "glow" CLI utility
 
-## [0.5.2] 2024-01-13
+### [0.5.2] 2024-01-13
 - wrap response when its going to the terminal
 
-## [0.5.1] 2024-01-12
+### [0.5.1] 2024-01-12
 - removed a wicked puts "loaded" statement
 - fixed missed code when the options were changed to --out_file and --log_file
 - fixed completion functions by updating $PROMPT_DIR to $AIA_PROMPTS_DIR to match the documentation.
 
-## [0.5.0] 2024-01-05
+### [0.5.0] 2024-01-05
 - breaking changes:
     - changed `--config` to `--config_file`
     - changed `--env` to `--shell`
     - changed `--output` to `--out_file`
         - changed default `out_file` to `STDOUT`
 
-## [0.4.3] 2023-12-31
+### [0.4.3] 2023-12-31
 - added --env to process embedded system environment variables and shell commands within a prompt.
 - added --erb to process Embedded RuBy within a prompt because have embedded shell commands will only get you in a trouble.  Having ERB will really get you into trouble.  Remember the simple prompt is usually the best prompt.
 
-## [0.4.2] 2023-12-31
+### [0.4.2] 2023-12-31
 - added the --role CLI option to pre-pend a "role" prompt to the front of a primary prompt.
 
-## [0.4.1] 2023-12-31
+### [0.4.1] 2023-12-31
 - added a chat mode
 - prompt directives now supported
 - version bumped to match the `prompt_manager` gem
 
-## [0.3.20] 2023-12-28
+### [0.3.20] 2023-12-28
 - added work around to issue with multiple context files going to the `mods` backend
 - added shellwords gem to santize prompt text on the command line
 
-## [0.3.19] 2023-12-26
+### [0.3.19] 2023-12-26
 - major code refactoring.
 - supports config files \*.yml, \*.yaml and \*.toml
 - usage implemented as a man page. --help will display the man page/
@@ -98,10 +106,10 @@
     3. envar values             over-rides ...
     4. default values
 
-## [0.3.0] = 2023-11-23
+### [0.3.0] = 2023-11-23
 
 - Matching version to [prompt_manager](https://github.com/prompt_manager) This version allows for the user of history in the entery of values to prompt keywords.  KW_HISTORY_MAX is set at 5.  Changed CLI enteraction to use historical selection and editing of prior keyword values.
 
-## [0.1.0] - 2023-11-23
+### [0.1.0] - 2023-11-23
 
 - Initial release

data/README.md

@@ -1,21 +1,13 @@
 # AI Assistant (AIA)
 
-`aia` is a command-line utility that facilitates interaction with AI models. It automates the management of pre-compositional prompts and executes generative AI (Gen-AI) commands on those prompts.
+`aia` is a command-line utility that facilitates interaction with AI models. It automates the management of pre-compositional prompts and executes generative AI (Gen-AI) commands on those prompts taking advantage of modern LLMs increased context window size.
 
 It leverages the `prompt_manager` gem to manage prompts for the `mods` and `sgpt` CLI utilities. It utilizes "ripgrep" for searching for prompt files.  It uses `fzf` for prompt selection based on a search term and fuzzy matching.
 
 **Most Recent Change**: Refer to the [Changelog](CHANGELOG.md)
 
+> Just an FYI ... I am working in the `develop` branch to **drop the dependency on backend LLM processors like mods and llm.**  I'm refactor aia to use my own universal client gem called ai_client which gives access to all models and all providers.
 
-> v0.5.16
-> - fixed bugs with the prompt pipeline
-> - Added new backend "client" which is an `aia` internal client to the OpenAI API that allows both text-to-speech and speech-to-text
-> - Added --image_size and --image_quality to support image generation with the dall-e-2 and dall-e-3 models using the new internal `aia` OpenAI client.
->
-> v0.5.15
-> - Support piped content by appending to end of prompt text
-> - fixed bugs with directives entered as follow-up while in chat mode
->
 
 
 <!-- Tocer[start]: Auto-generated, don't remove. -->
@@ -578,19 +570,17 @@ Here is what my `chat` prompt file looks like:
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+This CLI tool started life as a few lines of ruby in a file in my scripts repo.  I just kep growing as I decided to add more capability and more backend tools.  There was no real architecture to guide the design.  What was left is a large code mess which is slowly being refactored into something more maintainable.  That work is taking place in the `develop` branch.  I welcome you help.  Take a look at what is going on in that branch and send me a PR against it.
+
+Of course if you see something in the main branch send me a PR against that one so that we can fix the problem for all.
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/MadBomber/aia.
 
-I've designed `aia` so that it should be easy to integrate other backend LLM processors.  If you've found one that you like, send me a pull request or a feature request.
-
 When you find problems with `aia` please note them as an issue.  This thing was written mostly by a human and you know how error prone humans are.  There should be plenty of errors to find.
 
-I've been thinking that the REGEX used to identify a keyword within a prompt could be a configuration item.  I chose to use square brackets and uppercase in the default regex; maybe, you have a collection of prompt files that use some other regex.  Why should it be one way and not the other.
-
-Also I'm not happy with the way where I a some command line options for external command hard coded.  I think they should be part of the configuration as well.  For example the way I'm using `rg` and `fzf` may not be the way that you want to use them.
+I'm not happy with the way where some command line options for external command are hard coded.  I'm specific talking about the way in which the `rg` and `fzf` tools are used.  There options decide the basic look and feel of the search capability on the command line.  Maybe they should be part of the overall configuration so that users can tune their UI to the way they like.
 
 ## License
 

data/justfile

@@ -1,10 +1,12 @@
 # aia/main.just
 #
 # Support man pages with ...
-# gem install kramdown-man
+# gem install kramdown-man versionaire
 #
 
-RR := env_var('RR')
+RR                := env_var('RR')
+version_filepath  := env_var('RR') + "/.version"
+man_filepath      := env_var('RR') + "/man/aia.1.md"
 
 # with ~/.justfile
 
@@ -21,9 +23,10 @@ RR := env_var('RR')
 
 set fallback # search up for recipe name if not found locally.
 
-set positional-arguments    := true
-set allow-duplicate-recipes := true
-set dotenv-load             := false
+set positional-arguments      := true
+set allow-duplicate-recipes   := true
+set allow-duplicate-variables := true
+set dotenv-load               := false
 
 # my common variables
 
@@ -78,6 +81,18 @@ mods_delete_all:
   mods -l | awk '{print $1}' | xargs -I {} mods -d {}
 
 
+#############################################
+## iTerm2-related
+
+# Fix half-duplex terminal
+fix:
+  stty sane
+
+  
+# Clear the scroll-back buffer
+@clear_buffer:
+  printf "\e[3J"
+
 #################################################
 ## Private recipes
 
@@ -115,7 +130,7 @@ mods_delete_all:
 
 module_repo := "/Users/dewayne/sandbox/git_repos/repo.just"
 module_gem := "/Users/dewayne/sandbox/git_repos/gem.just"
-module_version := "/Users/dewayne/just_modules/version.just"
+module_version := "/Users/dewayne/just_modules/version_versionaire.just"
 module_git := "/Users/dewayne/just_modules/git.just"
 
 
@@ -170,7 +185,7 @@ tag_push_and_bump: tag push bump
 
 # Create a git tag for the current version
 tag:
-  git tag $(semver)
+  git tag v`head -1 {{version_filepath}}`
 
 # Push the git current working directory and all tags
 push:
@@ -180,12 +195,22 @@ push:
 
 alias inc := bump
 
-# Increament version's level: major.minor.patch
+# Increment version's level: major.minor.patch
 @bump level='patch':
-  semver increment {{level}}
-  echo "Now working on: $(semver)"
-  git add {{RR}}/.semver
-
+  #!/usr/bin/env ruby
+  require 'versionaire'
+  old_version = Versionaire::Version File.read("{{version_filepath}}").strip
+  level = "{{level}}".to_sym
+  new_version = old_version.bump level
+  puts "Bumping #{level}:  #{old_version} to #{new_version}"
+  File.open("{{version_filepath}}", 'w')
+  .write(new_version.to_s + "\n")
+  #
+  content = File.read({{man_filepath}}).sub(old_version, new_version)
+  #
+  File.write({{man_filepath}}, content)
+  #
+  `git add {{version_filepath}} {{man_filepath}}`
 
 
 # Module repo

data/lib/aia/tools/ai_client_backend.rb

@@ -0,0 +1,92 @@
+# lib/aia/tools/ai_client_backend.rb
+
+# This is WIP in the `develop` branch
+# do not use.
+
+require 'ai_client'
+require_relative 'backend_common'
+
+class AIA::AiClientBackend < AIA::Tools
+  include AIA::BackendCommon
+
+  meta(
+    name:     'ai_client',
+    role:     :backend,
+    desc:     'AI Client integration for unified model access',
+    url:      'https://github.com/path/to/ai_client', # TODO: Update URL
+    install:  'gem install ai_client',
+  )
+
+  attr_reader :client, :raw_response
+  
+  DEFAULT_PARAMETERS = ''
+  DIRECTIVES = %w[
+    model
+    temperature
+    max_tokens
+    top_p
+    frequency_penalty
+    presence_penalty
+  ]
+
+  def initialize(text: "", files: [])
+    super
+    @client = AiClient.new
+  end
+
+  def build_command
+    # No-op - ai_client doesn't use command line
+    @parameters = ""
+  end
+
+  def run
+    handle_model(AIA.config.model)
+  rescue => e
+    puts "Error handling model #{AIA.config.model}: #{e.message}"
+  end
+
+  private
+
+  def handle_model(model_name)
+    case model_name
+    when /vision/
+      image2text
+    when /^gpt/
+      text2text
+    when /^dall-e/
+      text2image
+    when /^tts/
+      text2audio
+    when /^whisper/
+      audio2text
+    else
+      raise "Unsupported model: #{model_name}"
+    end
+  end
+
+  def text2text
+    response = client.complete(
+      prompt: text,
+      model: AIA.config.model,
+      temperature: AIA.config.temp
+    )
+    response.completion
+  end
+
+  # Placeholder methods to maintain API compatibility
+  def image2text
+    raise "Not yet implemented for ai_client"
+  end
+
+  def text2image
+    raise "Not yet implemented for ai_client"
+  end
+
+  def text2audio
+    raise "Not yet implemented for ai_client"
+  end
+
+  def audio2text
+    raise "Not yet implemented for ai_client"
+  end
+end

data/lib/aia/version.rb

@@ -1,10 +1,10 @@
 # lib/aia/version.rb
 # frozen_string_literal: true
 
-require 'semver'
+require 'versionaire'
 
 module AIA
-  # .semver is located at the gem's root directory
-  version_file_path = File.join(__dir__, '..', '..')
-  VERSION = SemVer.find(version_file_path).to_s[1..]
+  VERSION_FILEPATH  = "#{__dir__}/../../.version"
+  VERSION           = Versionaire::Version File.read(VERSION_FILEPATH).strip
+  def self.version  = VERSION
 end

data/main.just

@@ -1,10 +1,12 @@
 # aia/main.just
 #
 # Support man pages with ...
-# gem install kramdown-man
+# gem install kramdown-man versionaire
 #
 
-RR := env_var('RR')
+RR                := env_var('RR')
+version_filepath  := env_var('RR') + "/.version"
+man_filepath      := env_var('RR') + "/man/aia.1.md"
 
 with ~/.justfile
 
@@ -13,7 +15,7 @@ with ~/.justfile
 
 module repo /Users/dewayne/sandbox/git_repos/repo.just
 module gem /Users/dewayne/sandbox/git_repos/gem.just
-module version /Users/dewayne/just_modules/version.just
+module version /Users/dewayne/just_modules/version_versionaire.just
 module git /Users/dewayne/just_modules/git.just
 
 
@@ -68,7 +70,7 @@ tag_push_and_bump: tag push bump
 
 # Create a git tag for the current version
 tag:
-  git tag $(semver)
+  git tag v`head -1 {{version_filepath}}`
 
 # Push the git current working directory and all tags
 push:
@@ -78,9 +80,19 @@ push:
 
 alias inc := bump
 
-# Increament version's level: major.minor.patch
+# Increment version's level: major.minor.patch
 @bump level='patch':
-  semver increment {{level}}
-  echo "Now working on: $(semver)"
-  git add {{RR}}/.semver
-
+  #!/usr/bin/env ruby
+  require 'versionaire'
+  old_version = Versionaire::Version File.read("{{version_filepath}}").strip
+  level = "{{level}}".to_sym
+  new_version = old_version.bump level
+  puts "Bumping #{level}:  #{old_version} to #{new_version}"
+  File.open("{{version_filepath}}", 'w')
+  .write(new_version.to_s + "\n")
+  #
+  content = File.read({{man_filepath}}).sub(old_version, new_version)
+  #
+  File.write({{man_filepath}}, content)
+  #
+  `git add {{version_filepath}} {{man_filepath}}`

data/man/aia.1

@@ -1,6 +1,6 @@
 .\" Generated by kramdown-man 1.0.1
 .\" https://github.com/postmodern/kramdown-man#readme
-.TH aia 1 "v0.5.16" AIA "User Manuals"
+.TH aia 1 "v0.5.18" AIA "User Manuals"
 .SH NAME
 .PP
 aia \- command\-line interface for an AI assistant

data/man/aia.1.md

@@ -1,4 +1,4 @@
-# aia 1 "v0.5.16" AIA "User Manuals"
+# aia 1 "v0.5.18" AIA "User Manuals"
 
 ## NAME
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: aia
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.18
 platform: ruby
 authors:
 - Dewayne VanHoozer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-10-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ai_client
+  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: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: semver2
+  name: shellwords
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shellwords
+  name: toml-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: toml-rb
+  name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-screen
+  name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-spinner
+  name: versionaire
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -255,7 +269,7 @@ files:
 - ".better-commits.json"
 - ".config/tocer/configuration.yml"
 - ".envrc"
-- ".semver"
+- ".version"
 - CHANGELOG.md
 - LICENSE
 - LICENSE.txt
@@ -277,6 +291,7 @@ files:
 - lib/aia/main.rb
 - lib/aia/prompt.rb
 - lib/aia/tools.rb
+- lib/aia/tools/ai_client_backend.rb
 - lib/aia/tools/backend_common.rb
 - lib/aia/tools/client.rb
 - lib/aia/tools/editor.rb
@@ -317,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: AI Assistant (aia) a command-line (CLI) utility

data/.semver

@@ -1,6 +0,0 @@
----
-:major: 0
-:minor: 5
-:patch: 16
-:special: ''
-:metadata: ''