Rubocop

Author: alexrudall

lib/openai/client.rb

@@ -3,17 +3,8 @@ class Client
     include OpenAI::HTTP
 
     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
+    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
 

spec/spec_helper.rb

@@ -16,11 +16,11 @@
     record: tokens_present ? :all : :new_episodes,
     match_requests_on: [:method, :uri, VCRMultipartMatcher.new]
   }
-  c.filter_sensitive_data("<OPENAI_ACCESS_TOKEN>") { OpenAI.configuration.access_token }
-  c.filter_sensitive_data("<OPENAI_ADMIN_TOKEN>") { OpenAI.configuration.admin_token }
-  c.filter_sensitive_data("<OPENAI_ORGANIZATION_ID>") { OpenAI.configuration.organization_id }
-  if (user_id = ENV.fetch("OPENAI_USER_ID", nil))
-    c.filter_sensitive_data("<OPENAI_USER_ID>") { user_id }
+
+  %w[ACCESS_TOKEN ADMIN_TOKEN ORGANIZATION_ID USER_ID].each do |key|
+    c.filter_sensitive_data("<OPENAI_#{key}>") do
+      key == "USER_ID" ? ENV.fetch("OPENAI_#{key}", nil) : OpenAI.configuration.send(key.downcase)
+    end
   end
 end
 
@@ -31,14 +31,12 @@
   # Disable RSpec exposing methods globally on `Module` and `main`
   c.disable_monkey_patching!
 
-  c.expect_with :rspec do |rspec|
-    rspec.syntax = :expect
-  end
+  c.expect_with(:rspec) { |rspec| rspec.syntax = :expect }
 
   if tokens_present
-    warning = "WARNING! Specs are hitting the OpenAI API using your OPENAI_ACCESS_TOKEN and OPENAI_ADMIN_TOKEN! This
-costs at least 2 cents per run and is very slow! If you don't want this, unset
-OPENAI_ACCESS_TOKEN or OPENAI_ADMIN_TOKEN to just run against the stored VCR responses.".freeze
+    warning = "WARNING! Specs are hitting the OpenAI API using your OPENAI_ACCESS_TOKEN or
+    OPENAI_ADMIN_TOKEN! This costs at least 2 cents per run and is very slow! If you don't want
+    this, unset OPENAI_ACCESS_TOKEN to just run against the stored VCR responses.".freeze
     warning = RSpec::Core::Formatters::ConsoleCodes.wrap(warning, :bold_red)
 
     c.before(:suite) { RSpec.configuration.reporter.message(warning) }
@@ -49,9 +47,7 @@
     OpenAI.configure do |config|
       config.access_token = ENV.fetch("OPENAI_ACCESS_TOKEN", "dummy-token")
       config.admin_token = ENV.fetch("OPENAI_ADMIN_TOKEN", "dummy-token")
-      if (organization_id = ENV.fetch("OPENAI_ORGANIZATION_ID", nil))
-        config.organization_id = organization_id
-      end
+      config.organization_id = ENV.fetch("OPENAI_ORGANIZATION_ID", nil)
     end
   end
 end