Merge branch 'feat/model-runtime' into deploy/dev

langgenius · Dec 28, 2023 · c8ef7dc · c8ef7dc
2 parents a833026 + 6f3d210
commit c8ef7dc
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 7 deletions.
diff --git a/api/controllers/console/workspace/models.py b/api/controllers/console/workspace/models.py
@@ -54,7 +54,7 @@ def post(self):
                 raise ValueError('invalid model type')
 
             if 'provider' not in model_setting:
-                raise ValueError('invalid provider')
+                continue
 
             if 'model' not in model_setting:
                 raise ValueError('invalid model')

diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py
@@ -108,7 +108,9 @@ def get_configurations(self, tenant_id: str) -> ProviderConfigurations:
             # Convert to system configuration
             system_configuration = self._to_system_configuration(
                 provider_entity,
-                provider_records
+                provider_records,
+                decoding_rsa_key,
+                decoding_cipher_rsa
             )
 
             # Get preferred provider type
@@ -487,12 +489,16 @@ def _to_custom_configuration(self,
 
     def _to_system_configuration(self,
                                  provider_entity: ProviderEntity,
-                                 provider_records: list[Provider]) -> SystemConfiguration:
+                                 provider_records: list[Provider],
+                                 decoding_rsa_key,
+                                 decoding_cipher_rsa) -> SystemConfiguration:
         """
         Convert to system configuration.
 
-        :param provider_entity:
-        :param provider_records:
+        :param provider_entity: provider entity
+        :param provider_records: provider records
+        :param decoding_rsa_key: decoding rsa key
+        :param decoding_cipher_rsa: decoding cipher rsa
         :return:
         """
         # Get hosting configuration
@@ -538,11 +544,38 @@ def _to_system_configuration(self,
                 enabled=False
             )
 
+        current_quota_type = self._choice_current_using_quota_type(quota_configurations)
+
+        current_using_credentials = provider_hosting_configuration.credentials
+        if current_quota_type == ProviderQuotaType.FREE:
+            provider_record = quota_type_to_provider_records_dict[current_quota_type]
+
+            try:
+                provider_credentials = json.loads(provider_record.encrypted_config)
+            except JSONDecodeError:
+                provider_credentials = {}
+
+            # Get provider credential secret variables
+            provider_credential_secret_variables = self._extract_secret_variables(
+                provider_entity.provider_credential_schema.credential_form_schemas
+                if provider_entity.provider_credential_schema else []
+            )
+
+            for variable in provider_credential_secret_variables:
+                if variable in provider_credentials:
+                    provider_credentials[variable] = encrypter.decrypt_token_with_decoding(
+                        provider_credentials.get(variable),
+                        decoding_rsa_key,
+                        decoding_cipher_rsa
+                    )
+
+            current_using_credentials = provider_credentials
+
         return SystemConfiguration(
             enabled=True,
-            current_quota_type=self._choice_current_using_quota_type(quota_configurations),
+            current_quota_type=current_quota_type,
             quota_configurations=quota_configurations,
-            credentials=provider_hosting_configuration.credentials,
+            credentials=current_using_credentials
         )
 
     def _choice_current_using_quota_type(self, quota_configurations: list[QuotaConfiguration]) -> ProviderQuotaType: