Allows for shared, default API keys. (#399)

AllYourBot · Jun 11, 2024 · 5e948f3 · 5e948f3
1 parent 07bdc44
commit 5e948f3
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -26,4 +26,12 @@ class User < ApplicationRecord
   def preferences
     attributes["preferences"].with_defaults(dark_mode: "system")
   end
+
+  def openai_key
+    self.attributes["openai_key"].presence || (Feature.default_llm_keys? ? Setting.default_openai_key : nil)
+  end
+
+  def anthropic_key
+    self.attributes["anthropic_key"].presence || (Feature.default_llm_keys? ? Setting.default_anthropic_key : nil)
+  end
 end
diff --git a/app/views/settings/people/_form.html.erb b/app/views/settings/people/_form.html.erb
@@ -122,6 +122,7 @@
         <li>Add a "Payment method."</li>
       </ol>
       <%= user_fields.text_field :openai_key,
+        value: person.user.attributes["openai_key"],
         class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full dark:text-black",
         placeholder: "OpenAI Key"
       %>
@@ -173,6 +174,7 @@
         </li>
       </ol>
       <%= user_fields.text_field :anthropic_key,
+        value: person.user.attributes["anthropic_key"],
         class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full dark:text-black",
         placeholder: "Anthropic Key"
       %>

diff --git a/config/initializers/allowed_request_origins.rb b/config/initializers/allowed_request_origins.rb
@@ -3,7 +3,7 @@
 #
 #   export ALLOWED_REQUEST_ORIGINS=https://myhost.com,https://myotherhost.com
 #
-if (allowed_request_origins = ENV['ALLOWED_REQUEST_ORIGINS'].to_s.split(',')).any?
+if (allowed_request_origins = ENV["ALLOWED_REQUEST_ORIGINS"].to_s.split(',')).any?
   Rails.application.configure do
     config.action_cable.allowed_request_origins = allowed_request_origins
 

diff --git a/config/options.yml b/config/options.yml
@@ -2,12 +2,16 @@ shared:
   features:
     default_to_voice: <%= ENV.fetch("DEFAULT_TO_VOICE_FEATURE", false) %>
     voice: <%= ENV.fetch("VOICE_FEATURE", false) %>
+    default_llm_keys: <%= ENV.fetch("DEFAULT_LLM_KEYS_FEATURE", false) %>
     google_tools: <%= ENV.fetch("GOOGLE_TOOLS", false) %>
     registration: <%= ENV.fetch("REGISTRATION_FEATURE", true) %>
     password_authentication: <%= ENV.fetch("PASSWORD_AUTHENTICATION_FEATURE", true) %>
     google_authentication: <%= ENV.fetch("GOOGLE_AUTHENTICATION_FEATURE", false) %>
     http_header_authentication: <%= ENV.fetch("HTTP_HEADER_AUTHENTICATION_FEATURE", false) %>
   settings:
+    # Be sure to add these ENV to docker-compose.yml
+    default_openai_key: <%= ENV["DEFAULT_OPENAI_KEY"] %>
+    default_anthropic_key: <%= ENV["DEFAULT_ANTHROPIC_KEY"] %>
     google_auth_client_id: <%= ENV["GOOGLE_AUTH_CLIENT_ID"] || Rails.application.credentials[:google_auth_client_id] %>
     google_auth_client_secret: <%= ENV["GOOGLE_AUTH_CLIENT_SECRET"] || Rails.application.credentials[:google_auth_client_secret] %>
     http_header_auth_email: <%= ENV["HTTP_HEADER_AUTH_EMAIL"] || "X-WEBAUTH-EMAIL" %>

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,10 +23,19 @@ services:
       context: .
       target: development
     environment:
+      # Be sure to add environment variables to config/options.yml
       - DATABASE_URL=postgres://app:secret@postgres/app_development
       - DEV_HOST=${DEV_HOST:-localhost} # Set if you want to use a different hostname
-      - ALLOWED_REQUEST_ORIGINS=${ALLOWED_REQUEST_ORIGINS}
       - OVERMIND_COLORS=2,3,5
+      - ALLOWED_REQUEST_ORIGINS
+      - DEFAULT_LLM_KEYS_FEATURE
+      - DEFAULT_OPENAI_KEY
+      - DEFAULT_ANTHROPIC_KEY
+      - GOOGLE_AUTH_CLIENT_ID
+      - GOOGLE_AUTH_CLIENT_SECRET
+      - HTTP_HEADER_AUTH_EMAIL
+      - HTTP_HEADER_AUTH_NAME
+      - HTTP_HEADER_AUTH_UID
     ports: ["3000:3000"]
     volumes:
       - .:/rails

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -87,4 +87,13 @@ class UserTest < ActiveSupport::TestCase
       users(:keith).update!(last_name: nil)
     end
   end
+
+  test "it treats blank String API keys as nil to allow for default keys" do
+    stub_features(default_llm_keys: false) do
+      user = users(:keith)
+      user.update(openai_key: '', anthropic_key: ' ')
+      assert_nil user.openai_key
+      assert_nil user.anthropic_key
+    end
+  end
 end