sync: 159 file da Baida98/AI@3e4accc9 (2026-08-16 08:10 UTC) [deploy-all]

models/ai_client.py

@@ -87,8 +87,22 @@ class AIClient:
         truth dichiarata in supabase/migrations/20260711_ai_providers_fleet.sql),
         fallback sui provider reali via env se Supabase non è raggiungibile/vuoto
         (es. progetto sospeso per fatturazione, tabella non ancora popolata)."""
-        providers = self._try_load_from_supabase()
-        return providers if providers else self._discover_providers_from_env()
+        database_providers = self._try_load_from_supabase()
+        environment_profiles = [
+            profile
+            for definition in _PROVIDER_DEFS
+            for profile in self._profile_rows_from_env(definition)
+        ]
+        if environment_profiles:
+            profiled_names = {profile.name for profile in environment_profiles}
+            # Explicit profile pools override a same-provider Supabase credential;
+            # DB providers not covered by a pool remain available as fallbacks.
+            database_providers = [
+                provider for provider in database_providers
+                if provider.name not in profiled_names
+            ]
+            return environment_profiles + database_providers
+        return database_providers or self._discover_providers_from_env()
 
     @staticmethod
     def _runtime_model_override(row: dict) -> str:

tests/test_provider_profile_pool.py

@@ -22,8 +22,8 @@ class ProviderProfilePoolTests(unittest.TestCase):
         with patch.dict(os.environ, {"OPENROUTER_PROFILES_JSON": raw, "OPENROUTER_API_KEY": "legacy-key"}, clear=True):
             client = AIClient()
         profiles = [p for p in client.providers if p.name == "openrouter"]
-        self.assertEqual([p.profile for p in profiles], ["primary", "backup", "legacy"])
-        self.assertEqual([p.api_key for p in profiles], ["profile-key-1", "profile-key-2", "legacy-key"])
+        self.assertEqual([p.profile for p in profiles], ["primary", "backup"])
+        self.assertEqual([p.api_key for p in profiles], ["profile-key-1", "profile-key-2"])
 
     def test_profile_json_is_supported_for_every_provider(self):
         env = {
@@ -39,6 +39,22 @@ class ProviderProfilePoolTests(unittest.TestCase):
             profiles = [p for p in client.providers if p.name == definition["name"]]
             self.assertEqual([p.profile for p in profiles], ["primary", "backup"])
 
+    def test_environment_pool_overrides_same_provider_database_row(self):
+        raw = json.dumps([
+            {"profile": "primary", "api_key": "profile-key-1"},
+            {"profile": "backup", "api_key": "profile-key-2"},
+        ])
+        database_row = ProviderConfig(
+            name="openrouter", api_key="database-key",
+            base_url="https://openrouter.ai/api/v1", profile="db-1",
+        )
+        with patch.dict(os.environ, {"OPENROUTER_PROFILES_JSON": raw}, clear=True), \
+             patch.object(AIClient, "_try_load_from_supabase", return_value=[database_row]):
+            client = AIClient()
+        profiles = [p for p in client.providers if p.name == "openrouter"]
+        self.assertEqual([p.profile for p in profiles], ["primary", "backup"])
+        self.assertNotIn("database-key", [p.api_key for p in profiles])
+
     def test_profiles_have_distinct_client_cache_entries(self):
         client = AIClient()
         first, second = self._profiles()[:2]