Regenerate client from commit 39e9110 of spec repo (#152)

Co-authored-by: ci.datadog-api-spec <[email protected]>

Author: api-clients-generation-pipeline[bot]

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.3.0",
-            "regenerated": "2020-11-16 10:16:59.959518",
-            "spec_repo_commit": "81a95d1"
+            "regenerated": "2020-11-16 16:32:33.369096",
+            "spec_repo_commit": "39e9110"
         },
         "v2": {
             "apigentools_version": "1.3.0",
-            "regenerated": "2020-11-16 10:17:11.730032",
-            "spec_repo_commit": "81a95d1"
+            "regenerated": "2020-11-16 16:32:43.927281",
+            "spec_repo_commit": "39e9110"
         }
     }
 }

src/datadog_api_client/v1/configuration.py

@@ -203,6 +203,9 @@ def __init__(self, host=None,
         # Enable client side validation
         self.client_side_validation = True
 
+        # Options to pass down to the underlying urllib3 socket
+        self.socket_options = None
+
         # Keep track of unstable operations
         self.unstable_operations = {
             "get_logs_index": False,

src/datadog_api_client/v1/model_utils.py

@@ -151,14 +151,6 @@ def set_attribute(self, name, value):
             )
         self.__dict__['_data_store'][name] = value
 
-    def __setitem__(self, name, value):
-        """this allows us to set values with instance[field_name] = val"""
-        self.__setattr__(name, value)
-
-    def __getitem__(self, name):
-        """this allows us to get a value with val = instance[field_name]"""
-        return self.__getattr__(name)
-
     def __repr__(self):
         """For `print` and `pprint`"""
         return self.to_str()
@@ -167,6 +159,14 @@ def __ne__(self, other):
         """Returns true if both objects are not equal"""
         return not self == other
 
+    def __setattr__(self, attr, value):
+        """set the value of an attribute using dot notation: `instance.attr = val`"""
+        self[attr] = value
+
+    def __getattr__(self, attr):
+        """get the value of an attribute using dot notation: `instance.attr`"""
+        return self.__getitem__(attr)
+
     def __new__(cls, *args, **kwargs):
         # this function uses the discriminator to
         # pick a new schema/class to instantiate because a discriminator
@@ -285,40 +285,39 @@ class ModelSimple(OpenApiModel):
     """the parent class of models whose type != object in their
     swagger/openapi"""
 
-    def __setattr__(self, name, value):
-        """this allows us to set a value with instance.field_name = val"""
+    def __setitem__(self, name, value):
+        """set the value of an attribute using square-bracket notation: `instance[attr] = val`"""
         if name in self.required_properties:
             self.__dict__[name] = value
             return
 
         self.set_attribute(name, value)
 
-    def __getattr__(self, name):
-        """this allows us to get a value with val = instance.field_name"""
+    def get(self, name, default=None):
+        """returns the value of an attribute or some default value if the attribute was not set"""
         if name in self.required_properties:
             return self.__dict__[name]
 
-        if name in self.__dict__['_data_store']:
-            return self.__dict__['_data_store'][name]
+        return self.__dict__['_data_store'].get(name, default)
+
+    def __getitem__(self, name):
+        """get the value of an attribute using square-bracket notation: `instance[attr]`"""
+        if name in self:
+            return self.get(name)
 
-        path_to_item = []
-        if self._path_to_item:
-            path_to_item.extend(self._path_to_item)
-        path_to_item.append(name)
         raise ApiAttributeError(
             "{0} has no attribute '{1}'".format(
                 type(self).__name__, name),
-            [name]
+            [e for e in [self._path_to_item, name] if e]
         )
 
     def __contains__(self, name):
-        """this allows us to use `in` operator: `'attr' in instance`"""
+        """used by `in` operator to check if an attrbute value was set in an instance: `'attr' in instance`"""
         if name in self.required_properties:
             return name in self.__dict__
 
         return name in self.__dict__['_data_store']
 
-
     def to_str(self):
         """Returns the string representation of the model"""
         return str(self.value)
@@ -341,40 +340,39 @@ class ModelNormal(OpenApiModel):
     """the parent class of models whose type == object in their
     swagger/openapi"""
 
-    def __setattr__(self, name, value):
-        """this allows us to set a value with instance.field_name = val"""
+    def __setitem__(self, name, value):
+        """set the value of an attribute using square-bracket notation: `instance[attr] = val`"""
         if name in self.required_properties:
             self.__dict__[name] = value
             return
 
         self.set_attribute(name, value)
 
-    def __getattr__(self, name):
-        """this allows us to get a value with val = instance.field_name"""
+    def get(self, name, default=None):
+        """returns the value of an attribute or some default value if the attribute was not set"""
         if name in self.required_properties:
             return self.__dict__[name]
 
-        if name in self.__dict__['_data_store']:
-            return self.__dict__['_data_store'][name]
+        return self.__dict__['_data_store'].get(name, default)
+
+    def __getitem__(self, name):
+        """get the value of an attribute using square-bracket notation: `instance[attr]`"""
+        if name in self:
+            return self.get(name)
 
-        path_to_item = []
-        if self._path_to_item:
-            path_to_item.extend(self._path_to_item)
-        path_to_item.append(name)
         raise ApiAttributeError(
             "{0} has no attribute '{1}'".format(
                 type(self).__name__, name),
-            [name]
+            [e for e in [self._path_to_item, name] if e]
         )
 
     def __contains__(self, name):
-        """this allows us to use `in` operator: `'attr' in instance`"""
+        """used by `in` operator to check if an attrbute value was set in an instance: `'attr' in instance`"""
         if name in self.required_properties:
             return name in self.__dict__
 
         return name in self.__dict__['_data_store']
 
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         return model_to_dict(self, serialize=False)
@@ -427,8 +425,8 @@ class ModelComposed(OpenApiModel):
     which contain the value that the key is referring to.
     """
 
-    def __setattr__(self, name, value):
-        """this allows us to set a value with instance.field_name = val"""
+    def __setitem__(self, name, value):
+        """set the value of an attribute using square-bracket notation: `instance[attr] = val`"""
         if name in self.required_properties:
             self.__dict__[name] = value
             return
@@ -449,28 +447,22 @@ def __setattr__(self, name, value):
                     )
             return None
 
-        path_to_item = []
-        if self._path_to_item:
-            path_to_item.extend(self._path_to_item)
-        path_to_item.append(name)
         raise ApiAttributeError(
             "{0} has no attribute '{1}'".format(
                 type(self).__name__, name),
-            path_to_item
+            [e for e in [self._path_to_item, name] if e]
         )
 
-    def __getattr__(self, name):
-        """this allows us to get a value with val = instance.field_name"""
+    __unset_attribute_value__ = object()
+
+    def get(self, name, default=None):
+        """returns the value of an attribute or some default value if the attribute was not set"""
         if name in self.required_properties:
             return self.__dict__[name]
 
         # get the attribute from the correct instance
         model_instances = self._var_name_to_model_instances.get(
             name, self._additional_properties_model_instances)
-        path_to_item = []
-        if self._path_to_item:
-            path_to_item.extend(self._path_to_item)
-        path_to_item.append(name)
         values = []
         # A composed model stores child (oneof/anyOf/allOf) models under
         # self._var_name_to_model_instances. A named property can exist in
@@ -484,23 +476,30 @@ def __getattr__(self, name):
                         values.append(v)
         len_values = len(values)
         if len_values == 0:
-            raise ApiAttributeError(
-                "{0} has no attribute '{1}'".format(
-                    type(self).__name__, name),
-                path_to_item
-            )
+            return default
         elif len_values == 1:
             return values[0]
         elif len_values > 1:
             raise ApiValueError(
                 "Values stored for property {0} in {1} differ when looking "
                 "at self and self's composed instances. All values must be "
                 "the same".format(name, type(self).__name__),
-                path_to_item
+                [e for e in [self._path_to_item, name] if e]
             )
 
+    def __getitem__(self, name):
+        """get the value of an attribute using square-bracket notation: `instance[attr]`"""
+        value = self.get(name, self.__unset_attribute_value__)
+        if value is self.__unset_attribute_value__:
+            raise ApiAttributeError(
+                "{0} has no attribute '{1}'".format(
+                    type(self).__name__, name),
+                    [e for e in [self._path_to_item, name] if e]
+            )
+        return value
+
     def __contains__(self, name):
-        """this allows us to use `in` operator: `'attr' in instance`"""
+        """used by `in` operator to check if an attrbute value was set in an instance: `'attr' in instance`"""
 
         if name in self.required_properties:
             return name in self.__dict__
@@ -515,7 +514,6 @@ def __contains__(self, name):
 
         return False
 
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         return model_to_dict(self, serialize=False)

src/datadog_api_client/v1/rest.py

@@ -67,6 +67,9 @@ def __init__(self, configuration, pools_size=4, maxsize=None):
         if configuration.retries is not None:
             addition_pool_args['retries'] = configuration.retries
 
+        if configuration.socket_options is not None:
+            addition_pool_args['socket_options'] = configuration.socket_options
+
         if maxsize is None:
             if configuration.connection_pool_maxsize is not None:
                 maxsize = configuration.connection_pool_maxsize

src/datadog_api_client/v2/configuration.py

@@ -203,6 +203,9 @@ def __init__(self, host=None,
         # Enable client side validation
         self.client_side_validation = True
 
+        # Options to pass down to the underlying urllib3 socket
+        self.socket_options = None
+
         # Keep track of unstable operations
         self.unstable_operations = {
             "create_incident_service": False,