ollama-client 0.2.4 → 0.2.5

data/lib/ollama/client.rb

@@ -206,7 +206,7 @@ module Ollama
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/ParameterLists
 
-    def generate(prompt:, schema:, model: nil, strict: false, return_meta: false)
+    def generate(prompt:, schema: nil, model: nil, strict: false, return_meta: false)
       attempts = 0
       @current_schema = schema # Store for prompt enhancement
       started_at = monotonic_time
@@ -227,6 +227,22 @@ module Ollama
           }
         )
 
+        # If no schema provided, return plain text/markdown
+        unless schema
+          return raw unless return_meta
+
+          return {
+            "data" => raw,
+            "meta" => {
+              "endpoint" => "/api/generate",
+              "model" => model || @config.model,
+              "attempts" => attempts,
+              "latency_ms" => elapsed_ms(started_at)
+            }
+          }
+        end
+
+        # Schema provided - parse and validate JSON
         parsed = parse_json_response(raw)
 
         # CRITICAL: If schema is provided, free-text output is forbidden
@@ -267,7 +283,7 @@ module Ollama
     end
     # rubocop:enable Metrics/MethodLength
 
-    def generate_strict!(prompt:, schema:, model: nil, return_meta: false)
+    def generate_strict!(prompt:, schema: nil, model: nil, return_meta: false)
       generate(prompt: prompt, schema: schema, model: model, strict: true, return_meta: return_meta)
     end
 

data/lib/ollama/document_loader.rb

@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+require "csv"
+require "json"
+
+module Ollama
+  # Document loader for RAG (Retrieval-Augmented Generation)
+  #
+  # Loads files from a directory and provides them as context for LLM queries.
+  # Supports: .txt, .md, .csv, .json files
+  #
+  # Example:
+  #   loader = Ollama::DocumentLoader.new("docs/")
+  #   context = loader.load_all
+  #   result = client.generate(
+  #     prompt: "Context: #{context}\n\nQuestion: What is Ruby?",
+  #     schema: {...}
+  #   )
+  class DocumentLoader
+    SUPPORTED_EXTENSIONS = %w[.txt .md .markdown .csv .json].freeze
+
+    def initialize(directory, extensions: SUPPORTED_EXTENSIONS)
+      @directory = File.expand_path(directory)
+      @extensions = extensions
+      @documents = {}
+    end
+
+    # Load all supported files from the directory
+    #
+    # @param recursive [Boolean] Load files from subdirectories
+    # @return [Hash] Hash of filename => content
+    def load_all(recursive: false)
+      raise Error, "Directory not found: #{@directory}" unless Dir.exist?(@directory)
+
+      pattern = recursive ? "**/*" : "*"
+      files = Dir.glob(File.join(@directory, pattern)).select { |f| File.file?(f) }
+
+      loaded_count = 0
+      files.each do |file|
+        next unless supported_file?(file)
+
+        filename = File.basename(file)
+        content = load_file(file)
+        next if content.nil?
+
+        @documents[filename] = content
+        loaded_count += 1
+      end
+
+      @documents
+    end
+
+    # Load a specific file
+    #
+    # @param filename [String] Name of the file to load (can be relative or absolute)
+    # @return [String] File content as text, or nil if file not found
+    def load_file(filename)
+      # Handle both relative and absolute paths
+      full_path = if File.absolute_path?(filename)
+                    filename
+                  else
+                    File.join(@directory, filename)
+                  end
+
+      return nil unless File.exist?(full_path)
+
+      # Store with basename for consistency
+      basename = File.basename(filename)
+
+      ext = File.extname(filename).downcase
+      content = File.read(full_path)
+
+      parsed_content = case ext
+                       when ".csv"
+                         parse_csv(content)
+                       when ".json"
+                         parse_json(content)
+                       else
+                         # .txt, .md, .markdown, or any other text file
+                         content
+                       end
+
+      # Store in documents hash
+      @documents[basename] = parsed_content
+      parsed_content
+    end
+
+    # Get all loaded documents as a single context string
+    #
+    # @param separator [String] Separator between documents
+    # @return [String] Combined context from all documents
+    def to_context(separator: "\n\n---\n\n")
+      @documents.map do |filename, content|
+        "File: #{filename}\n#{content}"
+      end.join(separator)
+    end
+
+    # Get documents matching a pattern
+    #
+    # @param pattern [String, Regexp] Pattern to match filenames
+    # @return [Hash] Matching documents
+    def select(pattern)
+      if pattern.is_a?(Regexp)
+        @documents.select { |filename, _| filename.match?(pattern) }
+      else
+        @documents.select { |filename, _| filename.include?(pattern.to_s) }
+      end
+    end
+
+    # Get a specific document by filename
+    #
+    # @param filename [String] Name of the document
+    # @return [String, nil] Document content or nil if not found
+    def [](filename)
+      @documents[filename]
+    end
+
+    # List all loaded document names
+    #
+    # @return [Array<String>] Array of filenames
+    def files
+      @documents.keys
+    end
+
+    # Check if any documents are loaded
+    #
+    # @return [Boolean] True if documents are loaded
+    def empty?
+      @documents.empty?
+    end
+
+    private
+
+    def supported_file?(file)
+      ext = File.extname(file).downcase
+      @extensions.include?(ext)
+    end
+
+    def parse_csv(content)
+      rows = CSV.parse(content, headers: true)
+      return content if rows.empty?
+
+      # Convert CSV to readable text format
+      headers = rows.headers || []
+      text_rows = rows.map do |row|
+        if headers.any?
+          headers.map { |h| "#{h}: #{row[h]}" }.join(", ")
+        else
+          row.fields.join(", ")
+        end
+      end
+
+      "CSV Data:\n" + text_rows.join("\n")
+    end
+
+    def parse_json(content)
+      parsed = JSON.parse(content)
+      JSON.pretty_generate(parsed)
+    rescue JSON::ParserError
+      content
+    end
+  end
+end

data/lib/ollama/embeddings.rb

@@ -44,6 +44,20 @@ module Ollama
       response_body = JSON.parse(res.body)
       embedding = response_body["embedding"]
 
+      if embedding.nil?
+        raise Error,
+              "Embedding not found in response. Response keys: #{response_body.keys.join(", ")}. Full response: #{response_body.inspect[0..200]}"
+      end
+
+      if embedding.is_a?(Array) && embedding.empty?
+        error_msg = "Empty embedding returned. This usually means:\n"
+        error_msg += "  1. The model may not be properly loaded - try: ollama pull #{model}\n"
+        error_msg += "  2. The model may not support embeddings - verify it's an embedding model\n"
+        error_msg += "  3. Check if the model is working: curl http://localhost:11434/api/embeddings -d '{\"model\":\"#{model}\",\"input\":\"test\"}'\n"
+        error_msg += "Response: #{response_body.inspect[0..300]}"
+        raise Error, error_msg
+      end
+
       # Return single array for single input, or array of arrays for multiple inputs
       if input.is_a?(Array)
         # Ollama returns single embedding array even for multiple inputs

data/lib/ollama/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ollama
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/ollama_client.rb

@@ -7,6 +7,7 @@ require_relative "ollama/options"
 require_relative "ollama/response"
 require_relative "ollama/tool"
 require_relative "ollama/client"
+require_relative "ollama/document_loader"
 require_relative "ollama/streaming_observer"
 require_relative "ollama/agent/messages"
 require_relative "ollama/agent/planner"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-client
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Shubham Taywade
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-18 00:00:00.000000000 Z
+date: 2026-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -60,17 +74,14 @@ files:
 - docs/CLOUD.md
 - docs/CONSOLE_IMPROVEMENTS.md
 - docs/FEATURES_ADDED.md
-- docs/GEM_RELEASE_GUIDE.md
-- docs/GET_RUBYGEMS_SECRET.md
 - docs/HANDLERS_ANALYSIS.md
 - docs/PRODUCTION_FIXES.md
-- docs/QUICK_OTP_SETUP.md
-- docs/QUICK_RELEASE.md
 - docs/README.md
-- docs/RUBYGEMS_OTP_SETUP.md
+- docs/RELEASE_GUIDE.md
 - docs/SCHEMA_FIXES.md
 - docs/TESTING.md
 - docs/TEST_UPDATES.md
+- docs/ruby_guide.md
 - examples/README.md
 - examples/advanced_complex_schemas.rb
 - examples/advanced_edge_cases.rb
@@ -124,6 +135,7 @@ files:
 - lib/ollama/agent/planner.rb
 - lib/ollama/client.rb
 - lib/ollama/config.rb
+- lib/ollama/document_loader.rb
 - lib/ollama/dto.rb
 - lib/ollama/embeddings.rb
 - lib/ollama/errors.rb