ollama_chat 0.0.67 → 0.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb8ee4b480c19b26ba27b6d112da4038ed16615881425ba4f7142483d329a79
-  data.tar.gz: 85a7d64b19b3e751d51d7ada7af2ff536e578f3425218394b0aa3efcd5301626
+  metadata.gz: 135734ab31efeba4bc0ba5a5268bb739269de2e30ed9bed5e92897e2bcf91007
+  data.tar.gz: 7b331fa27f44318d73524b532573a4e2a60d1d33a234400794ee30dfc9cb3210
 SHA512:
-  metadata.gz: f374a3d58183068936222115a61e090ee3e45efd637401ffd97cebc147286b971025730d6393e95dc2b5eeb2e89cacc65d33a3dc76f6467fb23e1aedfe13fffd
-  data.tar.gz: fefa35f2e685dab9c4f3e8b97487f4a4a072f3b2b982864ae423b8d4aaba29ea3e46dc4065dedb7db3908f3192c56c922f92e123163272ef186771b862b7ffc4
+  metadata.gz: 646671b9819e6f531e170edb969ce21d60bc7e32abbb1872eaa22da107895deaf0c5d46f816189d724a92a10e5cdcf21850e12ba80fa532e8e99d2f68265cfd7
+  data.tar.gz: b2f2a6e619d599d435025dfe715d7fab6af0d416356672a4c95721cff0bedb534868217281db916f9b26af3d1886e75c566d0695d712a341227fafd4b6e38ef4

data/CHANGES.md

@@ -1,5 +1,27 @@
 # Changes
 
+## 2026-02-19 v0.0.68
+
+- Added JSON serialization for directory structure in `OllamaChat::Parsing`
+  using `generate_structure(file).to_json`
+- Introduced `OllamaChat::HTTPError` exception with `status` attribute for
+  better error handling
+- Enhanced `OllamaChat::Utils::Fetcher` to handle `reraise` option and raise
+  `HTTPError` on non-200 HTTP responses
+- Added `require_confirmation: true` option for `open_file_in_editor` tool in
+  default configuration to provide additional safety check
+- Updated `AssetHelpers.asset` in `spec/spec_helper.rb` to accept optional name
+  parameter
+- Included `OllamaChat::Utils::AnalyzeDirectory` mixin in `OllamaChat::Parsing`
+  to simplify method calls
+- Replaced fully-qualified
+  `OllamaChat::Utils::AnalyzeDirectory.generate_structure(file)` calls with
+  local `generate_structure(file)` after including the module
+- Added specs to verify JSON output contains expected file names in
+  `spec/ollama_chat/parsing_spec.rb`
+- Updated tools (`get_cve`, `get_endoflife`, `get_jira_issue`) to pass
+  `reraise: true` to Excon for improved error propagation
+
 ## 2026-02-18 v0.0.67
 
 - Added `max_depth` option to directory listing tool

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -139,6 +139,7 @@ tools:
     default: true
   open_file_in_editor:
     default: true
+    require_confirmation: true
   run_tests:
     require_confirmation: true
     default: true

data/lib/ollama_chat/parsing.rb

@@ -12,6 +12,8 @@
 #   chat.parse_source(pdf_io)     # Extracts text from PDF files
 #   chat.parse_source(csv_io)     # Formats CSV data into readable strings
 module OllamaChat::Parsing
+  include OllamaChat::Utils::AnalyzeDirectory
+
   # The parse_source method processes different types of input sources and
   # converts them into a standardized text representation.
   #
@@ -221,7 +223,7 @@ module OllamaChat::Parsing
     contents = [ content ]
     content.scan(CONTENT_REGEXP).each { |url, tag, file_url, quoted_file, file|
       if file && File.directory?(file)
-        contents << OllamaChat::Utils::AnalyzeDirectory.generate_structure(file)
+        contents << generate_structure(file).to_json
         next
       end
       check_exist = false

data/lib/ollama_chat/tools/get_cve.rb

@@ -55,6 +55,7 @@ class OllamaChat::Tools::GetCVE
         'Accept' => 'application/json',
       },
       debug: OllamaChat::EnvConfig::OLLAMA::CHAT::DEBUG,
+      reraise: true,
       &valid_json?
     )
   rescue => e

data/lib/ollama_chat/tools/get_endoflife.rb

@@ -60,6 +60,7 @@ class OllamaChat::Tools::GetEndoflife
         'User-Agent' => OllamaChat::Chat.user_agent
       },
       debug: OllamaChat::EnvConfig::OLLAMA::CHAT::DEBUG,
+      reraise: true,
       &valid_json?
     )
   rescue => e

data/lib/ollama_chat/tools/get_jira_issue.rb

@@ -76,6 +76,7 @@ class OllamaChat::Tools::GetJiraIssue
       url,
       user:     env::USER,
       password: env::API_TOKEN,
+      reraise:  true,
       &valid_json?
     )
   end

data/lib/ollama_chat/utils/fetcher.rb

@@ -69,34 +69,75 @@ class OllamaChat::Utils::Fetcher
   #   rescue RetryWithoutStreaming
   #     # Handle retry with non-streaming method
   #   end
-  class RetryWithoutStreaming < StandardError; end
+  class RetryWithoutStreaming < OllamaChat::OllamaChatError; end
 
-  # The get method retrieves content from a URL, using caching when available.
-  # It processes the URL with optional headers and additional options,
-  # then yields a temporary file containing the retrieved content.
-  # If caching is enabled and content is found in the cache,
-  # it returns the cached result instead of fetching again.
-  # The method handles both cached and fresh fetches,
-  # ensuring that cache is updated when new content is retrieved.
-  #
-  # @param url [ String ] the URL to fetch content from
-  # @param headers [ Hash ] optional headers to include in the request
-  # @param options [ Hash ] additional options for the fetch operation
-  #
-  # @yield [ tmp ]
-  #
-  # @return [ Object ] the result of the block execution
-  # @return [ nil ] if no block is given or if the fetch fails
+  # Fetches the content located at +url+ and optionally caches it.
+  #
+  # This is a convenience wrapper around an instance of
+  # `OllamaChat::Utils::Fetcher`.  It accepts the same options as the
+  # instance method, with the following additions:
+  #
+  # * `:cache` – an object that responds to `get` and `put` (see
+  #   `OllamaChat::Utils::CacheFetcher`).  If a cached value exists,
+  #   it is returned immediately and the network is not contacted.
+  # * `:reraise` – if true, any exception raised during the fetch
+  #   will be re‑raised after a failed temporary file has been yielded.
+  #   The exception type `OllamaChat::HTTPError` is raised only when
+  #   `:reraise` is true; otherwise the error is swallowed and the
+  #   caller receives a failed `StringIO` via the block.
+  #
+  # The method streams the HTTP response into a temporary file (or a
+  # `StringIO` in the event of a failure).  The temporary file is
+  # extended with `HeaderExtension`, so the block can inspect
+  # `tmp.content_type` and `tmp.ex`.  After the block returns the
+  # temporary file is closed and discarded.  If a cache is supplied
+  # and the response is not a `StringIO`, the temporary file is written
+  # back to the cache for future requests.
+  #
+  # @param url [String] the URL to fetch
+  # @param headers [Hash] optional HTTP headers to send with the request
+  # @param options [Hash] additional options
+  #   * `:cache`          – a cache object (see above)
+  #   * `:reraise`        – see description above
+  #   * `:middlewares`    – array of Excon middleware classes
+  #   * `:http_options`   – hash of options forwarded to the Excon client
+  #
+  # @yield [tmp] Gives the caller a `Tempfile` (or a `StringIO` in case of
+  #   failure) that contains the fetched content.  The yielded object
+  #   is already extended with `HeaderExtension`, so the block can read
+  #   `tmp.content_type` and `tmp.ex`.
+  #
+  # @return [Object] the value returned by the block.  If no block is
+  #   given, the method returns `nil`.  If a cached value is returned,
+  #   the cached object (typically a `StringIO`) is returned directly.
+  #
+  # @raise [OllamaChat::HTTPError] when the HTTP response status is not
+  #   200 **and** the `:reraise` option is true.  The error is raised
+  #   after the failed `StringIO` has been yielded to the caller.
+  # @raise [OllamaChat::OllamaChatError] (or subclasses) for other
+  #   network or I/O errors.  If `:reraise` is true, the original
+  #   exception is re‑raised after yielding the failed `StringIO`.
+  #
+  # @example Fetch a URL with caching
+  #   cache = RedisCache.new
+  #   fetcher = OllamaChat::Utils::Fetcher
+  #   fetcher.get('https://example.com/data.json', cache: cache) do |tmp|
+  #     JSON.parse(tmp.read)
+  #   end
+  #
+  # @see OllamaChat::Utils::CacheFetcher
+  # @see HeaderExtension
   def self.get(url, headers: {}, **options, &block)
     cache = options.delete(:cache) and
       cache = OllamaChat::Utils::CacheFetcher.new(cache)
+    reraise = options.delete(:reraise)
     cache and infobar.puts "Getting #{url.to_s.inspect} via cache…"
     if result = cache&.get(url, &block)
       content_type = result&.content_type || 'unknown'
       infobar.puts "…hit, found #{content_type} content in cache."
       return result
     else
-      new(**options).send(:get, url, headers:) do |tmp|
+      new(**options).send(:get, url, headers:, reraise:) do |tmp|
         result = block.(tmp)
         if cache && !tmp.is_a?(StringIO)
           tmp.rewind
@@ -185,19 +226,67 @@ class OllamaChat::Utils::Fetcher
     @http_options = http_options
   end
 
-  # Makes an HTTP GET request to the specified URL with optional headers and
-  # processing block.
+  # Fetches the content located at +url+.
   #
-  # This method handles both streaming and non-streaming HTTP requests, using
-  # Excon for the actual HTTP communication. The response body is written to a
-  # temporary file which is then decorated with additional behavior before
-  # being passed to the provided block.
+  # The method first checks an optional cache (passed via the `:cache` option).
+  # If a cached response is found, it is returned immediately.  Otherwise the
+  # URL is fetched over HTTP using Excon.  Two modes are supported:
+  #
+  # * **Streaming** – the response body is streamed directly into a temporary
+  #   file.  Progress is reported via `infobar`.  If the first request
+  #   fails with a non‑200 status or the streaming mode is not supported,
+  #   the method falls back to a non‑streaming request.
+  # * **Non‑streaming** – the entire body is read into memory before
+  #   being written to the temporary file.
+  #
+  # The temporary file is yielded to the caller.  The file is extended
+  # with `HeaderExtension`, so the block can inspect `content_type` and
+  # `ex` (cache‑expiry in seconds).  After the block returns, the
+  # temporary file is closed and discarded.
+  #
+  # If a cache is supplied and the response is not a `StringIO`, the
+  # temporary file is written back to the cache for future requests.
+  #
+  # @param url [String] the URL to fetch
+  # @param headers [Hash] optional HTTP headers to send with the request
+  # @param options [Hash] additional options
+  #   * `:cache`   – an object that responds to `get` and `put` (see
+  #     `OllamaChat::Utils::CacheFetcher`).  When present, the method
+  #     will attempt to read from the cache before making a network
+  #     request.
+  #   * `:reraise` – if true, any exception raised during the fetch
+  #     will be re‑raised after a failed temporary file is yielded.
+  #   * `:middlewares` – an array of Excon middleware classes to apply.
+  #   * `:http_options` – hash of options forwarded to the Excon client.
+  #
+  # @yield [tmp] Gives the caller a `Tempfile` (or a `StringIO` in the
+  #   unlikely event of a failure) that contains the fetched content.
+  #   The yielded object is already extended with `HeaderExtension`,
+  #   so the block can read `tmp.content_type` and `tmp.ex`.
+  #
+  # @return [Object] the value returned by the block.  If no block is
+  #   given, the method returns `nil`.  If a cached value is returned,
+  #   the cached object (typically a `StringIO`) is returned directly.
+  #
+  # @raise [OllamaChat::HTTPError] when the HTTP response status is not
+  #   200 **and** the `:reraise` option is true.  The error is raised
+  #   after the failed `StringIO` has been yielded to the caller.
+  # @raise [OllamaChat::OllamaChatError] (or subclasses) for other
+  #   network or I/O errors.  If `:reraise` is true, the original
+  #   exception is re‑raised after yielding the failed `StringIO`.
+  #
+  # @example Fetch a URL with caching
+  #   cache = RedisCache.new
+  #   fetcher = OllamaChat::Utils::Fetcher
+  #   fetcher.get('https://example.com/data.json', cache: cache) do |tmp|
+  #     JSON.parse(tmp.read)
+  #   end
   #
-  # @param url [String] The URL to make the GET request to
-  # @yield [Tempfile] The temporary file containing the response body, after
-  #                   decoration
+  # @see OllamaChat::Utils::CacheFetcher
+  # @see HeaderExtension
   def get(url, **opts, &block)
     opts.delete(:response_block) and raise ArgumentError, 'response_block not allowed'
+    reraise ||= opts.delete(:reraise)
     middlewares = (self.middlewares | Array((opts.delete(:middlewares)))).uniq
     headers = opts.delete(:headers) || {}
     headers |= self.headers
@@ -213,8 +302,11 @@ class OllamaChat::Utils::Fetcher
         block.(tmp)
       else
         response = excon(url, headers:, middlewares:, **opts).request(method: :get)
-        if response.status != 200
-          raise "invalid response status code"
+        if status = response.status and status != 200
+          message = "request failed: %u %s" % [ status, response.reason_phrase ]
+          error = OllamaChat::HTTPError.new(message)
+          error.status = status
+          raise error
         end
         body = response.body
         tmp.print body
@@ -233,6 +325,7 @@ class OllamaChat::Utils::Fetcher
       STDERR.puts "#{e.backtrace * ?\n}"
     end
     yield HeaderExtension.failed
+    reraise and raise e
   end
 
   private

data/lib/ollama_chat/version.rb

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

data/lib/ollama_chat.rb

@@ -32,6 +32,13 @@ module OllamaChat
   # log or display the problematic location.
   class ConfigMissingError < OllamaChatError
   end
+
+  # Error raised when an HTTP request returns a non‑200 status code.
+  class HTTPError < OllamaChatError
+    # @!attribute [r] status
+    #   @return [Integer] the HTTP status code that caused the error.
+    attr_accessor :status
+  end
 end
 
 require 'ollama'

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.67 ruby lib
+# stub: ollama_chat 0.0.68 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.67".freeze
+  s.version = "0.0.68".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/spec/ollama_chat/parsing_spec.rb

@@ -279,5 +279,18 @@ describe OllamaChat::Parsing do
         EOT
       end
     end
+
+    it 'generates a readable directory‑structure string for directories' do
+      content, = chat.parse_content("look at #{asset}", [])
+      json_data = content.lines[2..-1].join('')
+      json = JSON(json_data)
+      expect(json.map { _1['name'] }.sort).to eq(
+        ["api_show.json", "api_tags.json", "api_version.json",
+         "conversation.json", "deep", "duckduckgo.html", "example.atom",
+         "example.csv", "example.html", "example.pdf", "example.ps",
+         "example.rb", "example.rss", "example.xml", "example_with_quote.html",
+         "kitten.jpg", "prompt.txt", "searxng.json"]
+      )
+    end
   end
 end

data/spec/ollama_chat/utils/fetcher_spec.rb

@@ -93,11 +93,24 @@ describe OllamaChat::Utils::Fetcher do
       with(headers: fetcher.headers).
       to_return(status: 500)
     expect(STDERR).to receive(:puts).with(/cannot.*get.*#{url}/i)
-      fetcher.get(url) do |tmp|
+    fetcher.get(url) do |tmp|
+      expect(tmp).to be_a StringIO
+      expect(tmp.read).to eq ''
+      expect(tmp.content_type).to eq 'text/plain'
+    end
+  end
+
+  it 'can #get and finally fail with reraise' do
+    stub_request(:get, url).
+      with(headers: fetcher.headers).
+      to_return(status: 500)
+    expect {
+      fetcher.get(url, reraise: true) do |tmp|
         expect(tmp).to be_a StringIO
         expect(tmp.read).to eq ''
         expect(tmp.content_type).to eq 'text/plain'
       end
+    }.to raise_error OllamaChat::HTTPError, /request failed: 500/
   end
 
   it 'can redirect' do

data/spec/spec_helper.rb

@@ -33,8 +33,8 @@ module AssetHelpers
   # @param name [String] the name of the asset file
   #
   # @return [String] the full path to the asset file
-  def asset(name)
-    File.join(__dir__, 'assets', name)
+  def asset(name = nil)
+    File.join(*[__dir__, 'assets', name ].compact)
   end
 
   # Reads and returns the content of an asset file from the assets directory.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.67
+  version: 0.0.68
 platform: ruby
 authors:
 - Florian Frank