cohere-ai 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f22e3efb3ba5824ea31a317019c161357645909902224eaba56fc14ae74a612
-  data.tar.gz: 0bdabed7a0be20e8ab55fc5a5c931360b314734820a2606aab75f7e3596c6526
+  metadata.gz: 28430515ffef2963f9fa1ae10b23bb3563bdea2e8c8ec7fdb7c711b783249312
+  data.tar.gz: eb0127adde3a17d90f30bed12a4b61cd27b99b5a4a956329429020d07a3cd658
 SHA512:
-  metadata.gz: c68ceb466d71170a84644d68d7be0d5f40c3f9ba3cf7e45b891f2c99460967f808a85402e92a9ccb67195ac76ae2776621e8f66d9538568b4bafe128a8006ee5
-  data.tar.gz: abccfbf233944338c738516610f398891ef76defb155142fa2e322ef22832b4817b786ba48e33f19d268ff2823822c191a04eaa21b26f60a710b3533430b9765
+  metadata.gz: a02810e106da158ebaf4b0cbd2aef712d3fc8c29ecb9472a8346cd7e0e905c928f28d698137a0adc57956dfcb0eb7d512767a61c764e7fbee5e82e7f982ab719
+  data.tar.gz: e1ed417932a6c1be52d1ee733f685d3e676e0d5d6d0c0c2ccfa25ebb0cf576897124be3413650ff4185c62672a461112f285ac35c17fd3595db8c20ef9eed576

data/.gitignore

@@ -1,2 +1,3 @@
 *.gem
 .devcontainer
+.env

data/Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :test, :development do
+  gem 'dotenv', '~> 2.8', '>= 2.8.1'
   gem 'pry-byebug', '~> 3.10', '>= 3.10.1'
   gem 'rubocop', '~> 1.58'
 end

data/Gemfile.lock

@@ -1,26 +1,27 @@
 PATH
   remote: .
   specs:
-    cohere-ai (1.0.0)
-      faraday (~> 2.8, >= 2.8.1)
+    cohere-ai (1.0.2)
+      faraday (~> 2.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    base64 (0.2.0)
     byebug (11.1.3)
     coderay (1.1.3)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    dotenv (2.8.1)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     method_source (1.0.0)
+    net-http (0.4.1)
+      uri
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.3)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -31,7 +32,7 @@ GEM
       pry (>= 0.13, < 0.15)
     racc (1.7.3)
     rainbow (3.1.1)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
     rubocop (1.59.0)
       json (~> 2.3)
@@ -47,14 +48,15 @@ GEM
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     unicode-display_width (2.5.0)
+    uri (0.13.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   cohere-ai!
+  dotenv (~> 2.8, >= 2.8.1)
   pry-byebug (~> 3.10, >= 3.10.1)
   rubocop (~> 1.58)
 

data/README.md

@@ -9,7 +9,7 @@ A Ruby gem for interacting with [Cohere AI](https://cohere.com).
 ## TL;DR and Quick Start
 
 ```ruby
-gem 'cohere-ai', '~> 1.0.0'
+gem 'cohere-ai', '~> 1.0.2'
 ```
 
 ```ruby
@@ -87,11 +87,11 @@ Result:
 ### Installing
 
 ```sh
-gem install cohere-ai -v 1.0.0
+gem install cohere-ai -v 1.0.2
 ```
 
 ```sh
-gem 'cohere-ai', '~> 1.0.0'
+gem 'cohere-ai', '~> 1.0.2'
 ```
 
 ### Credentials
@@ -694,6 +694,7 @@ CohereError
 
 MissingAPIKeyError
 BlockWithoutServerSentEventsError
+IncompleteJSONReceivedError
 
 RequestError
 ```
@@ -703,6 +704,8 @@ RequestError
 ```bash
 bundle
 rubocop -A
+
+bundle exec ruby spec/tasks/run-client.rb
 ```
 
 ### Purpose
@@ -716,7 +719,7 @@ gem build cohere-ai.gemspec
 
 gem signin
 
-gem push cohere-ai-1.0.0.gem
+gem push cohere-ai-1.0.2.gem
 ```
 
 ### Updating the README

data/cohere-ai.gemspec

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

data/components/errors.rb

@@ -10,6 +10,7 @@ module Cohere
 
     class MissingAPIKeyError < CohereError; end
     class BlockWithoutServerSentEventsError < CohereError; end
+    class IncompleteJSONReceivedError < CohereError; end
 
     class RequestError < CohereError
       attr_reader :request, :payload

data/controllers/client.rb

@@ -3,7 +3,7 @@
 require 'faraday'
 require 'json'
 
-require_relative '../ports/dsl/cohere-ai/errors'
+require_relative '../components/errors'
 
 module Cohere
   module Controllers
@@ -23,7 +23,7 @@ module Cohere
                    end
 
         if @api_key.nil? && @address == "#{DEFAULT_ADDRESS}/"
-          raise MissingAPIKeyError, 'Missing API Key, which is required.'
+          raise Errors::MissingAPIKeyError, 'Missing API Key, which is required.'
         end
 
         @request_options = config.dig(:options, :connection, :request)
@@ -80,7 +80,7 @@ module Cohere
         url = "#{@address}#{path}"
 
         if !callback.nil? && !server_sent_events_enabled
-          raise BlockWithoutServerSentEventsError,
+          raise Errors::BlockWithoutServerSentEventsError,
                 'You are trying to use a block without Server Sent Events (SSE) enabled.'
         end
 
@@ -88,6 +88,8 @@ module Cohere
 
         method_to_call = request_method.to_s.strip.downcase.to_sym
 
+        partial_json = ''
+
         response = Faraday.new(request: @request_options) do |faraday|
           faraday.response :raise_error
         end.send(method_to_call) do |request|
@@ -105,27 +107,45 @@ module Cohere
                 raise_error.on_complete(env.merge(body: chunk))
               end
 
-              result = { event: safe_parse_json(chunk), raw: { chunk:, bytes:, env: } }
+              partial_json += chunk
+
+              parsed_jsons = safe_parse_jsonl(partial_json)
+
+              if parsed_jsons
+                parsed_jsons.each do |parsed_json|
+                  result = { event: parsed_json, raw: { chunk:, bytes:, env: } }
 
-              callback.call(result[:event], result[:raw]) unless callback.nil?
+                  callback.call(result[:event], result[:raw]) unless callback.nil?
 
-              results << result
+                  results << result
+                end
+
+                partial_json = ''
+              end
             end
           end
         end
 
-        return safe_parse_json(response.body) unless server_sent_events_enabled
+        return safe_parse_json_with_fallback_to_raw(response.body) unless server_sent_events_enabled
+
+        raise Errors::IncompleteJSONReceivedError, partial_json if partial_json != ''
 
         results.map { |result| result[:event] }
       rescue Faraday::ServerError => e
-        raise RequestError.new(e.message, request: e, payload:)
+        raise Errors::RequestError.new(e.message, request: e, payload:)
       end
 
-      def safe_parse_json(raw)
-        raw.start_with?('{', '[') ? JSON.parse(raw) : raw
+      def safe_parse_json_with_fallback_to_raw(raw)
+        raw.to_s.lstrip.start_with?('{', '[') ? JSON.parse(raw) : raw
       rescue JSON::ParserError
         raw
       end
+
+      def safe_parse_jsonl(raw)
+        raw.to_s.lstrip.start_with?('{', '[') ? raw.split("\n").map { |line| JSON.parse(line) } : raw
+      rescue JSON::ParserError
+        nil
+      end
     end
   end
 end

data/static/gem.rb

@@ -3,10 +3,10 @@
 module Cohere
   GEM = {
     name: 'cohere-ai',
-    version: '1.0.0',
+    version: '1.0.2',
     author: 'gbaptista',
     summary: 'Interact with Cohere AI.',
-    description: "A Ruby gem for interacting with Cohere AI platform.",
+    description: 'A Ruby gem for interacting with Cohere AI platform.',
     github: 'https://github.com/gbaptista/cohere-ai',
     gem_server: 'https://rubygems.org',
     license: 'MIT',

data/template.md

@@ -9,7 +9,7 @@ A Ruby gem for interacting with [Cohere AI](https://cohere.com).
 ## TL;DR and Quick Start
 
 ```ruby
-gem 'cohere-ai', '~> 1.0.0'
+gem 'cohere-ai', '~> 1.0.2'
 ```
 
 ```ruby
@@ -50,11 +50,11 @@ Result:
 ### Installing
 
 ```sh
-gem install cohere-ai -v 1.0.0
+gem install cohere-ai -v 1.0.2
 ```
 
 ```sh
-gem 'cohere-ai', '~> 1.0.0'
+gem 'cohere-ai', '~> 1.0.2'
 ```
 
 ### Credentials
@@ -657,6 +657,7 @@ CohereError
 
 MissingAPIKeyError
 BlockWithoutServerSentEventsError
+IncompleteJSONReceivedError
 
 RequestError
 ```
@@ -666,6 +667,8 @@ RequestError
 ```bash
 bundle
 rubocop -A
+
+bundle exec ruby spec/tasks/run-client.rb
 ```
 
 ### Purpose
@@ -679,7 +682,7 @@ gem build cohere-ai.gemspec
 
 gem signin
 
-gem push cohere-ai-1.0.0.gem
+gem push cohere-ai-1.0.2.gem
 ```
 
 ### Updating the README

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cohere-ai
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - gbaptista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '2.9'
 description: A Ruby gem for interacting with Cohere AI platform.
 email: 
 executables: []
@@ -74,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Interact with Cohere AI.