ollama-ruby 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29863f68627a05541de5eab810850b0509db94c1d91b2e9a5a9be9bd387e8aea
-  data.tar.gz: 07f3558153a0a724c08e27a86482e0951070348bf25641d2a9feed113e3e7046
+  metadata.gz: bb7858cf04c638fa3369fe7d96d96eed12e5553fd17abe9ed48c1eaf25113ffb
+  data.tar.gz: ccb56d4b85a6e74256feb52ac5642d50850f7b980f9060dbb9fdf933985be746
 SHA512:
-  metadata.gz: 11c405277b59c6acc75c24220942dd883bb7aec99d97d19bc9baf8d61aa4e5dc59af905631dc37641b91babdd9e5ab7305720a8720451db7b4bb6ca067833913
-  data.tar.gz: 129f49e2d4b5cb65b7999f666f33798511b8a34b1be84bbc7bd4433872cd7c323812cd4dd3e8d2ae325cb013cfb6403db8181c8cbe641139469e5ea9821cc71d
+  metadata.gz: f36aacde399c0be934425f12669fa6cc55cdfad938ea8157c5195db8c2367243cc6470dff24ec5bf83800079732bfa271450a4779246335c45c2bedbb0e3a6cf
+  data.tar.gz: 56e465f056934210a6cc45677d52518d8adb76e8702561248b6db4cd1e4b129cfd22eedbdcc0c935f69bf85eeb9bc324aef6876f39969942af4529978a277756

data/.envrc

@@ -1 +1,2 @@
 export REDIS_URL=redis://localhost:9736
+export REDIS_EXPRING_URL=redis://localhost:9736

data/CHANGES.md

@@ -1,5 +1,108 @@
 # 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**

data/README.md

@@ -45,7 +45,6 @@ ollama_chat [OPTIONS]
   -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
 ```
 
@@ -154,21 +153,28 @@ 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
+/copy                           to copy last response to clipboard
+/paste                          to paste content
+/markdown                       toggle markdown output
+/stream                         toggle stream output
+/voice( change)                 toggle voice output or change the voice
+/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
+/system                         change system prompt (clears conversation)
+/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
@@ -462,7 +468,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

@@ -39,6 +39,9 @@ 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'
+  dependency             'xdg',                   '~> 7.0'
   development_dependency 'all_images',            '~> 0.4'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'webmock'