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

wds_client/models/generic_job.py

@@ -3,348 +3,116 @@
 """
     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 datetime import datetime
+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 GenericJob(object):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
+class GenericJob(BaseModel):
     """
+    Generic representation of a job, no opinion on inputs and result for the job. See individual APIs for more guidance on expected input and result payloads. 
+    """ # noqa: E501
+    job_id: StrictStr = Field(alias="jobId")
+    job_type: StrictStr = Field(alias="jobType")
+    instance_id: StrictStr = Field(alias="instanceId")
+    status: StrictStr
+    created: datetime
+    updated: datetime
+    error_message: Optional[StrictStr] = Field(default=None, alias="errorMessage")
+    input: Optional[Dict[str, Any]] = Field(default=None, description="Input arguments for this job")
+    result: Optional[Dict[str, Any]] = Field(default=None, description="Result of this job")
+    __properties: ClassVar[List[str]] = ["jobId", "jobType", "instanceId", "status", "created", "updated", "errorMessage", "input", "result"]
+
+    @field_validator('job_type')
+    def job_type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in set(['DATA_IMPORT', 'UNKNOWN']):
+            raise ValueError("must be one of enum values ('DATA_IMPORT', 'UNKNOWN')")
+        return value
+
+    @field_validator('status')
+    def status_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in set(['CREATED', 'QUEUED', 'RUNNING', 'SUCCEEDED', 'ERROR', 'CANCELLED', 'UNKNOWN']):
+            raise ValueError("must be one of enum values ('CREATED', '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 GenericJob 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.
+        """
+        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 GenericJob 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"),
+            "instanceId": obj.get("instanceId"),
+            "status": obj.get("status"),
+            "created": obj.get("created"),
+            "updated": obj.get("updated"),
+            "errorMessage": obj.get("errorMessage"),
+            "input": obj.get("input"),
+            "result": obj.get("result")
+        })
+        return _obj
 
-    """
-    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 = {
-        'job_id': 'str',
-        'job_type': 'str',
-        'instance_id': 'str',
-        'status': 'str',
-        'created': 'datetime',
-        'updated': 'datetime',
-        'error_message': 'str',
-        'input': 'object',
-        'result': 'object'
-    }
-
-    attribute_map = {
-        'job_id': 'jobId',
-        'job_type': 'jobType',
-        'instance_id': 'instanceId',
-        'status': 'status',
-        'created': 'created',
-        'updated': 'updated',
-        'error_message': 'errorMessage',
-        'input': 'input',
-        'result': 'result'
-    }
-
-    def __init__(self, job_id=None, job_type=None, instance_id=None, status=None, created=None, updated=None, error_message=None, input=None, result=None, local_vars_configuration=None):  # noqa: E501
-        """GenericJob - 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._instance_id = None
-        self._status = None
-        self._created = None
-        self._updated = None
-        self._error_message = None
-        self._input = None
-        self._result = None
-        self.discriminator = None
-
-        self.job_id = job_id
-        self.job_type = job_type
-        self.instance_id = instance_id
-        self.status = status
-        self.created = created
-        self.updated = updated
-        if error_message is not None:
-            self.error_message = error_message
-        if input is not None:
-            self.input = input
-        if result is not None:
-            self.result = result
-
-    @property
-    def job_id(self):
-        """Gets the job_id of this GenericJob.  # noqa: E501
-
-
-        :return: The job_id of this GenericJob.  # noqa: E501
-        :rtype: str
-        """
-        return self._job_id
-
-    @job_id.setter
-    def job_id(self, job_id):
-        """Sets the job_id of this GenericJob.
-
-
-        :param job_id: The job_id of this GenericJob.  # 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 GenericJob.  # noqa: E501
-
-
-        :return: The job_type of this GenericJob.  # noqa: E501
-        :rtype: str
-        """
-        return self._job_type
-
-    @job_type.setter
-    def job_type(self, job_type):
-        """Sets the job_type of this GenericJob.
-
-
-        :param job_type: The job_type of this GenericJob.  # noqa: E501
-        :type: str
-        """
-        if self.local_vars_configuration.client_side_validation and job_type is None:  # noqa: E501
-            raise ValueError("Invalid value for `job_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DATA_IMPORT", "UNKNOWN"]  # noqa: E501
-        if self.local_vars_configuration.client_side_validation and job_type not in allowed_values:  # noqa: E501
-            raise ValueError(
-                "Invalid value for `job_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(job_type, allowed_values)
-            )
-
-        self._job_type = job_type
-
-    @property
-    def instance_id(self):
-        """Gets the instance_id of this GenericJob.  # noqa: E501
-
-
-        :return: The instance_id of this GenericJob.  # noqa: E501
-        :rtype: str
-        """
-        return self._instance_id
-
-    @instance_id.setter
-    def instance_id(self, instance_id):
-        """Sets the instance_id of this GenericJob.
-
-
-        :param instance_id: The instance_id of this GenericJob.  # noqa: E501
-        :type: str
-        """
-        if self.local_vars_configuration.client_side_validation and instance_id is None:  # noqa: E501
-            raise ValueError("Invalid value for `instance_id`, must not be `None`")  # noqa: E501
-
-        self._instance_id = instance_id
-
-    @property
-    def status(self):
-        """Gets the status of this GenericJob.  # noqa: E501
-
-
-        :return: The status of this GenericJob.  # noqa: E501
-        :rtype: str
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this GenericJob.
-
-
-        :param status: The status of this GenericJob.  # 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 = ["CREATED", "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 GenericJob.  # noqa: E501
-
-
-        :return: The created of this GenericJob.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this GenericJob.
-
-
-        :param created: The created of this GenericJob.  # noqa: E501
-        :type: datetime
-        """
-        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 GenericJob.  # noqa: E501
-
-
-        :return: The updated of this GenericJob.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._updated
-
-    @updated.setter
-    def updated(self, updated):
-        """Sets the updated of this GenericJob.
-
-
-        :param updated: The updated of this GenericJob.  # noqa: E501
-        :type: datetime
-        """
-        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 GenericJob.  # noqa: E501
-
-
-        :return: The error_message of this GenericJob.  # noqa: E501
-        :rtype: str
-        """
-        return self._error_message
-
-    @error_message.setter
-    def error_message(self, error_message):
-        """Sets the error_message of this GenericJob.
-
-
-        :param error_message: The error_message of this GenericJob.  # noqa: E501
-        :type: str
-        """
-
-        self._error_message = error_message
-
-    @property
-    def input(self):
-        """Gets the input of this GenericJob.  # noqa: E501
-
-        Input arguments for this job  # noqa: E501
-
-        :return: The input of this GenericJob.  # noqa: E501
-        :rtype: object
-        """
-        return self._input
-
-    @input.setter
-    def input(self, input):
-        """Sets the input of this GenericJob.
-
-        Input arguments for this job  # noqa: E501
-
-        :param input: The input of this GenericJob.  # noqa: E501
-        :type: object
-        """
-
-        self._input = input
-
-    @property
-    def result(self):
-        """Gets the result of this GenericJob.  # noqa: E501
-
-        Result of this job  # noqa: E501
-
-        :return: The result of this GenericJob.  # noqa: E501
-        :rtype: object
-        """
-        return self._result
-
-    @result.setter
-    def result(self, result):
-        """Sets the result of this GenericJob.
-
-        Result of this job  # noqa: E501
-
-        :param result: The result of this GenericJob.  # noqa: E501
-        :type: object
-        """
-
-        self._result = result
-
-    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, GenericJob):
-            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, GenericJob):
-            return True
 
-        return self.to_dict() != other.to_dict()

wds_client/models/git.py

@@ -3,144 +3,91 @@
 """
     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 Git(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, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from wds_client.models.commit import Commit
+from typing import Optional, Set
+from typing_extensions import Self
 
+class Git(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 = {
-        'branch': 'str',
-        'commit': 'Commit'
-    }
-
-    attribute_map = {
-        'branch': 'branch',
-        'commit': 'commit'
-    }
-
-    def __init__(self, branch=None, commit=None, local_vars_configuration=None):  # noqa: E501
-        """Git - 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._branch = None
-        self._commit = None
-        self.discriminator = None
-
-        if branch is not None:
-            self.branch = branch
-        if commit is not None:
-            self.commit = commit
-
-    @property
-    def branch(self):
-        """Gets the branch of this Git.  # noqa: E501
-
-
-        :return: The branch of this Git.  # noqa: E501
-        :rtype: str
-        """
-        return self._branch
-
-    @branch.setter
-    def branch(self, branch):
-        """Sets the branch of this Git.
-
-
-        :param branch: The branch of this Git.  # noqa: E501
-        :type: str
+    Git
+    """ # noqa: E501
+    branch: Optional[StrictStr] = None
+    commit: Optional[Commit] = None
+    __properties: ClassVar[List[str]] = ["branch", "commit"]
+
+    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 Git 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.
         """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of commit
+        if self.commit:
+            _dict['commit'] = self.commit.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of Git from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "branch": obj.get("branch"),
+            "commit": Commit.from_dict(obj["commit"]) if obj.get("commit") is not None else None
+        })
+        return _obj
 
-        self._branch = branch
-
-    @property
-    def commit(self):
-        """Gets the commit of this Git.  # noqa: E501
-
-
-        :return: The commit of this Git.  # noqa: E501
-        :rtype: Commit
-        """
-        return self._commit
-
-    @commit.setter
-    def commit(self, commit):
-        """Sets the commit of this Git.
-
-
-        :param commit: The commit of this Git.  # noqa: E501
-        :type: Commit
-        """
 
-        self._commit = commit
-
-    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, Git):
-            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, Git):
-            return True
-
-        return self.to_dict() != other.to_dict()