ollama_chat 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36395404aa00934bda9f2229306a374143c30046bf7439188d369b9fe167f649
-  data.tar.gz: 2dc4c482a17e31a86c347d557475af52eccbe6638f2487abc564c11b5ef379b7
+  metadata.gz: c66eb0eb6290d5161516ac786036a66c381339db5ea9a91039efc0c26b069591
+  data.tar.gz: a762ad194903ce17b01d07fa44af1b2e2fc832049ae5ec665da0236291a58561
 SHA512:
-  metadata.gz: ece58d0452a5695dc3fec1a1032a9e45a6e9400085e48f512c13b9473acd53596a55d69a7f9264689fdb0a3b3335b8223547efbc504c9a3052a85e5ef9a0cc89
-  data.tar.gz: 11a052d21eed75504722adde01ff43c10213ba371887b7f376fdbe4b962cf3dd3bd550325341af16c2215101776ca14753cf353eec221f3f5e98fff386053f51
+  metadata.gz: b133ad766292019028dc584a6197d8cc84503e8260307a9fbf141a9635a1b798bffe5f24dbe2de88c6a62408b51fbed0a9826fa0a9716fafc22c0b3c63092a2a
+  data.tar.gz: d200903b0f20a6135c8603f831e454fdcdbc272bf646984ca733566e932fa2590fb89848d7776e1ae2ac7f37143966b18b489c73ec30c1b56e348dbf154435e7

data/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 2025-05-26 v0.0.9
+
+* Improved tag parsing in OllamaChat:
+  * Added regex validation for valid tags to `Documentrix::Utils::Tags`.
+  * Modified `parse_content` method in `OllamaChat::Parsing` to handle valid tag formats.
+  * Updated `scan` methods in `content` processing to more correctly identify tags.
+* Added option to explicitly open socket for receiving input from `ollama_chat_send`:
+  * Added new command-line option `-S` to enable server socket functionality.
+  * Updated `OllamaChat::Chat` class to include server socket initialization based on the new option.
+  * Modified usage message in `README.md` and `information.rb` files.
+
 ## 2025-05-23 v0.0.8
 
 * Introduce `fix_config` method to rescue `ComplexConfig` exceptions and prompt
@@ -13,7 +24,7 @@
 
 ## 2025-05-22 v0.0.7
 
-* Added `ollama_chat_send` executable in `/bin`, required 'ollama_chat' gem,
+* Added `ollama_chat_send` executable in `/bin`, required `ollama_chat` gem,
   sent user input to Ollama server via
   `OllamaChat::ServerSocket.send_to_server_socket` method and handled
   exceptions and exit with non-zero status code if an error occurs.

data/README.md

@@ -31,6 +31,7 @@ Usage: ollama_chat [OPTIONS]
   -D DOCUMENT    load document and add to embeddings collection (multiple)
   -M             use (empty) MemoryCache for this chat session
   -E             disable embeddings for this chat session
+  -S             open a socket to receive input from ollama_chat_send
   -V             display the current version number and quit
   -h             this help
 ```

data/Rakefile

@@ -31,7 +31,7 @@ GemHadar do
 
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.0'
-  dependency             'documentrix',           '~> 0.0'
+  dependency             'documentrix',           '~> 0.0', '>= 0.0.2'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'
   dependency             'redis',                 '~> 5.0'

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/ollama_chat/chat.rb

@@ -32,7 +32,7 @@ class OllamaChat::Chat
   include OllamaChat::ServerSocket
 
   def initialize(argv: ARGV.dup)
-    @opts               = go 'f:u:m:s:c:C:D:MEVh', argv
+    @opts               = go 'f:u:m:s:c:C:D:MESVh', argv
     @opts[?h] and exit usage
     @opts[?V] and exit version
     @ollama_chat_config = OllamaChat::OllamaChatConfig.new(@opts[?f])
@@ -67,7 +67,7 @@ class OllamaChat::Chat
     @current_voice = config.voice.default
     @images        = []
     init_chat_history
-    init_server_socket
+    @opts[?S] and init_server_socket
   rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e
     fix_config(e)
   end
@@ -331,7 +331,7 @@ class OllamaChat::Chat
       content, tags = if parse_content
                         parse_content(content, @images)
                       else
-                        [ content, Documentrix::Utils::Tags.new ]
+                        [ content, Documentrix::Utils::Tags.new(valid_tag: /\A#*([\w\]\[]+)/) ]
                       end
 
       if embedding.on? && content

data/lib/ollama_chat/information.rb

@@ -102,6 +102,7 @@ module OllamaChat::Information
         -D DOCUMENT    load document and add to embeddings collection (multiple)
         -M             use (empty) MemoryCache for this chat session
         -E             disable embeddings for this chat session
+        -S             open a socket to receive input from ollama_chat_send
         -V             display the current version number and quit
         -h             this help
 

data/lib/ollama_chat/parsing.rb

@@ -113,10 +113,10 @@ module OllamaChat::Parsing
 
   def parse_content(content, images)
     images.clear
-    tags = Documentrix::Utils::Tags.new
+    tags = Documentrix::Utils::Tags.new valid_tag: /\A#*([\w\]\[]+)/
 
     contents = [ content ]
-    content.scan(%r((https?://\S+)|(#\S+)|(?:file://)?(\S*\/\S+))).each do |url, tag, file|
+    content.scan(%r((https?://\S+)|(?<![a-zA-Z\d])#+([\w\]\[]+)|(?:file://)?(\S*\/\S+))).each do |url, tag, file|
       case
       when tag
         tags.add(tag)

data/lib/ollama_chat/version.rb

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

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.8 ruby lib
+# stub: ollama_chat 0.0.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.8".freeze
+  s.version = "0.0.9".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.0".freeze])
-  s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze])
+  s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze, ">= 0.0.2".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Florian Frank
@@ -142,6 +142,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,6 +152,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rss
   requirement: !ruby/object:Gem::Requirement