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

wds_client/models/app.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 App(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
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
 
+class App(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 = {
-        'chart_version': 'str',
-        'image': 'str'
-    }
-
-    attribute_map = {
-        'chart_version': 'chart-version',
-        'image': 'image'
-    }
-
-    def __init__(self, chart_version=None, image=None, local_vars_configuration=None):  # noqa: E501
-        """App - 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._chart_version = None
-        self._image = None
-        self.discriminator = None
-
-        if chart_version is not None:
-            self.chart_version = chart_version
-        if image is not None:
-            self.image = image
-
-    @property
-    def chart_version(self):
-        """Gets the chart_version of this App.  # noqa: E501
-
-
-        :return: The chart_version of this App.  # noqa: E501
-        :rtype: str
+    App
+    """ # noqa: E501
+    chart_version: Optional[StrictStr] = Field(default=None, alias="chart-version")
+    image: Optional[StrictStr] = None
+    __properties: ClassVar[List[str]] = ["chart-version", "image"]
+
+    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 App 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._chart_version
-
-    @chart_version.setter
-    def chart_version(self, chart_version):
-        """Sets the chart_version of this App.
+        excluded_fields: Set[str] = set([
+        ])
 
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
 
-        :param chart_version: The chart_version of this App.  # noqa: E501
-        :type: str
-        """
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of App from a dict"""
+        if obj is None:
+            return None
 
-        self._chart_version = chart_version
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
 
-    @property
-    def image(self):
-        """Gets the image of this App.  # noqa: E501
+        _obj = cls.model_validate({
+            "chart-version": obj.get("chart-version"),
+            "image": obj.get("image")
+        })
+        return _obj
 
 
-        :return: The image of this App.  # noqa: E501
-        :rtype: str
-        """
-        return self._image
-
-    @image.setter
-    def image(self, image):
-        """Sets the image of this App.
-
-
-        :param image: The image of this App.  # noqa: E501
-        :type: str
-        """
-
-        self._image = image
-
-    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, App):
-            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, App):
-            return True
-
-        return self.to_dict() != other.to_dict()

wds_client/models/attribute_data_type.py

@@ -3,111 +3,48 @@
 """
     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
-
-from wds_client.configuration import Configuration
+    Do not edit the class manually.
+"""  # noqa: E501
 
 
-class AttributeDataType(object):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
+from __future__ import annotations
+import json
+from enum import Enum
+from typing_extensions import Self
 
-    Do not edit the class manually.
-    """
 
+class AttributeDataType(str, Enum):
     """
-    allowed enum values
+    Datatype of attribute. The enum of data types is in flux and will change. Please comment at https://docs.google.com/document/d/1d352ZoN5kEYWPjy0NqqWGxdf7HEu5VEdrLmiAv7dMmQ/edit#heading=h.naxag0augkgf. 
     """
-    BOOLEAN = "BOOLEAN"
-    NUMBER = "NUMBER"
-    DATE = "DATE"
-    DATE_TIME = "DATE_TIME"
-    STRING = "STRING"
-    JSON = "JSON"
-    RELATION = "RELATION"
-    FILE = "FILE"
-    ARRAY_OF_BOOLEAN = "ARRAY_OF_BOOLEAN"
-    ARRAY_OF_STRING = "ARRAY_OF_STRING"
-    ARRAY_OF_NUMBER = "ARRAY_OF_NUMBER"
-    ARRAY_OF_DATE = "ARRAY_OF_DATE"
-    ARRAY_OF_DATE_TIME = "ARRAY_OF_DATE_TIME"
-    ARRAY_OF_RELATION = "ARRAY_OF_RELATION"
-    ARRAY_OF_FILE = "ARRAY_OF_FILE"
-
-    allowable_values = [BOOLEAN, NUMBER, DATE, DATE_TIME, STRING, JSON, RELATION, FILE, ARRAY_OF_BOOLEAN, ARRAY_OF_STRING, ARRAY_OF_NUMBER, ARRAY_OF_DATE, ARRAY_OF_DATE_TIME, ARRAY_OF_RELATION, ARRAY_OF_FILE]  # 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
-        """AttributeDataType - 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, AttributeDataType):
-            return False
-
-        return self.to_dict() == other.to_dict()
+    BOOLEAN = 'BOOLEAN'
+    NUMBER = 'NUMBER'
+    DATE = 'DATE'
+    DATE_TIME = 'DATE_TIME'
+    STRING = 'STRING'
+    JSON = 'JSON'
+    RELATION = 'RELATION'
+    FILE = 'FILE'
+    ARRAY_OF_BOOLEAN = 'ARRAY_OF_BOOLEAN'
+    ARRAY_OF_STRING = 'ARRAY_OF_STRING'
+    ARRAY_OF_NUMBER = 'ARRAY_OF_NUMBER'
+    ARRAY_OF_DATE = 'ARRAY_OF_DATE'
+    ARRAY_OF_DATE_TIME = 'ARRAY_OF_DATE_TIME'
+    ARRAY_OF_RELATION = 'ARRAY_OF_RELATION'
+    ARRAY_OF_FILE = 'ARRAY_OF_FILE'
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Create an instance of AttributeDataType 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, AttributeDataType):
-            return True
 
-        return self.to_dict() != other.to_dict()

wds_client/models/attribute_schema.py

@@ -3,176 +3,90 @@
 """
     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 AttributeSchema(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
+from typing import Any, ClassVar, Dict, List, Optional
+from wds_client.models.attribute_data_type import AttributeDataType
+from typing import Optional, Set
+from typing_extensions import Self
 
+class AttributeSchema(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 = {
-        'name': 'str',
-        'datatype': 'AttributeDataType',
-        'relates_to': 'str'
-    }
-
-    attribute_map = {
-        'name': 'name',
-        'datatype': 'datatype',
-        'relates_to': 'relatesTo'
-    }
-
-    def __init__(self, name=None, datatype=None, relates_to=None, local_vars_configuration=None):  # noqa: E501
-        """AttributeSchema - 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._name = None
-        self._datatype = None
-        self._relates_to = None
-        self.discriminator = None
-
-        self.name = name
-        self.datatype = datatype
-        if relates_to is not None:
-            self.relates_to = relates_to
-
-    @property
-    def name(self):
-        """Gets the name of this AttributeSchema.  # noqa: E501
-
-        name of this attribute.  # noqa: E501
-
-        :return: The name of this AttributeSchema.  # noqa: E501
-        :rtype: str
+    AttributeSchema
+    """ # noqa: E501
+    name: StrictStr = Field(description="name of this attribute.")
+    datatype: AttributeDataType
+    relates_to: Optional[StrictStr] = Field(default=None, description="Name of type to which this attribute relates. Only present if this is a relation attribute.", alias="relatesTo")
+    __properties: ClassVar[List[str]] = ["name", "datatype", "relatesTo"]
+
+    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 AttributeSchema 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._name
+        excluded_fields: Set[str] = set([
+        ])
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this AttributeSchema.
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
 
-        name of this attribute.  # noqa: E501
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of AttributeSchema from a dict"""
+        if obj is None:
+            return None
 
-        :param name: The name of this AttributeSchema.  # noqa: E501
-        :type: str
-        """
-        if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
 
-        self._name = name
+        _obj = cls.model_validate({
+            "name": obj.get("name"),
+            "datatype": obj.get("datatype"),
+            "relatesTo": obj.get("relatesTo")
+        })
+        return _obj
 
-    @property
-    def datatype(self):
-        """Gets the datatype of this AttributeSchema.  # noqa: E501
-
-
-        :return: The datatype of this AttributeSchema.  # noqa: E501
-        :rtype: AttributeDataType
-        """
-        return self._datatype
-
-    @datatype.setter
-    def datatype(self, datatype):
-        """Sets the datatype of this AttributeSchema.
-
-
-        :param datatype: The datatype of this AttributeSchema.  # noqa: E501
-        :type: AttributeDataType
-        """
-        if self.local_vars_configuration.client_side_validation and datatype is None:  # noqa: E501
-            raise ValueError("Invalid value for `datatype`, must not be `None`")  # noqa: E501
-
-        self._datatype = datatype
-
-    @property
-    def relates_to(self):
-        """Gets the relates_to of this AttributeSchema.  # noqa: E501
-
-        Name of type to which this attribute relates. Only present if this is a relation attribute.  # noqa: E501
-
-        :return: The relates_to of this AttributeSchema.  # noqa: E501
-        :rtype: str
-        """
-        return self._relates_to
-
-    @relates_to.setter
-    def relates_to(self, relates_to):
-        """Sets the relates_to of this AttributeSchema.
-
-        Name of type to which this attribute relates. Only present if this is a relation attribute.  # noqa: E501
-
-        :param relates_to: The relates_to of this AttributeSchema.  # noqa: E501
-        :type: str
-        """
 
-        self._relates_to = relates_to
-
-    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, AttributeSchema):
-            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, AttributeSchema):
-            return True
-
-        return self.to_dict() != other.to_dict()