ollama_chat 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c75809ec83f12f9b70645f426774dec435a2510db811fa861e9c862a1e5c71
-  data.tar.gz: bca4f2fcf8e5e77ccc922858e4fe25db8933e5b09a9b264b94648a39feabc0c2
+  metadata.gz: 2d43fc32c5ffc8c706161380789195d95410721f3f03f7154218c1733036dd47
+  data.tar.gz: 1238495af8d19da4f6dc1538a8f452fc659192904b5b57dc32b99633199c1952
 SHA512:
-  metadata.gz: a8e9c93775bfd1629a743436a7fd85b7b7801d7a69221a423b5abbe0a44d98afccc7f9c8eb5182fdfacd848b0d1b27140fb599c3794f77bd4fa2cec7a012a9fb
-  data.tar.gz: 4f0460bb249fcd988a3425bdedc377ceaf5052f90c12563ef5fa01b72100857e30484622ed840b11147aed9cdc9e8a9c5cf4f9979c96fa317c8c27780d9fa990
+  metadata.gz: 8370cf8beedee8da4c6f9d985966037e9f16ef2bcfe772f65c6bb0c3e61c835386f1f58d02639adeab61b9dd67df2b59fcd6a816fc1ab1b837d53599a085e0c6
+  data.tar.gz: aa6471bdce5fd7398c2886a0df8b86023c41dc9c7e3ad9e216503c5e37b80437f7d3278e6fb7a43e638f04551e0fc521bdbbe2731528de1223886abb105a6a62

data/.all_images.yml

@@ -1,13 +1,12 @@
 dockerfile: |-
-  RUN apk add --no-cache build-base git
-  RUN gem update --system
-  RUN gem install gem_hadar bundler
+  RUN apk add --no-cache build-base git yaml-dev
+  RUN gem install gem_hadar
 
 script: &script |-
   echo -e "\e[1m"
   ruby -v
   rm -f Gemfile.lock
-  bundle install --jobs=$(getconf _NPROCESSORS_ONLN) --full-index
+  bundle install --jobs=$(getconf _NPROCESSORS_ONLN)
   echo -e "\e[0m"
   rake test
 

data/CHANGES.md

@@ -1,5 +1,39 @@
 # Changes
 
+## 2025-02-17 v0.0.3
+
+* Support setting of request headers:
+    * Added `request_headers` option to `default_config.yml
+    * Updated `OllamaChat::SourceFetching` module to pass `config.request_headers?.to_h` to `Fetcher.get`
+    * Updated `OllamaChat::Utils::Fetcher.get` method to take an optional `headers:` parameter
+    * Updated tests for Fetcher utility to include new headers option
+* Refactoring
+    * Added `connect_to_ollama_server` method to `spec_helper.rb`
+    * Stubbed API requests for tags, show, and version in this method
+    * Removed stubbing of API requests from individual specs
+* Add support for ollama server version display:
+  * Add `server_version` method to display connected ollama server version
+  * Update `info` method to use new `server_version` method
+  * Add **6.6.6** as reported API version in `spec/assets/api_version.json`
+* Updated chat spec to use 'test' collection:
+  * Updated `argv` let in OllamaChat::Chat describe block to pass '-C test'
+    option to be isolated from 'default' collection
+  * Updated output of collection stats display to reflect 'test' collection
+
+## 2025-02-11 v0.0.2
+
+* Improved handling of location in MessageList class:
+  * Use assistant system prompt (`assistant_system_prompt`) for adding location
+    to message list, if no system prompt was defined.
+  * Updated spec to cover new behavior.
+* Simplified configuration defaults to be stored in `default_config.yml`:
+  - Replaced `DEFAULT_CONFIG` hash with a single line of code that reads from
+    `default_config.yml`
+  - Created new file `default_config.yml` in the same directory, containing the
+    old `DEFAULT_CONFIG` hash values
+  - Updated `initialize` method to use the new `default_config.yml` file if no
+    filename is provided
+
 ## 2025-02-02 v0.0.1
 
 * Renamed `documents` variable to `@documents` in `OllamaChat::Chat`

data/Rakefile

@@ -30,7 +30,7 @@ GemHadar do
   executables << 'ollama_chat'
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 0.14'
+  dependency             'ollama-ruby',           '~> 0.15'
   dependency             'documentrix',           '~> 0.0'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/lib/ollama_chat/chat.rb

@@ -37,6 +37,7 @@ class OllamaChat::Chat
       debug:      config.debug,
       user_agent:
     )
+    server_version
     @document_policy = config.document_policy
     @model           = choose_model(@opts[?m], config.model.name)
     @model_options   = Ollama::Options[config.model.options]

data/lib/ollama_chat/information.rb

@@ -28,6 +28,7 @@ module OllamaChat::Information
   end
 
   def info
+    STDOUT.puts "Connected to ollama server version: #{bold(server_version)}"
     STDOUT.puts "Current model is #{bold{@model}}."
     if @model_options.present?
       STDOUT.puts "  Options: #{JSON.pretty_generate(@model_options).gsub(/(?<!\A)^/, '  ')}"
@@ -110,4 +111,8 @@ module OllamaChat::Information
     STDOUT.puts "%s %s" % [ progname, OllamaChat::VERSION ]
     0
   end
+
+  def server_version
+    @server_version ||= ollama.version.version
+  end
 end

data/lib/ollama_chat/message_list.rb

@@ -182,14 +182,23 @@ class OllamaChat::MessageList
   # messages in the list.
   def to_ary
     location = at_location.full?
-    @messages.map do |message|
+    add_system = !!location
+    result = @messages.map do |message|
       if message.role == 'system' && location
+        add_system = false
         content = message.content + "\n\n#{location}"
         Ollama::Message.new(role: message.role, content:)
       else
         message
       end
     end
+    if add_system
+      prompt = @chat.config.system_prompts.assistant?
+      content = [ prompt, location ].compact * "\n\n"
+      message = Ollama::Message.new(role: 'system', content:)
+      result.unshift message
+    end
+    result
   end
 
   # The at_location method returns the location/time/units information as a

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -0,0 +1,62 @@
+---
+url: <%= ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST') %>
+proxy: null # http://localhost:8080
+model:
+  name: <%= ENV.fetch('OLLAMA_CHAT_MODEL', 'llama3.1') %>
+  options:
+    num_ctx: 8192
+location:
+  enabled: false
+  name: Berlin
+  decimal_degrees: [ 52.514127, 13.475211 ]
+  units: SI (International System of Units) # or USCS (United States Customary System)
+prompts:
+  embed: "This source was now embedded: %{source}"
+  summarize: |
+    Generate an abstract summary of the content in this document using
+    %{words} words:
+
+    %{source_content}
+  web: |
+    Answer the the query %{query} using these sources and summaries:
+
+    %{results}
+  location: You are at %{location_name} (%{location_decimal_degrees}), on %{localtime}, preferring %{units}
+system_prompts:
+  default: <%= ENV.fetch('OLLAMA_CHAT_SYSTEM', 'null') %>
+  assistant: You are a helpful assistant.
+voice:
+  enabled: false
+  default: Samantha
+  list: <%= `say -v ? 2>/dev/null`.lines.map { _1[/^(.+?)\s+[a-z]{2}_[a-zA-Z0-9]{2,}/, 1] }.uniq.sort.to_s.force_encoding('ASCII-8BIT') %>
+markdown: true
+stream: true
+document_policy: importing
+embedding:
+  enabled: true
+  model:
+    name: mxbai-embed-large
+    embedding_length: 1024
+    options: {}
+    # Retrieval prompt template:
+    prompt: 'Represent this sentence for searching relevant passages: %s'
+  batch_size: 10
+  database_filename: null # ':memory:'
+  collection: <%= ENV['OLLAMA_CHAT_COLLECTION'] %>
+  found_texts_size: 4096
+  found_texts_count: 10
+  splitter:
+    name: RecursiveCharacter
+    chunk_size: 1024
+cache: Documentrix::Documents::SQLiteCache
+redis:
+  documents:
+    url: <%= ENV.fetch('REDIS_URL', 'null') %>
+  expiring:
+    url: <%= ENV.fetch('REDIS_EXPIRING_URL', 'null') %>
+    ex: 86400
+debug: <%= ENV['OLLAMA_CHAT_DEBUG'].to_i == 1 ? true : false %>
+request_headers:
+  Accept: 'text/*,application/*,image/*'
+ssl_no_verify: []
+copy: pbcopy

data/lib/ollama_chat/ollama_chat_config.rb

@@ -1,67 +1,12 @@
+require 'pathname'
+
 class OllamaChat::OllamaChatConfig
   include ComplexConfig
   include FileUtils
 
-  DEFAULT_CONFIG = <<~EOT
-      ---
-      url: <%= ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST') %>
-      proxy: null # http://localhost:8080
-      model:
-        name: <%= ENV.fetch('OLLAMA_CHAT_MODEL', 'llama3.1') %>
-        options:
-          num_ctx: 8192
-      location:
-        enabled: false
-        name: Berlin
-        decimal_degrees: [ 52.514127, 13.475211 ]
-        units: SI (International System of Units) # or USCS (United States Customary System)
-      prompts:
-        embed: "This source was now embedded: %{source}"
-        summarize: |
-          Generate an abstract summary of the content in this document using
-          %{words} words:
-
-          %{source_content}
-        web: |
-          Answer the the query %{query} using these sources and summaries:
-
-          %{results}
-      system_prompts:
-        default: <%= ENV.fetch('OLLAMA_CHAT_SYSTEM', 'null') %>
-      voice:
-        enabled: false
-        default: Samantha
-        list: <%= `say -v ? 2>/dev/null`.lines.map { _1[/^(.+?)\s+[a-z]{2}_[a-zA-Z0-9]{2,}/, 1] }.uniq.sort.to_s.force_encoding('ASCII-8BIT') %>
-      markdown: true
-      stream: true
-      document_policy: importing
-      embedding:
-        enabled: true
-        model:
-          name: mxbai-embed-large
-          embedding_length: 1024
-          options: {}
-          # Retrieval prompt template:
-          prompt: 'Represent this sentence for searching relevant passages: %s'
-        batch_size: 10
-        database_filename: null # ':memory:'
-        collection: <%= ENV['OLLAMA_CHAT_COLLECTION'] %>
-        found_texts_size: 4096
-        found_texts_count: 10
-        splitter:
-          name: RecursiveCharacter
-          chunk_size: 1024
-      cache: Documentrix::Documents::SQLiteCache
-      redis:
-        documents:
-          url: <%= ENV.fetch('REDIS_URL', 'null') %>
-        expiring:
-          url: <%= ENV.fetch('REDIS_EXPIRING_URL', 'null') %>
-          ex: 86400
-      debug: <%= ENV['OLLAMA_CHAT_DEBUG'].to_i == 1 ? true : false %>
-      ssl_no_verify: []
-      copy: pbcopy
-  EOT
+  DEFAULT_CONFIG = File.read(
+    Pathname.new(__FILE__).dirname.join('ollama_chat_config/default_config.yml')
+  )
 
   def initialize(filename = nil)
     @filename = filename || default_path

data/lib/ollama_chat/source_fetching.rb

@@ -22,6 +22,7 @@ module OllamaChat::SourceFetching
       links.add(source.to_s)
       OllamaChat::Utils::Fetcher.get(
         source,
+        headers:      config.request_headers?.to_h,
         cache:        @cache,
         debug:        config.debug,
         http_options: http_options(OllamaChat::Utils::Fetcher.normalize_url(source))
@@ -148,7 +149,11 @@ module OllamaChat::SourceFetching
     n = n.to_i.clamp(1..)
     query = URI.encode_uri_component(query)
     url = "https://www.duckduckgo.com/html/?q=#{query}"
-    OllamaChat::Utils::Fetcher.get(url, debug: config.debug) do |tmp|
+    OllamaChat::Utils::Fetcher.get(
+      url,
+      headers: config.request_headers?.to_h,
+      debug:   config.debug
+    ) do |tmp|
       result = []
       doc = Nokogiri::HTML(tmp)
       doc.css('.results_links').each do |link|

data/lib/ollama_chat/utils/fetcher.rb

@@ -20,14 +20,14 @@ class OllamaChat::Utils::Fetcher
 
   class RetryWithoutStreaming < StandardError; end
 
-  def self.get(url, **options, &block)
+  def self.get(url, headers: {}, **options, &block)
     cache = options.delete(:cache) and
       cache = OllamaChat::Utils::CacheFetcher.new(cache)
     if result = cache&.get(url, &block)
       infobar.puts "Getting #{url.to_s.inspect} from cache."
       return result
     else
-      new(**options).send(:get, url) do |tmp|
+      new(**options).send(:get, url, headers:) do |tmp|
         result = block.(tmp)
         if cache && !tmp.is_a?(StringIO)
           tmp.rewind
@@ -91,7 +91,9 @@ class OllamaChat::Utils::Fetcher
     Excon.new(url, options.merge(@http_options))
   end
 
-  def get(url, &block)
+  def get(url, headers: {}, &block)
+    headers |= self.headers
+    headers = headers.transform_keys(&:to_s)
     response = nil
     Tempfile.open do |tmp|
       infobar.label = 'Getting'

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.1'
+  VERSION         = '0.0.3'
   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,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.1 ruby lib
+# stub: ollama_chat 0.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.1".freeze
+  s.version = "0.0.3".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2025-02-02"
+  s.date = "2025-02-17"
   s.description = "The app provides a command-line interface (CLI) to an Ollama AI model,\nallowing users to engage in text-based conversations and generate\nhuman-like responses. Users can import data from local files or web pages,\nwhich are then processed through three different modes: fully importing the\ncontent into the conversation context, summarizing the information for\nconcise reference, or storing it in an embedding vector database for later\nretrieval based on the conversation.\n".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_chat".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_type.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze]
-  s.files = [".all_images.yml".freeze, ".envrc".freeze, ".gitignore".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ollama_chat".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_type.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.files = [".all_images.yml".freeze, ".envrc".freeze, ".gitignore".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ollama_chat".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_type.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
   s.homepage = "https://github.com/flori/ollama_chat".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "OllamaChat - A command-line interface (CLI) for interacting with an Ollama AI model.".freeze, "--main".freeze, "README.md".freeze]
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
   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, ["~> 0.14".freeze])
+  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 0.15".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])

data/spec/assets/api_version.json

@@ -0,0 +1,3 @@
+{
+  "version": "6.6.6"
+}

data/spec/ollama_chat/chat_spec.rb

@@ -2,19 +2,14 @@ require 'spec_helper'
 
 RSpec.describe OllamaChat::Chat do
   let :argv do
-    []
+    %w[ -C test ]
   end
 
   let :chat do
     OllamaChat::Chat.new argv: argv
   end
 
-  before do
-    stub_request(:get, %r(/api/tags\z)).
-      to_return(status: 200, body: asset_json('api_tags.json'))
-    stub_request(:post, %r(/api/show\z)).
-      to_return(status: 200, body: asset_json('api_show.json'))
-  end
+  connect_to_ollama_server(instantiate: false)
 
   it 'can be instantiated' do
     expect(chat).to be_a described_class
@@ -43,7 +38,7 @@ RSpec.describe OllamaChat::Chat do
   describe Documentrix::Documents do
     context 'with documents' do
       let :argv do
-        %w[ -D ] << asset('example.html')
+        %w[ -C test -D ] << asset('example.html')
       end
 
       it 'Adds documents passed to app via -D option' do
@@ -66,7 +61,7 @@ RSpec.describe OllamaChat::Chat do
     it 'can display collection_stats' do
       chat
       expect(STDOUT).to receive(:puts).with(
-        "Current Collection\n  Name: \e[1mdefault\e[0m\n  #Embeddings: 0\n  #Tags: 0\n  Tags: \n"
+        "Current Collection\n  Name: \e[1mtest\e[0m\n  #Embeddings: 0\n  #Tags: 0\n  Tags: \n"
       )
       expect(chat.collection_stats).to be_nil
     end
@@ -76,6 +71,7 @@ RSpec.describe OllamaChat::Chat do
       expect(STDOUT).to receive(:puts).
         with(
           /
+            Connected\ to\ ollama\ server|
             Current\ model|
             Options|
             Embedding|

data/spec/ollama_chat/clipboard_spec.rb

@@ -5,13 +5,7 @@ RSpec.describe OllamaChat::Clipboard do
     OllamaChat::Chat.new
   end
 
-  before do
-    stub_request(:get, %r(/api/tags\z)).
-      to_return(status: 200, body: asset_json('api_tags.json'))
-    stub_request(:post, %r(/api/show\z)).
-      to_return(status: 200, body: asset_json('api_show.json'))
-    chat
-  end
+  connect_to_ollama_server
 
   it 'can copy to clipboard' do
     expect(STDERR).to receive(:puts).with(/No response available to copy to the system clipboard/)

data/spec/ollama_chat/information_spec.rb

@@ -5,13 +5,7 @@ RSpec.describe OllamaChat::Information do
     OllamaChat::Chat.new
   end
 
-  before do
-    stub_request(:get, %r(/api/tags\z)).
-      to_return(status: 200, body: asset_json('api_tags.json'))
-    stub_request(:post, %r(/api/show\z)).
-      to_return(status: 200, body: asset_json('api_show.json'))
-    chat
-  end
+  connect_to_ollama_server
 
   describe ::OllamaChat::Information::UserAgent do
     it 'has progname' do
@@ -29,6 +23,7 @@ RSpec.describe OllamaChat::Information do
   end
 
   it 'can show info' do
+    expect(STDOUT).to receive(:puts).with(/Connected to ollama server version/)
     expect(STDOUT).to receive(:puts).with(/Current model is/)
     expect(STDOUT).to receive(:puts).at_least(1)
     expect(chat.info).to be_nil

data/spec/ollama_chat/message_list_spec.rb

@@ -11,6 +11,9 @@ RSpec.describe OllamaChat::MessageList do
       ),
       prompts: double(
         location: 'You are at %{location_name} (%{location_decimal_degrees}), on %{localtime}, preferring %{units}'
+      ),
+      system_prompts: double(
+        assistant?: 'You are a helpful assistant.'
       )
     )
   end
@@ -122,6 +125,19 @@ RSpec.describe OllamaChat::MessageList do
       %r(You are at Berlin \(52.514127, 13.475211\), on))
   end
 
+  it 'can be converted int an Ollama::Message array with location without a system prompt' do
+    expect(chat).to receive(:location).and_return(double(on?: true))
+    list = described_class.new(chat).tap do |list|
+      list <<  Ollama::Message.new(role: 'user', content: 'hello')
+      list << Ollama::Message.new(role: 'assistant', content: 'world')
+    end
+    first = list.to_ary.first
+    expect(first.role).to eq 'system'
+    expect(first.content).to match(
+      %r(You are a helpful assistant.\n\nYou are at Berlin \(52.514127, 13.475211\), on))
+  end
+
+
   it 'can display messages with images' do
     expect(list.message_type([])).to eq ?📨
   end

data/spec/ollama_chat/model_handling_spec.rb

@@ -5,13 +5,7 @@ RSpec.describe OllamaChat::ModelHandling do
     OllamaChat::Chat.new
   end
 
-  before do
-    stub_request(:get, %r(/api/tags\z)).
-      to_return(status: 200, body: asset_json('api_tags.json'))
-    stub_request(:post, %r(/api/show\z)).
-      to_return(status: 200, body: asset_json('api_show.json'))
-    chat
-  end
+  connect_to_ollama_server
 
   it 'can check if model_present?' do
     expect(chat.ollama).to receive(:show).and_raise Ollama::Errors::NotFoundError

data/spec/ollama_chat/parsing_spec.rb

@@ -6,13 +6,7 @@ RSpec.describe OllamaChat::Parsing do
     OllamaChat::Chat.new
   end
 
-  before do
-    stub_request(:get, %r(/api/tags\z)).
-      to_return(status: 200, body: asset_json('api_tags.json'))
-    stub_request(:post, %r(/api/show\z)).
-      to_return(status: 200, body: asset_json('api_show.json'))
-    chat
-  end
+  connect_to_ollama_server
 
   describe '#parse_source' do
     it 'can parse HTML' do

data/spec/ollama_chat/source_fetching_spec.rb

@@ -5,13 +5,7 @@ RSpec.describe OllamaChat::SourceFetching do
     OllamaChat::Chat.new
   end
 
-  before do
-    stub_request(:get, %r(/api/tags\z)).
-      to_return(status: 200, body: asset_json('api_tags.json'))
-    stub_request(:post, %r(/api/show\z)).
-      to_return(status: 200, body: asset_json('api_show.json'))
-    allow(chat).to receive(:location).and_return(double(on?: false))
-  end
+  connect_to_ollama_server
 
   it 'can import' do
     expect(chat.import('./spec/assets/example.html')).to start_with(<<~EOT)

data/spec/ollama_chat/utils/fetcher_spec.rb

@@ -33,6 +33,21 @@ RSpec.describe OllamaChat::Utils::Fetcher do
     end
   end
 
+  it 'can #get with headers' do
+    stub_request(:get, url).
+      with(headers: { 'Accept' => 'text/html' } | fetcher.headers).
+      to_return(
+        status: 200,
+        body: 'world',
+        headers: { 'Content-Type' => 'text/plain' },
+      )
+    fetcher.get(url, headers: { 'Accept' => 'text/html' }) do |tmp|
+      expect(tmp).to be_a Tempfile
+      expect(tmp.read).to eq 'world'
+      expect(tmp.content_type).to eq 'text/plain'
+    end
+  end
+
   it 'can #get without ssl peer verification' do
     fetcher = described_class.new(
       http_options: { ssl_verify_peer: false }

data/spec/spec_helper.rb

@@ -39,6 +39,18 @@ def asset_json(name)
   JSON(JSON(File.read(asset(name))))
 end
 
+def connect_to_ollama_server(instantiate: true)
+  before do
+    stub_request(:get, %r(/api/tags\z)).
+      to_return(status: 200, body: asset_json('api_tags.json'))
+    stub_request(:post, %r(/api/show\z)).
+      to_return(status: 200, body: asset_json('api_show.json'))
+    stub_request(:get, %r(/api/version\z)).
+      to_return(status: 200, body: asset_json('api_version.json'))
+    instantiate and chat
+  end
+end
+
 RSpec.configure do |config|
   config.before(:suite) do
     infobar.show = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Florian Frank
 bindir: bin
 cert_chain: []
-date: 2025-02-02 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -127,14 +127,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: documentrix
   requirement: !ruby/object:Gem::Requirement
@@ -399,6 +399,7 @@ files:
 - lib/ollama_chat/message_type.rb
 - lib/ollama_chat/model_handling.rb
 - lib/ollama_chat/ollama_chat_config.rb
+- lib/ollama_chat/ollama_chat_config/default_config.yml
 - lib/ollama_chat/parsing.rb
 - lib/ollama_chat/source_fetching.rb
 - lib/ollama_chat/switches.rb
@@ -412,6 +413,7 @@ files:
 - redis/redis.conf
 - spec/assets/api_show.json
 - spec/assets/api_tags.json
+- spec/assets/api_version.json
 - spec/assets/conversation.json
 - spec/assets/duckduckgo.html
 - spec/assets/example.atom