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

wds_client/models/search_request.py

@@ -3,235 +3,99 @@
 """
     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
+from typing import Any, ClassVar, Dict, List, Optional
+from typing_extensions import Annotated
+from wds_client.models.search_filter import SearchFilter
+from wds_client.models.search_sort_direction import SearchSortDirection
+from typing import Optional, Set
+from typing_extensions import Self
 
-
-class SearchRequest(object):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
+class SearchRequest(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 = {
-        'offset': 'int',
-        'limit': 'int',
-        'sort': 'SearchSortDirection',
-        'sort_attribute': 'str',
-        'filter': 'SearchFilter'
-    }
-
-    attribute_map = {
-        'offset': 'offset',
-        'limit': 'limit',
-        'sort': 'sort',
-        'sort_attribute': 'sortAttribute',
-        'filter': 'filter'
-    }
-
-    def __init__(self, offset=0, limit=10, sort=None, sort_attribute=None, filter=None, local_vars_configuration=None):  # noqa: E501
-        """SearchRequest - 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._offset = None
-        self._limit = None
-        self._sort = None
-        self._sort_attribute = None
-        self._filter = None
-        self.discriminator = None
-
-        if offset is not None:
-            self.offset = offset
-        if limit is not None:
-            self.limit = limit
-        if sort is not None:
-            self.sort = sort
-        if sort_attribute is not None:
-            self.sort_attribute = sort_attribute
-        if filter is not None:
-            self.filter = filter
-
-    @property
-    def offset(self):
-        """Gets the offset of this SearchRequest.  # noqa: E501
-
-        Pagination offset  # noqa: E501
-
-        :return: The offset of this SearchRequest.  # noqa: E501
-        :rtype: int
+    SearchRequest
+    """ # noqa: E501
+    offset: Optional[Annotated[int, Field(strict=True, ge=0)]] = Field(default=0, description="Pagination offset")
+    limit: Optional[Annotated[int, Field(le=1000, strict=True, ge=0)]] = Field(default=10, description="Pagination limit")
+    sort: Optional[SearchSortDirection] = None
+    sort_attribute: Optional[StrictStr] = Field(default=None, alias="sortAttribute")
+    filter: Optional[SearchFilter] = None
+    __properties: ClassVar[List[str]] = ["offset", "limit", "sort", "sortAttribute", "filter"]
+
+    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 SearchRequest 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._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this SearchRequest.
-
-        Pagination offset  # noqa: E501
-
-        :param offset: The offset of this SearchRequest.  # noqa: E501
-        :type: int
-        """
-        if (self.local_vars_configuration.client_side_validation and
-                offset is not None and offset < 0):  # noqa: E501
-            raise ValueError("Invalid value for `offset`, must be a value greater than or equal to `0`")  # noqa: E501
-
-        self._offset = offset
-
-    @property
-    def limit(self):
-        """Gets the limit of this SearchRequest.  # noqa: E501
-
-        Pagination limit  # noqa: E501
-
-        :return: The limit of this SearchRequest.  # noqa: E501
-        :rtype: int
-        """
-        return self._limit
-
-    @limit.setter
-    def limit(self, limit):
-        """Sets the limit of this SearchRequest.
-
-        Pagination limit  # noqa: E501
-
-        :param limit: The limit of this SearchRequest.  # noqa: E501
-        :type: int
-        """
-        if (self.local_vars_configuration.client_side_validation and
-                limit is not None and limit > 1000):  # noqa: E501
-            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
-        if (self.local_vars_configuration.client_side_validation and
-                limit is not None and limit < 0):  # noqa: E501
-            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `0`")  # noqa: E501
-
-        self._limit = limit
-
-    @property
-    def sort(self):
-        """Gets the sort of this SearchRequest.  # noqa: E501
+        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 filter
+        if self.filter:
+            _dict['filter'] = self.filter.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of SearchRequest from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "offset": obj.get("offset") if obj.get("offset") is not None else 0,
+            "limit": obj.get("limit") if obj.get("limit") is not None else 10,
+            "sort": obj.get("sort"),
+            "sortAttribute": obj.get("sortAttribute"),
+            "filter": SearchFilter.from_dict(obj["filter"]) if obj.get("filter") is not None else None
+        })
+        return _obj
 
 
-        :return: The sort of this SearchRequest.  # noqa: E501
-        :rtype: SearchSortDirection
-        """
-        return self._sort
-
-    @sort.setter
-    def sort(self, sort):
-        """Sets the sort of this SearchRequest.
-
-
-        :param sort: The sort of this SearchRequest.  # noqa: E501
-        :type: SearchSortDirection
-        """
-
-        self._sort = sort
-
-    @property
-    def sort_attribute(self):
-        """Gets the sort_attribute of this SearchRequest.  # noqa: E501
-
-
-        :return: The sort_attribute of this SearchRequest.  # noqa: E501
-        :rtype: str
-        """
-        return self._sort_attribute
-
-    @sort_attribute.setter
-    def sort_attribute(self, sort_attribute):
-        """Sets the sort_attribute of this SearchRequest.
-
-
-        :param sort_attribute: The sort_attribute of this SearchRequest.  # noqa: E501
-        :type: str
-        """
-
-        self._sort_attribute = sort_attribute
-
-    @property
-    def filter(self):
-        """Gets the filter of this SearchRequest.  # noqa: E501
-
-
-        :return: The filter of this SearchRequest.  # noqa: E501
-        :rtype: SearchFilter
-        """
-        return self._filter
-
-    @filter.setter
-    def filter(self, filter):
-        """Sets the filter of this SearchRequest.
-
-
-        :param filter: The filter of this SearchRequest.  # noqa: E501
-        :type: SearchFilter
-        """
-
-        self._filter = filter
-
-    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, SearchRequest):
-            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, SearchRequest):
-            return True
-
-        return self.to_dict() != other.to_dict()

wds_client/models/search_sort_direction.py

@@ -3,98 +3,35 @@
 """
     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
-"""
-
-
-import pprint
-import re  # noqa: F401
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-import six
+    Do not edit the class manually.
+"""  # noqa: E501
 
-from wds_client.configuration import Configuration
 
+from __future__ import annotations
+import json
+from enum import Enum
+from typing_extensions import Self
 
-class SearchSortDirection(object):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
 
-    Do not edit the class manually.
+class SearchSortDirection(str, Enum):
     """
-
-    """
-    allowed enum values
+    Sort direction (descending or ascending) 
     """
-    ASC = "ASC"
-    DESC = "DESC"
-
-    allowable_values = [ASC, DESC]  # noqa: E501
 
     """
-    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.
+    allowed enum values
     """
-    openapi_types = {
-    }
-
-    attribute_map = {
-    }
-
-    def __init__(self, local_vars_configuration=None):  # noqa: E501
-        """SearchSortDirection - 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.discriminator = None
-
-    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, SearchSortDirection):
-            return False
+    ASC = 'ASC'
+    DESC = 'DESC'
 
-        return self.to_dict() == other.to_dict()
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Create an instance of SearchSortDirection from a JSON string"""
+        return cls(json.loads(json_str))
 
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, SearchSortDirection):
-            return True
 
-        return self.to_dict() != other.to_dict()

wds_client/models/status_response.py

@@ -3,144 +3,87 @@
 """
     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 StatusResponse(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 typing import Optional, Set
+from typing_extensions import Self
 
+class StatusResponse(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 = {
-        'status': 'str',
-        'components': 'object'
-    }
-
-    attribute_map = {
-        'status': 'status',
-        'components': 'components'
-    }
-
-    def __init__(self, status=None, components=None, local_vars_configuration=None):  # noqa: E501
-        """StatusResponse - 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._status = None
-        self._components = None
-        self.discriminator = None
-
-        if status is not None:
-            self.status = status
-        if components is not None:
-            self.components = components
-
-    @property
-    def status(self):
-        """Gets the status of this StatusResponse.  # noqa: E501
-
-
-        :return: The status of this StatusResponse.  # noqa: E501
-        :rtype: str
+    StatusResponse
+    """ # noqa: E501
+    status: Optional[StrictStr] = None
+    components: Optional[Dict[str, Any]] = None
+    __properties: ClassVar[List[str]] = ["status", "components"]
+
+    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 StatusResponse 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._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this StatusResponse.
+        excluded_fields: Set[str] = set([
+        ])
 
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
 
-        :param status: The status of this StatusResponse.  # noqa: E501
-        :type: str
-        """
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of StatusResponse from a dict"""
+        if obj is None:
+            return None
 
-        self._status = status
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
 
-    @property
-    def components(self):
-        """Gets the components of this StatusResponse.  # noqa: E501
+        _obj = cls.model_validate({
+            "status": obj.get("status"),
+            "components": obj.get("components")
+        })
+        return _obj
 
 
-        :return: The components of this StatusResponse.  # noqa: E501
-        :rtype: object
-        """
-        return self._components
-
-    @components.setter
-    def components(self, components):
-        """Sets the components of this StatusResponse.
-
-
-        :param components: The components of this StatusResponse.  # noqa: E501
-        :type: object
-        """
-
-        self._components = components
-
-    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, StatusResponse):
-            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, StatusResponse):
-            return True
-
-        return self.to_dict() != other.to_dict()