wds-client 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

wds_client/models/import_request.py

@@ -3,184 +3,96 @@
 """
     Workspace Data Service
 
-    This page lists current APIs. As of v0.2, all APIs are subject to change without notice.   # noqa: E501
+    This page lists current APIs.  All v0.2 APIs are subject to change without notice.  Changelog at [https://github.com/DataBiosphere/terra-workspace-data-service/releases](https://github.com/DataBiosphere/terra-workspace-data-service/releases) 
 
     The version of the OpenAPI document: v0.2
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
 
 
+from __future__ import annotations
 import pprint
 import re  # noqa: F401
+import json
 
-import six
-
-from wds_client.configuration import Configuration
-
-
-class ImportRequest(object):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
 
+class ImportRequest(BaseModel):
     """
-    Attributes:
-      openapi_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    openapi_types = {
-        'type': 'str',
-        'url': 'str',
-        'options': 'dict(str, object)'
-    }
-
-    attribute_map = {
-        'type': 'type',
-        'url': 'url',
-        'options': 'options'
-    }
-
-    def __init__(self, type=None, url=None, options=None, local_vars_configuration=None):  # noqa: E501
-        """ImportRequest - a model defined in OpenAPI"""  # noqa: E501
-        if local_vars_configuration is None:
-            local_vars_configuration = Configuration()
-        self.local_vars_configuration = local_vars_configuration
-
-        self._type = None
-        self._url = None
-        self._options = None
-        self.discriminator = None
-
-        self.type = type
-        self.url = url
-        if options is not None:
-            self.options = options
-
-    @property
-    def type(self):
-        """Gets the type of this ImportRequest.  # noqa: E501
-
-        format of file to import  # noqa: E501
-
-        :return: The type of this ImportRequest.  # noqa: E501
-        :rtype: str
+    ImportRequest
+    """ # noqa: E501
+    type: StrictStr = Field(description="format of file to import")
+    url: StrictStr = Field(description="url from which to import")
+    options: Optional[Dict[str, Any]] = Field(default=None, description="key-value pairs to configure this import. Options vary based on the import file type.")
+    __properties: ClassVar[List[str]] = ["type", "url", "options"]
+
+    @field_validator('type')
+    def type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in set(['PFB', 'RAWLSJSON', 'TDRMANIFEST']):
+            raise ValueError("must be one of enum values ('PFB', 'RAWLSJSON', 'TDRMANIFEST')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of ImportRequest from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
         """
-        return self._type
+        excluded_fields: Set[str] = set([
+        ])
 
-    @type.setter
-    def type(self, type):
-        """Sets the type of this ImportRequest.
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
 
-        format of file to import  # noqa: E501
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of ImportRequest from a dict"""
+        if obj is None:
+            return None
 
-        :param type: The type of this ImportRequest.  # noqa: E501
-        :type: str
-        """
-        if self.local_vars_configuration.client_side_validation and type is None:  # noqa: E501
-            raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
-        allowed_values = ["PFB", "RAWLSJSON", "TDRMANIFEST"]  # noqa: E501
-        if self.local_vars_configuration.client_side_validation and type not in allowed_values:  # noqa: E501
-            raise ValueError(
-                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
-                .format(type, allowed_values)
-            )
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
 
-        self._type = type
+        _obj = cls.model_validate({
+            "type": obj.get("type"),
+            "url": obj.get("url"),
+            "options": obj.get("options")
+        })
+        return _obj
 
-    @property
-    def url(self):
-        """Gets the url of this ImportRequest.  # noqa: E501
-
-        url from which to import  # noqa: E501
-
-        :return: The url of this ImportRequest.  # noqa: E501
-        :rtype: str
-        """
-        return self._url
-
-    @url.setter
-    def url(self, url):
-        """Sets the url of this ImportRequest.
-
-        url from which to import  # noqa: E501
-
-        :param url: The url of this ImportRequest.  # noqa: E501
-        :type: str
-        """
-        if self.local_vars_configuration.client_side_validation and url is None:  # noqa: E501
-            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
-
-        self._url = url
-
-    @property
-    def options(self):
-        """Gets the options of this ImportRequest.  # noqa: E501
-
-        key-value pairs to configure this import. Options vary based on the import file type.  # noqa: E501
-
-        :return: The options of this ImportRequest.  # noqa: E501
-        :rtype: dict(str, object)
-        """
-        return self._options
-
-    @options.setter
-    def options(self, options):
-        """Sets the options of this ImportRequest.
-
-        key-value pairs to configure this import. Options vary based on the import file type.  # noqa: E501
-
-        :param options: The options of this ImportRequest.  # noqa: E501
-        :type: dict(str, object)
-        """
 
-        self._options = options
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.openapi_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ImportRequest):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, ImportRequest):
-            return True
-
-        return self.to_dict() != other.to_dict()

wds_client/models/job.py

@@ -3,258 +3,102 @@
 """
     Workspace Data Service
 
-    This page lists current APIs. As of v0.2, all APIs are subject to change without notice.   # noqa: E501
+    This page lists current APIs.  All v0.2 APIs are subject to change without notice.  Changelog at [https://github.com/DataBiosphere/terra-workspace-data-service/releases](https://github.com/DataBiosphere/terra-workspace-data-service/releases) 
 
     The version of the OpenAPI document: v0.2
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
 
 
+from __future__ import annotations
 import pprint
 import re  # noqa: F401
+import json
 
-import six
-
-from wds_client.configuration import Configuration
-
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
 
-class Job(object):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      openapi_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
+class Job(BaseModel):
     """
-    openapi_types = {
-        'job_id': 'str',
-        'job_type': 'str',
-        'status': 'str',
-        'created': 'str',
-        'updated': 'str',
-        'error_message': 'str'
-    }
-
-    attribute_map = {
-        'job_id': 'jobId',
-        'job_type': 'jobType',
-        'status': 'status',
-        'created': 'created',
-        'updated': 'updated',
-        'error_message': 'errorMessage'
-    }
-
-    def __init__(self, job_id=None, job_type=None, status=None, created=None, updated=None, error_message=None, local_vars_configuration=None):  # noqa: E501
-        """Job - a model defined in OpenAPI"""  # noqa: E501
-        if local_vars_configuration is None:
-            local_vars_configuration = Configuration()
-        self.local_vars_configuration = local_vars_configuration
-
-        self._job_id = None
-        self._job_type = None
-        self._status = None
-        self._created = None
-        self._updated = None
-        self._error_message = None
-        self.discriminator = None
-
-        self.job_id = job_id
-        if job_type is not None:
-            self.job_type = job_type
-        self.status = status
-        self.created = created
-        self.updated = updated
-        if error_message is not None:
-            self.error_message = error_message
-
-    @property
-    def job_id(self):
-        """Gets the job_id of this Job.  # noqa: E501
-
-
-        :return: The job_id of this Job.  # noqa: E501
-        :rtype: str
-        """
-        return self._job_id
-
-    @job_id.setter
-    def job_id(self, job_id):
-        """Sets the job_id of this Job.
-
-
-        :param job_id: The job_id of this Job.  # noqa: E501
-        :type: str
-        """
-        if self.local_vars_configuration.client_side_validation and job_id is None:  # noqa: E501
-            raise ValueError("Invalid value for `job_id`, must not be `None`")  # noqa: E501
-
-        self._job_id = job_id
-
-    @property
-    def job_type(self):
-        """Gets the job_type of this Job.  # noqa: E501
-
-
-        :return: The job_type of this Job.  # noqa: E501
-        :rtype: str
-        """
-        return self._job_type
-
-    @job_type.setter
-    def job_type(self, job_type):
-        """Sets the job_type of this Job.
-
-
-        :param job_type: The job_type of this Job.  # noqa: E501
-        :type: str
-        """
-
-        self._job_type = job_type
-
-    @property
-    def status(self):
-        """Gets the status of this Job.  # noqa: E501
-
-
-        :return: The status of this Job.  # noqa: E501
-        :rtype: str
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this Job.
-
-
-        :param status: The status of this Job.  # noqa: E501
-        :type: str
-        """
-        if self.local_vars_configuration.client_side_validation and status is None:  # noqa: E501
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-        allowed_values = ["QUEUED", "RUNNING", "SUCCEEDED", "ERROR", "CANCELLED", "UNKNOWN"]  # noqa: E501
-        if self.local_vars_configuration.client_side_validation and status not in allowed_values:  # noqa: E501
-            raise ValueError(
-                "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
-                .format(status, allowed_values)
-            )
-
-        self._status = status
-
-    @property
-    def created(self):
-        """Gets the created of this Job.  # noqa: E501
-
-
-        :return: The created of this Job.  # noqa: E501
-        :rtype: str
+    Job
+    """ # noqa: E501
+    job_id: StrictStr = Field(alias="jobId")
+    job_type: Optional[StrictStr] = Field(default=None, alias="jobType")
+    status: StrictStr
+    created: StrictStr
+    updated: StrictStr
+    error_message: Optional[StrictStr] = Field(default=None, alias="errorMessage")
+    __properties: ClassVar[List[str]] = ["jobId", "jobType", "status", "created", "updated", "errorMessage"]
+
+    @field_validator('status')
+    def status_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in set(['QUEUED', 'RUNNING', 'SUCCEEDED', 'ERROR', 'CANCELLED', 'UNKNOWN']):
+            raise ValueError("must be one of enum values ('QUEUED', 'RUNNING', 'SUCCEEDED', 'ERROR', 'CANCELLED', 'UNKNOWN')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of Job from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
         """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this Job.
-
-
-        :param created: The created of this Job.  # noqa: E501
-        :type: str
-        """
-        if self.local_vars_configuration.client_side_validation and created is None:  # noqa: E501
-            raise ValueError("Invalid value for `created`, must not be `None`")  # noqa: E501
-
-        self._created = created
-
-    @property
-    def updated(self):
-        """Gets the updated of this Job.  # noqa: E501
-
-
-        :return: The updated of this Job.  # noqa: E501
-        :rtype: str
-        """
-        return self._updated
-
-    @updated.setter
-    def updated(self, updated):
-        """Sets the updated of this Job.
-
-
-        :param updated: The updated of this Job.  # noqa: E501
-        :type: str
-        """
-        if self.local_vars_configuration.client_side_validation and updated is None:  # noqa: E501
-            raise ValueError("Invalid value for `updated`, must not be `None`")  # noqa: E501
-
-        self._updated = updated
-
-    @property
-    def error_message(self):
-        """Gets the error_message of this Job.  # noqa: E501
-
-
-        :return: The error_message of this Job.  # noqa: E501
-        :rtype: str
-        """
-        return self._error_message
-
-    @error_message.setter
-    def error_message(self, error_message):
-        """Sets the error_message of this Job.
-
-
-        :param error_message: The error_message of this Job.  # noqa: E501
-        :type: str
-        """
-
-        self._error_message = error_message
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.openapi_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, Job):
-            return False
-
-        return self.to_dict() == other.to_dict()
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of Job from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "jobId": obj.get("jobId"),
+            "jobType": obj.get("jobType"),
+            "status": obj.get("status"),
+            "created": obj.get("created"),
+            "updated": obj.get("updated"),
+            "errorMessage": obj.get("errorMessage")
+        })
+        return _obj
 
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, Job):
-            return True
 
-        return self.to_dict() != other.to_dict()