Add the updated external API (#1)

Author: Dhruv-Mehndhiratta-Centml

platform_api_client/__init__.py

@@ -31,7 +31,6 @@
 from platform_api_client.exceptions import ApiException
 
 # import models into sdk package
-from platform_api_client.models.auth_secret import AuthSecret
 from platform_api_client.models.client_secret_response import ClientSecretResponse
 from platform_api_client.models.create_compute_deployment_request import CreateComputeDeploymentRequest
 from platform_api_client.models.create_compute_deployment_response import CreateComputeDeploymentResponse
@@ -47,6 +46,7 @@
 from platform_api_client.models.deployment_type import DeploymentType
 from platform_api_client.models.endpoint_ready_state import EndpointReadyState
 from platform_api_client.models.get_compute_deployment_response import GetComputeDeploymentResponse
+from platform_api_client.models.get_deployment_log_response import GetDeploymentLogResponse
 from platform_api_client.models.get_deployment_response import GetDeploymentResponse
 from platform_api_client.models.get_inference_deployment_response import GetInferenceDeploymentResponse
 from platform_api_client.models.get_training_deployment_response import GetTrainingDeploymentResponse

platform_api_client/api/external_api.py

@@ -22,7 +22,8 @@
 import tempfile
 
 from urllib.parse import quote
-from typing import Tuple, Optional, List, Dict
+from typing import Tuple, Optional, List, Dict, Union
+from pydantic import SecretStr
 
 from platform_api_client.configuration import Configuration
 from platform_api_client.api_response import ApiResponse, T as ApiResponseT
@@ -207,7 +208,8 @@ def param_serialize(
                 post_params,
                 collection_formats
             )
-            post_params.extend(self.files_parameters(files))
+            if files:
+                post_params.extend(self.files_parameters(files))
 
         # auth setting
         self.update_params_for_auth(
@@ -312,7 +314,10 @@ def response_deserialize(
                     match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type)
                 encoding = match.group(1) if match else "utf-8"
                 response_text = response_data.data.decode(encoding)
-                return_data = self.deserialize(response_text, response_type)
+                if response_type in ["bytearray", "str"]:
+                    return_data = self.__deserialize_primitive(response_text, response_type)
+                else:
+                    return_data = self.deserialize(response_text, response_type)
         finally:
             if not 200 <= response_data.status <= 299:
                 raise ApiException.from_response(
@@ -332,6 +337,7 @@ def sanitize_for_serialization(self, obj):
         """Builds a JSON POST object.
 
         If obj is None, return None.
+        If obj is SecretStr, return obj.get_secret_value()
         If obj is str, int, long, float, bool, return directly.
         If obj is datetime.datetime, datetime.date
             convert to string in iso8601 format.
@@ -344,6 +350,10 @@ def sanitize_for_serialization(self, obj):
         """
         if obj is None:
             return None
+        elif isinstance(obj, Enum):
+            return obj.value
+        elif isinstance(obj, SecretStr):
+            return obj.get_secret_value()
         elif isinstance(obj, self.PRIMITIVE_TYPES):
             return obj
         elif isinstance(obj, list):
@@ -365,7 +375,10 @@ def sanitize_for_serialization(self, obj):
             # and attributes which value is not None.
             # Convert attribute name to json key in
             # model definition for request.
-            obj_dict = obj.to_dict()
+            if hasattr(obj, 'to_dict') and callable(getattr(obj, 'to_dict')):
+                obj_dict = obj.to_dict()
+            else:
+                obj_dict = obj.__dict__
 
         return {
             key: self.sanitize_for_serialization(val)
@@ -504,31 +517,30 @@ def parameters_to_url_query(self, params, collection_formats):
 
         return "&".join(["=".join(map(str, item)) for item in new_params])
 
-    def files_parameters(self, files=None):
+    def files_parameters(self, files: Dict[str, Union[str, bytes]]):
         """Builds form parameters.
 
         :param files: File parameters.
         :return: Form parameters with files.
         """
         params = []
-
-        if files:
-            for k, v in files.items():
-                if not v:
-                    continue
-                file_names = v if type(v) is list else [v]
-                for n in file_names:
-                    with open(n, 'rb') as f:
-                        filename = os.path.basename(f.name)
-                        filedata = f.read()
-                        mimetype = (
-                            mimetypes.guess_type(filename)[0]
-                            or 'application/octet-stream'
-                        )
-                        params.append(
-                            tuple([k, tuple([filename, filedata, mimetype])])
-                        )
-
+        for k, v in files.items():
+            if isinstance(v, str):
+                with open(v, 'rb') as f:
+                    filename = os.path.basename(f.name)
+                    filedata = f.read()
+            elif isinstance(v, bytes):
+                filename = k
+                filedata = v
+            else:
+                raise ValueError("Unsupported file value")
+            mimetype = (
+                mimetypes.guess_type(filename)[0]
+                or 'application/octet-stream'
+            )
+            params.append(
+                tuple([k, tuple([filename, filedata, mimetype])])
+            )
         return params
 
     def select_header_accept(self, accepts: List[str]) -> Optional[str]:

platform_api_client/api_client.py

@@ -14,7 +14,6 @@
 
 
 # import models into model package
-from platform_api_client.models.auth_secret import AuthSecret
 from platform_api_client.models.client_secret_response import ClientSecretResponse
 from platform_api_client.models.create_compute_deployment_request import CreateComputeDeploymentRequest
 from platform_api_client.models.create_compute_deployment_response import CreateComputeDeploymentResponse
@@ -30,6 +29,7 @@
 from platform_api_client.models.deployment_type import DeploymentType
 from platform_api_client.models.endpoint_ready_state import EndpointReadyState
 from platform_api_client.models.get_compute_deployment_response import GetComputeDeploymentResponse
+from platform_api_client.models.get_deployment_log_response import GetDeploymentLogResponse
 from platform_api_client.models.get_deployment_response import GetDeploymentResponse
 from platform_api_client.models.get_inference_deployment_response import GetInferenceDeploymentResponse
 from platform_api_client.models.get_training_deployment_response import GetTrainingDeploymentResponse

platform_api_client/models/__init__.py

@@ -19,7 +19,6 @@
 
 from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from platform_api_client.models.auth_secret import AuthSecret
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -30,12 +29,10 @@ class CreateComputeDeploymentRequest(BaseModel):
     name: StrictStr
     image_url: StrictStr
     hardware_instance_id: StrictInt
-    env_vars: Optional[Dict[str, StrictStr]] = None
-    secrets: Optional[AuthSecret] = None
     ssh_key: Optional[StrictStr] = None
-    username: Optional[StrictStr] = None
-    password: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["name", "image_url", "hardware_instance_id", "env_vars", "secrets", "ssh_key", "username", "password"]
+    username: StrictStr
+    password: StrictStr
+    __properties: ClassVar[List[str]] = ["name", "image_url", "hardware_instance_id", "ssh_key", "username", "password"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -76,34 +73,11 @@ def to_dict(self) -> Dict[str, Any]:
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of secrets
-        if self.secrets:
-            _dict['secrets'] = self.secrets.to_dict()
-        # set to None if env_vars (nullable) is None
-        # and model_fields_set contains the field
-        if self.env_vars is None and "env_vars" in self.model_fields_set:
-            _dict['env_vars'] = None
-
-        # set to None if secrets (nullable) is None
-        # and model_fields_set contains the field
-        if self.secrets is None and "secrets" in self.model_fields_set:
-            _dict['secrets'] = None
-
         # set to None if ssh_key (nullable) is None
         # and model_fields_set contains the field
         if self.ssh_key is None and "ssh_key" in self.model_fields_set:
             _dict['ssh_key'] = None
 
-        # set to None if username (nullable) is None
-        # and model_fields_set contains the field
-        if self.username is None and "username" in self.model_fields_set:
-            _dict['username'] = None
-
-        # set to None if password (nullable) is None
-        # and model_fields_set contains the field
-        if self.password is None and "password" in self.model_fields_set:
-            _dict['password'] = None
-
         return _dict
 
     @classmethod
@@ -119,8 +93,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "name": obj.get("name"),
             "image_url": obj.get("image_url"),
             "hardware_instance_id": obj.get("hardware_instance_id"),
-            "env_vars": obj.get("env_vars"),
-            "secrets": AuthSecret.from_dict(obj["secrets"]) if obj.get("secrets") is not None else None,
             "ssh_key": obj.get("ssh_key"),
             "username": obj.get("username"),
             "password": obj.get("password")

platform_api_client/models/create_compute_deployment_request.py

@@ -30,7 +30,8 @@ class CreateComputeDeploymentResponse(BaseModel):
     id: StrictInt
     created_at: datetime
     endpoint_url: StrictStr
-    __properties: ClassVar[List[str]] = ["id", "created_at", "endpoint_url"]
+    port: StrictInt
+    __properties: ClassVar[List[str]] = ["id", "created_at", "endpoint_url", "port"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -85,7 +86,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         _obj = cls.model_validate({
             "id": obj.get("id"),
             "created_at": obj.get("created_at"),
-            "endpoint_url": obj.get("endpoint_url")
+            "endpoint_url": obj.get("endpoint_url"),
+            "port": obj.get("port")
         })
         return _obj
 

platform_api_client/models/create_compute_deployment_response.py

@@ -19,7 +19,6 @@
 
 from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from platform_api_client.models.auth_secret import AuthSecret
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -30,14 +29,16 @@ class CreateInferenceDeploymentRequest(BaseModel):
     name: StrictStr
     image_url: StrictStr
     hardware_instance_id: StrictInt
-    env_vars: Optional[Dict[str, StrictStr]] = None
-    secrets: Optional[AuthSecret] = None
     port: StrictInt
     min_replicas: StrictInt
     max_replicas: StrictInt
     timeout: Optional[StrictInt] = None
     healthcheck: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["name", "image_url", "hardware_instance_id", "env_vars", "secrets", "port", "min_replicas", "max_replicas", "timeout", "healthcheck"]
+    env_vars: Optional[Dict[str, StrictStr]] = None
+    command: Optional[List[StrictStr]] = None
+    command_args: Optional[List[StrictStr]] = None
+    endpoint_certificate_authority: Optional[StrictStr] = None
+    __properties: ClassVar[List[str]] = ["name", "image_url", "hardware_instance_id", "port", "min_replicas", "max_replicas", "timeout", "healthcheck", "env_vars", "command", "command_args", "endpoint_certificate_authority"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -78,28 +79,35 @@ def to_dict(self) -> Dict[str, Any]:
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of secrets
-        if self.secrets:
-            _dict['secrets'] = self.secrets.to_dict()
+        # set to None if timeout (nullable) is None
+        # and model_fields_set contains the field
+        if self.timeout is None and "timeout" in self.model_fields_set:
+            _dict['timeout'] = None
+
+        # set to None if healthcheck (nullable) is None
+        # and model_fields_set contains the field
+        if self.healthcheck is None and "healthcheck" in self.model_fields_set:
+            _dict['healthcheck'] = None
+
         # set to None if env_vars (nullable) is None
         # and model_fields_set contains the field
         if self.env_vars is None and "env_vars" in self.model_fields_set:
             _dict['env_vars'] = None
 
-        # set to None if secrets (nullable) is None
+        # set to None if command (nullable) is None
         # and model_fields_set contains the field
-        if self.secrets is None and "secrets" in self.model_fields_set:
-            _dict['secrets'] = None
+        if self.command is None and "command" in self.model_fields_set:
+            _dict['command'] = None
 
-        # set to None if timeout (nullable) is None
+        # set to None if command_args (nullable) is None
         # and model_fields_set contains the field
-        if self.timeout is None and "timeout" in self.model_fields_set:
-            _dict['timeout'] = None
+        if self.command_args is None and "command_args" in self.model_fields_set:
+            _dict['command_args'] = None
 
-        # set to None if healthcheck (nullable) is None
+        # set to None if endpoint_certificate_authority (nullable) is None
         # and model_fields_set contains the field
-        if self.healthcheck is None and "healthcheck" in self.model_fields_set:
-            _dict['healthcheck'] = None
+        if self.endpoint_certificate_authority is None and "endpoint_certificate_authority" in self.model_fields_set:
+            _dict['endpoint_certificate_authority'] = None
 
         return _dict
 
@@ -116,13 +124,15 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "name": obj.get("name"),
             "image_url": obj.get("image_url"),
             "hardware_instance_id": obj.get("hardware_instance_id"),
-            "env_vars": obj.get("env_vars"),
-            "secrets": AuthSecret.from_dict(obj["secrets"]) if obj.get("secrets") is not None else None,
             "port": obj.get("port"),
             "min_replicas": obj.get("min_replicas"),
             "max_replicas": obj.get("max_replicas"),
             "timeout": obj.get("timeout"),
-            "healthcheck": obj.get("healthcheck")
+            "healthcheck": obj.get("healthcheck"),
+            "env_vars": obj.get("env_vars"),
+            "command": obj.get("command"),
+            "command_args": obj.get("command_args"),
+            "endpoint_certificate_authority": obj.get("endpoint_certificate_authority")
         })
         return _obj
 

platform_api_client/models/create_inference_deployment_request.py

@@ -18,8 +18,7 @@
 import json
 
 from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr
-from typing import Any, ClassVar, Dict, List, Optional
-from platform_api_client.models.auth_secret import AuthSecret
+from typing import Any, ClassVar, Dict, List
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -30,9 +29,7 @@ class CreateTrainingDeploymentRequest(BaseModel):
     name: StrictStr
     image_url: StrictStr
     hardware_instance_id: StrictInt
-    env_vars: Optional[Dict[str, StrictStr]] = None
-    secrets: Optional[AuthSecret] = None
-    __properties: ClassVar[List[str]] = ["name", "image_url", "hardware_instance_id", "env_vars", "secrets"]
+    __properties: ClassVar[List[str]] = ["name", "image_url", "hardware_instance_id"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -73,19 +70,6 @@ def to_dict(self) -> Dict[str, Any]:
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of secrets
-        if self.secrets:
-            _dict['secrets'] = self.secrets.to_dict()
-        # set to None if env_vars (nullable) is None
-        # and model_fields_set contains the field
-        if self.env_vars is None and "env_vars" in self.model_fields_set:
-            _dict['env_vars'] = None
-
-        # set to None if secrets (nullable) is None
-        # and model_fields_set contains the field
-        if self.secrets is None and "secrets" in self.model_fields_set:
-            _dict['secrets'] = None
-
         return _dict
 
     @classmethod
@@ -100,9 +84,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         _obj = cls.model_validate({
             "name": obj.get("name"),
             "image_url": obj.get("image_url"),
-            "hardware_instance_id": obj.get("hardware_instance_id"),
-            "env_vars": obj.get("env_vars"),
-            "secrets": AuthSecret.from_dict(obj["secrets"]) if obj.get("secrets") is not None else None
+            "hardware_instance_id": obj.get("hardware_instance_id")
         })
         return _obj
 

platform_api_client/models/create_training_deployment_request.py

@@ -29,7 +29,6 @@ class DeploymentStatus(str, Enum):
     ACTIVE = 'active'
     PAUSED = 'paused'
     DELETED = 'deleted'
-    FAILED = 'failed'
 
     @classmethod
     def from_json(cls, json_str: str) -> Self: