enkryptai-sdk 1.0.15__py3-none-any.whl → 1.0.16__py3-none-any.whl

enkryptai_sdk/dto/models.py

@@ -40,6 +40,7 @@ class ModelProviders(str, Enum):
     CUSTOM = "custom"
     HR = "hr"
     URL = "url"
+    ENKRYPTAI = "enkryptai"
 
 
 @dataclass
@@ -92,10 +93,11 @@ class ModelDetailConfig:
     # model_provider: str = "openai"
     model_provider: ModelProviders = ModelProviders.OPENAI
     system_prompt: str = ""
-
-    endpoint_url: str = "https://api.openai.com/v1/chat/completions"
+    endpoint_url: str = ""
     auth_data: AuthData = field(default_factory=AuthData)
+    metadata: Dict[str, Any] = field(default_factory=dict)
     api_keys: Set[Optional[str]] = field(default_factory=lambda: {None})
+    _extra_fields: Dict[str, Any] = field(default_factory=dict)
 
 
 @dataclass
@@ -159,7 +161,7 @@ class ModelConfigDetails(BaseDTO):
     headers: str = ""
     system_prompt: str = ""
     hosting_type: str = "External"
-    endpoint_url: str = "https://api.openai.com/v1/chat/completions"
+    endpoint_url: str = ""
     model_name: Optional[str] = ""
     apikey: Optional[str] = None
     paths: Optional[PathsConfig] = None

enkryptai_sdk/dto/red_team.py

@@ -62,13 +62,59 @@ class RedTeamTaskStatus(BaseDTO):
     status: Optional[str] = None
 
 
+@dataclass
+class RedTeamTaskDetailsModelConfig(BaseDTO):
+    system_prompt: Optional[str] = None
+    model_version: Optional[str] = None
+    _extra_fields: Dict[str, Any] = field(default_factory=dict)
+
+    @classmethod
+    def from_dict(cls, data: Dict) -> "RedTeamTaskDetailsModelConfig":
+        return cls(
+            system_prompt=data.get("system_prompt"),
+            model_version=data.get("model_version"),
+        )
+    
+    def to_dict(self) -> Dict:
+        return {
+            "system_prompt": self.system_prompt,
+            "model_version": self.model_version,
+        }
+
+
 @dataclass
 class RedTeamTaskDetails(BaseDTO):
     created_at: Optional[str] = None
+    model_saved_name: Optional[str] = None
     model_name: Optional[str] = None
     status: Optional[str] = None
     test_name: Optional[str] = None
     task_id: Optional[str] = None
+    model_config: Optional[RedTeamTaskDetailsModelConfig] = None
+    _extra_fields: Dict[str, Any] = field(default_factory=dict)
+
+    @classmethod
+    def from_dict(cls, data: Dict) -> "RedTeamTaskDetails":
+        return cls(
+            created_at=data.get("created_at"),
+            model_saved_name=data.get("model_saved_name"),
+            model_name=data.get("model_name"),
+            status=data.get("status"),
+            test_name=data.get("test_name"),
+            task_id=data.get("task_id"),
+            model_config=RedTeamTaskDetailsModelConfig.from_dict(data.get("model_config", {})),
+        )
+    
+    def to_dict(self) -> Dict:
+        return {
+            "created_at": self.created_at,
+            "model_saved_name": self.model_saved_name,
+            "model_name": self.model_name,
+            "status": self.status,
+            "test_name": self.test_name,
+            "task_id": self.task_id,
+            "model_config": self.model_config.to_dict(),
+        }
 
 
 @dataclass
@@ -602,7 +648,7 @@ class RedTeamTaskList(BaseDTO):
 
 @dataclass
 class RedTeamRiskMitigationGuardrailsPolicyConfig(BaseDTO):
-    required_detectors: List[RiskGuardrailDetectorsEnum] = field(default_factory=list)
+    # required_detectors: List[RiskGuardrailDetectorsEnum] = field(default_factory=list)
     redteam_summary: ResultSummary = field(default_factory=ResultSummary)
     _extra_fields: Dict[str, Any] = field(default_factory=dict)
 
@@ -611,14 +657,14 @@ class RedTeamRiskMitigationGuardrailsPolicyConfig(BaseDTO):
         data = data.copy()
         summary = ResultSummary.from_dict(data.pop("redteam_summary", {}))
         return cls(
-            required_detectors=[RiskGuardrailDetectorsEnum(detector) for detector in data.get("required_detectors", [])],
+            # required_detectors=[RiskGuardrailDetectorsEnum(detector) for detector in data.get("required_detectors", [])],
             redteam_summary=summary,
             _extra_fields=data,
         )
 
     def to_dict(self) -> dict:
         return {
-            "required_detectors": [detector.value for detector in self.required_detectors],
+            # "required_detectors": [detector.value for detector in self.required_detectors],
             "redteam_summary": self.redteam_summary.to_dict(),
         }
 

enkryptai_sdk/models.py

@@ -29,17 +29,29 @@ class ModelClient(BaseClient):
         if isinstance(config, dict):
             config = ModelConfig.from_dict(config)
         
-        # Parse endpoint_url into components
-        parsed_url = urlparse(config.model_config.endpoint_url)
-        path_parts = parsed_url.path.strip("/").split("/")
-
-        # Extract base_path and endpoint path
-        if len(path_parts) >= 1:
-            base_path = path_parts[0]  # Usually 'v1'
-            remaining_path = "/".join(path_parts[1:])  # The rest of the path
-        else:
-            base_path = ""
-            remaining_path = ""
+        endpoint_data = {}
+        base_path = ""
+        remaining_path = ""
+
+        if config.model_config.endpoint_url:
+            # Parse endpoint_url into components
+            parsed_url = urlparse(config.model_config.endpoint_url)
+            path_parts = parsed_url.path.strip("/").split("/")
+
+            # Extract base_path and endpoint path
+            if len(path_parts) >= 1:
+                base_path = path_parts[0]  # Usually 'v1'
+                remaining_path = "/".join(path_parts[1:])  # The rest of the path
+            else:
+                base_path = ""
+                remaining_path = ""
+            
+            endpoint_data = {
+                    "scheme": parsed_url.scheme,
+                    "host": parsed_url.hostname,
+                    "port": parsed_url.port or (443 if parsed_url.scheme == "https" else 80),
+                    "base_path": f"/{base_path}",
+                }
 
         if config.model_config.paths:
             paths = config.model_config.paths.to_dict()
@@ -61,12 +73,7 @@ class ModelClient(BaseClient):
                 "hosting_type": config.model_config.hosting_type,
                 "model_source": config.model_config.model_source,
                 "system_prompt": config.model_config.system_prompt,
-                "endpoint": {
-                    "scheme": parsed_url.scheme,
-                    "host": parsed_url.hostname,
-                    "port": parsed_url.port or (443 if parsed_url.scheme == "https" else 80),
-                    "base_path": f"/{base_path}",
-                },
+                "endpoint": endpoint_data,
                 "paths": paths,
                 "auth_data": {
                     "header_name": config.model_config.auth_data.header_name,
@@ -149,92 +156,33 @@ class ModelClient(BaseClient):
         except Exception as e:
             return {"error": str(e)}
 
-    def modify_model(self, config: ModelConfig, old_model_saved_name=None, old_model_version=None) -> ModelResponse:
+    def modify_model(self, config: ModelConfig | dict, old_model_saved_name=None, old_model_version=None) -> ModelResponse:
         """
         Modify an existing model in the system.
 
         Args:
-            old_model_saved_name (str): The old saved name of the model to modify
-            old_model_version (str): The old version of the model to modify
-            config (ModelConfig): Configuration object containing model details
+            config (Union[ModelConfig, dict]): Configuration object or dictionary containing model details
+            old_model_saved_name (str, optional): The old saved name of the model to modify. Defaults to None.
+            old_model_version (str, optional): The old version of the model to modify. Defaults to None.
 
         Returns:
             dict: Response from the API containing the modified model details
         """
+        
+        temp_config = config
+        if isinstance(temp_config, dict):
+            temp_config = ModelConfig.from_dict(temp_config)
+
         if old_model_saved_name is None:
-            old_model_saved_name = config["model_saved_name"]
+            old_model_saved_name = temp_config.model_saved_name
 
         if old_model_version is None:
-            old_model_version = config["model_version"]
+            old_model_version = temp_config.model_version
 
         headers = {"Content-Type": "application/json", "X-Enkrypt-Model": old_model_saved_name, "X-Enkrypt-Model-Version": old_model_version}
-        # print(config)
-        config = ModelConfig.from_dict(config)
-        # Parse endpoint_url into components
-        parsed_url = urlparse(config.model_config.endpoint_url)
-        path_parts = parsed_url.path.strip("/").split("/")
-
-        # Extract base_path and endpoint path
-        if len(path_parts) >= 1:
-            base_path = path_parts[0]  # Usually 'v1'
-            remaining_path = "/".join(path_parts[1:])  # The rest of the path
-        else:
-            base_path = ""
-            remaining_path = ""
-
-        if config.model_config.paths:
-            paths = config.model_config.paths.to_dict()
-        else:
-            # Determine paths based on the endpoint
-            paths = {
-                "completions": (
-                    f"/{remaining_path.split('/')[-1]}" if remaining_path else ""
-                ),
-                "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 = self.prepare_model_payload(temp_config)
 
-        payload = {
-            "model_saved_name": config.model_saved_name,
-            "model_version": config.model_version,
-            "testing_for": config.testing_for,
-            "model_name": config.model_name,
-            "certifications": config.certifications,
-            "model_config": {
-                "model_provider": config.model_config.model_provider,
-                "hosting_type": config.model_config.hosting_type,
-                "model_source": config.model_config.model_source,
-                "system_prompt": config.model_config.system_prompt,
-                "endpoint": {
-                    "scheme": parsed_url.scheme,
-                    "host": parsed_url.hostname,
-                    "port": parsed_url.port
-                    or (443 if parsed_url.scheme == "https" else 80),
-                    "base_path": f"/{base_path}",  # Just v1
-                },
-                "paths": paths,
-                "auth_data": {
-                    "header_name": config.model_config.auth_data.header_name,
-                    "header_prefix": config.model_config.auth_data.header_prefix,
-                    "space_after_prefix": config.model_config.auth_data.space_after_prefix,
-                },
-                "apikeys": (
-                    [config.model_config.apikey] if config.model_config.apikey else []
-                ),
-                "tools": config.model_config.tools,
-                "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_curl_command": config.model_config.custom_curl_command,
-                "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,
-                "metadata": config.model_config.metadata,
-                "default_request_options": config.model_config.default_request_options,
-            },
-        }
         try:
             response = self._request(
                 "PATCH", "/models/modify-model", headers=headers, json=payload

{enkryptai_sdk-1.0.15.dist-info → enkryptai_sdk-1.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: enkryptai-sdk
-Version: 1.0.15
+Version: 1.0.16
 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
@@ -526,9 +526,6 @@ sample_custom_redteam_model_config = {
 
 ```python Python
 sample_redteam_risk_mitigation_guardrails_policy_config = {
-        "required_detectors": [
-            "policy_violation"
-        ],
         "redteam_summary": {
             "category": [
                 {

{enkryptai_sdk-1.0.15.dist-info → enkryptai_sdk-1.0.16.dist-info}/RECORD

@@ -8,7 +8,7 @@ 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=rrLTT3i96flWidVrr67j6VZ6XmkdxwEzlF4S4aoVmOQ,11559
+enkryptai_sdk/models.py,sha256=OfADGvP2gy52_fXT5iAj81Q07iDGAEYWiKYLD_ycozU,8786
 enkryptai_sdk/red_team.py,sha256=cjN4LODbpYiECcoL0JROMcCPCzm3Ib6kXi7kQspP4hQ,19869
 enkryptai_sdk/response.py,sha256=43JRubzgGCpoVxYNzBZY0AlUgLbfcXD_AwD7wU3qY9o,4086
 enkryptai_sdk/dto/__init__.py,sha256=wHgIv_OCnVMJOys-vqImF59ifogDrMcgxVRmfNayVvc,2761
@@ -18,10 +18,10 @@ 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=oJQqFhsdQd_yPU187AhKse-Y4xktgmVNwwKKkzFazbg,50167
-enkryptai_sdk/dto/models.py,sha256=zldbvYV5zcg1J3UZh4UnaeM1cBx-_LCCyW-LtfBcjaQ,14246
-enkryptai_sdk/dto/red_team.py,sha256=7wtIFfcbWXw3w8aRWO4YMUwIvhwJX8XOJEyOv8Ls_eQ,23143
-enkryptai_sdk-1.0.15.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enkryptai_sdk-1.0.15.dist-info/METADATA,sha256=LcZpm1lqiwbrWYExhN26Fntjjm0PAFhcx_OYzzUbpYg,72934
-enkryptai_sdk-1.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-enkryptai_sdk-1.0.15.dist-info/top_level.txt,sha256=s2X9UJJwvJamNmr6ZXWyyQe60sXtQGWFuaBYfhgHI_4,14
-enkryptai_sdk-1.0.15.dist-info/RECORD,,
+enkryptai_sdk/dto/models.py,sha256=SDzNMwxDVIp2D1qO29ere8WgqC5n_bJuitesaoxitZo,14312
+enkryptai_sdk/dto/red_team.py,sha256=EHwDbDM0mMLDyGB_kN4KEOO65ng9Bn51q9O3IdwO5Ng,24766
+enkryptai_sdk-1.0.16.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+enkryptai_sdk-1.0.16.dist-info/METADATA,sha256=T7ws5lOF-ynN_Z3cegMX0Ysotjp2_n7pet8Ci-ULFmI,72860
+enkryptai_sdk-1.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+enkryptai_sdk-1.0.16.dist-info/top_level.txt,sha256=s2X9UJJwvJamNmr6ZXWyyQe60sXtQGWFuaBYfhgHI_4,14
+enkryptai_sdk-1.0.16.dist-info/RECORD,,