correct handling and error messages

Author: SamSaffron

app/models/llm_quota.rb

@@ -16,21 +16,25 @@ class LlmQuota < ActiveRecord::Base
 
   validate :at_least_one_limit
 
-  def self.within_quota?(llm, user)
+  def self.check_quotas!(llm, user)
     return true if user.blank?
     quotas = joins(:group).where(llm_model: llm).where(group: user.groups)
 
     return true if quotas.empty?
-    quotas.each do |quota|
-      usage = LlmQuotaUsage.find_or_create_for(user: user, llm_quota: quota)
-      begin
-        usage.check_quota!
-      rescue LlmQuotaUsage::QuotaExceededError
-        return false
+    errors =
+      quotas.map do |quota|
+        usage = LlmQuotaUsage.find_or_create_for(user: user, llm_quota: quota)
+        begin
+          usage.check_quota!
+          nil
+        rescue LlmQuotaUsage::QuotaExceededError => e
+          e
+        end
       end
-    end
 
-    true
+    return if errors.include?(nil)
+
+    raise errors.first
   end
 
   def self.log_usage(llm, user, input_tokens, output_tokens)

app/models/llm_quota_usage.rb

@@ -60,8 +60,7 @@ def check_quota!
       raise QuotaExceededError.new(
               I18n.t(
                 "discourse_ai.errors.quota_exceeded",
-                group: llm_quota.group.name,
-                reset_at: reset_at,
+                relative_time: AgeWords.distance_of_time_in_words(reset_at, Time.now),
               ),
             )
     end

config/locales/server.en.yml

@@ -446,7 +446,7 @@ en:
       bedrock_invalid_url: "Please complete all the fields to use this model."
 
     errors:
-      quota_exceeded: "You have exceeded the quota for this model. Please try again after %{reset_at}."
+      quota_exceeded: "You have exceeded the quota for this model. Please try again in %{relative_time}."
       quota_required: "You must specify maximum tokens or usages for this model."
       no_query_specified: The query parameter is required, please specify it.
       no_user_for_persona: The persona specified does not have a user associated with it.

lib/completions/endpoints/base.rb

@@ -65,11 +65,7 @@ def perform_completion!(
           partial_tool_calls: false,
           &blk
         )
-          if !LlmQuota.within_quota?(@llm_model, user)
-            raise LlmQuotaUsage::QuotaExceededError.new(
-                    I18n.t("discourse_ai.errors.quota_exceeded"),
-                  )
-          end
+          LlmQuota.check_quotas!(@llm_model, user)
 
           @partial_tool_calls = partial_tool_calls
           model_params = normalize_model_params(model_params)