automatic1111 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64fba0709fdd2df4befa859bb0ffb2d440806a5da1a43e4f116f8c90eb90c388
-  data.tar.gz: 94e0fcdc2affc297686c28118d05495a87969387b9e631bc0ae0f0e30ad88d3d
+  metadata.gz: da6e8e072ce73cd690e52055b50c50d3f1f9f7d98c83739096274bff64dc9aca
+  data.tar.gz: 701b00689274d734d33a11bcf90ca98132df7d47610815a2edf0286e38e95685
 SHA512:
-  metadata.gz: fdd1482b5a057331f20688c24eb9c5fe6012563cc024f43d6b4b0b76e3ae94ae5303ca4bae855fd78d8e08a2ac2373893f7a7163389c44887d5607d0d128e804
-  data.tar.gz: 8191fc84cdfaeae328d24748b322673aad8266fab3cc3f6892eded79ee8c4034ffe932d8de37c4c461edafdfece55517153a8511d6d3feefae6e77afb204746c
+  metadata.gz: eba6a96c47e0996021431a0fd01651a5e72e525a0bc8d3a20011ecf5ba0a5bdcc438c4cad45ba04b275b6d8d8f381e6fe8f2f2fa9997da2c11c82d8cb633796d
+  data.tar.gz: 2ada977842ff633c1e864c5050a8f43852885f827f5ae0a9b8f4e1b9607c40319822e0e9abca775505ca30db3b79994619e55464c2b1cb9330905119fdd7737c

data/Gemfile.lock

@@ -0,0 +1,77 @@
+PATH
+  remote: .
+  specs:
+    automatic1111 (0.1.0)
+      addressable
+      faraday (>= 2.0)
+      faraday-multipart
+      faraday-retry
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    crack (0.4.5)
+      rexml
+    faraday (2.7.4)
+      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)
+    faraday-retry (2.0.0)
+      faraday (~> 2.0)
+    hashdiff (1.0.1)
+    json (2.6.3)
+    method_source (1.0.0)
+    minitest (5.17.0)
+    multipart-post (2.3.0)
+    parallel (1.22.1)
+    parser (3.2.1.0)
+      ast (~> 2.4.1)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (5.0.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.7.0)
+    rexml (3.2.5)
+    rubocop (1.46.0)
+      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.26.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    unicode-display_width (2.4.2)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+
+PLATFORMS
+  arm64-darwin-22
+
+DEPENDENCIES
+  automatic1111!
+  byebug
+  minitest (~> 5.0)
+  pry
+  rake (~> 13.0)
+  rubocop (~> 1.21)
+  webmock
+
+BUNDLED WITH
+   2.4.6

data/README.md

@@ -13,7 +13,18 @@ gem 'automatic1111'
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+# Setup client
+client = Automatic1111::Client.new(api_endpoint_url: '<http://127.0.0.1:7860 or
+https://xxxxxx.gradio.live')
+
+# Authenticate
+client.post('/login', params: { username: 'username', password: 'password' }, headers: { 'Content-Type' => 'application/x-www-form-urlencoded' })
+
+# Call endpoint
+resp = client.post('/sdapi/v1/txt2img', params: { prompt: 'test', sampler_name: 'DPM++ SDE Karras', steps: 20, enable_hr: true, hr_upscaler: 'Latent', denoising_strength: 0.7, width: 512, height: 768 })
+resp['images']
+```
 
 ## Development
 

data/lib/automatic1111/client.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "automatic1111/configurable"
+require "automatic1111/connection"
+
+module Automatic1111
+  class Client
+    include Automatic1111::Configurable
+    include Automatic1111::Connection
+
+    def initialize(options = {})
+      # Use options passed in, but fall back to module defaults
+      Automatic1111::Configurable.keys.each do |key|
+        value = options.key?(key) ? options[key] : Automatic1111.instance_variable_get(:"@#{key}")
+        instance_variable_set(:"@#{key}", value)
+      end
+    end
+  end
+end

data/lib/automatic1111/configurable.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Automatic1111
+  module Configurable
+    attr_accessor :api_endpoint_url, :cookie, :read_timeout
+
+    class << self
+      # List of configurable keys for {Datatrans::Client}
+      # @return [Array] of option keys
+      def keys
+        @keys ||= %i[api_endpoint_url cookie read_timeout]
+      end
+    end
+
+    # Set configuration options using a block
+    def configure
+      yield self
+    end
+
+    def read_timeout
+      @read_timeout ||= 60
+    end
+
+    private
+
+    def options
+      Hash[Automatic1111::Configurable.keys.map { |key| [key, send(key)] }]
+    end
+  end
+end

data/lib/automatic1111/connection.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'byebug'
+require "faraday"
+require "faraday/net_http"
+require "faraday/retry"
+require "faraday/multipart"
+require "addressable/uri"
+
+module Automatic1111
+  # Network layer for API clients.
+  module Connection
+    def get(url, params: {}, headers: {})
+      request :get, url, params, headers: headers
+    end
+
+    def post(url, params: {}, headers: {})
+      request :post, url, params, headers: headers
+    end
+
+    def put(url, params: {}, headers: {})
+      request :put, url, params, headers: headers
+    end
+
+    def patch(url, params: {}, headers: {})
+      request :patch, url, params, headers: headers
+    end
+
+    def delete(url, params: {}, headers: {})
+      request :delete, url, params, headers: headers
+    end
+
+    def head(url, params: {}, headers: {})
+      request :head, url, params, headers: headers
+    end
+
+    # Response for last HTTP request
+    #
+    # @return [Sawyer::Response]
+    def last_response
+      @last_response if defined? @last_response
+    end
+
+    private
+
+    def request(method, path, data, headers: {})
+      headers['Content-Type'] ||= 'application/json'
+      headers['Cookie'] ||= cookie
+
+      connection = Faraday.new(url: api_endpoint_url) do |conn|
+        conn.request :retry
+        conn.adapter :net_http
+        conn.options.read_timeout = read_timeout
+      end
+
+      # @last_response = connection.send(method, Addressable::URI.parse(path.to_s).normalize.to_s, data)
+      @last_response = connection.send(method, Addressable::URI.parse(path.to_s).normalize.to_s) do |req|
+        req.headers = headers
+        case headers["Content-Type"]
+        when 'application/x-www-form-urlencoded'
+          req.body = URI.encode_www_form(data)
+        else
+          req.body = data.to_json
+        end
+      end
+
+      case @last_response.status
+      when 400
+        raise Error, "#{@last_response.status} #{@last_response.reason_phrase}: #{JSON.parse(@last_response.body)}"
+      else
+        self.cookie = @last_response.headers['set-cookie'] if @last_response.headers['set-cookie']
+
+        case headers["Content-Type"]
+        when 'application/json'
+          JSON.parse(@last_response.body)
+        else
+          @last_response.body
+        end
+      end
+    end
+  end
+end

data/lib/automatic1111/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Automatic1111
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/automatic1111.rb

@@ -1,8 +1,17 @@
 # frozen_string_literal: true
 
 require_relative "automatic1111/version"
+require_relative "automatic1111/client"
 
 module Automatic1111
   class Error < StandardError; end
-  # Your code goes here...
+
+  class << self
+    include Automatic1111::Configurable
+
+    def client
+      return @client if defined?(@client)
+      @client = Automatic1111::Client.new(options)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: automatic1111
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Dreaming Tulpa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  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: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - hey@dreamingtulpa.com
@@ -90,9 +118,13 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - lib/automatic1111.rb
+- lib/automatic1111/client.rb
+- lib/automatic1111/configurable.rb
+- lib/automatic1111/connection.rb
 - lib/automatic1111/version.rb
 - sig/automatic1111.rbs
 homepage: https://github.com/dreamingtulpa/automatic1111-ruby