agenta 0.59.6__py3-none-any.whl → 0.59.8__py3-none-any.whl

agenta/sdk/managers/secrets.py

@@ -119,11 +119,16 @@ class SecretsManager:
         # The reason is that custom providers are in fact openai compatible providers
         # They need to be passed in litellm as openai/modelname
 
-        if "custom" in model:
-            modified_model = model.replace(f"{provider_slug}/custom/", "openai/")
-            return modified_model.replace(f"{provider_slug}/", "")
+        modified_model = model
 
-        return model.replace(f"{provider_slug}/", "")
+        if "custom" in modified_model:
+            modified_model = modified_model.replace(
+                f"{provider_slug}/custom/", "openai/"
+            )
+
+        modified_model = modified_model.replace(f"{provider_slug}/", "")
+
+        return modified_model
 
     @staticmethod
     def get_provider_settings(model: str) -> Optional[Dict]:
@@ -137,6 +142,8 @@ class SecretsManager:
             Dict: A dictionary containing all parameters needed for litellm.completion
         """
 
+        request_provider_model = model
+
         # STEP 1: get vault secrets from route context and transform it
         secrets = SecretsManager.get_from_route()
         if not secrets:
@@ -146,11 +153,11 @@ class SecretsManager:
         secrets = SecretsManager._parse_secrets(secrets=secrets)
 
         # STEP 2: check model exists in supported standard models
-        provider = _standard_providers.get(model)
+        provider = _standard_providers.get(request_provider_model)
         if not provider:
             # check and get provider kind if model exists in custom provider models
             provider = SecretsManager._custom_providers_get(
-                model=model,
+                model=request_provider_model,
                 secrets=secrets,
             )
 
@@ -159,16 +166,19 @@ class SecretsManager:
             return None
 
         # STEP 2c: get litellm compatible model
-        provider_slug = SecretsManager._custom_provider_slug_get(
-            model=model, secrets=secrets
+        request_provider_slug = (
+            SecretsManager._custom_provider_slug_get(
+                model=request_provider_model, secrets=secrets
+            )
+            or ""
         )
-        model = SecretsManager._get_compatible_model(
-            model=model, provider_slug=provider_slug
+        compatible_provider_model = SecretsManager._get_compatible_model(
+            model=request_provider_model, provider_slug=request_provider_slug
         )
 
         # STEP 3: initialize provider settings and simplify provider name
-        provider_settings = {"model": model}
-        provider_name = re.sub(
+        provider_settings = dict(model=compatible_provider_model)
+        request_provider_kind = re.sub(
             r"[\s-]+", "", provider.lower()
         )  # normalizing other special characters too (azure-openai)
 
@@ -180,9 +190,9 @@ class SecretsManager:
             # i). Extract API key if present
             # (for standard models -- openai/anthropic/gemini, etc)
             if secret.get("kind") == "provider_key":
-                provider_kind = secret_data.get("kind", "")
+                secret_provider_kind = secret_data.get("kind", "")
 
-                if provider_kind == provider_name:
+                if request_provider_kind == secret_provider_kind:
                     if "key" in provider_info:
                         provider_settings["api_key"] = provider_info["key"]
                 continue
@@ -190,13 +200,20 @@ class SecretsManager:
             # ii). Extract Credentials if present
             # (for custom providers -- aws bedrock/sagemaker, vertex_ai, etc)
             elif secret.get("kind") == "custom_provider":
-                provider_kind = provider_info.get("kind", "").lower().replace(" ", "")
-                provider_slug = secret_data.get("provider_slug", "")
-                provider_extras = provider_info.get("extras", {})
-
-                if provider_kind == provider_name or provider_slug == provider_name:
-                    if provider_extras:
-                        provider_settings.update(provider_extras)
+                secret_provider_kind = (
+                    provider_info.get("kind", "").lower().replace(" ", "")
+                )
+                secret_provider_slug = secret_data.get("provider_slug", "")
+                secret_provider_models = secret_data.get("models", "")
+                secret_provider_extras = provider_info.get("extras", {})
+
+                if (
+                    request_provider_kind == secret_provider_kind
+                    and request_provider_slug == secret_provider_slug
+                    and request_provider_model in secret_provider_models
+                ):
+                    if secret_provider_extras:
+                        provider_settings.update(secret_provider_extras)
                 continue
 
         return provider_settings

{agenta-0.59.6.dist-info → agenta-0.59.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agenta
-Version: 0.59.6
+Version: 0.59.8
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Keywords: LLMOps,LLM,evaluation,prompt engineering
 Author: Mahmoud Mabrouk

{agenta-0.59.6.dist-info → agenta-0.59.8.dist-info}/RECORD

@@ -324,7 +324,7 @@ agenta/sdk/managers/__init__.py,sha256=SN-LRwG0pRRDV3u2Q4JiiSTigN3-mYpzGNM35RzT4
 agenta/sdk/managers/apps.py,sha256=BeAlTJlOOM0Wh_XWgjve65Mt-LwFgib_swu-1wvGQi4,2250
 agenta/sdk/managers/config.py,sha256=yyFxjZVf3_XfNAkZpl-qWzljYz4XB8LgPYc55JXEwG0,7494
 agenta/sdk/managers/deployment.py,sha256=SEokjZeh6n7HRKZ92Y0WncdG49hIFx-Z3B3HAl2kmUg,1174
-agenta/sdk/managers/secrets.py,sha256=3fd-WKJo2vs8dA_Nk4NLqf8RYG9FcvFTrnSmKBQqSm0,7459
+agenta/sdk/managers/secrets.py,sha256=WgMAdWIagGntQrjj1A6_fcZxyFxfL2SaQOxnfdtGceE,8077
 agenta/sdk/managers/shared.py,sha256=kI3w74E4rS3YDORG2e-_r0Pz5KslTRzRBK7vgyOeaJA,21559
 agenta/sdk/managers/variant.py,sha256=A5ga3mq3b0weUTXa9HO72MGaspthGcu1uK9K5OnP738,4172
 agenta/sdk/managers/vault.py,sha256=tOJsRWSEpmNT_ysWVcK5KQMdQO4pwiK90H3rsr9BUbg,337
@@ -366,6 +366,6 @@ agenta/sdk/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 agenta/sdk/workflows/registry.py,sha256=4FRSeU4njMmP6xFCIteF5f_W6NVlqFTx1AM7hsaGAQk,975
 agenta/sdk/workflows/types.py,sha256=SjYeT8FWVgwaIIC8sI3fRjKERLEA_oxuBGvYSaFqNg8,11720
 agenta/sdk/workflows/utils.py,sha256=ILfY8DSBWLrdWIuKg6mq7rANwKiiY6sxEeFiBFhjLYM,413
-agenta-0.59.6.dist-info/METADATA,sha256=UZCPm9nHFNbO6R_mRwLcjn7qIza-xHv96UgZyyqW1bU,31792
-agenta-0.59.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-agenta-0.59.6.dist-info/RECORD,,
+agenta-0.59.8.dist-info/METADATA,sha256=5HTX5B2fD64ORR-vZcNjBmxxWkVIWoItZG0eqZRIo_c,31792
+agenta-0.59.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+agenta-0.59.8.dist-info/RECORD,,