ollama-ai 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2fd0eb2c7a52658cbbbd9e96790db7756f46b9ba74dab3a8fd825c55ad6f1b6
-  data.tar.gz: 9b8fed3ca8b0fea528284d63257995d8893efa148923475e0b6eeecd7cc23128
+  metadata.gz: ea11236a89bbbd351372a7ebe35dfe0bff07ee8728fd81163a0119b104edc1e9
+  data.tar.gz: 50da7ae43a519cfa1c01f2c08664f481390bff4619a5be72b85d539abff490f3
 SHA512:
-  metadata.gz: a57063b64634e2312afc789e1cd8b5d4b32f55b82da6ff698b55207cf5514b44e667ee47de0c361903ac66202f7a55bac02b3888039a5b6bd911589ca29b37e0
-  data.tar.gz: d87bddf69072a65a7661bae253524c624b993c2f8c995f68657382b033054ee3a4620312004074d1aff13c167556607ca9a8354f2939f081f7e4cd3f97378d2f
+  metadata.gz: 0e06ff9b6927132829e9315c33a470b0f8282cb4edd8f2780a5ed79295356f4aa4cc2b0470fb4932d40270c9e3bf49268015bd18053b6f80682af6f41beea8cc
+  data.tar.gz: a02a9d87919270d2aca1091819ef407826cb934c40e856403875021900ce72cca80b8b3f36f1e39280ad7d61857511bf1307b837195812f11940970fca04d109

data/Gemfile

@@ -6,5 +6,5 @@ gemspec
 
 group :test, :development do
   gem 'pry-byebug', '~> 3.10', '>= 3.10.1'
-  gem 'rubocop', '~> 1.60', '>= 1.60.2'
+  gem 'rubocop', '~> 1.65'
 end

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    ollama-ai (1.2.0)
-      faraday (~> 2.9)
+    ollama-ai (1.3.0)
+      faraday (~> 2.10)
       faraday-typhoeus (~> 1.1)
+      typhoeus (~> 1.4, >= 1.4.1)
 
 GEM
   remote: https://rubygems.org/
@@ -13,21 +14,23 @@ GEM
     coderay (1.1.3)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    faraday (2.9.0)
+    faraday (2.10.0)
       faraday-net_http (>= 2.0, < 3.2)
+      logger
     faraday-net_http (3.1.0)
       net-http
     faraday-typhoeus (1.1.0)
       faraday (~> 2.0)
       typhoeus (~> 1.4)
-    ffi (1.16.3)
-    json (2.7.1)
+    ffi (1.17.0)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    method_source (1.0.0)
+    logger (1.6.0)
+    method_source (1.1.0)
     net-http (0.4.1)
       uri
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -36,36 +39,39 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    racc (1.7.3)
+    racc (1.8.0)
     rainbow (3.1.1)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rubocop (1.60.2)
+    regexp_parser (2.9.2)
+    rexml (3.3.2)
+      strscan
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
+    strscan (3.1.0)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     unicode-display_width (2.5.0)
     uri (0.13.0)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
   ollama-ai!
   pry-byebug (~> 3.10, >= 3.10.1)
-  rubocop (~> 1.60, >= 1.60.2)
+  rubocop (~> 1.65)
 
 BUNDLED WITH
    2.4.22

data/README.md

@@ -9,7 +9,7 @@ A Ruby gem for interacting with [Ollama](https://ollama.ai)'s API that allows yo
 ## TL;DR and Quick Start
 
 ```ruby
-gem 'ollama-ai', '~> 1.2.0'
+gem 'ollama-ai', '~> 1.3.0'
 ```
 
 ```ruby
@@ -65,6 +65,7 @@ Result:
   - [Installing](#installing)
 - [Usage](#usage)
   - [Client](#client)
+    - [Bearer Authentication](#bearer-authentication)
   - [Methods](#methods)
     - [generate: Generate a completion](#generate-generate-a-completion)
       - [Without Streaming Events](#without-streaming-events)
@@ -105,11 +106,11 @@ Result:
 ### Installing
 
 ```sh
-gem install ollama-ai -v 1.2.0
+gem install ollama-ai -v 1.3.0
 ```
 
 ```sh
-gem 'ollama-ai', '~> 1.2.0'
+gem 'ollama-ai', '~> 1.3.0'
 ```
 
 ## Usage
@@ -126,6 +127,34 @@ client = Ollama.new(
 )
 ```
 
+#### Bearer Authentication
+
+```ruby
+require 'ollama-ai'
+
+client = Ollama.new(
+  credentials: {
+    address: 'http://localhost:11434',
+    bearer_token: 'eyJhbG...Qssw5c'
+  },
+  options: { server_sent_events: true }
+)
+```
+
+Remember that hardcoding your credentials in code is unsafe. It's preferable to use environment variables:
+
+```ruby
+require 'ollama-ai'
+
+client = Ollama.new(
+  credentials: {
+    address: 'http://localhost:11434',
+    bearer_token: ENV['OLLAMA_BEARER_TOKEN']
+  },
+  options: { server_sent_events: true }
+)
+```
+
 ### Methods
 
 ```ruby
@@ -871,6 +900,7 @@ bundle
 rubocop -A
 
 bundle exec ruby spec/tasks/run-client.rb
+bundle exec ruby spec/tasks/test-encoding.rb
 ```
 
 ### Purpose
@@ -884,7 +914,7 @@ gem build ollama-ai.gemspec
 
 gem signin
 
-gem push ollama-ai-1.2.0.gem
+gem push ollama-ai-1.3.0.gem
 ```
 
 ### Updating the README

data/components/errors.rb

@@ -4,7 +4,7 @@ module Ollama
   module Errors
     class OllamaError < StandardError
       def initialize(message = nil)
-        super(message)
+        super
       end
     end
 

data/controllers/client.rb

@@ -24,6 +24,8 @@ module Ollama
                      "#{config[:credentials][:address].to_s.sub(%r{/$}, '')}/"
                    end
 
+        @bearer_token = config[:credentials][:bearer_token]
+
         @request_options = config.dig(:options, :connection, :request)
 
         @request_options = if @request_options.is_a?(Hash)
@@ -92,11 +94,12 @@ module Ollama
 
         method_to_call = request_method.to_s.strip.downcase.to_sym
 
-        partial_json = ''
+        partial_json = String.new.force_encoding('UTF-8')
 
         response = Faraday.new(request: @request_options) do |faraday|
           faraday.adapter @faraday_adapter
           faraday.response :raise_error
+          faraday.request :authorization, 'Bearer', @bearer_token if @bearer_token
         end.send(method_to_call) do |request|
           request.url url
           request.headers['Content-Type'] = 'application/json'
@@ -110,7 +113,13 @@ module Ollama
                 raise_error.on_complete(env.merge(body: chunk))
               end
 
-              partial_json += chunk
+              utf8_chunk = chunk.force_encoding('UTF-8')
+
+              partial_json += if utf8_chunk.valid_encoding?
+                                utf8_chunk
+                              else
+                                utf8_chunk.encode('UTF-8', invalid: :replace, undef: :replace)
+                              end
 
               parsed_json = safe_parse_json(partial_json)
 
@@ -121,7 +130,7 @@ module Ollama
 
                 results << result
 
-                partial_json = ''
+                partial_json = String.new.force_encoding('UTF-8')
               end
             end
           end

data/ollama-ai.gemspec

@@ -29,8 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['ports/dsl']
 
-  spec.add_dependency 'faraday', '~> 2.9'
+  spec.add_dependency 'faraday', '~> 2.10'
   spec.add_dependency 'faraday-typhoeus', '~> 1.1'
+  spec.add_dependency 'typhoeus', '~> 1.4', '>= 1.4.1'
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/static/gem.rb

@@ -3,7 +3,7 @@
 module Ollama
   GEM = {
     name: 'ollama-ai',
-    version: '1.2.0',
+    version: '1.3.0',
     author: 'gbaptista',
     summary: 'Interact with Ollama API to run open source AI models locally.',
     description: "A Ruby gem for interacting with Ollama's API that allows you to run open source AI LLMs (Large Language Models) locally.",

data/template.md

@@ -9,7 +9,7 @@ A Ruby gem for interacting with [Ollama](https://ollama.ai)'s API that allows yo
 ## TL;DR and Quick Start
 
 ```ruby
-gem 'ollama-ai', '~> 1.2.0'
+gem 'ollama-ai', '~> 1.3.0'
 ```
 
 ```ruby
@@ -66,11 +66,11 @@ Result:
 ### Installing
 
 ```sh
-gem install ollama-ai -v 1.2.0
+gem install ollama-ai -v 1.3.0
 ```
 
 ```sh
-gem 'ollama-ai', '~> 1.2.0'
+gem 'ollama-ai', '~> 1.3.0'
 ```
 
 ## Usage
@@ -87,6 +87,34 @@ client = Ollama.new(
 )
 ```
 
+#### Bearer Authentication
+
+```ruby
+require 'ollama-ai'
+
+client = Ollama.new(
+  credentials: {
+    address: 'http://localhost:11434',
+    bearer_token: 'eyJhbG...Qssw5c'
+  },
+  options: { server_sent_events: true }
+)
+```
+
+Remember that hardcoding your credentials in code is unsafe. It's preferable to use environment variables:
+
+```ruby
+require 'ollama-ai'
+
+client = Ollama.new(
+  credentials: {
+    address: 'http://localhost:11434',
+    bearer_token: ENV['OLLAMA_BEARER_TOKEN']
+  },
+  options: { server_sent_events: true }
+)
+```
+
 ### Methods
 
 ```ruby
@@ -832,6 +860,7 @@ bundle
 rubocop -A
 
 bundle exec ruby spec/tasks/run-client.rb
+bundle exec ruby spec/tasks/test-encoding.rb
 ```
 
 ### Purpose
@@ -845,7 +874,7 @@ gem build ollama-ai.gemspec
 
 gem signin
 
-gem push ollama-ai-1.2.0.gem
+gem push ollama-ai-1.3.0.gem
 ```
 
 ### Updating the README

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ai
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - gbaptista
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2024-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: faraday-typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 description: A Ruby gem for interacting with Ollama's API that allows you to run open
   source AI LLMs (Large Language Models) locally.
 email: