ruby-leonardoai 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 267d56d7aa704aabc1811a935781aeb4a76fd33a6190814fa24d0205094e4a0a
-  data.tar.gz: 257de0b0042ce3f39de55fbb49b6df8a04b011852627cf6c3ae040c5ae76c3c9
+  metadata.gz: ffeeea7f957abbf1047c55db4b65e787b4c881c5bb3025cfad2b773403bcf6c9
+  data.tar.gz: aafa39eba2314b23210262dba8ccbb60b68dc688cd6f111ede64c50b641b6f5d
 SHA512:
-  metadata.gz: a35af039b1a1a22e5b34d64e9fa7698dca4ecde84205699218bba8bb3a9ac8e769afb87342b97bc0a2374a1496b7ee4f8def929e356422acb476aebda0f3f69c
-  data.tar.gz: aa680397e3e68cf6e442b5c0932d09ed0423352e94c7ad53d1fa560bf6bfb4e5a50b00d2dcac6573c8d8063e890ab072103ae35e83dbddf2c2dd2273df6b8dc3
+  metadata.gz: 3e0ed3ba12d42f629cb319784c6c53b8c911a0c7c1d11d07e6b1485c26293d7a44bd1b1132515adb19207641191589d4733e84bd5cda1e4a83f323611f0c9ff4
+  data.tar.gz: 5144d1f07fb74fe88ef233255ff8e970e0985facbaa5ab56377188727e84816f740be883f10d8a607a588abe36e6d0e7924ae90a31138a5391ae8a3a9a141c68

data/Gemfile.lock

@@ -0,0 +1,86 @@
+PATH
+  remote: .
+  specs:
+    ruby-leonardoai (0.1.3)
+      faraday (>= 1)
+      faraday-multipart (>= 1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    byebug (11.1.3)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    dotenv (2.8.1)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (3.0.2)
+    hashdiff (1.0.1)
+    json (2.6.3)
+    multipart-post (2.3.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
+      ast (~> 2.4.1)
+      racc
+    public_suffix (5.0.3)
+    racc (1.7.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.50.2)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    unicode-display_width (2.5.0)
+    vcr (6.1.0)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+
+PLATFORMS
+  x86_64-darwin-19
+
+DEPENDENCIES
+  byebug (~> 11.1.3)
+  dotenv (~> 2.8.1)
+  rake (~> 13.0)
+  rspec (~> 3.12)
+  rubocop (~> 1.50.2)
+  ruby-leonardoai!
+  vcr (~> 6.1.0)
+  webmock (~> 3.18.1)
+
+BUNDLED WITH
+   2.4.20

data/lib/leonardoai/client.rb

@@ -0,0 +1,31 @@
+module LeonardoAI
+  class Client
+    include LeonardoAI::HTTP
+
+    CONFIG_KEYS = %i[
+      api_type
+      api_version
+      access_token
+      uri_base
+      request_timeout
+      extra_headers
+    ].freeze
+    attr_reader *CONFIG_KEYS
+
+    def initialize(config = {})
+      CONFIG_KEYS.each do |key|
+        # Set instance variables like api_type & access_token. Fall back to global config
+        # if not present.
+        instance_variable_set("@#{key}", config[key] || LeonardoAI.configuration.send(key))
+      end
+    end
+
+    def chat(parameters: {})
+      json_post(path: "/chat/completions", parameters: parameters)
+    end
+
+    def generations
+      @generations ||= LeonardoAI::Generations.new(client: self)
+    end
+  end
+end

data/lib/leonardoai/compatibility.rb

@@ -0,0 +1,9 @@
+module Ruby
+  module LeonardoAI
+    VERSION = ::LeonardoAI::VERSION
+
+    Error = ::LeonardoAI::Error
+    ConfigurationError = ::LeonardoAI::ConfigurationError
+    Configuration = ::LeonardoAI::Configuration
+  end
+end

data/lib/{ruby/leonardoai → leonardoai}/generations.rb

@@ -5,11 +5,11 @@ module LeonardoAI
     end
 
     def generate(parameters: {})
-      @client.json_post(path: "/images/generations", parameters: parameters)
+      @client.json_post(path: "/generations", parameters: parameters)
     end
 
     def edit(parameters: {})
-      @client.multipart_post(path: "/images/edits", parameters: open_files(parameters))
+      @client.multipart_post(path: "/edits", parameters: open_files(parameters))
     end
 
     private
@@ -19,7 +19,5 @@ module LeonardoAI
       parameters = parameters.merge(mask: File.open(parameters[:mask])) if parameters[:mask]
       parameters
     end
-
-    def 
   end
 end

data/lib/leonardoai/http.rb

@@ -0,0 +1,73 @@
+module LeonardoAI
+  module HTTP
+    def get(path:)
+      to_json(conn.get(uri(path: path)) do |req|
+        req.headers = headers
+      end&.body)
+    end
+
+    def json_post(path:, parameters:)
+      to_json(conn.post(uri(path: path)) do |req|
+        req.headers = headers
+        req.body = parameters.to_json
+      end&.body)
+    end
+
+    def multipart_post(path:, parameters: nil)
+      to_json(conn(multipart: true).post(uri(path: path)) do |req|
+        req.headers = headers.merge({ "Content-Type" => "multipart/form-data" })
+        req.body = multipart_parameters(parameters)
+      end&.body)
+    end
+
+    def delete(path:)
+      to_json(conn.delete(uri(path: path)) do |req|
+        req.headers = headers
+      end&.body)
+    end
+
+    private
+
+    def to_json(string)
+      return unless string
+
+      JSON.parse(string)
+      rescue JSON::ParserError
+        # Convert a multiline string of JSON objects to a JSON array.
+        JSON.parse(string.gsub("}\n{", "},{").prepend("[").concat("]"))
+    end
+
+    def conn(multipart: false)
+      Faraday.new do |f|
+        f.options[:timeout] = @request_timeout
+        f.request(:multipart) if multipart
+      end
+    end
+
+    def uri(path:)
+      File.join(@uri_base, @api_version, path)
+    end
+
+    def headers
+      leonardoai_headers.merge(@extra_headers || {})
+    end
+
+    def leonardoai_headers
+      {
+        "Content-Type" => "application/json",
+        "Authorization" => "Bearer #{@access_token}",
+      }
+    end
+
+    def multipart_parameters(parameters)
+      parameters&.transform_values do |value|
+        next value unless value.respond_to?(:close) # File or IO object.
+
+        # Doesn't seem like OpenAI needs mime_type yet, so not worth
+        # the library to figure this out. Hence the empty string
+        # as the second argument.
+        Faraday::UploadIO.new(value, "", value.path)
+      end
+    end
+  end
+end

data/lib/leonardoai/version.rb

@@ -0,0 +1,3 @@
+module LeonardoAI
+  VERSION = "0.1.3"
+end

data/lib/leonardoai.rb

@@ -1,9 +1,11 @@
 require "faraday"
 require "faraday/multipart"
+require_relative "leonardoai/http"
+require_relative "leonardoai/client"
+require_relative "leonardoai/generations"
 require_relative "leonardoai/version"
 
-
-module Leonardoai
+module LeonardoAI
   class Error < StandardError; end
   class ConfigurationError < Error; end
 
@@ -13,7 +15,7 @@ module Leonardoai
                   :extra_headers
 
     DEFAULT_API_VERSION = "v1".freeze
-    DEFAULT_URI_BASE = "https://cloud.leonardo.ai/api/rest/v1/".freeze
+    DEFAULT_URI_BASE = "https://cloud.leonardo.ai/api/rest/".freeze
     DEFAULT_REQUEST_TIMEOUT = 120
 
     def initialize
@@ -35,5 +37,17 @@ module Leonardoai
       raise ConfigurationError, error_text
     end
   end
+
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= LeonardoAI::Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
 end
 

data/lib/ruby/leonardoai.rb

@@ -0,0 +1,2 @@
+require_relative "../leonardoai"
+require_relative "../leonardoai/compatibility"

data/ruby-leonardoai.gemspec

@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
-require_relative "lib/ruby/leonardoai/version"
+require_relative "lib/leonardoai/version"
 
 Gem::Specification.new do |spec|
   spec.name = "ruby-leonardoai"
-  spec.version = Ruby::Leonardoai::VERSION
+  spec.version = LeonardoAI::VERSION
   spec.authors = ["Donald Lee"]
   spec.email = ["donaldlee50@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-leonardoai
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Donald Lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2023-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -49,14 +49,19 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - lib/leonardoai.rb
-- lib/ruby/leonardoai/generations.rb
-- lib/ruby/leonardoai/version.rb
+- lib/leonardoai/client.rb
+- lib/leonardoai/compatibility.rb
+- lib/leonardoai/generations.rb
+- lib/leonardoai/http.rb
+- lib/leonardoai/version.rb
+- lib/ruby/leonardoai.rb
 - ruby-leonardoai.gemspec
 - sig/ruby/leonardoai.rbs
 homepage: https://github.com/royalgiant/ruby-leonardoai

data/lib/ruby/leonardoai/version.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Ruby
-  module Leonardoai
-    VERSION = "0.1.0"
-  end
-end