ollama-ai 1.0.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fde2a3054fbb7ae9b7dc02b3bb0f083a18496fa9af299299ca138a28ba0663e7
-  data.tar.gz: 371bda0d8c2db9e82cee85162d665a2ccf4bb204a487f5b0c19a156f7ac4e292
+  metadata.gz: 2b2cbe0dd2d75850aea0dddf66463e295dc3941205d66bbd5abbb1c8590fc8a7
+  data.tar.gz: 802c5423e24119488d9112726704e056bbed29c70c0c98247dd89a757fdefaaf
 SHA512:
-  metadata.gz: bdf82b0c94f7011f6d35b4997db27f65c1f87ddd60b05adb221d84f7504934eec3492be675647fd448e6157fa880a149d7a98d7066c597ab76559477101744d1
-  data.tar.gz: de8ddb9883d714f226edfa5f12a343002703f619717c653f7ab58f1757bb43f6662d451f77abc850cf1880c41165e64aa35589cb52a695c73d5452d6a25baf56
+  metadata.gz: acaa09929dfd956842f026ff504cfc6cc3213c7ae829a39a901a6302b9a45694e23795698375e25f0773780275811575dc5f6eef8b22d940849d9fdf855c4bf2
+  data.tar.gz: bd2758a1306d2a1a44b67c4662cb029f403100b3c2a34f44925d1d6b1bb514b2015154b004035927a5320ef9e137959d872d2f5361e13e6d8fd5767182ced122

data/Gemfile

@@ -6,5 +6,5 @@ gemspec
 
 group :test, :development do
   gem 'pry-byebug', '~> 3.10', '>= 3.10.1'
-  gem 'rubocop', '~> 1.58'
+  gem 'rubocop', '~> 1.63', '>= 1.63.1'
 end

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    ollama-ai (1.0.1)
+    ollama-ai (1.2.1)
       faraday (~> 2.9)
+      faraday-typhoeus (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -10,17 +11,23 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
     faraday-net_http (3.1.0)
       net-http
-    json (2.7.1)
+    faraday-typhoeus (1.1.0)
+      faraday (~> 2.0)
+      typhoeus (~> 1.4)
+    ffi (1.16.3)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     method_source (1.0.0)
     net-http (0.4.1)
       uri
     parallel (1.24.0)
-    parser (3.3.0.3)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -33,20 +40,22 @@ GEM
     rainbow (3.1.1)
     regexp_parser (2.9.0)
     rexml (3.2.6)
-    rubocop (1.59.0)
+    rubocop (1.63.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 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.2)
+      parser (>= 3.3.0.4)
     ruby-progressbar (1.13.0)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
     unicode-display_width (2.5.0)
     uri (0.13.0)
 
@@ -56,7 +65,7 @@ PLATFORMS
 DEPENDENCIES
   ollama-ai!
   pry-byebug (~> 3.10, >= 3.10.1)
-  rubocop (~> 1.58)
+  rubocop (~> 1.63, >= 1.63.1)
 
 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.0.1'
+gem 'ollama-ai', '~> 1.2.1'
 ```
 
 ```ruby
@@ -62,40 +62,41 @@ Result:
 - [TL;DR and Quick Start](#tldr-and-quick-start)
 - [Index](#index)
 - [Setup](#setup)
-    - [Installing](#installing)
+  - [Installing](#installing)
 - [Usage](#usage)
-    - [Client](#client)
-    - [Methods](#methods)
-        - [generate: Generate a completion](#generate-generate-a-completion)
-            - [Without Streaming Events](#without-streaming-events)
-            - [Receiving Stream Events](#receiving-stream-events)
-        - [chat: Generate a chat completion](#chat-generate-a-chat-completion)
-            - [Back-and-Forth Conversations](#back-and-forth-conversations)
-        - [embeddings: Generate Embeddings](#embeddings-generate-embeddings)
-        - [Models](#models)
-            - [create: Create a Model](#create-create-a-model)
-            - [tags: List Local Models](#tags-list-local-models)
-            - [show: Show Model Information](#show-show-model-information)
-            - [copy: Copy a Model](#copy-copy-a-model)
-            - [delete: Delete a Model](#delete-delete-a-model)
-            - [pull: Pull a Model](#pull-pull-a-model)
-            - [push: Push a Model](#push-push-a-model)
-    - [Modes](#modes)
-        - [Text](#text)
-        - [Image](#image)
-    - [Streaming and Server-Sent Events (SSE)](#streaming-and-server-sent-events-sse)
-        - [Server-Sent Events (SSE) Hang](#server-sent-events-sse-hang)
-    - [New Functionalities and APIs](#new-functionalities-and-apis)
-    - [Request Options](#request-options)
-        - [Timeout](#timeout)
-    - [Error Handling](#error-handling)
-        - [Rescuing](#rescuing)
-        - [For Short](#for-short)
-        - [Errors](#errors)
+  - [Client](#client)
+  - [Methods](#methods)
+    - [generate: Generate a completion](#generate-generate-a-completion)
+      - [Without Streaming Events](#without-streaming-events)
+      - [Receiving Stream Events](#receiving-stream-events)
+    - [chat: Generate a chat completion](#chat-generate-a-chat-completion)
+      - [Back-and-Forth Conversations](#back-and-forth-conversations)
+    - [embeddings: Generate Embeddings](#embeddings-generate-embeddings)
+    - [Models](#models)
+      - [create: Create a Model](#create-create-a-model)
+      - [tags: List Local Models](#tags-list-local-models)
+      - [show: Show Model Information](#show-show-model-information)
+      - [copy: Copy a Model](#copy-copy-a-model)
+      - [delete: Delete a Model](#delete-delete-a-model)
+      - [pull: Pull a Model](#pull-pull-a-model)
+      - [push: Push a Model](#push-push-a-model)
+  - [Modes](#modes)
+    - [Text](#text)
+    - [Image](#image)
+  - [Streaming and Server-Sent Events (SSE)](#streaming-and-server-sent-events-sse)
+    - [Server-Sent Events (SSE) Hang](#server-sent-events-sse-hang)
+  - [New Functionalities and APIs](#new-functionalities-and-apis)
+  - [Request Options](#request-options)
+    - [Adapter](#adapter)
+    - [Timeout](#timeout)
+  - [Error Handling](#error-handling)
+    - [Rescuing](#rescuing)
+    - [For Short](#for-short)
+    - [Errors](#errors)
 - [Development](#development)
-    - [Purpose](#purpose)
-    - [Publish to RubyGems](#publish-to-rubygems)
-    - [Updating the README](#updating-the-readme)
+  - [Purpose](#purpose)
+  - [Publish to RubyGems](#publish-to-rubygems)
+  - [Updating the README](#updating-the-readme)
 - [Resources and References](#resources-and-references)
 - [Disclaimer](#disclaimer)
 
@@ -104,11 +105,11 @@ Result:
 ### Installing
 
 ```sh
-gem install ollama-ai -v 1.0.1
+gem install ollama-ai -v 1.2.1
 ```
 
 ```sh
-gem 'ollama-ai', '~> 1.0.1'
+gem 'ollama-ai', '~> 1.2.1'
 ```
 
 ## Usage
@@ -767,6 +768,21 @@ result = client.request(
 
 ### Request Options
 
+#### Adapter
+
+The gem uses [Faraday](https://github.com/lostisland/faraday) with the [Typhoeus](https://github.com/typhoeus/typhoeus) adapter by default.
+
+You can use a different adapter if you want:
+
+```ruby
+require 'faraday/net_http'
+
+client = Ollama.new(
+  credentials: { address: 'http://localhost:11434' },
+  options: { connection: { adapter: :net_http } }
+)
+```
+
 #### Timeout
 
 You can set the maximum number of seconds to wait for the request to complete with the `timeout` option:
@@ -855,6 +871,7 @@ bundle
 rubocop -A
 
 bundle exec ruby spec/tasks/run-client.rb
+bundle exec ruby spec/tasks/test-encoding.rb
 ```
 
 ### Purpose
@@ -868,7 +885,7 @@ gem build ollama-ai.gemspec
 
 gem signin
 
-gem push ollama-ai-1.0.1.gem
+gem push ollama-ai-1.2.1.gem
 ```
 
 ### Updating the README

data/controllers/client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'faraday'
+require 'faraday/typhoeus'
 require 'json'
 
 require_relative '../components/errors'
@@ -12,6 +13,8 @@ module Ollama
 
       ALLOWED_REQUEST_OPTIONS = %i[timeout open_timeout read_timeout write_timeout].freeze
 
+      DEFAULT_FARADAY_ADAPTER = :typhoeus
+
       def initialize(config)
         @server_sent_events = config.dig(:options, :server_sent_events)
 
@@ -30,6 +33,8 @@ module Ollama
                            else
                              {}
                            end
+
+        @faraday_adapter = config.dig(:options, :connection, :adapter) || DEFAULT_FARADAY_ADAPTER
       end
 
       def generate(payload, server_sent_events: nil, &callback)
@@ -87,9 +92,10 @@ 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
         end.send(method_to_call) do |request|
           request.url url
@@ -104,7 +110,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)
 
@@ -115,7 +127,7 @@ module Ollama
 
                 results << result
 
-                partial_json = ''
+                partial_json = String.new.force_encoding('UTF-8')
               end
             end
           end

data/ollama-ai.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['ports/dsl']
 
   spec.add_dependency 'faraday', '~> 2.9'
+  spec.add_dependency 'faraday-typhoeus', '~> 1.1'
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/static/gem.rb

@@ -3,7 +3,7 @@
 module Ollama
   GEM = {
     name: 'ollama-ai',
-    version: '1.0.1',
+    version: '1.2.1',
     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/tasks/generate-readme.clj

@@ -23,7 +23,7 @@
                              (remove nil?))]
     (->> processed-lines
          (map (fn [{:keys [level title link]}]
-                (str (apply str (repeat (* 4 (- level 2)) " "))
+                (str (apply str (repeat (* 2 (- level 2)) " "))
                      "- ["
                      title
                      "](#"

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.0.1'
+gem 'ollama-ai', '~> 1.2.1'
 ```
 
 ```ruby
@@ -66,11 +66,11 @@ Result:
 ### Installing
 
 ```sh
-gem install ollama-ai -v 1.0.1
+gem install ollama-ai -v 1.2.1
 ```
 
 ```sh
-gem 'ollama-ai', '~> 1.0.1'
+gem 'ollama-ai', '~> 1.2.1'
 ```
 
 ## Usage
@@ -729,6 +729,21 @@ result = client.request(
 
 ### Request Options
 
+#### Adapter
+
+The gem uses [Faraday](https://github.com/lostisland/faraday) with the [Typhoeus](https://github.com/typhoeus/typhoeus) adapter by default.
+
+You can use a different adapter if you want:
+
+```ruby
+require 'faraday/net_http'
+
+client = Ollama.new(
+  credentials: { address: 'http://localhost:11434' },
+  options: { connection: { adapter: :net_http } }
+)
+```
+
 #### Timeout
 
 You can set the maximum number of seconds to wait for the request to complete with the `timeout` option:
@@ -817,6 +832,7 @@ bundle
 rubocop -A
 
 bundle exec ruby spec/tasks/run-client.rb
+bundle exec ruby spec/tasks/test-encoding.rb
 ```
 
 ### Purpose
@@ -830,7 +846,7 @@ gem build ollama-ai.gemspec
 
 gem signin
 
-gem push ollama-ai-1.0.1.gem
+gem push ollama-ai-1.2.1.gem
 ```
 
 ### Updating the README

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ai
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.1
 platform: ruby
 authors:
 - gbaptista
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,9 +24,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: faraday-typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.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: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -54,7 +68,7 @@ metadata:
   homepage_uri: https://github.com/gbaptista/ollama-ai
   source_code_uri: https://github.com/gbaptista/ollama-ai
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - ports/dsl
@@ -70,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Interact with Ollama API to run open source AI models locally.
 test_files: []