From f9df3cfb088519693e67fb0c7c34651eace9f541 Mon Sep 17 00:00:00 2001
From: Jarvis <jarvis@api7.ai>
Date: Fri, 26 Jun 2026 16:15:35 +0800
Subject: [PATCH] test(core): lock inline rate_limit rps/rph acceptance for
 models & api keys

#644 reported the Admin API rejected inline rate_limit.rps/rph. That held
for the old hand-written validation schema but was already fixed by #638,
which derives the model/api-key schemas from the RateLimit struct (rps,
rpm, rph, rpd, tpm, tpd, concurrency). Add regression tests so the
per-second and per-hour request windows can't silently drop out of the
derived schema again.
---
 crates/aisix-core/src/models/schema.rs | 32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/crates/aisix-core/src/models/schema.rs b/crates/aisix-core/src/models/schema.rs
index a265b9d3..ee22bc83 100644
--- a/crates/aisix-core/src/models/schema.rs
+++ b/crates/aisix-core/src/models/schema.rs
@@ -472,6 +472,25 @@ mod tests {
         validate_model(&v).unwrap();
     }
 
+    #[test]
+    fn model_rate_limit_accepts_all_request_windows_incl_rps_rph() {
+        // Regression for #644: the inline rate_limit schema is derived from the
+        // RateLimit struct (#638), so every request-count window — rps/rpm/rph/
+        // rpd — alongside the token windows and concurrency must be accepted,
+        // not just rpm/rpd/tpm/tpd/concurrency.
+        let v = json!({
+            "display_name": "my-gpt4",
+            "provider": "openai",
+            "model_name": "gpt-4o",
+            "provider_key_id": "11111111-1111-1111-1111-111111111111",
+            "rate_limit": {
+                "rps": 10, "rpm": 100, "rph": 1000, "rpd": 10000,
+                "tpm": 100000, "tpd": 1000000, "concurrency": 5
+            }
+        });
+        validate_model(&v).unwrap();
+    }
+
     #[test]
     fn model_ensemble_with_direct_fields_fails() {
         // ensemble is mutually exclusive with the direct upstream triple.
@@ -976,6 +995,19 @@ mod tests {
         validate_apikey(&v).unwrap();
     }
 
+    #[test]
+    fn apikey_rate_limit_accepts_rps_and_rph() {
+        // Regression for #644: inline rate_limit on a caller API key must accept
+        // the per-second and per-hour request windows too, not only
+        // rpm/rpd/tpm/tpd/concurrency.
+        let v = json!({
+            "key_hash":"9df37f5e7cbc3c391d872742b5f286c242e733a09add9eeaa4d26a599bd90b20",
+            "allowed_models":["gpt-4o"],
+            "rate_limit": {"rps": 5, "rph": 500}
+        });
+        validate_apikey(&v).unwrap();
+    }
+
     #[test]
     fn apikey_unknown_field_rejected() {
         let v = json!({