ollama-ruby 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9304634c783477787792071f039d6941222bcca0577cd59cdbc5103f820ea299
-  data.tar.gz: 9edc7eaf98c0601e08bb5cde23fc2d46b745982172caea349982d8867790166a
+  metadata.gz: 3efc65090c37d60db61417738d3780ce7b86af805c86e1828421b86e83c11c13
+  data.tar.gz: 3d18b6d92320c889bcef7b566a818867cbd55ff29a519738e3dd0e524d766aa6
 SHA512:
-  metadata.gz: 0bda727610f0793d6c360a63c76b2c42e032109f34011ed7cbd54df5663102c3738498be836adcb00645e4ce407cab1f422737970b83a3fa757ea0b4d90d8453
-  data.tar.gz: b9df134561b2a44accfdc1ec6da68eb0b3b9b5ce64c2d64c744834a0b74cbfde8018e270977440224d0433c681e7a203d272453e391b85a3d32f34e3b0c790ca
+  metadata.gz: 5086fa3669dd9a19d917a528dacf8073cf250400ef91210086b96a99e62468f3b232d55a1a04240537ab79f58cb9015c5f591b46b61e60424e068107133a944a
+  data.tar.gz: 93837384222c5221e8b70db3034fe8ac4dbb86c379bd583a66c29b500376e6fc6bacba2419d673cf84f1b81a2b13b2cbd0ac8d32a2280e09e1c46acc48de5f8b

data/CHANGES.md

@@ -1,5 +1,136 @@
 # Changes
 
+## 2024-09-26 v0.5.0
+
+### New Features
+
+* Add stdin substitution and variable expansion to `ollama_cli`:
+	+ Added support for `%{stdin}` in prompts, substituting with actual input
+	+ Added `-P` option to set prompt variables from command line arguments
+	+ Added handling of multiple placeholders in prompts
+* Add proxy support to Ollama chat client:
+	+ Add `tins/xt/hash_union` gem to dependencies
+    + Update `OllamaChatConfig` with new `proxy` option
+    + Modify `http_options` method to include proxy and SSL verify peer options
+      based on config settings
+* Refactor source embedding logic:
+    + Simplified explicit case statement.
+    + Added `inputs or return` to ensure early exit when splitting cannot be
+      done
+* Update Ollama chat script to embed, import or summarize sources:
+    + Added `require 'tins/xt/full'`
+    + Updated prompts in `OllamaChatConfig` to include embed prompt and
+      summarize prompt with word count option
+    + Modified `import_document` method to use `embed_source` instead of
+      importing document as a whole
+    + Added `embed_source` method to parse source content and add it to the
+      conversation via embeddings
+    + Updated `summarize` method to take an optional word count parameter
+    + Added `toggle_markdown` method to toggle markdown output on/off
+    + Added `show_embedding` method to display embedding status
+    + Updated `choose_collection` method to include new collection option
+    + Added `set_embedding` method to set embedding model and paused embedding
+    + Updated `info` method to display current model, collection stats, and
+      embedding status
+
+### Improvements
+
+* Improve conversation listing command:
+    + Allow `list_conversation` method to take an optional argument for the
+      number of messages to display
+    + Added support for displaying a specific number of messages with `/list
+      [n]`
+* Update chat commands' quit functionality:
+	+ Moved `/quit` command to exit the program
+* Refactor OllamaChatConfig web prompt:
+    + Add `web` prompt to `OllamaChatConfig` class
+    + Replace hardcoded content with variable `content`
+    + Use `query` and `results` variables instead of interpolating strings
+* Add Redis cache expiration support:
+    + Added `ex` option to `initialize` method in
+      `lib/ollama/documents/cache/redis_cache.rb`
+    + Updated `[]=` method in `lib/ollama/documents/cache/redis_cache.rb` to
+      use Redis expiration
+    + Added `ttl` method in `lib/ollama/documents/cache/redis_cache.rb` to get
+      key TTL
+* Update Redis and Redis-backed memory cache to use `object_class` parameter:
+    + Added `object_class` parameter to `RedisBackedMemoryCache` and
+      `RedisCache` constructors
+    + Updated tests in `redis_backed_memory_cache_spec.rb` and
+      `redis_cache_spec.rb` to reflect new behavior
+
+### Bug Fixes
+
+* Update semantic splitter to use `include_separator` option from opts:
+    + Added flexibility by allowing `include_separator` option to be passed in
+      through opts
+    + Updated `include_separator` parameter to use
+      `opts.fetch(:include_separator, true)` instead of hardcoding value to
+      True.
+
+### Refactoring
+
+* Refactor `file_argument.rb` for better readability:
+	+ Update conditionals in Ollama::Utils::FileArgument module
+	+ Simplify logic with improved variable usage
+	+ Remove unnecessary elsif statement
+	+ Use consistent indentation and spacing throughout the code
+* Refactor Redis-backed memory cache:
+    + Removed `pre` and `unpre` methods from `Ollama::Documents` use mixin
+      instead.
+
+### Documentation
+
+* Update README.md to reflect changes in `ollama_chat` functionality.
+	+ Modified commands:
+		- `/import source` to import the source's content
+		- `/embed source` to embed the source's content
+        - `/summarize [n] source` to summarize the source's content in n words
+        - `/embedding` to toggle embedding paused or not
+		- `/embed source` to embed the source's content
+
+### Dependencies and Date Updates
+
+* Update dependencies and date in gemspec:
+    + Added `logger` (~> **1.0**) and `json` (~> **2.0**) as runtime
+      dependencies to Rakefile and ollama-ruby.gemspec.
+    + Updated date in ollama-ruby.gemspec from "2024-09-21" to "2024-09-22".
+	+ Added `require 'logger'` to lib/ollama.rb.
+
+### Other Changes
+
+* Add SSL no verify option to OllamaChatConfig and Utils::Fetcher:
+	+ Added `ssl_no_verify` option to OllamaChatConfig
+	+ Updated Utils::Fetcher to take an
+
+## 2024-09-21 v0.4.0
+
+### Change Log for **1.2.3**
+
+#### New Features
+
+* Added `-E` option to disable embeddings for this chat session.
+* Added `-M` option to load document embeddings into (empty) MemoryCache for this chat session.
+* Added CSV parsing support to `ollama_chat`.
+* Improved error handling in `Ollama::Utils::Fetcher` methods.
+
+#### Bug Fixes
+
+* Handle case in `ollama_chat` where responses don't provide counts, display 0
+  rates instead.
+
+#### Refactoring and Improvements
+
+* Updated eval count and rate display in FollowChat class.
+* Refactor system prompt display and chunk listing in chat output.
+* Refactor cache implementation to use Ollama::Documents::Cache::Common module.
+* Improved system prompt formatting in `ollama_chat` script.
+* Renamed `tags` method to `tags_set` in `Ollama::Documents::Record` class.
+
+#### Documentation
+
+* Added comments to ColorizeTexts utility class.
+
 ## 2024-09-15 v0.3.2
 
 * Add color support to chooser module:

data/README.md

@@ -43,6 +43,8 @@ ollama_chat [OPTIONS]
   -c CHAT        a saved chat conversation to load
   -C COLLECTION  name of the collection used in this conversation
   -D DOCUMENT    load document and add to collection (multiple)
+  -M             use (empty) MemoryCache for this chat session
+  -E             disable embeddings for this chat session
   -v             use voice output
   -h             this help
 ```
@@ -152,21 +154,24 @@ subject - the young, blue-eyed cat.
 The following commands can be given inside the chat, if prefixed by a `/`:
 
 ```
-/paste                                   to paste content
-/markdown                                toggle markdown output
-/list                                    list the messages of the conversation
-/clear                                   clear the conversation messages
-/clobber                                 clear conversation messages and collection
-/pop [n]                                 pop the last n exchanges, defaults to 1
-/model                                   change the model
-/regenerate                              the last answer message
-/collection clear [tag]|stats|change|new clear or show stats of current collection
-/summarize source                        summarize the URL/file source's content
-/web [n] query                           query web search & return n or 1 results
-/save filename                           store conversation messages
-/load filename                           load conversation messages
-/quit                                    to quit
-/help                                    to view this help
+/paste                          to paste content
+/markdown                       toggle markdown output
+/list [n]                       list the last n / all conversation exchanges
+/clear                          clear the whole conversation
+/clobber                        clear the conversation and collection
+/pop [n]                        pop the last n exchanges, defaults to 1
+/model                          change the model
+/regenerate                     the last answer message
+/collection clear [tag]|change  clear or show stats of current collection
+/import source                  import the source's content
+/summarize [n] source           summarize the source's content in n words
+/embedding                      toggle embedding paused or not
+/embed source                   embed the source's content
+/web [n] query                  query web search & return n or 1 results
+/save filename                  store conversation messages
+/load filename                  load conversation messages
+/quit                           to quit
+/help                           to view this help
 ```
 
 ### ollama\_console
@@ -460,7 +465,7 @@ The homepage of this library is located at
 
 ## Author
 
-<b>Ollama</b> was written by Florian Frank [Florian Frank](mailto:flori@ping.de)
+<b>Ollama Ruby</b> was written by Florian Frank [Florian Frank](mailto:flori@ping.de)
 
 ## License
 

data/Rakefile

@@ -13,7 +13,8 @@ GemHadar do
   description 'Library that allows interacting with the Ollama API'
   test_dir    'spec'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.AppleDouble', '.bundle',
-    '.yardoc', 'tags', 'errors.lst', 'cscope.out', 'coverage', 'tmp', 'corpus'
+    '.yardoc', 'doc', 'tags', 'errors.lst', 'cscope.out', 'coverage', 'tmp',
+    'corpus'
   package_ignore '.all_images.yml', '.tool-versions', '.gitignore', 'VERSION',
      '.rspec', *Dir.glob('.github/**/*', File::FNM_DOTMATCH)
   readme      'README.md'
@@ -38,9 +39,13 @@ GemHadar do
   dependency             'search_ui',             '~> 0.0'
   dependency             'amatch',                '~> 0.4.1'
   dependency             'pdf-reader',            '~> 2.0'
+  dependency             'logger',                '~> 1.0'
+  dependency             'json',                  '~> 2.0'
   development_dependency 'all_images',            '~> 0.4'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'webmock'
+  development_dependency 'debug'
+  development_dependency 'simplecov'
 
   licenses << 'MIT'