enkryptai-sdk 1.0.10__py3-none-any.whl → 1.0.11__py3-none-any.whl

enkryptai_sdk/base.py

@@ -72,14 +72,17 @@ class BaseClient:
                 )
 
             if response.status >= 400:
-                error_data = (
-                    response.json()
-                    if response.data
-                    else {"message": f"HTTP {response.status}"}
-                )
-                error_message = error_data.get("message", str(error_data))
+                try:
+                    error_data = response.json()
+                    error_message = error_data.get("message", str(error_data))
+                except:
+                    error_message = response.data.decode('utf-8') if response.data else f"HTTP {response.status}"
                 raise urllib3.exceptions.HTTPError(error_message)
-            return response.json()
+            
+            try:
+                return response.json()
+            except:
+                return {"error": response.data.decode('utf-8') if response.data else "Invalid JSON response"}
         except urllib3.exceptions.HTTPError as e:
             return {"error": str(e)}
 

enkryptai_sdk/dto/base.py

@@ -52,7 +52,18 @@ class BaseDTO:
 
     def to_dict(self) -> Dict[str, Any]:
         """Convert the instance to a dictionary."""
-        d = {k: v for k, v in self.__dict__.items() if k != "_extra_fields"}
+        d = {}
+        for k, v in self.__dict__.items():
+            if k == "_extra_fields":
+                continue
+            if hasattr(v, "to_dict"):
+                d[k] = v.to_dict()
+            elif isinstance(v, list):
+                d[k] = [item.to_dict() if hasattr(item, "to_dict") else item for item in v]
+            elif isinstance(v, dict):
+                d[k] = {key: val.to_dict() if hasattr(val, "to_dict") else val for key, val in v.items()}
+            else:
+                d[k] = v
         d.update(self._extra_fields)
         return d
 

enkryptai_sdk/dto/models.py

@@ -37,6 +37,8 @@ class ModelProviders(str, Enum):
     OPENAI_COMPATIBLE = "openai_compatible"
     COHERE_COMPATIBLE = "cohere_compatible"
     ANTHROPIC_COMPATIBLE = "anthropic_compatible"
+    CUSTOM = "custom"
+    HR = "hr"
 
 
 @dataclass
@@ -247,6 +249,14 @@ class ModelConfigDetails(BaseDTO):
         d = super().to_dict()
         # Handle AuthData specifically
         d["auth_data"] = self.auth_data.to_dict()
+        # Handle CustomHeader list
+        d["custom_headers"] = [header.to_dict() for header in self.custom_headers]
+        # Handle ModelProviders enum
+        if isinstance(d["model_provider"], ModelProviders):
+            d["model_provider"] = d["model_provider"].value
+        # Handle input/output modalities
+        d["input_modalities"] = [m.value for m in self.input_modalities]
+        d["output_modalities"] = [m.value for m in self.output_modalities]
         return d
 
     def to_json(self):
@@ -289,6 +299,13 @@ class ModelConfig(BaseDTO):
 
         return cls(**data, model_config=model_config)
 
+    def to_dict(self) -> dict:
+        """Convert the ModelConfig instance to a dictionary."""
+        d = super().to_dict()
+        # Handle nested ModelConfigDetails
+        d["model_config"] = self.model_config.to_dict()
+        return d
+
     @classmethod
     def __str__(self):
         """String representation of the ModelConfig."""

enkryptai_sdk/dto/red_team.py

@@ -367,7 +367,15 @@ class TargetModelConfiguration(BaseDTO):
 
     @classmethod
     def from_dict(cls, data: dict):
+        data = data.copy()
+        if "custom_headers" in data:
+            data["custom_headers"] = [CustomHeader.from_dict(header) for header in data["custom_headers"]]
         return cls(**data)
+    
+    def to_dict(self) -> dict:
+        d = asdict(self)
+        d["custom_headers"] = [header.to_dict() for header in self.custom_headers]
+        return d
 
 
 @dataclass

enkryptai_sdk/models.py

@@ -49,6 +49,9 @@ class ModelClient(BaseClient):
                 "chat": f"/{remaining_path}" if remaining_path else "",
             }
 
+        # Convert custom_headers to list of dictionaries
+        custom_headers = [header.to_dict() for header in config.model_config.custom_headers]
+
         payload = {
             "testing_for": config.testing_for,
             "model_name": config.model_name,
@@ -72,9 +75,9 @@ class ModelClient(BaseClient):
                 },
                 "apikeys": [config.model_config.apikey] if config.model_config.apikey else [],
                 "tools": config.model_config.tools,
-                "input_modalities": config.model_config.input_modalities,
-                "output_modalities": config.model_config.output_modalities,
-                "custom_headers": config.model_config.custom_headers,
+                "input_modalities": [m.value if hasattr(m, 'value') else m for m in config.model_config.input_modalities],
+                "output_modalities": [m.value if hasattr(m, 'value') else m for m in config.model_config.output_modalities],
+                "custom_headers": custom_headers,
                 "custom_payload": config.model_config.custom_payload,
                 "custom_response_content_type": config.model_config.custom_response_content_type,
                 "custom_response_format": config.model_config.custom_response_format,
@@ -189,6 +192,9 @@ class ModelClient(BaseClient):
                 "chat": f"/{remaining_path}" if remaining_path else "",
             }
 
+        # Convert custom_headers to list of dictionaries
+        custom_headers = [header.to_dict() for header in config.model_config.custom_headers]
+
         payload = {
             "model_saved_name": config.model_saved_name,
             "model_version": config.model_version,
@@ -217,9 +223,9 @@ class ModelClient(BaseClient):
                     [config.model_config.apikey] if config.model_config.apikey else []
                 ),
                 "tools": config.model_config.tools,
-                "input_modalities": config.model_config.input_modalities,
-                "output_modalities": config.model_config.output_modalities,
-                "custom_headers": config.model_config.custom_headers,
+                "input_modalities": [m.value if hasattr(m, 'value') else m for m in config.model_config.input_modalities],
+                "output_modalities": [m.value if hasattr(m, 'value') else m for m in config.model_config.output_modalities],
+                "custom_headers": custom_headers,
                 "custom_payload": config.model_config.custom_payload,
                 "custom_response_content_type": config.model_config.custom_response_content_type,
                 "custom_response_format": config.model_config.custom_response_format,

enkryptai_sdk/red_team.py

@@ -1,4 +1,5 @@
-import urllib3
+# import json
+# import urllib3
 from .base import BaseClient
 from .models import ModelClient
 from .datasets import DatasetClient
@@ -62,6 +63,8 @@ class RedTeamClient(BaseClient):
         """
         try:
             config = RedTeamModelHealthConfig.from_dict(config)
+            # Print the config as json string
+            # print(f"Config: {json.dumps(config.to_dict(), indent=4)}")
             response = self._request("POST", "/redteam/model-health", json=config.to_dict())
             # if response.get("error"):
             if response.get("error") not in [None, ""]:

{enkryptai_sdk-1.0.10.dist-info → enkryptai_sdk-1.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: enkryptai-sdk
-Version: 1.0.10
+Version: 1.0.11
 Summary: A Python SDK with guardrails and red teaming functionality for API interactions
 Home-page: https://github.com/enkryptai/enkryptai-sdk
 Author: Enkrypt AI Team

{enkryptai_sdk-1.0.10.dist-info → enkryptai_sdk-1.0.11.dist-info}/RECORD

@@ -1,6 +1,6 @@
 enkryptai_sdk/__init__.py,sha256=8H5tznmjirTVdrTmrsyU6fNVRj3-UC0nrTGkzfFp0h0,845
 enkryptai_sdk/ai_proxy.py,sha256=ot1lqKk2LjcvlpnFm2kSA51vFThfquVlx86BhSbAzBo,3823
-enkryptai_sdk/base.py,sha256=8iQr5skm46-hGFIMOZsQgZkqL0RBrIJDYUENOybBrwg,3087
+enkryptai_sdk/base.py,sha256=KonezvdjVzIr3gw75grzcCNyhzI_sHXi-Cb9tRJgSDE,3277
 enkryptai_sdk/coc.py,sha256=5rq9LhZX-uvCmX8fM6JEndIEvd8rSzsSfDFnTvSvTQE,7396
 enkryptai_sdk/config.py,sha256=PyyuJRKWuiuFUaI90M21M141wlfIBeO_QVDU36KHKCs,9065
 enkryptai_sdk/datasets.py,sha256=RQIR6spI2STXeVolYzBt6gPv6PD5AGh9krs16aKWdWA,6067
@@ -8,20 +8,20 @@ enkryptai_sdk/deployments.py,sha256=A7XZ2JwrMod9V4_aV8bFY_Soh9E3jHdwaTuJ9BwXuyk,
 enkryptai_sdk/evals.py,sha256=BywyEgIT7xdJ58svO_sDNOMVowdB0RTGoAZPEbCnDVo,2595
 enkryptai_sdk/guardrails.py,sha256=NluimOA0gM9N3S_q47LTUeG97t9PlYqPHlZahDPkJvI,16365
 enkryptai_sdk/guardrails_old.py,sha256=SgzPZkTzbAPD9XfmYNG6M1-TrzbhDHpAkI3FjnVWS_s,6434
-enkryptai_sdk/models.py,sha256=2H316e28Ssi_MHck0pAoydThRYSdAeSOlwwAoU7q86Q,10941
-enkryptai_sdk/red_team.py,sha256=sJbhCuPfI9aowGvV71hRZslBp1HQa7bklbb89HU5tk8,18574
+enkryptai_sdk/models.py,sha256=EA2jwdoYqOjQ8GuRawsZ3syIvVinwhvodTLQlvt51Mo,11399
+enkryptai_sdk/red_team.py,sha256=iTBSXNUr_JFFQppKzUzJ5-gWtlPPzY6BkKahhXppaFM,18709
 enkryptai_sdk/response.py,sha256=43JRubzgGCpoVxYNzBZY0AlUgLbfcXD_AwD7wU3qY9o,4086
 enkryptai_sdk/dto/__init__.py,sha256=wHgIv_OCnVMJOys-vqImF59ifogDrMcgxVRmfNayVvc,2761
 enkryptai_sdk/dto/ai_proxy.py,sha256=clwMN4xdH8Zr55dnhilHbs-qaHRlCOrLPrij0Zd1Av0,11283
-enkryptai_sdk/dto/base.py,sha256=6VWTkoNZ7uILqn_iYsPS21cVa2xLYpw5bjDIsRCS5tk,2389
+enkryptai_sdk/dto/base.py,sha256=y77kQL1X7389ifSVNc0E7CUFNxACh5AM3ml9YPon1KY,2822
 enkryptai_sdk/dto/coc.py,sha256=Lp2aat_24J4KuUg4BeJl9S39tEak8Bw15eJ4cQDrRQk,4749
 enkryptai_sdk/dto/datasets.py,sha256=RFA9CmbhD-QDDyweBq_k9iBd00b6I6SWmdP9DPNd9fc,5002
 enkryptai_sdk/dto/deployments.py,sha256=Aw4b8tDA3FYIomqDvCjblCXTagL4bT8Fx91X0SFXs40,11216
 enkryptai_sdk/dto/guardrails.py,sha256=wfKm2R0uJAq9nljLBPuuT05tj1nBqZraga-5lMHd3n8,49812
-enkryptai_sdk/dto/models.py,sha256=lNakMstGozgN_htY2_OItkjQnMQpw5tO9lCZVlywMIg,13442
-enkryptai_sdk/dto/red_team.py,sha256=QtsT4GCnDs24WOF_RMxFtYjvIUULaw5temZ70aduevI,17966
-enkryptai_sdk-1.0.10.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enkryptai_sdk-1.0.10.dist-info/METADATA,sha256=elvqsbmZjsswZaBA2cbm1Dmy4teinjb7mR2EPUvtOR0,62092
-enkryptai_sdk-1.0.10.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-enkryptai_sdk-1.0.10.dist-info/top_level.txt,sha256=s2X9UJJwvJamNmr6ZXWyyQe60sXtQGWFuaBYfhgHI_4,14
-enkryptai_sdk-1.0.10.dist-info/RECORD,,
+enkryptai_sdk/dto/models.py,sha256=08ilpQkp_tpUDzM5Jt-mrWdHlbBgYst0plzzT4G-Gds,14184
+enkryptai_sdk/dto/red_team.py,sha256=UNqiPxKqk8TJ-hLtBCWRvtoXyGCFiz3X7bKpx8sTQxo,18298
+enkryptai_sdk-1.0.11.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+enkryptai_sdk-1.0.11.dist-info/METADATA,sha256=adej6oT0uO297qJIDmyktoTx7CmgSZWiBMyPWAHYMro,62092
+enkryptai_sdk-1.0.11.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+enkryptai_sdk-1.0.11.dist-info/top_level.txt,sha256=s2X9UJJwvJamNmr6ZXWyyQe60sXtQGWFuaBYfhgHI_4,14
+enkryptai_sdk-1.0.11.dist-info/RECORD,,

{enkryptai_sdk-1.0.10.dist-info → enkryptai_sdk-1.0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any