ruby-openai 7.3.0 → 7.4.0

data/lib/openai/client.rb

@@ -2,18 +2,11 @@ module OpenAI
   class Client
     include OpenAI::HTTP
 
-    SENSITIVE_ATTRIBUTES = %i[@access_token @organization_id @extra_headers].freeze
-    CONFIG_KEYS = %i[
-      api_type
-      api_version
-      access_token
-      log_errors
-      organization_id
-      uri_base
-      request_timeout
-      extra_headers
-    ].freeze
+    SENSITIVE_ATTRIBUTES = %i[@access_token @admin_token @organization_id @extra_headers].freeze
+    CONFIG_KEYS = %i[access_token admin_token api_type api_version extra_headers
+                     log_errors organization_id request_timeout uri_base].freeze
     attr_reader *CONFIG_KEYS, :faraday_middleware
+    attr_writer :access_token
 
     def initialize(config = {}, &faraday_middleware)
       CONFIG_KEYS.each do |key|
@@ -99,10 +92,25 @@ module OpenAI
       json_post(path: "/moderations", parameters: parameters)
     end
 
+    def usage
+      @usage ||= OpenAI::Usage.new(client: self)
+    end
+
     def azure?
       @api_type&.to_sym == :azure
     end
 
+    def admin
+      unless admin_token
+        e = "You must set an OPENAI_ADMIN_TOKEN= to use administrative endpoints:\n\n  https://platform.openai.com/settings/organization/admin-keys"
+        raise AuthenticationError, e
+      end
+
+      dup.tap do |client|
+        client.access_token = client.admin_token
+      end
+    end
+
     def beta(apis)
       dup.tap do |client|
         client.add_headers("OpenAI-Beta": apis.map { |k, v| "#{k}=#{v}" }.join(";"))

data/lib/openai/compatibility.rb

@@ -3,6 +3,7 @@ module Ruby
     VERSION = ::OpenAI::VERSION
 
     Error = ::OpenAI::Error
+    AuthenticationError = ::OpenAI::AuthenticationError
     ConfigurationError = ::OpenAI::ConfigurationError
     Configuration = ::OpenAI::Configuration
     MiddlewareErrors = ::OpenAI::MiddlewareErrors

data/lib/openai/http.rb

@@ -21,7 +21,7 @@ module OpenAI
     def json_post(path:, parameters:, query_parameters: {})
       conn.post(uri(path: path)) do |req|
         configure_json_post_request(req, parameters)
-        req.params = query_parameters
+        req.params = req.params.merge(query_parameters)
       end&.body
     end
 

data/lib/openai/usage.rb

@@ -0,0 +1,70 @@
+module OpenAI
+  class Usage
+    def initialize(client:)
+      @client = client
+    end
+
+    def completions(parameters: {})
+      @client.admin.get(
+        path: "/organization/usage/completions",
+        parameters: parameters
+      )
+    end
+
+    def embeddings(parameters: {})
+      @client.admin.get(
+        path: "/organization/usage/embeddings",
+        parameters: parameters
+      )
+    end
+
+    def moderations(parameters: {})
+      @client.admin.get(
+        path: "/organization/usage/moderations",
+        parameters: parameters
+      )
+    end
+
+    def images(parameters: {})
+      @client.admin.get(
+        path: "/organization/usage/images",
+        parameters: parameters
+      )
+    end
+
+    def audio_speeches(parameters: {})
+      @client.admin.get(
+        path: "/organization/usage/audio_speeches",
+        parameters: parameters
+      )
+    end
+
+    def audio_transcriptions(parameters: {})
+      @client.admin.get(
+        path: "/organization/usage/audio_transcriptions",
+        parameters: parameters
+      )
+    end
+
+    def vector_stores(parameters: {})
+      @client.admin.get(
+        path: "/organization/usage/vector_stores",
+        parameters: parameters
+      )
+    end
+
+    def code_interpreter_sessions(parameters: {})
+      @client.admin.get(
+        path: "/organization/usage/code_interpreter_sessions",
+        parameters: parameters
+      )
+    end
+
+    def costs(parameters: {})
+      @client.admin.get(
+        path: "/organization/costs",
+        parameters: parameters
+      )
+    end
+  end
+end

data/lib/openai/version.rb

@@ -1,3 +1,3 @@
 module OpenAI
-  VERSION = "7.3.0".freeze
+  VERSION = "7.4.0".freeze
 end

data/lib/openai.rb

@@ -18,10 +18,12 @@ require_relative "openai/vector_store_file_batches"
 require_relative "openai/audio"
 require_relative "openai/version"
 require_relative "openai/batches"
+require_relative "openai/usage"
 
 module OpenAI
   class Error < StandardError; end
   class ConfigurationError < Error; end
+  class AuthenticationError < Error; end
 
   class MiddlewareErrors < Faraday::Middleware
     def call(env)
@@ -41,6 +43,7 @@ module OpenAI
 
   class Configuration
     attr_accessor :access_token,
+                  :admin_token,
                   :api_type,
                   :api_version,
                   :log_errors,
@@ -56,6 +59,7 @@ module OpenAI
 
     def initialize
       @access_token = nil
+      @admin_token = nil
       @api_type = nil
       @api_version = DEFAULT_API_VERSION
       @log_errors = DEFAULT_LOG_ERRORS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-openai
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.4.0
 platform: ruby
 authors:
 - Alex
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser
@@ -102,6 +102,7 @@ files:
 - lib/openai/run_steps.rb
 - lib/openai/runs.rb
 - lib/openai/threads.rb
+- lib/openai/usage.rb
 - lib/openai/vector_store_file_batches.rb
 - lib/openai/vector_store_files.rb
 - lib/openai/vector_stores.rb