Disable staging and bypass proxy tests on CI to reduce utilization

Author: andrewheard

FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift

@@ -50,15 +50,18 @@ struct GenerateContentIntegrationTests {
   @Test(arguments: [
     (InstanceConfig.vertexAI_v1beta, ModelNames.gemini2FlashLite),
     (InstanceConfig.vertexAI_v1beta_global, ModelNames.gemini2FlashLite),
-    (InstanceConfig.vertexAI_v1beta_staging, ModelNames.gemini2FlashLite),
     (InstanceConfig.vertexAI_v1beta_global_appCheckLimitedUse, ModelNames.gemini2FlashLite),
     (InstanceConfig.googleAI_v1beta, ModelNames.gemini2FlashLite),
     (InstanceConfig.googleAI_v1beta_appCheckLimitedUse, ModelNames.gemini2FlashLite),
     (InstanceConfig.googleAI_v1beta, ModelNames.gemma3_4B),
-    (InstanceConfig.googleAI_v1beta_staging, ModelNames.gemini2FlashLite),
-    (InstanceConfig.googleAI_v1beta_staging, ModelNames.gemma3_4B),
-    (InstanceConfig.googleAI_v1beta_freeTier_bypassProxy, ModelNames.gemini2FlashLite),
-    (InstanceConfig.googleAI_v1beta_freeTier_bypassProxy, ModelNames.gemma3_4B),
+    (InstanceConfig.googleAI_v1beta_freeTier, ModelNames.gemini2FlashLite),
+    (InstanceConfig.googleAI_v1beta_freeTier, ModelNames.gemma3_4B),
+    // Note: The following configs are commented out for easy one-off manual testing.
+    // (InstanceConfig.googleAI_v1beta_staging, ModelNames.gemini2FlashLite),
+    // (InstanceConfig.googleAI_v1beta_staging, ModelNames.gemma3_4B),
+    // (InstanceConfig.vertexAI_v1beta_staging, ModelNames.gemini2FlashLite),
+    // (InstanceConfig.googleAI_v1beta_freeTier_bypassProxy, ModelNames.gemini2FlashLite),
+    // (InstanceConfig.googleAI_v1beta_freeTier_bypassProxy, ModelNames.gemma3_4B),
   ])
   func generateContent(_ config: InstanceConfig, modelName: String) async throws {
     let model = FirebaseAI.componentInstance(config).generativeModel(
@@ -322,8 +325,9 @@ struct GenerateContentIntegrationTests {
     InstanceConfig.vertexAI_v1beta,
     InstanceConfig.vertexAI_v1beta_global,
     InstanceConfig.googleAI_v1beta,
-    InstanceConfig.googleAI_v1beta_staging,
-    InstanceConfig.googleAI_v1beta_freeTier_bypassProxy,
+    // Note: The following configs are commented out for easy one-off manual testing.
+    // InstanceConfig.googleAI_v1beta_staging,
+    // InstanceConfig.googleAI_v1beta_freeTier_bypassProxy,
   ])
   func generateImage(_ config: InstanceConfig) async throws {
     let generationConfig = GenerationConfig(
@@ -419,13 +423,18 @@ struct GenerateContentIntegrationTests {
   @Test(arguments: [
     (InstanceConfig.vertexAI_v1beta, ModelNames.gemini2FlashLite),
     (InstanceConfig.vertexAI_v1beta_global, ModelNames.gemini2FlashLite),
-    (InstanceConfig.vertexAI_v1beta_staging, ModelNames.gemini2FlashLite),
+    (InstanceConfig.vertexAI_v1beta_global_appCheckLimitedUse, ModelNames.gemini2FlashLite),
     (InstanceConfig.googleAI_v1beta, ModelNames.gemini2FlashLite),
+    (InstanceConfig.googleAI_v1beta_appCheckLimitedUse, ModelNames.gemini2FlashLite),
     (InstanceConfig.googleAI_v1beta, ModelNames.gemma3_4B),
-    (InstanceConfig.googleAI_v1beta_staging, ModelNames.gemini2FlashLite),
-    (InstanceConfig.googleAI_v1beta_staging, ModelNames.gemma3_4B),
-    (InstanceConfig.googleAI_v1beta_freeTier_bypassProxy, ModelNames.gemini2FlashLite),
-    (InstanceConfig.googleAI_v1beta_freeTier_bypassProxy, ModelNames.gemma3_4B),
+    (InstanceConfig.googleAI_v1beta_freeTier, ModelNames.gemini2FlashLite),
+    (InstanceConfig.googleAI_v1beta_freeTier, ModelNames.gemma3_4B),
+    // Note: The following configs are commented out for easy one-off manual testing.
+    // (InstanceConfig.vertexAI_v1beta_staging, ModelNames.gemini2FlashLite),
+    // (InstanceConfig.googleAI_v1beta_staging, ModelNames.gemini2FlashLite),
+    // (InstanceConfig.googleAI_v1beta_staging, ModelNames.gemma3_4B),
+    // (InstanceConfig.googleAI_v1beta_freeTier_bypassProxy, ModelNames.gemini2FlashLite),
+    // (InstanceConfig.googleAI_v1beta_freeTier_bypassProxy, ModelNames.gemma3_4B),
   ])
   func generateContentStream(_ config: InstanceConfig, modelName: String) async throws {
     let expectedResponse = [

FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift

@@ -56,35 +56,56 @@ struct InstanceConfig: Equatable, Encodable {
   static let allConfigs = [
     vertexAI_v1beta,
     vertexAI_v1beta_global,
-    vertexAI_v1beta_staging,
     vertexAI_v1beta_global_appCheckLimitedUse,
     googleAI_v1beta,
-    googleAI_v1beta_staging,
-    googleAI_v1beta_freeTier_bypassProxy,
     googleAI_v1beta_appCheckLimitedUse,
+    googleAI_v1beta_freeTier,
+    // Note: The following configs are commented out for easy one-off manual testing.
+    // vertexAI_v1beta_staging,
+    // googleAI_v1beta_staging,
+    // googleAI_v1beta_freeTier_bypassProxy,
   ]
 
   static let vertexAI_v1beta_appCheckNotConfigured = InstanceConfig(
     appName: FirebaseAppNames.appCheckNotConfigured,
     apiConfig: APIConfig(service: .vertexAI(endpoint: .firebaseProxyProd), version: .v1beta)
   )
+  static let vertexAI_v1beta_appCheckNotConfigured_limitedUseTokens = InstanceConfig(
+    appName: FirebaseAppNames.appCheckNotConfigured,
+    useLimitedUseAppCheckTokens: true,
+    apiConfig: APIConfig(service: .vertexAI(endpoint: .firebaseProxyProd), version: .v1beta)
+  )
   static let googleAI_v1beta_appCheckNotConfigured = InstanceConfig(
     appName: FirebaseAppNames.appCheckNotConfigured,
     apiConfig: APIConfig(service: .googleAI(endpoint: .firebaseProxyProd), version: .v1beta)
   )
+  static let googleAI_v1beta_appCheckNotConfigured_limitedUseTokens = InstanceConfig(
+    appName: FirebaseAppNames.appCheckNotConfigured,
+    useLimitedUseAppCheckTokens: true,
+    apiConfig: APIConfig(service: .googleAI(endpoint: .firebaseProxyProd), version: .v1beta)
+  )
 
   static let appCheckNotConfiguredConfigs = [
     vertexAI_v1beta_appCheckNotConfigured,
+    vertexAI_v1beta_appCheckNotConfigured_limitedUseTokens,
     googleAI_v1beta_appCheckNotConfigured,
+    googleAI_v1beta_appCheckNotConfigured_limitedUseTokens
   ]
 
   let appName: String?
   let location: String?
+  let useLimitedUseAppCheckTokens: Bool
   let apiConfig: APIConfig
 
-  init(appName: String? = nil, location: String? = nil, apiConfig: APIConfig) {
+  init(
+    appName: String? = nil,
+    location: String? = nil,
+    useLimitedUseAppCheckTokens: Bool = false,
+    apiConfig: APIConfig
+  ) {
     self.appName = appName
     self.location = location
+    self.useLimitedUseAppCheckTokens = useLimitedUseAppCheckTokens
     self.apiConfig = apiConfig
   }
 
@@ -118,8 +139,12 @@ extension InstanceConfig: CustomTestStringConvertible {
       " - Bypass Proxy"
     }
     let locationSuffix = location.map { " - \($0)" } ?? ""
+    let appCheckLimitedUseDesignator = useLimitedUseAppCheckTokens ? " - FAC Limited-Use" : ""
 
-    return "\(serviceName) (\(versionName))\(freeTierDesignator)\(endpointSuffix)\(locationSuffix)"
+    return """
+    \(serviceName) (\(versionName))\(freeTierDesignator)\(endpointSuffix)\(locationSuffix)\
+    \(appCheckLimitedUseDesignator)
+    """
   }
 }
 
@@ -132,7 +157,7 @@ extension FirebaseAI {
         app: instanceConfig.app,
         location: location,
         apiConfig: instanceConfig.apiConfig,
-        useLimitedUseAppCheckTokens: false
+        useLimitedUseAppCheckTokens: instanceConfig.useLimitedUseAppCheckTokens
       )
     case .googleAI:
       assert(
@@ -143,7 +168,7 @@ extension FirebaseAI {
         app: instanceConfig.app,
         location: nil,
         apiConfig: instanceConfig.apiConfig,
-        useLimitedUseAppCheckTokens: false
+        useLimitedUseAppCheckTokens: instanceConfig.useLimitedUseAppCheckTokens
       )
     }
   }