ibm-platform-services 0.60.0__py3-none-any.whl → 0.61.1__py3-none-any.whl

ibm_platform_services/global_catalog_v1.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-# (C) Copyright IBM Corp. 2021.
+# (C) Copyright IBM Corp. 2025.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-4c92c221-20210211-060810
+# IBM OpenAPI SDK Code Generator Version: 3.102.0-615ec964-20250307-203034
 
 """
 The catalog service manages offerings across geographies as the system of record. The
@@ -24,11 +24,13 @@ the endpoints to retrieve metadata about services in the catalog and manage serv
 visbility. Depending on the kind of object, the metadata can include information about
 pricing, provisioning, regions, and more. For more information, see the [catalog
 documentation](https://cloud.ibm.com/docs/overview/catalog.html#global-catalog-overview).
+
+API Version: 1.0.3
 """
 
 from datetime import datetime
 from enum import Enum
-from typing import BinaryIO, Dict, List
+from typing import BinaryIO, Dict, List, Optional
 import json
 
 from ibm_cloud_sdk_core import BaseService, DetailedResponse
@@ -71,7 +73,7 @@ class GlobalCatalogV1(BaseService):
         Construct a new client for the Global Catalog service.
 
         :param Authenticator authenticator: The authenticator specifies the authentication mechanism.
-               Get up to date information from https://github.com/IBM/python-sdk-core/blob/master/README.md
+               Get up to date information from https://github.com/IBM/python-sdk-core/blob/main/README.md
                about initializing the authenticator of your choice.
         """
         BaseService.__init__(self, service_url=self.DEFAULT_SERVICE_URL, authenticator=authenticator)
@@ -83,16 +85,16 @@ class GlobalCatalogV1(BaseService):
     def list_catalog_entries(
         self,
         *,
-        account: str = None,
-        include: str = None,
-        q: str = None,
-        sort_by: str = None,
-        descending: str = None,
-        languages: str = None,
-        catalog: bool = None,
-        complete: bool = None,
-        offset: int = None,
-        limit: int = None,
+        account: Optional[str] = None,
+        include: Optional[str] = None,
+        q: Optional[str] = None,
+        sort_by: Optional[str] = None,
+        descending: Optional[str] = None,
+        languages: Optional[str] = None,
+        catalog: Optional[bool] = None,
+        complete: Optional[bool] = None,
+        offset: Optional[int] = None,
+        limit: Optional[int] = None,
         **kwargs,
     ) -> DetailedResponse:
         """
@@ -126,8 +128,8 @@ class GlobalCatalogV1(BaseService):
         :param str descending: (optional) Sets the sort order. The default is
                false, which is ascending.
         :param str languages: (optional) Return the data strings in a specified
-               langauge. By default, the strings returned are of the language preferred by
-               your browser through the Accept-Langauge header, which allows an override
+               language. By default, the strings returned are of the language preferred by
+               your browser through the Accept-Language header, which allows an override
                of the header. Languages are specified in standard form, such as `en-us`.
                To include all languages use a wildcard (*).
         :param bool catalog: (optional) Checks to see if a catalog's object is
@@ -149,7 +151,9 @@ class GlobalCatalogV1(BaseService):
 
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='list_catalog_entries'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='list_catalog_entries',
         )
         headers.update(sdk_headers)
 
@@ -168,12 +172,18 @@ class GlobalCatalogV1(BaseService):
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = 'application/json'
 
         url = '/'
-        request = self.prepare_request(method='GET', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='GET',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
     def create_catalog_entry(
@@ -187,11 +197,12 @@ class GlobalCatalogV1(BaseService):
         provider: 'Provider',
         id: str,
         *,
-        parent_id: str = None,
-        group: bool = None,
-        active: bool = None,
-        metadata: 'ObjectMetadataSet' = None,
-        account: str = None,
+        parent_id: Optional[str] = None,
+        group: Optional[bool] = None,
+        active: Optional[bool] = None,
+        url: Optional[str] = None,
+        metadata: Optional['ObjectMetadataSet'] = None,
+        account: Optional[str] = None,
         **kwargs,
     ) -> DetailedResponse:
         """
@@ -225,6 +236,7 @@ class GlobalCatalogV1(BaseService):
                catalog entry is a group.
         :param bool active: (optional) Boolean value that describes whether the
                service is active.
+        :param str url: (optional) Url of the object.
         :param ObjectMetadataSet metadata: (optional) Model used to describe
                metadata object that can be set.
         :param str account: (optional) This changes the scope of the request
@@ -258,11 +270,15 @@ class GlobalCatalogV1(BaseService):
             metadata = convert_model(metadata)
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='create_catalog_entry'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='create_catalog_entry',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account}
+        params = {
+            'account': account,
+        }
 
         data = {
             'name': name,
@@ -276,6 +292,7 @@ class GlobalCatalogV1(BaseService):
             'parent_id': parent_id,
             'group': group,
             'active': active,
+            'url': url,
             'metadata': metadata,
         }
         data = {k: v for (k, v) in data.items() if v is not None}
@@ -284,23 +301,30 @@ class GlobalCatalogV1(BaseService):
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = 'application/json'
 
         url = '/'
-        request = self.prepare_request(method='POST', url=url, headers=headers, params=params, data=data)
+        request = self.prepare_request(
+            method='POST',
+            url=url,
+            headers=headers,
+            params=params,
+            data=data,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
     def get_catalog_entry(
         self,
         id: str,
         *,
-        account: str = None,
-        include: str = None,
-        languages: str = None,
-        complete: bool = None,
-        depth: int = None,
+        account: Optional[str] = None,
+        include: Optional[str] = None,
+        languages: Optional[str] = None,
+        complete: Optional[bool] = None,
+        depth: Optional[int] = None,
         **kwargs,
     ) -> DetailedResponse:
         """
@@ -311,7 +335,7 @@ class GlobalCatalogV1(BaseService):
         enabled. This can be used by an unauthenticated user for publicly available
         services.
 
-        :param str id: The catalog entry's unqiue ID.
+        :param str id: The catalog entry's unique ID.
         :param str account: (optional) This changes the scope of the request
                regardless of the authorization header. Example scopes are `account` and
                `global`. `account=global` is reqired if operating with a service ID that
@@ -323,8 +347,8 @@ class GlobalCatalogV1(BaseService):
                with a colon (:), for example `GET
                /id?include=metadata.ui:metadata.pricing`.
         :param str languages: (optional) Return the data strings in the specified
-               langauge. By default the strings returned are of the language preferred by
-               your browser through the Accept-Langauge header, which allows an override
+               language. By default the strings returned are of the language preferred by
+               your browser through the Accept-Language header, which allows an override
                of the header. Languages are specified in standard form, such as `en-us`.
                To include all languages use a wildcard (*).
         :param bool complete: (optional) Returns all available fields for all
@@ -340,27 +364,41 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse with `dict` result representing a `CatalogEntry` object
         """
 
-        if id is None:
+        if not id:
             raise ValueError('id must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_catalog_entry'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='get_catalog_entry',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account, 'include': include, 'languages': languages, 'complete': complete, 'depth': depth}
+        params = {
+            'account': account,
+            'include': include,
+            'languages': languages,
+            'complete': complete,
+            'depth': depth,
+        }
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = 'application/json'
 
         path_param_keys = ['id']
         path_param_values = self.encode_path_vars(id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{id}'.format(**path_param_dict)
-        request = self.prepare_request(method='GET', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='GET',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
     def update_catalog_entry(
@@ -374,12 +412,13 @@ class GlobalCatalogV1(BaseService):
         tags: List[str],
         provider: 'Provider',
         *,
-        parent_id: str = None,
-        group: bool = None,
-        active: bool = None,
-        metadata: 'ObjectMetadataSet' = None,
-        account: str = None,
-        move: str = None,
+        parent_id: Optional[str] = None,
+        group: Optional[bool] = None,
+        active: Optional[bool] = None,
+        url: Optional[str] = None,
+        metadata: Optional['ObjectMetadataSet'] = None,
+        account: Optional[str] = None,
+        move: Optional[str] = None,
         **kwargs,
     ) -> DetailedResponse:
         """
@@ -412,6 +451,7 @@ class GlobalCatalogV1(BaseService):
                catalog entry is a group.
         :param bool active: (optional) Boolean value that describes whether the
                service is active.
+        :param str url: (optional) Url of the object.
         :param ObjectMetadataSet metadata: (optional) Model used to describe
                metadata object that can be set.
         :param str account: (optional) This changes the scope of the request
@@ -429,7 +469,7 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse with `dict` result representing a `CatalogEntry` object
         """
 
-        if id is None:
+        if not id:
             raise ValueError('id must be provided')
         if name is None:
             raise ValueError('name must be provided')
@@ -451,11 +491,16 @@ class GlobalCatalogV1(BaseService):
             metadata = convert_model(metadata)
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='update_catalog_entry'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='update_catalog_entry',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account, 'move': move}
+        params = {
+            'account': account,
+            'move': move,
+        }
 
         data = {
             'name': name,
@@ -468,6 +513,7 @@ class GlobalCatalogV1(BaseService):
             'parent_id': parent_id,
             'group': group,
             'active': active,
+            'url': url,
             'metadata': metadata,
         }
         data = {k: v for (k, v) in data.items() if v is not None}
@@ -476,18 +522,32 @@ class GlobalCatalogV1(BaseService):
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = 'application/json'
 
         path_param_keys = ['id']
         path_param_values = self.encode_path_vars(id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{id}'.format(**path_param_dict)
-        request = self.prepare_request(method='PUT', url=url, headers=headers, params=params, data=data)
+        request = self.prepare_request(
+            method='PUT',
+            url=url,
+            headers=headers,
+            params=params,
+            data=data,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
-    def delete_catalog_entry(self, id: str, *, account: str = None, force: bool = None, **kwargs) -> DetailedResponse:
+    def delete_catalog_entry(
+        self,
+        id: str,
+        *,
+        account: Optional[str] = None,
+        force: Optional[bool] = None,
+        **kwargs,
+    ) -> DetailedResponse:
         """
         Delete a catalog entry.
 
@@ -509,26 +569,37 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse
         """
 
-        if id is None:
+        if not id:
             raise ValueError('id must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='delete_catalog_entry'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='delete_catalog_entry',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account, 'force': force}
+        params = {
+            'account': account,
+            'force': force,
+        }
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
 
         path_param_keys = ['id']
         path_param_values = self.encode_path_vars(id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{id}'.format(**path_param_dict)
-        request = self.prepare_request(method='DELETE', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='DELETE',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
     def get_child_objects(
@@ -536,15 +607,15 @@ class GlobalCatalogV1(BaseService):
         id: str,
         kind: str,
         *,
-        account: str = None,
-        include: str = None,
-        q: str = None,
-        sort_by: str = None,
-        descending: str = None,
-        languages: str = None,
-        complete: bool = None,
-        offset: int = None,
-        limit: int = None,
+        account: Optional[str] = None,
+        include: Optional[str] = None,
+        q: Optional[str] = None,
+        sort_by: Optional[str] = None,
+        descending: Optional[str] = None,
+        languages: Optional[str] = None,
+        complete: Optional[bool] = None,
+        offset: Optional[int] = None,
+        limit: Optional[int] = None,
         **kwargs,
     ) -> DetailedResponse:
         """
@@ -574,8 +645,8 @@ class GlobalCatalogV1(BaseService):
         :param str descending: (optional) The sort order. The default is false,
                which is ascending.
         :param str languages: (optional) Return the data strings in the specified
-               langauge. By default the strings returned are of the language preferred by
-               your browser through the Accept-Langauge header. This allows an override of
+               language. By default the strings returned are of the language preferred by
+               your browser through the Accept-Language header. This allows an override of
                the header. Languages are specified in standard form, such as `en-us`. To
                include all languages use the wildcard (*).
         :param bool complete: (optional) Use the value `?complete=true` as shortcut
@@ -589,13 +660,15 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse with `dict` result representing a `EntrySearchResult` object
         """
 
-        if id is None:
+        if not id:
             raise ValueError('id must be provided')
-        if kind is None:
+        if not kind:
             raise ValueError('kind must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_child_objects'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='get_child_objects',
         )
         headers.update(sdk_headers)
 
@@ -613,18 +686,30 @@ class GlobalCatalogV1(BaseService):
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = 'application/json'
 
         path_param_keys = ['id', 'kind']
         path_param_values = self.encode_path_vars(id, kind)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{id}/{kind}'.format(**path_param_dict)
-        request = self.prepare_request(method='GET', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='GET',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
-    def restore_catalog_entry(self, id: str, *, account: str = None, **kwargs) -> DetailedResponse:
+    def restore_catalog_entry(
+        self,
+        id: str,
+        *,
+        account: Optional[str] = None,
+        **kwargs,
+    ) -> DetailedResponse:
         """
         Restore archived catalog entry.
 
@@ -641,33 +726,49 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse
         """
 
-        if id is None:
+        if not id:
             raise ValueError('id must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='restore_catalog_entry'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='restore_catalog_entry',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account}
+        params = {
+            'account': account,
+        }
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
 
         path_param_keys = ['id']
         path_param_values = self.encode_path_vars(id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{id}/restore'.format(**path_param_dict)
-        request = self.prepare_request(method='PUT', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='PUT',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
     #########################
     # Visibility
     #########################
 
-    def get_visibility(self, id: str, *, account: str = None, **kwargs) -> DetailedResponse:
+    def get_visibility(
+        self,
+        id: str,
+        *,
+        account: Optional[str] = None,
+        **kwargs,
+    ) -> DetailedResponse:
         """
         Get the visibility constraints for an object.
 
@@ -686,37 +787,47 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse with `dict` result representing a `Visibility` object
         """
 
-        if id is None:
+        if not id:
             raise ValueError('id must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_visibility'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='get_visibility',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account}
+        params = {
+            'account': account,
+        }
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = 'application/json'
 
         path_param_keys = ['id']
         path_param_values = self.encode_path_vars(id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{id}/visibility'.format(**path_param_dict)
-        request = self.prepare_request(method='GET', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='GET',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
     def update_visibility(
         self,
         id: str,
         *,
-        extendable: bool = None,
-        include: 'VisibilityDetail' = None,
-        exclude: 'VisibilityDetail' = None,
-        account: str = None,
+        extendable: Optional[bool] = None,
+        include: Optional['VisibilityDetail'] = None,
+        exclude: Optional['VisibilityDetail'] = None,
+        account: Optional[str] = None,
         **kwargs,
     ) -> DetailedResponse:
         """
@@ -740,7 +851,7 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse
         """
 
-        if id is None:
+        if not id:
             raise ValueError('id must be provided')
         if include is not None:
             include = convert_model(include)
@@ -748,34 +859,56 @@ class GlobalCatalogV1(BaseService):
             exclude = convert_model(exclude)
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='update_visibility'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='update_visibility',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account}
+        params = {
+            'account': account,
+        }
 
-        data = {'extendable': extendable, 'include': include, 'exclude': exclude}
+        data = {
+            'extendable': extendable,
+            'include': include,
+            'exclude': exclude,
+        }
         data = {k: v for (k, v) in data.items() if v is not None}
         data = json.dumps(data)
         headers['content-type'] = 'application/json'
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
 
         path_param_keys = ['id']
         path_param_values = self.encode_path_vars(id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{id}/visibility'.format(**path_param_dict)
-        request = self.prepare_request(method='PUT', url=url, headers=headers, params=params, data=data)
+        request = self.prepare_request(
+            method='PUT',
+            url=url,
+            headers=headers,
+            params=params,
+            data=data,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
     #########################
     # Pricing
     #########################
 
-    def get_pricing(self, id: str, *, account: str = None, **kwargs) -> DetailedResponse:
+    def get_pricing(
+        self,
+        id: str,
+        *,
+        account: Optional[str] = None,
+        deployment_region: Optional[str] = None,
+        **kwargs,
+    ) -> DetailedResponse:
         """
         Get the pricing for an object.
 
@@ -788,32 +921,104 @@ class GlobalCatalogV1(BaseService):
                regardless of the authorization header. Example scopes are `account` and
                `global`. `account=global` is reqired if operating with a service ID that
                has a global admin policy, for example `GET /?account=global`.
+        :param str deployment_region: (optional) Specify a region to retrieve plan
+               pricing for a global deployment. The value must match an entry in the
+               `deployment_regions` list.
         :param dict headers: A `dict` containing the request headers
         :return: A `DetailedResponse` containing the result, headers and HTTP status code.
         :rtype: DetailedResponse with `dict` result representing a `PricingGet` object
         """
 
-        if id is None:
+        if not id:
             raise ValueError('id must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_pricing'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='get_pricing',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account}
+        params = {
+            'account': account,
+            'deployment_region': deployment_region,
+        }
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = 'application/json'
 
         path_param_keys = ['id']
         path_param_values = self.encode_path_vars(id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{id}/pricing'.format(**path_param_dict)
-        request = self.prepare_request(method='GET', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='GET',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
+        return response
+
+    def get_pricing_deployments(
+        self,
+        id: str,
+        *,
+        account: Optional[str] = None,
+        **kwargs,
+    ) -> DetailedResponse:
+        """
+        Get the pricing deployments for a plan.
+
+        This endpoint returns the deployment pricing for a plan. For a plan it returns a
+        pricing for each visible child deployment object. Static pricing is defined in the
+        catalog. Dynamic pricing is stored in IBM Cloud Pricing Catalog. This can be used
+        by an unauthenticated user for publicly available services.
+
+        :param str id: The object's unique ID.
+        :param str account: (optional) This changes the scope of the request
+               regardless of the authorization header. Example scopes are `account` and
+               `global`. `account=global` is reqired if operating with a service ID that
+               has a global admin policy, for example `GET /?account=global`.
+        :param dict headers: A `dict` containing the request headers
+        :return: A `DetailedResponse` containing the result, headers and HTTP status code.
+        :rtype: DetailedResponse with `dict` result representing a `PricingSearchResult` object
+        """
+
+        if not id:
+            raise ValueError('id must be provided')
+        headers = {}
+        sdk_headers = get_sdk_headers(
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='get_pricing_deployments',
+        )
+        headers.update(sdk_headers)
+
+        params = {
+            'account': account,
+        }
+
+        if 'headers' in kwargs:
+            headers.update(kwargs.get('headers'))
+            del kwargs['headers']
+        headers['Accept'] = 'application/json'
+
+        path_param_keys = ['id']
+        path_param_values = self.encode_path_vars(id)
+        path_param_dict = dict(zip(path_param_keys, path_param_values))
+        url = '/{id}/pricing/deployment'.format(**path_param_dict)
+        request = self.prepare_request(
+            method='GET',
+            url=url,
+            headers=headers,
+            params=params,
+        )
+
+        response = self.send(request, **kwargs)
         return response
 
     #########################
@@ -824,11 +1029,11 @@ class GlobalCatalogV1(BaseService):
         self,
         id: str,
         *,
-        account: str = None,
-        ascending: str = None,
-        startat: str = None,
-        offset: int = None,
-        limit: int = None,
+        account: Optional[str] = None,
+        ascending: Optional[str] = None,
+        startat: Optional[str] = None,
+        offset: Optional[int] = None,
+        limit: Optional[int] = None,
         **kwargs,
     ) -> DetailedResponse:
         """
@@ -859,34 +1064,54 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse with `dict` result representing a `AuditSearchResult` object
         """
 
-        if id is None:
+        if not id:
             raise ValueError('id must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_audit_logs'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='get_audit_logs',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account, 'ascending': ascending, 'startat': startat, '_offset': offset, '_limit': limit}
+        params = {
+            'account': account,
+            'ascending': ascending,
+            'startat': startat,
+            '_offset': offset,
+            '_limit': limit,
+        }
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = 'application/json'
 
         path_param_keys = ['id']
         path_param_values = self.encode_path_vars(id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{id}/logs'.format(**path_param_dict)
-        request = self.prepare_request(method='GET', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='GET',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
     #########################
     # Artifact
     #########################
 
-    def list_artifacts(self, object_id: str, *, account: str = None, **kwargs) -> DetailedResponse:
+    def list_artifacts(
+        self,
+        object_id: str,
+        *,
+        account: Optional[str] = None,
+        **kwargs,
+    ) -> DetailedResponse:
         """
         Get artifacts.
 
@@ -902,30 +1127,47 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse with `dict` result representing a `Artifacts` object
         """
 
-        if object_id is None:
+        if not object_id:
             raise ValueError('object_id must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='list_artifacts'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='list_artifacts',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account}
+        params = {
+            'account': account,
+        }
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = 'application/json'
 
         path_param_keys = ['object_id']
         path_param_values = self.encode_path_vars(object_id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{object_id}/artifacts'.format(**path_param_dict)
-        request = self.prepare_request(method='GET', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='GET',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
-    def get_artifact(self, object_id: str, artifact_id: str, *, account: str = None, **kwargs) -> DetailedResponse:
+    def get_artifact(
+        self,
+        object_id: str,
+        artifact_id: str,
+        *,
+        account: Optional[str] = None,
+        **kwargs,
+    ) -> DetailedResponse:
         """
         Get artifact.
 
@@ -942,29 +1184,39 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse with `BinaryIO` result
         """
 
-        if object_id is None:
+        if not object_id:
             raise ValueError('object_id must be provided')
-        if artifact_id is None:
+        if not artifact_id:
             raise ValueError('artifact_id must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_artifact'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='get_artifact',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account}
+        params = {
+            'account': account,
+        }
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
         headers['Accept'] = '*/*'
 
         path_param_keys = ['object_id', 'artifact_id']
         path_param_values = self.encode_path_vars(object_id, artifact_id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{object_id}/artifacts/{artifact_id}'.format(**path_param_dict)
-        request = self.prepare_request(method='GET', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='GET',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
     def upload_artifact(
@@ -972,9 +1224,9 @@ class GlobalCatalogV1(BaseService):
         object_id: str,
         artifact_id: str,
         *,
-        artifact: BinaryIO = None,
-        content_type: str = None,
-        account: str = None,
+        artifact: Optional[BinaryIO] = None,
+        content_type: Optional[str] = None,
+        account: Optional[str] = None,
         **kwargs,
     ) -> DetailedResponse:
         """
@@ -996,33 +1248,53 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse
         """
 
-        if object_id is None:
+        if not object_id:
             raise ValueError('object_id must be provided')
-        if artifact_id is None:
+        if not artifact_id:
             raise ValueError('artifact_id must be provided')
-        headers = {'Content-Type': content_type}
+        headers = {
+            'Content-Type': content_type,
+        }
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='upload_artifact'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='upload_artifact',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account}
+        params = {
+            'account': account,
+        }
 
         data = artifact
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
 
         path_param_keys = ['object_id', 'artifact_id']
         path_param_values = self.encode_path_vars(object_id, artifact_id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{object_id}/artifacts/{artifact_id}'.format(**path_param_dict)
-        request = self.prepare_request(method='PUT', url=url, headers=headers, params=params, data=data)
+        request = self.prepare_request(
+            method='PUT',
+            url=url,
+            headers=headers,
+            params=params,
+            data=data,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
-    def delete_artifact(self, object_id: str, artifact_id: str, *, account: str = None, **kwargs) -> DetailedResponse:
+    def delete_artifact(
+        self,
+        object_id: str,
+        artifact_id: str,
+        *,
+        account: Optional[str] = None,
+        **kwargs,
+    ) -> DetailedResponse:
         """
         Delete artifact.
 
@@ -1040,28 +1312,38 @@ class GlobalCatalogV1(BaseService):
         :rtype: DetailedResponse
         """
 
-        if object_id is None:
+        if not object_id:
             raise ValueError('object_id must be provided')
-        if artifact_id is None:
+        if not artifact_id:
             raise ValueError('artifact_id must be provided')
         headers = {}
         sdk_headers = get_sdk_headers(
-            service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='delete_artifact'
+            service_name=self.DEFAULT_SERVICE_NAME,
+            service_version='V1',
+            operation_id='delete_artifact',
         )
         headers.update(sdk_headers)
 
-        params = {'account': account}
+        params = {
+            'account': account,
+        }
 
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
+            del kwargs['headers']
 
         path_param_keys = ['object_id', 'artifact_id']
         path_param_values = self.encode_path_vars(object_id, artifact_id)
         path_param_dict = dict(zip(path_param_keys, path_param_values))
         url = '/{object_id}/artifacts/{artifact_id}'.format(**path_param_dict)
-        request = self.prepare_request(method='DELETE', url=url, headers=headers, params=params)
+        request = self.prepare_request(
+            method='DELETE',
+            url=url,
+            headers=headers,
+            params=params,
+        )
 
-        response = self.send(request)
+        response = self.send(request, **kwargs)
         return response
 
 
@@ -1074,12 +1356,17 @@ class AliasMetaData:
     """
     Alias-related metadata.
 
-    :attr str type: (optional) Type of alias.
-    :attr str plan_id: (optional) Points to the plan that this object is an alias
+    :param str type: (optional) Type of alias.
+    :param str plan_id: (optional) Points to the plan that this object is an alias
           for.
     """
 
-    def __init__(self, *, type: str = None, plan_id: str = None) -> None:
+    def __init__(
+        self,
+        *,
+        type: Optional[str] = None,
+        plan_id: Optional[str] = None,
+    ) -> None:
         """
         Initialize a AliasMetaData object.
 
@@ -1094,10 +1381,10 @@ class AliasMetaData:
     def from_dict(cls, _dict: Dict) -> 'AliasMetaData':
         """Initialize a AliasMetaData object from a json dictionary."""
         args = {}
-        if 'type' in _dict:
-            args['type'] = _dict.get('type')
-        if 'plan_id' in _dict:
-            args['plan_id'] = _dict.get('plan_id')
+        if (type := _dict.get('type')) is not None:
+            args['type'] = type
+        if (plan_id := _dict.get('plan_id')) is not None:
+            args['plan_id'] = plan_id
         return cls(**args)
 
     @classmethod
@@ -1137,12 +1424,18 @@ class Amount:
     """
     Country-specific pricing information.
 
-    :attr str country: (optional) Country.
-    :attr str currency: (optional) Currency.
-    :attr List[Price] prices: (optional) See Price for nested fields.
+    :param str country: (optional) Country.
+    :param str currency: (optional) Currency.
+    :param List[Price] prices: (optional) See Price for nested fields.
     """
 
-    def __init__(self, *, country: str = None, currency: str = None, prices: List['Price'] = None) -> None:
+    def __init__(
+        self,
+        *,
+        country: Optional[str] = None,
+        currency: Optional[str] = None,
+        prices: Optional[List['Price']] = None,
+    ) -> None:
         """
         Initialize a Amount object.
 
@@ -1158,12 +1451,12 @@ class Amount:
     def from_dict(cls, _dict: Dict) -> 'Amount':
         """Initialize a Amount object from a json dictionary."""
         args = {}
-        if 'country' in _dict:
-            args['country'] = _dict.get('country')
-        if 'currency' in _dict:
-            args['currency'] = _dict.get('currency')
-        if 'prices' in _dict:
-            args['prices'] = [Price.from_dict(x) for x in _dict.get('prices')]
+        if (country := _dict.get('country')) is not None:
+            args['country'] = country
+        if (currency := _dict.get('currency')) is not None:
+            args['currency'] = currency
+        if (prices := _dict.get('prices')) is not None:
+            args['prices'] = [Price.from_dict(v) for v in prices]
         return cls(**args)
 
     @classmethod
@@ -1179,7 +1472,13 @@ class Amount:
         if hasattr(self, 'currency') and self.currency is not None:
             _dict['currency'] = self.currency
         if hasattr(self, 'prices') and self.prices is not None:
-            _dict['prices'] = [x.to_dict() for x in self.prices]
+            prices_list = []
+            for v in self.prices:
+                if isinstance(v, dict):
+                    prices_list.append(v)
+                else:
+                    prices_list.append(v.to_dict())
+            _dict['prices'] = prices_list
         return _dict
 
     def _to_dict(self):
@@ -1205,16 +1504,22 @@ class Artifact:
     """
     Artifact Details.
 
-    :attr str name: (optional) The name of the artifact.
-    :attr datetime updated: (optional) The timestamp of the last update to the
+    :param str name: (optional) The name of the artifact.
+    :param datetime updated: (optional) The timestamp of the last update to the
           artifact.
-    :attr str url: (optional) The url for the artifact.
-    :attr str etag: (optional) The etag of the artifact.
-    :attr int size: (optional) The content length of the artifact.
+    :param str url: (optional) The url for the artifact.
+    :param str etag: (optional) The etag of the artifact.
+    :param int size: (optional) The content length of the artifact.
     """
 
     def __init__(
-        self, *, name: str = None, updated: datetime = None, url: str = None, etag: str = None, size: int = None
+        self,
+        *,
+        name: Optional[str] = None,
+        updated: Optional[datetime] = None,
+        url: Optional[str] = None,
+        etag: Optional[str] = None,
+        size: Optional[int] = None,
     ) -> None:
         """
         Initialize a Artifact object.
@@ -1236,16 +1541,16 @@ class Artifact:
     def from_dict(cls, _dict: Dict) -> 'Artifact':
         """Initialize a Artifact object from a json dictionary."""
         args = {}
-        if 'name' in _dict:
-            args['name'] = _dict.get('name')
-        if 'updated' in _dict:
-            args['updated'] = string_to_datetime(_dict.get('updated'))
-        if 'url' in _dict:
-            args['url'] = _dict.get('url')
-        if 'etag' in _dict:
-            args['etag'] = _dict.get('etag')
-        if 'size' in _dict:
-            args['size'] = _dict.get('size')
+        if (name := _dict.get('name')) is not None:
+            args['name'] = name
+        if (updated := _dict.get('updated')) is not None:
+            args['updated'] = string_to_datetime(updated)
+        if (url := _dict.get('url')) is not None:
+            args['url'] = url
+        if (etag := _dict.get('etag')) is not None:
+            args['etag'] = etag
+        if (size := _dict.get('size')) is not None:
+            args['size'] = size
         return cls(**args)
 
     @classmethod
@@ -1291,11 +1596,16 @@ class Artifacts:
     """
     Artifacts List.
 
-    :attr int count: (optional) The total number of artifacts.
-    :attr List[Artifact] resources: (optional) The list of artifacts.
+    :param int count: (optional) The total number of artifacts.
+    :param List[Artifact] resources: (optional) The list of artifacts.
     """
 
-    def __init__(self, *, count: int = None, resources: List['Artifact'] = None) -> None:
+    def __init__(
+        self,
+        *,
+        count: Optional[int] = None,
+        resources: Optional[List['Artifact']] = None,
+    ) -> None:
         """
         Initialize a Artifacts object.
 
@@ -1309,10 +1619,10 @@ class Artifacts:
     def from_dict(cls, _dict: Dict) -> 'Artifacts':
         """Initialize a Artifacts object from a json dictionary."""
         args = {}
-        if 'count' in _dict:
-            args['count'] = _dict.get('count')
-        if 'resources' in _dict:
-            args['resources'] = [Artifact.from_dict(x) for x in _dict.get('resources')]
+        if (count := _dict.get('count')) is not None:
+            args['count'] = count
+        if (resources := _dict.get('resources')) is not None:
+            args['resources'] = [Artifact.from_dict(v) for v in resources]
         return cls(**args)
 
     @classmethod
@@ -1326,7 +1636,13 @@ class Artifacts:
         if hasattr(self, 'count') and self.count is not None:
             _dict['count'] = self.count
         if hasattr(self, 'resources') and self.resources is not None:
-            _dict['resources'] = [x.to_dict() for x in self.resources]
+            resources_list = []
+            for v in self.resources:
+                if isinstance(v, dict):
+                    resources_list.append(v)
+                else:
+                    resources_list.append(v.to_dict())
+            _dict['resources'] = resources_list
         return _dict
 
     def _to_dict(self):
@@ -1352,36 +1668,38 @@ class AuditSearchResult:
     """
     A paginated search result containing audit logs.
 
-    :attr int offset: (optional) The offset (origin 0) of the first resource in this
-          page of search results.
-    :attr int limit: (optional) The maximum number of resources returned in each
+    :param int offset: (optional) The offset (origin 0) of the first resource in
+          this page of search results.
+    :param int limit: (optional) The maximum number of resources returned in each
           page of search results.
-    :attr int count: (optional) The overall total number of resources in the search
+    :param int count: (optional) The overall total number of resources in the search
           result set.
-    :attr int resource_count: (optional) The number of resources returned in this
+    :param int resource_count: (optional) The number of resources returned in this
           page of search results.
-    :attr str first: (optional) A URL for retrieving the first page of search
+    :param str first: (optional) A URL for retrieving the first page of search
           results.
-    :attr str last: (optional) A URL for retrieving the last page of search results.
-    :attr str prev: (optional) A URL for retrieving the previous page of search
+    :param str last: (optional) A URL for retrieving the last page of search
           results.
-    :attr str next: (optional) A URL for retrieving the next page of search results.
-    :attr List[Message] resources: (optional) The resources (audit messages)
+    :param str prev: (optional) A URL for retrieving the previous page of search
+          results.
+    :param str next: (optional) A URL for retrieving the next page of search
+          results.
+    :param List[Message] resources: (optional) The resources (audit messages)
           contained in this page of search results.
     """
 
     def __init__(
         self,
         *,
-        offset: int = None,
-        limit: int = None,
-        count: int = None,
-        resource_count: int = None,
-        first: str = None,
-        last: str = None,
-        prev: str = None,
-        next: str = None,
-        resources: List['Message'] = None,
+        offset: Optional[int] = None,
+        limit: Optional[int] = None,
+        count: Optional[int] = None,
+        resource_count: Optional[int] = None,
+        first: Optional[str] = None,
+        last: Optional[str] = None,
+        prev: Optional[str] = None,
+        next: Optional[str] = None,
+        resources: Optional[List['Message']] = None,
     ) -> None:
         """
         Initialize a AuditSearchResult object.
@@ -1419,24 +1737,24 @@ class AuditSearchResult:
     def from_dict(cls, _dict: Dict) -> 'AuditSearchResult':
         """Initialize a AuditSearchResult object from a json dictionary."""
         args = {}
-        if 'offset' in _dict:
-            args['offset'] = _dict.get('offset')
-        if 'limit' in _dict:
-            args['limit'] = _dict.get('limit')
-        if 'count' in _dict:
-            args['count'] = _dict.get('count')
-        if 'resource_count' in _dict:
-            args['resource_count'] = _dict.get('resource_count')
-        if 'first' in _dict:
-            args['first'] = _dict.get('first')
-        if 'last' in _dict:
-            args['last'] = _dict.get('last')
-        if 'prev' in _dict:
-            args['prev'] = _dict.get('prev')
-        if 'next' in _dict:
-            args['next'] = _dict.get('next')
-        if 'resources' in _dict:
-            args['resources'] = [Message.from_dict(x) for x in _dict.get('resources')]
+        if (offset := _dict.get('offset')) is not None:
+            args['offset'] = offset
+        if (limit := _dict.get('limit')) is not None:
+            args['limit'] = limit
+        if (count := _dict.get('count')) is not None:
+            args['count'] = count
+        if (resource_count := _dict.get('resource_count')) is not None:
+            args['resource_count'] = resource_count
+        if (first := _dict.get('first')) is not None:
+            args['first'] = first
+        if (last := _dict.get('last')) is not None:
+            args['last'] = last
+        if (prev := _dict.get('prev')) is not None:
+            args['prev'] = prev
+        if (next := _dict.get('next')) is not None:
+            args['next'] = next
+        if (resources := _dict.get('resources')) is not None:
+            args['resources'] = [Message.from_dict(v) for v in resources]
         return cls(**args)
 
     @classmethod
@@ -1464,7 +1782,13 @@ class AuditSearchResult:
         if hasattr(self, 'next') and self.next is not None:
             _dict['next'] = self.next
         if hasattr(self, 'resources') and self.resources is not None:
-            _dict['resources'] = [x.to_dict() for x in self.resources]
+            resources_list = []
+            for v in self.resources:
+                if isinstance(v, dict):
+                    resources_list.append(v)
+                else:
+                    resources_list.append(v.to_dict())
+            _dict['resources'] = resources_list
         return _dict
 
     def _to_dict(self):
@@ -1490,11 +1814,16 @@ class Broker:
     """
     The broker associated with a catalog entry.
 
-    :attr str name: (optional) Broker name.
-    :attr str guid: (optional) Broker guid.
+    :param str name: (optional) Broker name.
+    :param str guid: (optional) Broker guid.
     """
 
-    def __init__(self, *, name: str = None, guid: str = None) -> None:
+    def __init__(
+        self,
+        *,
+        name: Optional[str] = None,
+        guid: Optional[str] = None,
+    ) -> None:
         """
         Initialize a Broker object.
 
@@ -1508,10 +1837,10 @@ class Broker:
     def from_dict(cls, _dict: Dict) -> 'Broker':
         """Initialize a Broker object from a json dictionary."""
         args = {}
-        if 'name' in _dict:
-            args['name'] = _dict.get('name')
-        if 'guid' in _dict:
-            args['guid'] = _dict.get('guid')
+        if (name := _dict.get('name')) is not None:
+            args['name'] = name
+        if (guid := _dict.get('guid')) is not None:
+            args['guid'] = guid
         return cls(**args)
 
     @classmethod
@@ -1551,13 +1880,20 @@ class Bullets:
     """
     Information related to list delimiters.
 
-    :attr str title: (optional) The bullet title.
-    :attr str description: (optional) The bullet description.
-    :attr str icon: (optional) The icon to use for rendering the bullet.
-    :attr int quantity: (optional) The bullet quantity.
+    :param str title: (optional) The bullet title.
+    :param str description: (optional) The bullet description.
+    :param str icon: (optional) The icon to use for rendering the bullet.
+    :param int quantity: (optional) The bullet quantity.
     """
 
-    def __init__(self, *, title: str = None, description: str = None, icon: str = None, quantity: int = None) -> None:
+    def __init__(
+        self,
+        *,
+        title: Optional[str] = None,
+        description: Optional[str] = None,
+        icon: Optional[str] = None,
+        quantity: Optional[int] = None,
+    ) -> None:
         """
         Initialize a Bullets object.
 
@@ -1575,14 +1911,14 @@ class Bullets:
     def from_dict(cls, _dict: Dict) -> 'Bullets':
         """Initialize a Bullets object from a json dictionary."""
         args = {}
-        if 'title' in _dict:
-            args['title'] = _dict.get('title')
-        if 'description' in _dict:
-            args['description'] = _dict.get('description')
-        if 'icon' in _dict:
-            args['icon'] = _dict.get('icon')
-        if 'quantity' in _dict:
-            args['quantity'] = _dict.get('quantity')
+        if (title := _dict.get('title')) is not None:
+            args['title'] = title
+        if (description := _dict.get('description')) is not None:
+            args['description'] = description
+        if (icon := _dict.get('icon')) is not None:
+            args['icon'] = icon
+        if (quantity := _dict.get('quantity')) is not None:
+            args['quantity'] = quantity
         return cls(**args)
 
     @classmethod
@@ -1626,31 +1962,31 @@ class CFMetaData:
     """
     Service-related metadata.
 
-    :attr str type: (optional) Type of service.
-    :attr bool iam_compatible: (optional) Boolean value that describes whether the
+    :param str type: (optional) Type of service.
+    :param bool iam_compatible: (optional) Boolean value that describes whether the
           service is compatible with Identity and Access Management.
-    :attr bool unique_api_key: (optional) Boolean value that describes whether the
+    :param bool unique_api_key: (optional) Boolean value that describes whether the
           service has a unique API key.
-    :attr bool provisionable: (optional) Boolean value that describes whether the
+    :param bool provisionable: (optional) Boolean value that describes whether the
           service is provisionable or not. You may need sales or support to create this
           service.
-    :attr bool bindable: (optional) Boolean value that describes whether you can
+    :param bool bindable: (optional) Boolean value that describes whether you can
           create bindings for this service.
-    :attr bool async_provisioning_supported: (optional) Boolean value that describes
-          whether the service supports asynchronous provisioning.
-    :attr bool async_unprovisioning_supported: (optional) Boolean value that
+    :param bool async_provisioning_supported: (optional) Boolean value that
+          describes whether the service supports asynchronous provisioning.
+    :param bool async_unprovisioning_supported: (optional) Boolean value that
           describes whether the service supports asynchronous unprovisioning.
-    :attr List[str] requires: (optional) Service dependencies.
-    :attr bool plan_updateable: (optional) Boolean value that describes whether the
+    :param List[str] requires: (optional) Service dependencies.
+    :param bool plan_updateable: (optional) Boolean value that describes whether the
           service supports upgrade or downgrade for some plans.
-    :attr str state: (optional) String that describes whether the service is active
+    :param str state: (optional) String that describes whether the service is active
           or inactive.
-    :attr bool service_check_enabled: (optional) Boolean value that describes
+    :param bool service_check_enabled: (optional) Boolean value that describes
           whether the service check is enabled.
-    :attr int test_check_interval: (optional) Test check interval.
-    :attr bool service_key_supported: (optional) Boolean value that describes
+    :param int test_check_interval: (optional) Test check interval.
+    :param bool service_key_supported: (optional) Boolean value that describes
           whether the service supports service keys.
-    :attr dict cf_guid: (optional) If the field is imported from Cloud Foundry, the
+    :param dict cf_guid: (optional) If the field is imported from Cloud Foundry, the
           Cloud Foundry region's GUID. This is a required field. For example,
           `us-south=123`.
     """
@@ -1658,20 +1994,20 @@ class CFMetaData:
     def __init__(
         self,
         *,
-        type: str = None,
-        iam_compatible: bool = None,
-        unique_api_key: bool = None,
-        provisionable: bool = None,
-        bindable: bool = None,
-        async_provisioning_supported: bool = None,
-        async_unprovisioning_supported: bool = None,
-        requires: List[str] = None,
-        plan_updateable: bool = None,
-        state: str = None,
-        service_check_enabled: bool = None,
-        test_check_interval: int = None,
-        service_key_supported: bool = None,
-        cf_guid: dict = None,
+        type: Optional[str] = None,
+        iam_compatible: Optional[bool] = None,
+        unique_api_key: Optional[bool] = None,
+        provisionable: Optional[bool] = None,
+        bindable: Optional[bool] = None,
+        async_provisioning_supported: Optional[bool] = None,
+        async_unprovisioning_supported: Optional[bool] = None,
+        requires: Optional[List[str]] = None,
+        plan_updateable: Optional[bool] = None,
+        state: Optional[str] = None,
+        service_check_enabled: Optional[bool] = None,
+        test_check_interval: Optional[int] = None,
+        service_key_supported: Optional[bool] = None,
+        cf_guid: Optional[dict] = None,
     ) -> None:
         """
         Initialize a CFMetaData object.
@@ -1723,34 +2059,34 @@ class CFMetaData:
     def from_dict(cls, _dict: Dict) -> 'CFMetaData':
         """Initialize a CFMetaData object from a json dictionary."""
         args = {}
-        if 'type' in _dict:
-            args['type'] = _dict.get('type')
-        if 'iam_compatible' in _dict:
-            args['iam_compatible'] = _dict.get('iam_compatible')
-        if 'unique_api_key' in _dict:
-            args['unique_api_key'] = _dict.get('unique_api_key')
-        if 'provisionable' in _dict:
-            args['provisionable'] = _dict.get('provisionable')
-        if 'bindable' in _dict:
-            args['bindable'] = _dict.get('bindable')
-        if 'async_provisioning_supported' in _dict:
-            args['async_provisioning_supported'] = _dict.get('async_provisioning_supported')
-        if 'async_unprovisioning_supported' in _dict:
-            args['async_unprovisioning_supported'] = _dict.get('async_unprovisioning_supported')
-        if 'requires' in _dict:
-            args['requires'] = _dict.get('requires')
-        if 'plan_updateable' in _dict:
-            args['plan_updateable'] = _dict.get('plan_updateable')
-        if 'state' in _dict:
-            args['state'] = _dict.get('state')
-        if 'service_check_enabled' in _dict:
-            args['service_check_enabled'] = _dict.get('service_check_enabled')
-        if 'test_check_interval' in _dict:
-            args['test_check_interval'] = _dict.get('test_check_interval')
-        if 'service_key_supported' in _dict:
-            args['service_key_supported'] = _dict.get('service_key_supported')
-        if 'cf_guid' in _dict:
-            args['cf_guid'] = _dict.get('cf_guid')
+        if (type := _dict.get('type')) is not None:
+            args['type'] = type
+        if (iam_compatible := _dict.get('iam_compatible')) is not None:
+            args['iam_compatible'] = iam_compatible
+        if (unique_api_key := _dict.get('unique_api_key')) is not None:
+            args['unique_api_key'] = unique_api_key
+        if (provisionable := _dict.get('provisionable')) is not None:
+            args['provisionable'] = provisionable
+        if (bindable := _dict.get('bindable')) is not None:
+            args['bindable'] = bindable
+        if (async_provisioning_supported := _dict.get('async_provisioning_supported')) is not None:
+            args['async_provisioning_supported'] = async_provisioning_supported
+        if (async_unprovisioning_supported := _dict.get('async_unprovisioning_supported')) is not None:
+            args['async_unprovisioning_supported'] = async_unprovisioning_supported
+        if (requires := _dict.get('requires')) is not None:
+            args['requires'] = requires
+        if (plan_updateable := _dict.get('plan_updateable')) is not None:
+            args['plan_updateable'] = plan_updateable
+        if (state := _dict.get('state')) is not None:
+            args['state'] = state
+        if (service_check_enabled := _dict.get('service_check_enabled')) is not None:
+            args['service_check_enabled'] = service_check_enabled
+        if (test_check_interval := _dict.get('test_check_interval')) is not None:
+            args['test_check_interval'] = test_check_interval
+        if (service_key_supported := _dict.get('service_key_supported')) is not None:
+            args['service_key_supported'] = service_key_supported
+        if (cf_guid := _dict.get('cf_guid')) is not None:
+            args['cf_guid'] = cf_guid
         return cls(**args)
 
     @classmethod
@@ -1814,34 +2150,34 @@ class Callbacks:
     """
     Callback-related information associated with a catalog entry.
 
-    :attr str controller_url: (optional) The URL of the deployment controller.
-    :attr str broker_url: (optional) The URL of the deployment broker.
-    :attr str broker_proxy_url: (optional) The URL of the deployment broker SC
+    :param str controller_url: (optional) The URL of the deployment controller.
+    :param str broker_url: (optional) The URL of the deployment broker.
+    :param str broker_proxy_url: (optional) The URL of the deployment broker SC
           proxy.
-    :attr str dashboard_url: (optional) The URL of dashboard callback.
-    :attr str dashboard_data_url: (optional) The URL of dashboard data.
-    :attr str dashboard_detail_tab_url: (optional) The URL of the dashboard detail
+    :param str dashboard_url: (optional) The URL of dashboard callback.
+    :param str dashboard_data_url: (optional) The URL of dashboard data.
+    :param str dashboard_detail_tab_url: (optional) The URL of the dashboard detail
           tab.
-    :attr str dashboard_detail_tab_ext_url: (optional) The URL of the dashboard
+    :param str dashboard_detail_tab_ext_url: (optional) The URL of the dashboard
           detail tab extension.
-    :attr str service_monitor_api: (optional) Service monitor API URL.
-    :attr str service_monitor_app: (optional) Service monitor app URL.
-    :attr dict api_endpoint: (optional) API endpoint.
+    :param str service_monitor_api: (optional) Service monitor API URL.
+    :param str service_monitor_app: (optional) Service monitor app URL.
+    :param dict api_endpoint: (optional) API endpoint.
     """
 
     def __init__(
         self,
         *,
-        controller_url: str = None,
-        broker_url: str = None,
-        broker_proxy_url: str = None,
-        dashboard_url: str = None,
-        dashboard_data_url: str = None,
-        dashboard_detail_tab_url: str = None,
-        dashboard_detail_tab_ext_url: str = None,
-        service_monitor_api: str = None,
-        service_monitor_app: str = None,
-        api_endpoint: dict = None,
+        controller_url: Optional[str] = None,
+        broker_url: Optional[str] = None,
+        broker_proxy_url: Optional[str] = None,
+        dashboard_url: Optional[str] = None,
+        dashboard_data_url: Optional[str] = None,
+        dashboard_detail_tab_url: Optional[str] = None,
+        dashboard_detail_tab_ext_url: Optional[str] = None,
+        service_monitor_api: Optional[str] = None,
+        service_monitor_app: Optional[str] = None,
+        api_endpoint: Optional[dict] = None,
     ) -> None:
         """
         Initialize a Callbacks object.
@@ -1875,26 +2211,26 @@ class Callbacks:
     def from_dict(cls, _dict: Dict) -> 'Callbacks':
         """Initialize a Callbacks object from a json dictionary."""
         args = {}
-        if 'controller_url' in _dict:
-            args['controller_url'] = _dict.get('controller_url')
-        if 'broker_url' in _dict:
-            args['broker_url'] = _dict.get('broker_url')
-        if 'broker_proxy_url' in _dict:
-            args['broker_proxy_url'] = _dict.get('broker_proxy_url')
-        if 'dashboard_url' in _dict:
-            args['dashboard_url'] = _dict.get('dashboard_url')
-        if 'dashboard_data_url' in _dict:
-            args['dashboard_data_url'] = _dict.get('dashboard_data_url')
-        if 'dashboard_detail_tab_url' in _dict:
-            args['dashboard_detail_tab_url'] = _dict.get('dashboard_detail_tab_url')
-        if 'dashboard_detail_tab_ext_url' in _dict:
-            args['dashboard_detail_tab_ext_url'] = _dict.get('dashboard_detail_tab_ext_url')
-        if 'service_monitor_api' in _dict:
-            args['service_monitor_api'] = _dict.get('service_monitor_api')
-        if 'service_monitor_app' in _dict:
-            args['service_monitor_app'] = _dict.get('service_monitor_app')
-        if 'api_endpoint' in _dict:
-            args['api_endpoint'] = _dict.get('api_endpoint')
+        if (controller_url := _dict.get('controller_url')) is not None:
+            args['controller_url'] = controller_url
+        if (broker_url := _dict.get('broker_url')) is not None:
+            args['broker_url'] = broker_url
+        if (broker_proxy_url := _dict.get('broker_proxy_url')) is not None:
+            args['broker_proxy_url'] = broker_proxy_url
+        if (dashboard_url := _dict.get('dashboard_url')) is not None:
+            args['dashboard_url'] = dashboard_url
+        if (dashboard_data_url := _dict.get('dashboard_data_url')) is not None:
+            args['dashboard_data_url'] = dashboard_data_url
+        if (dashboard_detail_tab_url := _dict.get('dashboard_detail_tab_url')) is not None:
+            args['dashboard_detail_tab_url'] = dashboard_detail_tab_url
+        if (dashboard_detail_tab_ext_url := _dict.get('dashboard_detail_tab_ext_url')) is not None:
+            args['dashboard_detail_tab_ext_url'] = dashboard_detail_tab_ext_url
+        if (service_monitor_api := _dict.get('service_monitor_api')) is not None:
+            args['service_monitor_api'] = service_monitor_api
+        if (service_monitor_app := _dict.get('service_monitor_app')) is not None:
+            args['service_monitor_app'] = service_monitor_app
+        if (api_endpoint := _dict.get('api_endpoint')) is not None:
+            args['api_endpoint'] = api_endpoint
         return cls(**args)
 
     @classmethod
@@ -1950,39 +2286,42 @@ class CatalogEntry:
     """
     An entry in the global catalog.
 
-    :attr str name: Programmatic name for this catalog entry, which must be
+    :param str name: Programmatic name for this catalog entry, which must be
           formatted like a CRN segment. See the display name in OverviewUI for a
           user-readable name.
-    :attr str kind: The type of catalog entry, **service**, **template**,
+    :param str kind: The type of catalog entry, **service**, **template**,
           **dashboard**, which determines the type and shape of the object.
-    :attr dict overview_ui: Overview is nested in the top level. The key value pair
+    :param dict overview_ui: Overview is nested in the top level. The key value pair
           is `[_language_]overview_ui`.
-    :attr Image images: Image annotation for this catalog entry. The image is a URL.
-    :attr str parent_id: (optional) The ID of the parent catalog entry if it exists.
-    :attr bool disabled: Boolean value that determines the global visibility for the
-          catalog entry, and its children. If it is not enabled, all plans are disabled.
-    :attr List[str] tags: A list of tags. For example, IBM, 3rd Party, Beta, GA, and
-          Single Tenant.
-    :attr bool group: (optional) Boolean value that determines whether the catalog
+    :param Image images: Image annotation for this catalog entry. The image is a
+          URL.
+    :param str parent_id: (optional) The ID of the parent catalog entry if it
+          exists.
+    :param bool disabled: Boolean value that determines the global visibility for
+          the catalog entry, and its children. If it is not enabled, all plans are
+          disabled.
+    :param List[str] tags: A list of tags. For example, IBM, 3rd Party, Beta, GA,
+          and Single Tenant.
+    :param bool group: (optional) Boolean value that determines whether the catalog
           entry is a group.
-    :attr Provider provider: Information related to the provider associated with a
+    :param Provider provider: Information related to the provider associated with a
           catalog entry.
-    :attr bool active: (optional) Boolean value that describes whether the service
+    :param bool active: (optional) Boolean value that describes whether the service
           is active.
-    :attr CatalogEntryMetadata metadata: (optional) Model used to describe metadata
+    :param str url: (optional) URL to get details about this object.
+    :param CatalogEntryMetadata metadata: (optional) Model used to describe metadata
           object returned.
-    :attr str id: (optional) Catalog entry's unique ID. It's the same across all
+    :param str id: (optional) Catalog entry's unique ID. It's the same across all
           catalog instances.
-    :attr str catalog_crn: (optional) The CRN associated with the catalog entry.
-    :attr str url: (optional) URL to get details about this object.
-    :attr str children_url: (optional) URL to get details about children of this
+    :param str catalog_crn: (optional) The CRN associated with the catalog entry.
+    :param str children_url: (optional) URL to get details about children of this
           object.
-    :attr List[str] geo_tags: (optional) tags to indicate the locations this service
-          is deployable to.
-    :attr List[str] pricing_tags: (optional) tags to indicate the type of pricing
+    :param List[str] geo_tags: (optional) tags to indicate the locations this
+          service is deployable to.
+    :param List[str] pricing_tags: (optional) tags to indicate the type of pricing
           plans this service supports.
-    :attr datetime created: (optional) Date created.
-    :attr datetime updated: (optional) Date last updated.
+    :param datetime created: (optional) Date created.
+    :param datetime updated: (optional) Date last updated.
     """
 
     def __init__(
@@ -1995,18 +2334,18 @@ class CatalogEntry:
         tags: List[str],
         provider: 'Provider',
         *,
-        parent_id: str = None,
-        group: bool = None,
-        active: bool = None,
-        metadata: 'CatalogEntryMetadata' = None,
-        id: str = None,
-        catalog_crn: str = None,
-        url: str = None,
-        children_url: str = None,
-        geo_tags: List[str] = None,
-        pricing_tags: List[str] = None,
-        created: datetime = None,
-        updated: datetime = None,
+        parent_id: Optional[str] = None,
+        group: Optional[bool] = None,
+        active: Optional[bool] = None,
+        url: Optional[str] = None,
+        metadata: Optional['CatalogEntryMetadata'] = None,
+        id: Optional[str] = None,
+        catalog_crn: Optional[str] = None,
+        children_url: Optional[str] = None,
+        geo_tags: Optional[List[str]] = None,
+        pricing_tags: Optional[List[str]] = None,
+        created: Optional[datetime] = None,
+        updated: Optional[datetime] = None,
     ) -> None:
         """
         Initialize a CatalogEntry object.
@@ -2046,10 +2385,10 @@ class CatalogEntry:
         self.group = group
         self.provider = provider
         self.active = active
+        self.url = url
         self.metadata = metadata
         self.id = id
         self.catalog_crn = catalog_crn
-        self.url = url
         self.children_url = children_url
         self.geo_tags = geo_tags
         self.pricing_tags = pricing_tags
@@ -2060,58 +2399,58 @@ class CatalogEntry:
     def from_dict(cls, _dict: Dict) -> 'CatalogEntry':
         """Initialize a CatalogEntry object from a json dictionary."""
         args = {}
-        if 'name' in _dict:
-            args['name'] = _dict.get('name')
+        if (name := _dict.get('name')) is not None:
+            args['name'] = name
         else:
             raise ValueError('Required property \'name\' not present in CatalogEntry JSON')
-        if 'kind' in _dict:
-            args['kind'] = _dict.get('kind')
+        if (kind := _dict.get('kind')) is not None:
+            args['kind'] = kind
         else:
             raise ValueError('Required property \'kind\' not present in CatalogEntry JSON')
-        if 'overview_ui' in _dict:
-            args['overview_ui'] = {k: Overview.from_dict(v) for k, v in _dict.get('overview_ui').items()}
+        if (overview_ui := _dict.get('overview_ui')) is not None:
+            args['overview_ui'] = {k: Overview.from_dict(v) for k, v in overview_ui.items()}
         else:
             raise ValueError('Required property \'overview_ui\' not present in CatalogEntry JSON')
-        if 'images' in _dict:
-            args['images'] = Image.from_dict(_dict.get('images'))
+        if (images := _dict.get('images')) is not None:
+            args['images'] = Image.from_dict(images)
         else:
             raise ValueError('Required property \'images\' not present in CatalogEntry JSON')
-        if 'parent_id' in _dict:
-            args['parent_id'] = _dict.get('parent_id')
-        if 'disabled' in _dict:
-            args['disabled'] = _dict.get('disabled')
+        if (parent_id := _dict.get('parent_id')) is not None:
+            args['parent_id'] = parent_id
+        if (disabled := _dict.get('disabled')) is not None:
+            args['disabled'] = disabled
         else:
             raise ValueError('Required property \'disabled\' not present in CatalogEntry JSON')
-        if 'tags' in _dict:
-            args['tags'] = _dict.get('tags')
+        if (tags := _dict.get('tags')) is not None:
+            args['tags'] = tags
         else:
             raise ValueError('Required property \'tags\' not present in CatalogEntry JSON')
-        if 'group' in _dict:
-            args['group'] = _dict.get('group')
-        if 'provider' in _dict:
-            args['provider'] = Provider.from_dict(_dict.get('provider'))
+        if (group := _dict.get('group')) is not None:
+            args['group'] = group
+        if (provider := _dict.get('provider')) is not None:
+            args['provider'] = Provider.from_dict(provider)
         else:
             raise ValueError('Required property \'provider\' not present in CatalogEntry JSON')
-        if 'active' in _dict:
-            args['active'] = _dict.get('active')
-        if 'metadata' in _dict:
-            args['metadata'] = CatalogEntryMetadata.from_dict(_dict.get('metadata'))
-        if 'id' in _dict:
-            args['id'] = _dict.get('id')
-        if 'catalog_crn' in _dict:
-            args['catalog_crn'] = _dict.get('catalog_crn')
-        if 'url' in _dict:
-            args['url'] = _dict.get('url')
-        if 'children_url' in _dict:
-            args['children_url'] = _dict.get('children_url')
-        if 'geo_tags' in _dict:
-            args['geo_tags'] = _dict.get('geo_tags')
-        if 'pricing_tags' in _dict:
-            args['pricing_tags'] = _dict.get('pricing_tags')
-        if 'created' in _dict:
-            args['created'] = string_to_datetime(_dict.get('created'))
-        if 'updated' in _dict:
-            args['updated'] = string_to_datetime(_dict.get('updated'))
+        if (active := _dict.get('active')) is not None:
+            args['active'] = active
+        if (url := _dict.get('url')) is not None:
+            args['url'] = url
+        if (metadata := _dict.get('metadata')) is not None:
+            args['metadata'] = CatalogEntryMetadata.from_dict(metadata)
+        if (id := _dict.get('id')) is not None:
+            args['id'] = id
+        if (catalog_crn := _dict.get('catalog_crn')) is not None:
+            args['catalog_crn'] = catalog_crn
+        if (children_url := _dict.get('children_url')) is not None:
+            args['children_url'] = children_url
+        if (geo_tags := _dict.get('geo_tags')) is not None:
+            args['geo_tags'] = geo_tags
+        if (pricing_tags := _dict.get('pricing_tags')) is not None:
+            args['pricing_tags'] = pricing_tags
+        if (created := _dict.get('created')) is not None:
+            args['created'] = string_to_datetime(created)
+        if (updated := _dict.get('updated')) is not None:
+            args['updated'] = string_to_datetime(updated)
         return cls(**args)
 
     @classmethod
@@ -2127,9 +2466,18 @@ class CatalogEntry:
         if hasattr(self, 'kind') and self.kind is not None:
             _dict['kind'] = self.kind
         if hasattr(self, 'overview_ui') and self.overview_ui is not None:
-            _dict['overview_ui'] = {k: v.to_dict() for k, v in self.overview_ui.items()}
+            overview_ui_map = {}
+            for k, v in self.overview_ui.items():
+                if isinstance(v, dict):
+                    overview_ui_map[k] = v
+                else:
+                    overview_ui_map[k] = v.to_dict()
+            _dict['overview_ui'] = overview_ui_map
         if hasattr(self, 'images') and self.images is not None:
-            _dict['images'] = self.images.to_dict()
+            if isinstance(self.images, dict):
+                _dict['images'] = self.images
+            else:
+                _dict['images'] = self.images.to_dict()
         if hasattr(self, 'parent_id') and self.parent_id is not None:
             _dict['parent_id'] = self.parent_id
         if hasattr(self, 'disabled') and self.disabled is not None:
@@ -2139,17 +2487,23 @@ class CatalogEntry:
         if hasattr(self, 'group') and self.group is not None:
             _dict['group'] = self.group
         if hasattr(self, 'provider') and self.provider is not None:
-            _dict['provider'] = self.provider.to_dict()
+            if isinstance(self.provider, dict):
+                _dict['provider'] = self.provider
+            else:
+                _dict['provider'] = self.provider.to_dict()
         if hasattr(self, 'active') and self.active is not None:
             _dict['active'] = self.active
+        if hasattr(self, 'url') and getattr(self, 'url') is not None:
+            _dict['url'] = getattr(self, 'url')
         if hasattr(self, 'metadata') and self.metadata is not None:
-            _dict['metadata'] = self.metadata.to_dict()
+            if isinstance(self.metadata, dict):
+                _dict['metadata'] = self.metadata
+            else:
+                _dict['metadata'] = self.metadata.to_dict()
         if hasattr(self, 'id') and getattr(self, 'id') is not None:
             _dict['id'] = getattr(self, 'id')
         if hasattr(self, 'catalog_crn') and getattr(self, 'catalog_crn') is not None:
             _dict['catalog_crn'] = getattr(self, 'catalog_crn')
-        if hasattr(self, 'url') and getattr(self, 'url') is not None:
-            _dict['url'] = getattr(self, 'url')
         if hasattr(self, 'children_url') and getattr(self, 'children_url') is not None:
             _dict['children_url'] = getattr(self, 'children_url')
         if hasattr(self, 'geo_tags') and getattr(self, 'geo_tags') is not None:
@@ -2195,44 +2549,45 @@ class CatalogEntryMetadata:
     """
     Model used to describe metadata object returned.
 
-    :attr bool rc_compatible: (optional) Boolean value that describes whether the
+    :param bool rc_compatible: (optional) Boolean value that describes whether the
           service is compatible with the Resource Controller.
-    :attr CFMetaData service: (optional) Service-related metadata.
-    :attr PlanMetaData plan: (optional) Plan-related metadata.
-    :attr AliasMetaData alias: (optional) Alias-related metadata.
-    :attr TemplateMetaData template: (optional) Template-related metadata.
-    :attr UIMetaData ui: (optional) Information related to the UI presentation
+    :param CFMetaData service: (optional) Service-related metadata.
+    :param PlanMetaData plan: (optional) Plan-related metadata.
+    :param AliasMetaData alias: (optional) Alias-related metadata.
+    :param TemplateMetaData template: (optional) Template-related metadata.
+    :param UIMetaData ui: (optional) Information related to the UI presentation
           associated with a catalog entry.
-    :attr List[str] compliance: (optional) Compliance information for HIPAA and PCI.
-    :attr SLAMetaData sla: (optional) Service Level Agreement related metadata.
-    :attr Callbacks callbacks: (optional) Callback-related information associated
+    :param List[str] compliance: (optional) Compliance information for HIPAA and
+          PCI.
+    :param SLAMetaData sla: (optional) Service Level Agreement related metadata.
+    :param Callbacks callbacks: (optional) Callback-related information associated
           with a catalog entry.
-    :attr str original_name: (optional) The original name of the object.
-    :attr str version: (optional) Optional version of the object.
-    :attr dict other: (optional) Additional information.
-    :attr CatalogEntryMetadataPricing pricing: (optional) Pricing-related
+    :param str original_name: (optional) The original name of the object.
+    :param str version: (optional) Optional version of the object.
+    :param dict other: (optional) Additional information.
+    :param CatalogEntryMetadataPricing pricing: (optional) Pricing-related
           information.
-    :attr CatalogEntryMetadataDeployment deployment: (optional) Deployment-related
+    :param CatalogEntryMetadataDeployment deployment: (optional) Deployment-related
           metadata.
     """
 
     def __init__(
         self,
         *,
-        rc_compatible: bool = None,
-        service: 'CFMetaData' = None,
-        plan: 'PlanMetaData' = None,
-        alias: 'AliasMetaData' = None,
-        template: 'TemplateMetaData' = None,
-        ui: 'UIMetaData' = None,
-        compliance: List[str] = None,
-        sla: 'SLAMetaData' = None,
-        callbacks: 'Callbacks' = None,
-        original_name: str = None,
-        version: str = None,
-        other: dict = None,
-        pricing: 'CatalogEntryMetadataPricing' = None,
-        deployment: 'CatalogEntryMetadataDeployment' = None,
+        rc_compatible: Optional[bool] = None,
+        service: Optional['CFMetaData'] = None,
+        plan: Optional['PlanMetaData'] = None,
+        alias: Optional['AliasMetaData'] = None,
+        template: Optional['TemplateMetaData'] = None,
+        ui: Optional['UIMetaData'] = None,
+        compliance: Optional[List[str]] = None,
+        sla: Optional['SLAMetaData'] = None,
+        callbacks: Optional['Callbacks'] = None,
+        original_name: Optional[str] = None,
+        version: Optional[str] = None,
+        other: Optional[dict] = None,
+        pricing: Optional['CatalogEntryMetadataPricing'] = None,
+        deployment: Optional['CatalogEntryMetadataDeployment'] = None,
     ) -> None:
         """
         Initialize a CatalogEntryMetadata object.
@@ -2278,34 +2633,34 @@ class CatalogEntryMetadata:
     def from_dict(cls, _dict: Dict) -> 'CatalogEntryMetadata':
         """Initialize a CatalogEntryMetadata object from a json dictionary."""
         args = {}
-        if 'rc_compatible' in _dict:
-            args['rc_compatible'] = _dict.get('rc_compatible')
-        if 'service' in _dict:
-            args['service'] = CFMetaData.from_dict(_dict.get('service'))
-        if 'plan' in _dict:
-            args['plan'] = PlanMetaData.from_dict(_dict.get('plan'))
-        if 'alias' in _dict:
-            args['alias'] = AliasMetaData.from_dict(_dict.get('alias'))
-        if 'template' in _dict:
-            args['template'] = TemplateMetaData.from_dict(_dict.get('template'))
-        if 'ui' in _dict:
-            args['ui'] = UIMetaData.from_dict(_dict.get('ui'))
-        if 'compliance' in _dict:
-            args['compliance'] = _dict.get('compliance')
-        if 'sla' in _dict:
-            args['sla'] = SLAMetaData.from_dict(_dict.get('sla'))
-        if 'callbacks' in _dict:
-            args['callbacks'] = Callbacks.from_dict(_dict.get('callbacks'))
-        if 'original_name' in _dict:
-            args['original_name'] = _dict.get('original_name')
-        if 'version' in _dict:
-            args['version'] = _dict.get('version')
-        if 'other' in _dict:
-            args['other'] = _dict.get('other')
-        if 'pricing' in _dict:
-            args['pricing'] = CatalogEntryMetadataPricing.from_dict(_dict.get('pricing'))
-        if 'deployment' in _dict:
-            args['deployment'] = CatalogEntryMetadataDeployment.from_dict(_dict.get('deployment'))
+        if (rc_compatible := _dict.get('rc_compatible')) is not None:
+            args['rc_compatible'] = rc_compatible
+        if (service := _dict.get('service')) is not None:
+            args['service'] = CFMetaData.from_dict(service)
+        if (plan := _dict.get('plan')) is not None:
+            args['plan'] = PlanMetaData.from_dict(plan)
+        if (alias := _dict.get('alias')) is not None:
+            args['alias'] = AliasMetaData.from_dict(alias)
+        if (template := _dict.get('template')) is not None:
+            args['template'] = TemplateMetaData.from_dict(template)
+        if (ui := _dict.get('ui')) is not None:
+            args['ui'] = UIMetaData.from_dict(ui)
+        if (compliance := _dict.get('compliance')) is not None:
+            args['compliance'] = compliance
+        if (sla := _dict.get('sla')) is not None:
+            args['sla'] = SLAMetaData.from_dict(sla)
+        if (callbacks := _dict.get('callbacks')) is not None:
+            args['callbacks'] = Callbacks.from_dict(callbacks)
+        if (original_name := _dict.get('original_name')) is not None:
+            args['original_name'] = original_name
+        if (version := _dict.get('version')) is not None:
+            args['version'] = version
+        if (other := _dict.get('other')) is not None:
+            args['other'] = other
+        if (pricing := _dict.get('pricing')) is not None:
+            args['pricing'] = CatalogEntryMetadataPricing.from_dict(pricing)
+        if (deployment := _dict.get('deployment')) is not None:
+            args['deployment'] = CatalogEntryMetadataDeployment.from_dict(deployment)
         return cls(**args)
 
     @classmethod
@@ -2319,21 +2674,42 @@ class CatalogEntryMetadata:
         if hasattr(self, 'rc_compatible') and self.rc_compatible is not None:
             _dict['rc_compatible'] = self.rc_compatible
         if hasattr(self, 'service') and self.service is not None:
-            _dict['service'] = self.service.to_dict()
+            if isinstance(self.service, dict):
+                _dict['service'] = self.service
+            else:
+                _dict['service'] = self.service.to_dict()
         if hasattr(self, 'plan') and self.plan is not None:
-            _dict['plan'] = self.plan.to_dict()
+            if isinstance(self.plan, dict):
+                _dict['plan'] = self.plan
+            else:
+                _dict['plan'] = self.plan.to_dict()
         if hasattr(self, 'alias') and self.alias is not None:
-            _dict['alias'] = self.alias.to_dict()
+            if isinstance(self.alias, dict):
+                _dict['alias'] = self.alias
+            else:
+                _dict['alias'] = self.alias.to_dict()
         if hasattr(self, 'template') and self.template is not None:
-            _dict['template'] = self.template.to_dict()
+            if isinstance(self.template, dict):
+                _dict['template'] = self.template
+            else:
+                _dict['template'] = self.template.to_dict()
         if hasattr(self, 'ui') and self.ui is not None:
-            _dict['ui'] = self.ui.to_dict()
+            if isinstance(self.ui, dict):
+                _dict['ui'] = self.ui
+            else:
+                _dict['ui'] = self.ui.to_dict()
         if hasattr(self, 'compliance') and self.compliance is not None:
             _dict['compliance'] = self.compliance
         if hasattr(self, 'sla') and self.sla is not None:
-            _dict['sla'] = self.sla.to_dict()
+            if isinstance(self.sla, dict):
+                _dict['sla'] = self.sla
+            else:
+                _dict['sla'] = self.sla.to_dict()
         if hasattr(self, 'callbacks') and self.callbacks is not None:
-            _dict['callbacks'] = self.callbacks.to_dict()
+            if isinstance(self.callbacks, dict):
+                _dict['callbacks'] = self.callbacks
+            else:
+                _dict['callbacks'] = self.callbacks.to_dict()
         if hasattr(self, 'original_name') and self.original_name is not None:
             _dict['original_name'] = self.original_name
         if hasattr(self, 'version') and self.version is not None:
@@ -2341,9 +2717,15 @@ class CatalogEntryMetadata:
         if hasattr(self, 'other') and self.other is not None:
             _dict['other'] = self.other
         if hasattr(self, 'pricing') and self.pricing is not None:
-            _dict['pricing'] = self.pricing.to_dict()
+            if isinstance(self.pricing, dict):
+                _dict['pricing'] = self.pricing
+            else:
+                _dict['pricing'] = self.pricing.to_dict()
         if hasattr(self, 'deployment') and self.deployment is not None:
-            _dict['deployment'] = self.deployment.to_dict()
+            if isinstance(self.deployment, dict):
+                _dict['deployment'] = self.deployment
+            else:
+                _dict['deployment'] = self.deployment.to_dict()
         return _dict
 
     def _to_dict(self):
@@ -2369,33 +2751,33 @@ class CatalogEntryMetadataDeployment:
     """
     Deployment-related metadata.
 
-    :attr str location: (optional) Describes the region where the service is
+    :param str location: (optional) Describes the region where the service is
           located.
-    :attr str location_url: (optional) Pointer to the location resource in the
+    :param str location_url: (optional) Pointer to the location resource in the
           catalog.
-    :attr str original_location: (optional) Original service location.
-    :attr str target_crn: (optional) A CRN that describes the deployment.
+    :param str original_location: (optional) Original service location.
+    :param str target_crn: (optional) A CRN that describes the deployment.
           crn:v1:[cname]:[ctype]:[location]:[scope]::[resource-type]:[resource].
-    :attr str service_crn: (optional) CRN for the service.
-    :attr str mccp_id: (optional) ID for MCCP.
-    :attr Broker broker: (optional) The broker associated with a catalog entry.
-    :attr bool supports_rc_migration: (optional) This deployment not only supports
+    :param str service_crn: (optional) CRN for the service.
+    :param str mccp_id: (optional) ID for MCCP.
+    :param Broker broker: (optional) The broker associated with a catalog entry.
+    :param bool supports_rc_migration: (optional) This deployment not only supports
           RC but is ready to migrate and support the RC broker for a location.
-    :attr str target_network: (optional) network to use during deployment.
+    :param str target_network: (optional) network to use during deployment.
     """
 
     def __init__(
         self,
         *,
-        location: str = None,
-        location_url: str = None,
-        original_location: str = None,
-        target_crn: str = None,
-        service_crn: str = None,
-        mccp_id: str = None,
-        broker: 'Broker' = None,
-        supports_rc_migration: bool = None,
-        target_network: str = None,
+        location: Optional[str] = None,
+        location_url: Optional[str] = None,
+        original_location: Optional[str] = None,
+        target_crn: Optional[str] = None,
+        service_crn: Optional[str] = None,
+        mccp_id: Optional[str] = None,
+        broker: Optional['Broker'] = None,
+        supports_rc_migration: Optional[bool] = None,
+        target_network: Optional[str] = None,
     ) -> None:
         """
         Initialize a CatalogEntryMetadataDeployment object.
@@ -2428,24 +2810,24 @@ class CatalogEntryMetadataDeployment:
     def from_dict(cls, _dict: Dict) -> 'CatalogEntryMetadataDeployment':
         """Initialize a CatalogEntryMetadataDeployment object from a json dictionary."""
         args = {}
-        if 'location' in _dict:
-            args['location'] = _dict.get('location')
-        if 'location_url' in _dict:
-            args['location_url'] = _dict.get('location_url')
-        if 'original_location' in _dict:
-            args['original_location'] = _dict.get('original_location')
-        if 'target_crn' in _dict:
-            args['target_crn'] = _dict.get('target_crn')
-        if 'service_crn' in _dict:
-            args['service_crn'] = _dict.get('service_crn')
-        if 'mccp_id' in _dict:
-            args['mccp_id'] = _dict.get('mccp_id')
-        if 'broker' in _dict:
-            args['broker'] = Broker.from_dict(_dict.get('broker'))
-        if 'supports_rc_migration' in _dict:
-            args['supports_rc_migration'] = _dict.get('supports_rc_migration')
-        if 'target_network' in _dict:
-            args['target_network'] = _dict.get('target_network')
+        if (location := _dict.get('location')) is not None:
+            args['location'] = location
+        if (location_url := _dict.get('location_url')) is not None:
+            args['location_url'] = location_url
+        if (original_location := _dict.get('original_location')) is not None:
+            args['original_location'] = original_location
+        if (target_crn := _dict.get('target_crn')) is not None:
+            args['target_crn'] = target_crn
+        if (service_crn := _dict.get('service_crn')) is not None:
+            args['service_crn'] = service_crn
+        if (mccp_id := _dict.get('mccp_id')) is not None:
+            args['mccp_id'] = mccp_id
+        if (broker := _dict.get('broker')) is not None:
+            args['broker'] = Broker.from_dict(broker)
+        if (supports_rc_migration := _dict.get('supports_rc_migration')) is not None:
+            args['supports_rc_migration'] = supports_rc_migration
+        if (target_network := _dict.get('target_network')) is not None:
+            args['target_network'] = target_network
         return cls(**args)
 
     @classmethod
@@ -2469,7 +2851,10 @@ class CatalogEntryMetadataDeployment:
         if hasattr(self, 'mccp_id') and self.mccp_id is not None:
             _dict['mccp_id'] = self.mccp_id
         if hasattr(self, 'broker') and self.broker is not None:
-            _dict['broker'] = self.broker.to_dict()
+            if isinstance(self.broker, dict):
+                _dict['broker'] = self.broker
+            else:
+                _dict['broker'] = self.broker.to_dict()
         if hasattr(self, 'supports_rc_migration') and self.supports_rc_migration is not None:
             _dict['supports_rc_migration'] = self.supports_rc_migration
         if hasattr(self, 'target_network') and self.target_network is not None:
@@ -2499,21 +2884,35 @@ class CatalogEntryMetadataPricing:
     """
     Pricing-related information.
 
-    :attr str type: (optional) Type of plan. Valid values are `free`, `trial`,
+    :param str type: (optional) Type of plan. Valid values are `free`, `trial`,
           `paygo`, `bluemix-subscription`, and `ibm-subscription`.
-    :attr str origin: (optional) Defines where the pricing originates.
-    :attr StartingPrice starting_price: (optional) Plan-specific starting price
+    :param str origin: (optional) Defines where the pricing originates.
+    :param StartingPrice starting_price: (optional) Plan-specific starting price
           information.
-    :attr List[Metrics] metrics: (optional) Plan-specific cost metric structure.
+    :param str deployment_id: (optional) The deployment object id this pricing is
+          from. Only set if object kind is deployment.
+    :param str deployment_location: (optional) The deployment location this pricing
+          is from. Only set if object kind is deployment.
+    :param bool deployment_location_no_price_available: (optional) Is the location
+          price not available. Only set in api /pricing/deployment and only set if true.
+          This means for the given deployment object there was no pricing set in pricing
+          catalog.
+    :param List[Metrics] metrics: (optional) Plan-specific cost metric structure.
+    :param List[str] deployment_regions: (optional) List of regions where region
+          pricing is available. Only set on global deployments if enabled by owner.
     """
 
     def __init__(
         self,
         *,
-        type: str = None,
-        origin: str = None,
-        starting_price: 'StartingPrice' = None,
-        metrics: List['Metrics'] = None,
+        type: Optional[str] = None,
+        origin: Optional[str] = None,
+        starting_price: Optional['StartingPrice'] = None,
+        deployment_id: Optional[str] = None,
+        deployment_location: Optional[str] = None,
+        deployment_location_no_price_available: Optional[bool] = None,
+        metrics: Optional[List['Metrics']] = None,
+        deployment_regions: Optional[List[str]] = None,
     ) -> None:
         """
         Initialize a CatalogEntryMetadataPricing object.
@@ -2523,26 +2922,49 @@ class CatalogEntryMetadataPricing:
         :param str origin: (optional) Defines where the pricing originates.
         :param StartingPrice starting_price: (optional) Plan-specific starting
                price information.
+        :param str deployment_id: (optional) The deployment object id this pricing
+               is from. Only set if object kind is deployment.
+        :param str deployment_location: (optional) The deployment location this
+               pricing is from. Only set if object kind is deployment.
+        :param bool deployment_location_no_price_available: (optional) Is the
+               location price not available. Only set in api /pricing/deployment and only
+               set if true. This means for the given deployment object there was no
+               pricing set in pricing catalog.
         :param List[Metrics] metrics: (optional) Plan-specific cost metric
                structure.
+        :param List[str] deployment_regions: (optional) List of regions where
+               region pricing is available. Only set on global deployments if enabled by
+               owner.
         """
         self.type = type
         self.origin = origin
         self.starting_price = starting_price
+        self.deployment_id = deployment_id
+        self.deployment_location = deployment_location
+        self.deployment_location_no_price_available = deployment_location_no_price_available
         self.metrics = metrics
+        self.deployment_regions = deployment_regions
 
     @classmethod
     def from_dict(cls, _dict: Dict) -> 'CatalogEntryMetadataPricing':
         """Initialize a CatalogEntryMetadataPricing object from a json dictionary."""
         args = {}
-        if 'type' in _dict:
-            args['type'] = _dict.get('type')
-        if 'origin' in _dict:
-            args['origin'] = _dict.get('origin')
-        if 'starting_price' in _dict:
-            args['starting_price'] = StartingPrice.from_dict(_dict.get('starting_price'))
-        if 'metrics' in _dict:
-            args['metrics'] = [Metrics.from_dict(x) for x in _dict.get('metrics')]
+        if (type := _dict.get('type')) is not None:
+            args['type'] = type
+        if (origin := _dict.get('origin')) is not None:
+            args['origin'] = origin
+        if (starting_price := _dict.get('starting_price')) is not None:
+            args['starting_price'] = StartingPrice.from_dict(starting_price)
+        if (deployment_id := _dict.get('deployment_id')) is not None:
+            args['deployment_id'] = deployment_id
+        if (deployment_location := _dict.get('deployment_location')) is not None:
+            args['deployment_location'] = deployment_location
+        if (deployment_location_no_price_available := _dict.get('deployment_location_no_price_available')) is not None:
+            args['deployment_location_no_price_available'] = deployment_location_no_price_available
+        if (metrics := _dict.get('metrics')) is not None:
+            args['metrics'] = [Metrics.from_dict(v) for v in metrics]
+        if (deployment_regions := _dict.get('deployment_regions')) is not None:
+            args['deployment_regions'] = deployment_regions
         return cls(**args)
 
     @classmethod
@@ -2558,9 +2980,29 @@ class CatalogEntryMetadataPricing:
         if hasattr(self, 'origin') and self.origin is not None:
             _dict['origin'] = self.origin
         if hasattr(self, 'starting_price') and self.starting_price is not None:
-            _dict['starting_price'] = self.starting_price.to_dict()
+            if isinstance(self.starting_price, dict):
+                _dict['starting_price'] = self.starting_price
+            else:
+                _dict['starting_price'] = self.starting_price.to_dict()
+        if hasattr(self, 'deployment_id') and self.deployment_id is not None:
+            _dict['deployment_id'] = self.deployment_id
+        if hasattr(self, 'deployment_location') and self.deployment_location is not None:
+            _dict['deployment_location'] = self.deployment_location
+        if (
+            hasattr(self, 'deployment_location_no_price_available')
+            and self.deployment_location_no_price_available is not None
+        ):
+            _dict['deployment_location_no_price_available'] = self.deployment_location_no_price_available
         if hasattr(self, 'metrics') and self.metrics is not None:
-            _dict['metrics'] = [x.to_dict() for x in self.metrics]
+            metrics_list = []
+            for v in self.metrics:
+                if isinstance(v, dict):
+                    metrics_list.append(v)
+                else:
+                    metrics_list.append(v.to_dict())
+            _dict['metrics'] = metrics_list
+        if hasattr(self, 'deployment_regions') and self.deployment_regions is not None:
+            _dict['deployment_regions'] = self.deployment_regions
         return _dict
 
     def _to_dict(self):
@@ -2586,13 +3028,18 @@ class DRMetaData:
     """
     SLA Disaster Recovery-related metadata.
 
-    :attr bool dr: (optional) Required boolean value that describes whether disaster
-          recovery is on.
-    :attr str description: (optional) Description of the disaster recovery
+    :param bool dr: (optional) Required boolean value that describes whether
+          disaster recovery is on.
+    :param str description: (optional) Description of the disaster recovery
           implementation.
     """
 
-    def __init__(self, *, dr: bool = None, description: str = None) -> None:
+    def __init__(
+        self,
+        *,
+        dr: Optional[bool] = None,
+        description: Optional[str] = None,
+    ) -> None:
         """
         Initialize a DRMetaData object.
 
@@ -2608,10 +3055,10 @@ class DRMetaData:
     def from_dict(cls, _dict: Dict) -> 'DRMetaData':
         """Initialize a DRMetaData object from a json dictionary."""
         args = {}
-        if 'dr' in _dict:
-            args['dr'] = _dict.get('dr')
-        if 'description' in _dict:
-            args['description'] = _dict.get('description')
+        if (dr := _dict.get('dr')) is not None:
+            args['dr'] = dr
+        if (description := _dict.get('description')) is not None:
+            args['description'] = description
         return cls(**args)
 
     @classmethod
@@ -2651,32 +3098,32 @@ class DeploymentBase:
     """
     Deployment-related metadata.
 
-    :attr str location: (optional) Describes the region where the service is
+    :param str location: (optional) Describes the region where the service is
           located.
-    :attr str location_url: (optional) URL of deployment.
-    :attr str original_location: (optional) Original service location.
-    :attr str target_crn: (optional) A CRN that describes the deployment.
+    :param str location_url: (optional) URL of deployment.
+    :param str original_location: (optional) Original service location.
+    :param str target_crn: (optional) A CRN that describes the deployment.
           crn:v1:[cname]:[ctype]:[location]:[scope]::[resource-type]:[resource].
-    :attr str service_crn: (optional) CRN for the service.
-    :attr str mccp_id: (optional) ID for MCCP.
-    :attr Broker broker: (optional) The broker associated with a catalog entry.
-    :attr bool supports_rc_migration: (optional) This deployment not only supports
+    :param str service_crn: (optional) CRN for the service.
+    :param str mccp_id: (optional) ID for MCCP.
+    :param Broker broker: (optional) The broker associated with a catalog entry.
+    :param bool supports_rc_migration: (optional) This deployment not only supports
           RC but is ready to migrate and support the RC broker for a location.
-    :attr str target_network: (optional) network to use during deployment.
+    :param str target_network: (optional) network to use during deployment.
     """
 
     def __init__(
         self,
         *,
-        location: str = None,
-        location_url: str = None,
-        original_location: str = None,
-        target_crn: str = None,
-        service_crn: str = None,
-        mccp_id: str = None,
-        broker: 'Broker' = None,
-        supports_rc_migration: bool = None,
-        target_network: str = None,
+        location: Optional[str] = None,
+        location_url: Optional[str] = None,
+        original_location: Optional[str] = None,
+        target_crn: Optional[str] = None,
+        service_crn: Optional[str] = None,
+        mccp_id: Optional[str] = None,
+        broker: Optional['Broker'] = None,
+        supports_rc_migration: Optional[bool] = None,
+        target_network: Optional[str] = None,
     ) -> None:
         """
         Initialize a DeploymentBase object.
@@ -2710,24 +3157,24 @@ class DeploymentBase:
     def from_dict(cls, _dict: Dict) -> 'DeploymentBase':
         """Initialize a DeploymentBase object from a json dictionary."""
         args = {}
-        if 'location' in _dict:
-            args['location'] = _dict.get('location')
-        if 'location_url' in _dict:
-            args['location_url'] = _dict.get('location_url')
-        if 'original_location' in _dict:
-            args['original_location'] = _dict.get('original_location')
-        if 'target_crn' in _dict:
-            args['target_crn'] = _dict.get('target_crn')
-        if 'service_crn' in _dict:
-            args['service_crn'] = _dict.get('service_crn')
-        if 'mccp_id' in _dict:
-            args['mccp_id'] = _dict.get('mccp_id')
-        if 'broker' in _dict:
-            args['broker'] = Broker.from_dict(_dict.get('broker'))
-        if 'supports_rc_migration' in _dict:
-            args['supports_rc_migration'] = _dict.get('supports_rc_migration')
-        if 'target_network' in _dict:
-            args['target_network'] = _dict.get('target_network')
+        if (location := _dict.get('location')) is not None:
+            args['location'] = location
+        if (location_url := _dict.get('location_url')) is not None:
+            args['location_url'] = location_url
+        if (original_location := _dict.get('original_location')) is not None:
+            args['original_location'] = original_location
+        if (target_crn := _dict.get('target_crn')) is not None:
+            args['target_crn'] = target_crn
+        if (service_crn := _dict.get('service_crn')) is not None:
+            args['service_crn'] = service_crn
+        if (mccp_id := _dict.get('mccp_id')) is not None:
+            args['mccp_id'] = mccp_id
+        if (broker := _dict.get('broker')) is not None:
+            args['broker'] = Broker.from_dict(broker)
+        if (supports_rc_migration := _dict.get('supports_rc_migration')) is not None:
+            args['supports_rc_migration'] = supports_rc_migration
+        if (target_network := _dict.get('target_network')) is not None:
+            args['target_network'] = target_network
         return cls(**args)
 
     @classmethod
@@ -2751,7 +3198,10 @@ class DeploymentBase:
         if hasattr(self, 'mccp_id') and self.mccp_id is not None:
             _dict['mccp_id'] = self.mccp_id
         if hasattr(self, 'broker') and self.broker is not None:
-            _dict['broker'] = self.broker.to_dict()
+            if isinstance(self.broker, dict):
+                _dict['broker'] = self.broker
+            else:
+                _dict['broker'] = self.broker.to_dict()
         if hasattr(self, 'supports_rc_migration') and self.supports_rc_migration is not None:
             _dict['supports_rc_migration'] = self.supports_rc_migration
         if hasattr(self, 'target_network') and self.target_network is not None:
@@ -2781,36 +3231,38 @@ class EntrySearchResult:
     """
     A paginated search result containing catalog entries.
 
-    :attr int offset: (optional) The offset (origin 0) of the first resource in this
-          page of search results.
-    :attr int limit: (optional) The maximum number of resources returned in each
+    :param int offset: (optional) The offset (origin 0) of the first resource in
+          this page of search results.
+    :param int limit: (optional) The maximum number of resources returned in each
           page of search results.
-    :attr int count: (optional) The overall total number of resources in the search
+    :param int count: (optional) The overall total number of resources in the search
           result set.
-    :attr int resource_count: (optional) The number of resources returned in this
+    :param int resource_count: (optional) The number of resources returned in this
           page of search results.
-    :attr str first: (optional) A URL for retrieving the first page of search
+    :param str first: (optional) A URL for retrieving the first page of search
           results.
-    :attr str last: (optional) A URL for retrieving the last page of search results.
-    :attr str prev: (optional) A URL for retrieving the previous page of search
+    :param str last: (optional) A URL for retrieving the last page of search
           results.
-    :attr str next: (optional) A URL for retrieving the next page of search results.
-    :attr List[CatalogEntry] resources: (optional) The resources (catalog entries)
+    :param str prev: (optional) A URL for retrieving the previous page of search
+          results.
+    :param str next: (optional) A URL for retrieving the next page of search
+          results.
+    :param List[CatalogEntry] resources: (optional) The resources (catalog entries)
           contained in this page of search results.
     """
 
     def __init__(
         self,
         *,
-        offset: int = None,
-        limit: int = None,
-        count: int = None,
-        resource_count: int = None,
-        first: str = None,
-        last: str = None,
-        prev: str = None,
-        next: str = None,
-        resources: List['CatalogEntry'] = None,
+        offset: Optional[int] = None,
+        limit: Optional[int] = None,
+        count: Optional[int] = None,
+        resource_count: Optional[int] = None,
+        first: Optional[str] = None,
+        last: Optional[str] = None,
+        prev: Optional[str] = None,
+        next: Optional[str] = None,
+        resources: Optional[List['CatalogEntry']] = None,
     ) -> None:
         """
         Initialize a EntrySearchResult object.
@@ -2848,24 +3300,24 @@ class EntrySearchResult:
     def from_dict(cls, _dict: Dict) -> 'EntrySearchResult':
         """Initialize a EntrySearchResult object from a json dictionary."""
         args = {}
-        if 'offset' in _dict:
-            args['offset'] = _dict.get('offset')
-        if 'limit' in _dict:
-            args['limit'] = _dict.get('limit')
-        if 'count' in _dict:
-            args['count'] = _dict.get('count')
-        if 'resource_count' in _dict:
-            args['resource_count'] = _dict.get('resource_count')
-        if 'first' in _dict:
-            args['first'] = _dict.get('first')
-        if 'last' in _dict:
-            args['last'] = _dict.get('last')
-        if 'prev' in _dict:
-            args['prev'] = _dict.get('prev')
-        if 'next' in _dict:
-            args['next'] = _dict.get('next')
-        if 'resources' in _dict:
-            args['resources'] = [CatalogEntry.from_dict(x) for x in _dict.get('resources')]
+        if (offset := _dict.get('offset')) is not None:
+            args['offset'] = offset
+        if (limit := _dict.get('limit')) is not None:
+            args['limit'] = limit
+        if (count := _dict.get('count')) is not None:
+            args['count'] = count
+        if (resource_count := _dict.get('resource_count')) is not None:
+            args['resource_count'] = resource_count
+        if (first := _dict.get('first')) is not None:
+            args['first'] = first
+        if (last := _dict.get('last')) is not None:
+            args['last'] = last
+        if (prev := _dict.get('prev')) is not None:
+            args['prev'] = prev
+        if (next := _dict.get('next')) is not None:
+            args['next'] = next
+        if (resources := _dict.get('resources')) is not None:
+            args['resources'] = [CatalogEntry.from_dict(v) for v in resources]
         return cls(**args)
 
     @classmethod
@@ -2893,7 +3345,13 @@ class EntrySearchResult:
         if hasattr(self, 'next') and self.next is not None:
             _dict['next'] = self.next
         if hasattr(self, 'resources') and self.resources is not None:
-            _dict['resources'] = [x.to_dict() for x in self.resources]
+            resources_list = []
+            for v in self.resources:
+                if isinstance(v, dict):
+                    resources_list.append(v)
+                else:
+                    resources_list.append(v.to_dict())
+            _dict['resources'] = resources_list
         return _dict
 
     def _to_dict(self):
@@ -2919,14 +3377,19 @@ class Image:
     """
     Image annotation for this catalog entry. The image is a URL.
 
-    :attr str image: URL for the large, default image.
-    :attr str small_image: (optional) URL for a small image.
-    :attr str medium_image: (optional) URL for a medium image.
-    :attr str feature_image: (optional) URL for a featured image.
+    :param str image: URL for the large, default image.
+    :param str small_image: (optional) URL for a small image.
+    :param str medium_image: (optional) URL for a medium image.
+    :param str feature_image: (optional) URL for a featured image.
     """
 
     def __init__(
-        self, image: str, *, small_image: str = None, medium_image: str = None, feature_image: str = None
+        self,
+        image: str,
+        *,
+        small_image: Optional[str] = None,
+        medium_image: Optional[str] = None,
+        feature_image: Optional[str] = None,
     ) -> None:
         """
         Initialize a Image object.
@@ -2945,16 +3408,16 @@ class Image:
     def from_dict(cls, _dict: Dict) -> 'Image':
         """Initialize a Image object from a json dictionary."""
         args = {}
-        if 'image' in _dict:
-            args['image'] = _dict.get('image')
+        if (image := _dict.get('image')) is not None:
+            args['image'] = image
         else:
             raise ValueError('Required property \'image\' not present in Image JSON')
-        if 'small_image' in _dict:
-            args['small_image'] = _dict.get('small_image')
-        if 'medium_image' in _dict:
-            args['medium_image'] = _dict.get('medium_image')
-        if 'feature_image' in _dict:
-            args['feature_image'] = _dict.get('feature_image')
+        if (small_image := _dict.get('small_image')) is not None:
+            args['small_image'] = small_image
+        if (medium_image := _dict.get('medium_image')) is not None:
+            args['medium_image'] = medium_image
+        if (feature_image := _dict.get('feature_image')) is not None:
+            args['feature_image'] = feature_image
         return cls(**args)
 
     @classmethod
@@ -2998,35 +3461,35 @@ class Message:
     """
     log object describing who did what.
 
-    :attr str id: (optional) id of catalog entry.
-    :attr Visibility effective: (optional) Information related to the visibility of
+    :param str id: (optional) id of catalog entry.
+    :param Visibility effective: (optional) Information related to the visibility of
           a catalog entry.
-    :attr datetime time: (optional) time of action.
-    :attr str who_id: (optional) user ID of person who did action.
-    :attr str who_name: (optional) name of person who did action.
-    :attr str who_email: (optional) user email of person who did action.
-    :attr str instance: (optional) Global catalog instance where this occured.
-    :attr str gid: (optional) transaction id associatd with action.
-    :attr str type: (optional) type of action taken.
-    :attr str message: (optional) message describing action.
-    :attr dict data: (optional) An object containing details on changes made to
+    :param datetime time: (optional) time of action.
+    :param str who_id: (optional) user ID of person who did action.
+    :param str who_name: (optional) name of person who did action.
+    :param str who_email: (optional) user email of person who did action.
+    :param str instance: (optional) Global catalog instance where this occured.
+    :param str gid: (optional) transaction id associatd with action.
+    :param str type: (optional) type of action taken.
+    :param str message: (optional) message describing action.
+    :param dict data: (optional) An object containing details on changes made to
           object data.
     """
 
     def __init__(
         self,
         *,
-        id: str = None,
-        effective: 'Visibility' = None,
-        time: datetime = None,
-        who_id: str = None,
-        who_name: str = None,
-        who_email: str = None,
-        instance: str = None,
-        gid: str = None,
-        type: str = None,
-        message: str = None,
-        data: dict = None,
+        id: Optional[str] = None,
+        effective: Optional['Visibility'] = None,
+        time: Optional[datetime] = None,
+        who_id: Optional[str] = None,
+        who_name: Optional[str] = None,
+        who_email: Optional[str] = None,
+        instance: Optional[str] = None,
+        gid: Optional[str] = None,
+        type: Optional[str] = None,
+        message: Optional[str] = None,
+        data: Optional[dict] = None,
     ) -> None:
         """
         Initialize a Message object.
@@ -3061,28 +3524,28 @@ class Message:
     def from_dict(cls, _dict: Dict) -> 'Message':
         """Initialize a Message object from a json dictionary."""
         args = {}
-        if 'id' in _dict:
-            args['id'] = _dict.get('id')
-        if 'effective' in _dict:
-            args['effective'] = Visibility.from_dict(_dict.get('effective'))
-        if 'time' in _dict:
-            args['time'] = string_to_datetime(_dict.get('time'))
-        if 'who_id' in _dict:
-            args['who_id'] = _dict.get('who_id')
-        if 'who_name' in _dict:
-            args['who_name'] = _dict.get('who_name')
-        if 'who_email' in _dict:
-            args['who_email'] = _dict.get('who_email')
-        if 'instance' in _dict:
-            args['instance'] = _dict.get('instance')
-        if 'gid' in _dict:
-            args['gid'] = _dict.get('gid')
-        if 'type' in _dict:
-            args['type'] = _dict.get('type')
-        if 'message' in _dict:
-            args['message'] = _dict.get('message')
-        if 'data' in _dict:
-            args['data'] = _dict.get('data')
+        if (id := _dict.get('id')) is not None:
+            args['id'] = id
+        if (effective := _dict.get('effective')) is not None:
+            args['effective'] = Visibility.from_dict(effective)
+        if (time := _dict.get('time')) is not None:
+            args['time'] = string_to_datetime(time)
+        if (who_id := _dict.get('who_id')) is not None:
+            args['who_id'] = who_id
+        if (who_name := _dict.get('who_name')) is not None:
+            args['who_name'] = who_name
+        if (who_email := _dict.get('who_email')) is not None:
+            args['who_email'] = who_email
+        if (instance := _dict.get('instance')) is not None:
+            args['instance'] = instance
+        if (gid := _dict.get('gid')) is not None:
+            args['gid'] = gid
+        if (type := _dict.get('type')) is not None:
+            args['type'] = type
+        if (message := _dict.get('message')) is not None:
+            args['message'] = message
+        if (data := _dict.get('data')) is not None:
+            args['data'] = data
         return cls(**args)
 
     @classmethod
@@ -3096,7 +3559,10 @@ class Message:
         if hasattr(self, 'id') and self.id is not None:
             _dict['id'] = self.id
         if hasattr(self, 'effective') and self.effective is not None:
-            _dict['effective'] = self.effective.to_dict()
+            if isinstance(self.effective, dict):
+                _dict['effective'] = self.effective
+            else:
+                _dict['effective'] = self.effective.to_dict()
         if hasattr(self, 'time') and self.time is not None:
             _dict['time'] = datetime_to_string(self.time)
         if hasattr(self, 'who_id') and self.who_id is not None:
@@ -3140,38 +3606,38 @@ class Metrics:
     """
     Plan-specific cost metrics information.
 
-    :attr str part_ref: (optional) The part reference.
-    :attr str metric_id: (optional) The metric ID or part number.
-    :attr str tier_model: (optional) The tier model.
-    :attr str charge_unit: (optional) The unit to charge.
-    :attr str charge_unit_name: (optional) The charge unit name.
-    :attr str charge_unit_quantity: (optional) The charge unit quantity.
-    :attr str resource_display_name: (optional) Display name of the resource.
-    :attr str charge_unit_display_name: (optional) Display name of the charge unit.
-    :attr int usage_cap_qty: (optional) Usage limit for the metric.
-    :attr int display_cap: (optional) Display capacity.
-    :attr datetime effective_from: (optional) Effective from time.
-    :attr datetime effective_until: (optional) Effective until time.
-    :attr List[Amount] amounts: (optional) The pricing per metric by country and
+    :param str part_ref: (optional) The part reference.
+    :param str metric_id: (optional) The metric ID or part number.
+    :param str tier_model: (optional) The tier model.
+    :param str charge_unit: (optional) The unit to charge.
+    :param str charge_unit_name: (optional) The charge unit name.
+    :param int charge_unit_quantity: (optional) The charge unit quantity.
+    :param str resource_display_name: (optional) Display name of the resource.
+    :param str charge_unit_display_name: (optional) Display name of the charge unit.
+    :param int usage_cap_qty: (optional) Usage limit for the metric.
+    :param int display_cap: (optional) Display capacity.
+    :param datetime effective_from: (optional) Effective from time.
+    :param datetime effective_until: (optional) Effective until time.
+    :param List[Amount] amounts: (optional) The pricing per metric by country and
           currency.
     """
 
     def __init__(
         self,
         *,
-        part_ref: str = None,
-        metric_id: str = None,
-        tier_model: str = None,
-        charge_unit: str = None,
-        charge_unit_name: str = None,
-        charge_unit_quantity: str = None,
-        resource_display_name: str = None,
-        charge_unit_display_name: str = None,
-        usage_cap_qty: int = None,
-        display_cap: int = None,
-        effective_from: datetime = None,
-        effective_until: datetime = None,
-        amounts: List['Amount'] = None,
+        part_ref: Optional[str] = None,
+        metric_id: Optional[str] = None,
+        tier_model: Optional[str] = None,
+        charge_unit: Optional[str] = None,
+        charge_unit_name: Optional[str] = None,
+        charge_unit_quantity: Optional[int] = None,
+        resource_display_name: Optional[str] = None,
+        charge_unit_display_name: Optional[str] = None,
+        usage_cap_qty: Optional[int] = None,
+        display_cap: Optional[int] = None,
+        effective_from: Optional[datetime] = None,
+        effective_until: Optional[datetime] = None,
+        amounts: Optional[List['Amount']] = None,
     ) -> None:
         """
         Initialize a Metrics object.
@@ -3181,7 +3647,7 @@ class Metrics:
         :param str tier_model: (optional) The tier model.
         :param str charge_unit: (optional) The unit to charge.
         :param str charge_unit_name: (optional) The charge unit name.
-        :param str charge_unit_quantity: (optional) The charge unit quantity.
+        :param int charge_unit_quantity: (optional) The charge unit quantity.
         :param str resource_display_name: (optional) Display name of the resource.
         :param str charge_unit_display_name: (optional) Display name of the charge
                unit.
@@ -3210,32 +3676,32 @@ class Metrics:
     def from_dict(cls, _dict: Dict) -> 'Metrics':
         """Initialize a Metrics object from a json dictionary."""
         args = {}
-        if 'part_ref' in _dict:
-            args['part_ref'] = _dict.get('part_ref')
-        if 'metric_id' in _dict:
-            args['metric_id'] = _dict.get('metric_id')
-        if 'tier_model' in _dict:
-            args['tier_model'] = _dict.get('tier_model')
-        if 'charge_unit' in _dict:
-            args['charge_unit'] = _dict.get('charge_unit')
-        if 'charge_unit_name' in _dict:
-            args['charge_unit_name'] = _dict.get('charge_unit_name')
-        if 'charge_unit_quantity' in _dict:
-            args['charge_unit_quantity'] = _dict.get('charge_unit_quantity')
-        if 'resource_display_name' in _dict:
-            args['resource_display_name'] = _dict.get('resource_display_name')
-        if 'charge_unit_display_name' in _dict:
-            args['charge_unit_display_name'] = _dict.get('charge_unit_display_name')
-        if 'usage_cap_qty' in _dict:
-            args['usage_cap_qty'] = _dict.get('usage_cap_qty')
-        if 'display_cap' in _dict:
-            args['display_cap'] = _dict.get('display_cap')
-        if 'effective_from' in _dict:
-            args['effective_from'] = string_to_datetime(_dict.get('effective_from'))
-        if 'effective_until' in _dict:
-            args['effective_until'] = string_to_datetime(_dict.get('effective_until'))
-        if 'amounts' in _dict:
-            args['amounts'] = [Amount.from_dict(x) for x in _dict.get('amounts')]
+        if (part_ref := _dict.get('part_ref')) is not None:
+            args['part_ref'] = part_ref
+        if (metric_id := _dict.get('metric_id')) is not None:
+            args['metric_id'] = metric_id
+        if (tier_model := _dict.get('tier_model')) is not None:
+            args['tier_model'] = tier_model
+        if (charge_unit := _dict.get('charge_unit')) is not None:
+            args['charge_unit'] = charge_unit
+        if (charge_unit_name := _dict.get('charge_unit_name')) is not None:
+            args['charge_unit_name'] = charge_unit_name
+        if (charge_unit_quantity := _dict.get('charge_unit_quantity')) is not None:
+            args['charge_unit_quantity'] = charge_unit_quantity
+        if (resource_display_name := _dict.get('resource_display_name')) is not None:
+            args['resource_display_name'] = resource_display_name
+        if (charge_unit_display_name := _dict.get('charge_unit_display_name')) is not None:
+            args['charge_unit_display_name'] = charge_unit_display_name
+        if (usage_cap_qty := _dict.get('usage_cap_qty')) is not None:
+            args['usage_cap_qty'] = usage_cap_qty
+        if (display_cap := _dict.get('display_cap')) is not None:
+            args['display_cap'] = display_cap
+        if (effective_from := _dict.get('effective_from')) is not None:
+            args['effective_from'] = string_to_datetime(effective_from)
+        if (effective_until := _dict.get('effective_until')) is not None:
+            args['effective_until'] = string_to_datetime(effective_until)
+        if (amounts := _dict.get('amounts')) is not None:
+            args['amounts'] = [Amount.from_dict(v) for v in amounts]
         return cls(**args)
 
     @classmethod
@@ -3271,7 +3737,13 @@ class Metrics:
         if hasattr(self, 'effective_until') and self.effective_until is not None:
             _dict['effective_until'] = datetime_to_string(self.effective_until)
         if hasattr(self, 'amounts') and self.amounts is not None:
-            _dict['amounts'] = [x.to_dict() for x in self.amounts]
+            amounts_list = []
+            for v in self.amounts:
+                if isinstance(v, dict):
+                    amounts_list.append(v)
+                else:
+                    amounts_list.append(v.to_dict())
+            _dict['amounts'] = amounts_list
         return _dict
 
     def _to_dict(self):
@@ -3297,42 +3769,43 @@ class ObjectMetadataSet:
     """
     Model used to describe metadata object that can be set.
 
-    :attr bool rc_compatible: (optional) Boolean value that describes whether the
+    :param bool rc_compatible: (optional) Boolean value that describes whether the
           service is compatible with the Resource Controller.
-    :attr CFMetaData service: (optional) Service-related metadata.
-    :attr PlanMetaData plan: (optional) Plan-related metadata.
-    :attr AliasMetaData alias: (optional) Alias-related metadata.
-    :attr TemplateMetaData template: (optional) Template-related metadata.
-    :attr UIMetaData ui: (optional) Information related to the UI presentation
+    :param CFMetaData service: (optional) Service-related metadata.
+    :param PlanMetaData plan: (optional) Plan-related metadata.
+    :param AliasMetaData alias: (optional) Alias-related metadata.
+    :param TemplateMetaData template: (optional) Template-related metadata.
+    :param UIMetaData ui: (optional) Information related to the UI presentation
           associated with a catalog entry.
-    :attr List[str] compliance: (optional) Compliance information for HIPAA and PCI.
-    :attr SLAMetaData sla: (optional) Service Level Agreement related metadata.
-    :attr Callbacks callbacks: (optional) Callback-related information associated
+    :param List[str] compliance: (optional) Compliance information for HIPAA and
+          PCI.
+    :param SLAMetaData sla: (optional) Service Level Agreement related metadata.
+    :param Callbacks callbacks: (optional) Callback-related information associated
           with a catalog entry.
-    :attr str original_name: (optional) The original name of the object.
-    :attr str version: (optional) Optional version of the object.
-    :attr dict other: (optional) Additional information.
-    :attr PricingSet pricing: (optional) Pricing-related information.
-    :attr DeploymentBase deployment: (optional) Deployment-related metadata.
+    :param str original_name: (optional) The original name of the object.
+    :param str version: (optional) Optional version of the object.
+    :param dict other: (optional) Additional information.
+    :param PricingSet pricing: (optional) Pricing-related information.
+    :param DeploymentBase deployment: (optional) Deployment-related metadata.
     """
 
     def __init__(
         self,
         *,
-        rc_compatible: bool = None,
-        service: 'CFMetaData' = None,
-        plan: 'PlanMetaData' = None,
-        alias: 'AliasMetaData' = None,
-        template: 'TemplateMetaData' = None,
-        ui: 'UIMetaData' = None,
-        compliance: List[str] = None,
-        sla: 'SLAMetaData' = None,
-        callbacks: 'Callbacks' = None,
-        original_name: str = None,
-        version: str = None,
-        other: dict = None,
-        pricing: 'PricingSet' = None,
-        deployment: 'DeploymentBase' = None,
+        rc_compatible: Optional[bool] = None,
+        service: Optional['CFMetaData'] = None,
+        plan: Optional['PlanMetaData'] = None,
+        alias: Optional['AliasMetaData'] = None,
+        template: Optional['TemplateMetaData'] = None,
+        ui: Optional['UIMetaData'] = None,
+        compliance: Optional[List[str]] = None,
+        sla: Optional['SLAMetaData'] = None,
+        callbacks: Optional['Callbacks'] = None,
+        original_name: Optional[str] = None,
+        version: Optional[str] = None,
+        other: Optional[dict] = None,
+        pricing: Optional['PricingSet'] = None,
+        deployment: Optional['DeploymentBase'] = None,
     ) -> None:
         """
         Initialize a ObjectMetadataSet object.
@@ -3376,34 +3849,34 @@ class ObjectMetadataSet:
     def from_dict(cls, _dict: Dict) -> 'ObjectMetadataSet':
         """Initialize a ObjectMetadataSet object from a json dictionary."""
         args = {}
-        if 'rc_compatible' in _dict:
-            args['rc_compatible'] = _dict.get('rc_compatible')
-        if 'service' in _dict:
-            args['service'] = CFMetaData.from_dict(_dict.get('service'))
-        if 'plan' in _dict:
-            args['plan'] = PlanMetaData.from_dict(_dict.get('plan'))
-        if 'alias' in _dict:
-            args['alias'] = AliasMetaData.from_dict(_dict.get('alias'))
-        if 'template' in _dict:
-            args['template'] = TemplateMetaData.from_dict(_dict.get('template'))
-        if 'ui' in _dict:
-            args['ui'] = UIMetaData.from_dict(_dict.get('ui'))
-        if 'compliance' in _dict:
-            args['compliance'] = _dict.get('compliance')
-        if 'sla' in _dict:
-            args['sla'] = SLAMetaData.from_dict(_dict.get('sla'))
-        if 'callbacks' in _dict:
-            args['callbacks'] = Callbacks.from_dict(_dict.get('callbacks'))
-        if 'original_name' in _dict:
-            args['original_name'] = _dict.get('original_name')
-        if 'version' in _dict:
-            args['version'] = _dict.get('version')
-        if 'other' in _dict:
-            args['other'] = _dict.get('other')
-        if 'pricing' in _dict:
-            args['pricing'] = PricingSet.from_dict(_dict.get('pricing'))
-        if 'deployment' in _dict:
-            args['deployment'] = DeploymentBase.from_dict(_dict.get('deployment'))
+        if (rc_compatible := _dict.get('rc_compatible')) is not None:
+            args['rc_compatible'] = rc_compatible
+        if (service := _dict.get('service')) is not None:
+            args['service'] = CFMetaData.from_dict(service)
+        if (plan := _dict.get('plan')) is not None:
+            args['plan'] = PlanMetaData.from_dict(plan)
+        if (alias := _dict.get('alias')) is not None:
+            args['alias'] = AliasMetaData.from_dict(alias)
+        if (template := _dict.get('template')) is not None:
+            args['template'] = TemplateMetaData.from_dict(template)
+        if (ui := _dict.get('ui')) is not None:
+            args['ui'] = UIMetaData.from_dict(ui)
+        if (compliance := _dict.get('compliance')) is not None:
+            args['compliance'] = compliance
+        if (sla := _dict.get('sla')) is not None:
+            args['sla'] = SLAMetaData.from_dict(sla)
+        if (callbacks := _dict.get('callbacks')) is not None:
+            args['callbacks'] = Callbacks.from_dict(callbacks)
+        if (original_name := _dict.get('original_name')) is not None:
+            args['original_name'] = original_name
+        if (version := _dict.get('version')) is not None:
+            args['version'] = version
+        if (other := _dict.get('other')) is not None:
+            args['other'] = other
+        if (pricing := _dict.get('pricing')) is not None:
+            args['pricing'] = PricingSet.from_dict(pricing)
+        if (deployment := _dict.get('deployment')) is not None:
+            args['deployment'] = DeploymentBase.from_dict(deployment)
         return cls(**args)
 
     @classmethod
@@ -3417,21 +3890,42 @@ class ObjectMetadataSet:
         if hasattr(self, 'rc_compatible') and self.rc_compatible is not None:
             _dict['rc_compatible'] = self.rc_compatible
         if hasattr(self, 'service') and self.service is not None:
-            _dict['service'] = self.service.to_dict()
+            if isinstance(self.service, dict):
+                _dict['service'] = self.service
+            else:
+                _dict['service'] = self.service.to_dict()
         if hasattr(self, 'plan') and self.plan is not None:
-            _dict['plan'] = self.plan.to_dict()
+            if isinstance(self.plan, dict):
+                _dict['plan'] = self.plan
+            else:
+                _dict['plan'] = self.plan.to_dict()
         if hasattr(self, 'alias') and self.alias is not None:
-            _dict['alias'] = self.alias.to_dict()
+            if isinstance(self.alias, dict):
+                _dict['alias'] = self.alias
+            else:
+                _dict['alias'] = self.alias.to_dict()
         if hasattr(self, 'template') and self.template is not None:
-            _dict['template'] = self.template.to_dict()
+            if isinstance(self.template, dict):
+                _dict['template'] = self.template
+            else:
+                _dict['template'] = self.template.to_dict()
         if hasattr(self, 'ui') and self.ui is not None:
-            _dict['ui'] = self.ui.to_dict()
+            if isinstance(self.ui, dict):
+                _dict['ui'] = self.ui
+            else:
+                _dict['ui'] = self.ui.to_dict()
         if hasattr(self, 'compliance') and self.compliance is not None:
             _dict['compliance'] = self.compliance
         if hasattr(self, 'sla') and self.sla is not None:
-            _dict['sla'] = self.sla.to_dict()
+            if isinstance(self.sla, dict):
+                _dict['sla'] = self.sla
+            else:
+                _dict['sla'] = self.sla.to_dict()
         if hasattr(self, 'callbacks') and self.callbacks is not None:
-            _dict['callbacks'] = self.callbacks.to_dict()
+            if isinstance(self.callbacks, dict):
+                _dict['callbacks'] = self.callbacks
+            else:
+                _dict['callbacks'] = self.callbacks.to_dict()
         if hasattr(self, 'original_name') and self.original_name is not None:
             _dict['original_name'] = self.original_name
         if hasattr(self, 'version') and self.version is not None:
@@ -3439,9 +3933,15 @@ class ObjectMetadataSet:
         if hasattr(self, 'other') and self.other is not None:
             _dict['other'] = self.other
         if hasattr(self, 'pricing') and self.pricing is not None:
-            _dict['pricing'] = self.pricing.to_dict()
+            if isinstance(self.pricing, dict):
+                _dict['pricing'] = self.pricing
+            else:
+                _dict['pricing'] = self.pricing.to_dict()
         if hasattr(self, 'deployment') and self.deployment is not None:
-            _dict['deployment'] = self.deployment.to_dict()
+            if isinstance(self.deployment, dict):
+                _dict['deployment'] = self.deployment
+            else:
+                _dict['deployment'] = self.deployment.to_dict()
         return _dict
 
     def _to_dict(self):
@@ -3467,15 +3967,20 @@ class Overview:
     """
     Overview is nested in the top level. The key value pair is `[_language_]overview_ui`.
 
-    :attr str display_name: The translated display name.
-    :attr str long_description: The translated long description.
-    :attr str description: The translated description.
-    :attr str featured_description: (optional) The translated description that will
+    :param str display_name: The translated display name.
+    :param str long_description: The translated long description.
+    :param str description: The translated description.
+    :param str featured_description: (optional) The translated description that will
           be featured.
     """
 
     def __init__(
-        self, display_name: str, long_description: str, description: str, *, featured_description: str = None
+        self,
+        display_name: str,
+        long_description: str,
+        description: str,
+        *,
+        featured_description: Optional[str] = None,
     ) -> None:
         """
         Initialize a Overview object.
@@ -3495,20 +4000,20 @@ class Overview:
     def from_dict(cls, _dict: Dict) -> 'Overview':
         """Initialize a Overview object from a json dictionary."""
         args = {}
-        if 'display_name' in _dict:
-            args['display_name'] = _dict.get('display_name')
+        if (display_name := _dict.get('display_name')) is not None:
+            args['display_name'] = display_name
         else:
             raise ValueError('Required property \'display_name\' not present in Overview JSON')
-        if 'long_description' in _dict:
-            args['long_description'] = _dict.get('long_description')
+        if (long_description := _dict.get('long_description')) is not None:
+            args['long_description'] = long_description
         else:
             raise ValueError('Required property \'long_description\' not present in Overview JSON')
-        if 'description' in _dict:
-            args['description'] = _dict.get('description')
+        if (description := _dict.get('description')) is not None:
+            args['description'] = description
         else:
             raise ValueError('Required property \'description\' not present in Overview JSON')
-        if 'featured_description' in _dict:
-            args['featured_description'] = _dict.get('featured_description')
+        if (featured_description := _dict.get('featured_description')) is not None:
+            args['featured_description'] = featured_description
         return cls(**args)
 
     @classmethod
@@ -3552,21 +4057,21 @@ class PlanMetaData:
     """
     Plan-related metadata.
 
-    :attr bool bindable: (optional) Boolean value that describes whether the service
-          can be bound to an application.
-    :attr bool reservable: (optional) Boolean value that describes whether the
+    :param bool bindable: (optional) Boolean value that describes whether the
+          service can be bound to an application.
+    :param bool reservable: (optional) Boolean value that describes whether the
           service can be reserved.
-    :attr bool allow_internal_users: (optional) Boolean value that describes whether
-          the service can be used internally.
-    :attr bool async_provisioning_supported: (optional) Boolean value that describes
-          whether the service can be provisioned asynchronously.
-    :attr bool async_unprovisioning_supported: (optional) Boolean value that
+    :param bool allow_internal_users: (optional) Boolean value that describes
+          whether the service can be used internally.
+    :param bool async_provisioning_supported: (optional) Boolean value that
+          describes whether the service can be provisioned asynchronously.
+    :param bool async_unprovisioning_supported: (optional) Boolean value that
           describes whether the service can be unprovisioned asynchronously.
-    :attr int test_check_interval: (optional) Test check interval.
-    :attr str single_scope_instance: (optional) Single scope instance.
-    :attr bool service_check_enabled: (optional) Boolean value that describes
+    :param int test_check_interval: (optional) Test check interval.
+    :param str single_scope_instance: (optional) Single scope instance.
+    :param bool service_check_enabled: (optional) Boolean value that describes
           whether the service check is enabled.
-    :attr dict cf_guid: (optional) If the field is imported from Cloud Foundry, the
+    :param dict cf_guid: (optional) If the field is imported from Cloud Foundry, the
           Cloud Foundry region's GUID. This is a required field. For example,
           `us-south=123`.
     """
@@ -3574,15 +4079,15 @@ class PlanMetaData:
     def __init__(
         self,
         *,
-        bindable: bool = None,
-        reservable: bool = None,
-        allow_internal_users: bool = None,
-        async_provisioning_supported: bool = None,
-        async_unprovisioning_supported: bool = None,
-        test_check_interval: int = None,
-        single_scope_instance: str = None,
-        service_check_enabled: bool = None,
-        cf_guid: dict = None,
+        bindable: Optional[bool] = None,
+        reservable: Optional[bool] = None,
+        allow_internal_users: Optional[bool] = None,
+        async_provisioning_supported: Optional[bool] = None,
+        async_unprovisioning_supported: Optional[bool] = None,
+        test_check_interval: Optional[int] = None,
+        single_scope_instance: Optional[str] = None,
+        service_check_enabled: Optional[bool] = None,
+        cf_guid: Optional[dict] = None,
     ) -> None:
         """
         Initialize a PlanMetaData object.
@@ -3619,24 +4124,24 @@ class PlanMetaData:
     def from_dict(cls, _dict: Dict) -> 'PlanMetaData':
         """Initialize a PlanMetaData object from a json dictionary."""
         args = {}
-        if 'bindable' in _dict:
-            args['bindable'] = _dict.get('bindable')
-        if 'reservable' in _dict:
-            args['reservable'] = _dict.get('reservable')
-        if 'allow_internal_users' in _dict:
-            args['allow_internal_users'] = _dict.get('allow_internal_users')
-        if 'async_provisioning_supported' in _dict:
-            args['async_provisioning_supported'] = _dict.get('async_provisioning_supported')
-        if 'async_unprovisioning_supported' in _dict:
-            args['async_unprovisioning_supported'] = _dict.get('async_unprovisioning_supported')
-        if 'test_check_interval' in _dict:
-            args['test_check_interval'] = _dict.get('test_check_interval')
-        if 'single_scope_instance' in _dict:
-            args['single_scope_instance'] = _dict.get('single_scope_instance')
-        if 'service_check_enabled' in _dict:
-            args['service_check_enabled'] = _dict.get('service_check_enabled')
-        if 'cf_guid' in _dict:
-            args['cf_guid'] = _dict.get('cf_guid')
+        if (bindable := _dict.get('bindable')) is not None:
+            args['bindable'] = bindable
+        if (reservable := _dict.get('reservable')) is not None:
+            args['reservable'] = reservable
+        if (allow_internal_users := _dict.get('allow_internal_users')) is not None:
+            args['allow_internal_users'] = allow_internal_users
+        if (async_provisioning_supported := _dict.get('async_provisioning_supported')) is not None:
+            args['async_provisioning_supported'] = async_provisioning_supported
+        if (async_unprovisioning_supported := _dict.get('async_unprovisioning_supported')) is not None:
+            args['async_unprovisioning_supported'] = async_unprovisioning_supported
+        if (test_check_interval := _dict.get('test_check_interval')) is not None:
+            args['test_check_interval'] = test_check_interval
+        if (single_scope_instance := _dict.get('single_scope_instance')) is not None:
+            args['single_scope_instance'] = single_scope_instance
+        if (service_check_enabled := _dict.get('service_check_enabled')) is not None:
+            args['service_check_enabled'] = service_check_enabled
+        if (cf_guid := _dict.get('cf_guid')) is not None:
+            args['cf_guid'] = cf_guid
         return cls(**args)
 
     @classmethod
@@ -3690,11 +4195,16 @@ class Price:
     """
     Pricing-related information.
 
-    :attr int quantity_tier: (optional) Pricing tier.
-    :attr float price: (optional) Price in the selected currency.
+    :param int quantity_tier: (optional) Pricing tier.
+    :param float price: (optional) Price in the selected currency.
     """
 
-    def __init__(self, *, quantity_tier: int = None, price: float = None) -> None:
+    def __init__(
+        self,
+        *,
+        quantity_tier: Optional[int] = None,
+        price: Optional[float] = None,
+    ) -> None:
         """
         Initialize a Price object.
 
@@ -3708,10 +4218,10 @@ class Price:
     def from_dict(cls, _dict: Dict) -> 'Price':
         """Initialize a Price object from a json dictionary."""
         args = {}
-        if 'quantity_tier' in _dict:
-            args['quantity_tier'] = _dict.get('quantity_tier')
-        if 'Price' in _dict:
-            args['price'] = _dict.get('Price')
+        if (quantity_tier := _dict.get('quantity_tier')) is not None:
+            args['quantity_tier'] = quantity_tier
+        if (price := _dict.get('price')) is not None:
+            args['price'] = price
         return cls(**args)
 
     @classmethod
@@ -3725,7 +4235,7 @@ class Price:
         if hasattr(self, 'quantity_tier') and self.quantity_tier is not None:
             _dict['quantity_tier'] = self.quantity_tier
         if hasattr(self, 'price') and self.price is not None:
-            _dict['Price'] = self.price
+            _dict['price'] = self.price
         return _dict
 
     def _to_dict(self):
@@ -3751,25 +4261,47 @@ class PricingGet:
     """
     Pricing-related information.
 
-    :attr str type: (optional) Type of plan. Valid values are `free`, `trial`,
+    :param str deployment_id: (optional) The deployment object id this pricing is
+          from. Only set if object kind is deployment.
+    :param str deployment_location: (optional) The deployment location this pricing
+          is from. Only set if object kind is deployment.
+    :param bool deployment_location_no_price_available: (optional) Is the location
+          price not available. Only set in api /pricing/deployment and only set if true.
+          This means for the given deployment object there was no pricing set in pricing
+          catalog.
+    :param str type: (optional) Type of plan. Valid values are `free`, `trial`,
           `paygo`, `bluemix-subscription`, and `ibm-subscription`.
-    :attr str origin: (optional) Defines where the pricing originates.
-    :attr StartingPrice starting_price: (optional) Plan-specific starting price
+    :param str origin: (optional) Defines where the pricing originates.
+    :param StartingPrice starting_price: (optional) Plan-specific starting price
           information.
-    :attr List[Metrics] metrics: (optional) Plan-specific cost metric structure.
+    :param List[Metrics] metrics: (optional) Plan-specific cost metric structure.
+    :param List[str] deployment_regions: (optional) List of regions where region
+          pricing is available. Only set on global deployments if enabled by owner.
     """
 
     def __init__(
         self,
         *,
-        type: str = None,
-        origin: str = None,
-        starting_price: 'StartingPrice' = None,
-        metrics: List['Metrics'] = None,
+        deployment_id: Optional[str] = None,
+        deployment_location: Optional[str] = None,
+        deployment_location_no_price_available: Optional[bool] = None,
+        type: Optional[str] = None,
+        origin: Optional[str] = None,
+        starting_price: Optional['StartingPrice'] = None,
+        metrics: Optional[List['Metrics']] = None,
+        deployment_regions: Optional[List[str]] = None,
     ) -> None:
         """
         Initialize a PricingGet object.
 
+        :param str deployment_id: (optional) The deployment object id this pricing
+               is from. Only set if object kind is deployment.
+        :param str deployment_location: (optional) The deployment location this
+               pricing is from. Only set if object kind is deployment.
+        :param bool deployment_location_no_price_available: (optional) Is the
+               location price not available. Only set in api /pricing/deployment and only
+               set if true. This means for the given deployment object there was no
+               pricing set in pricing catalog.
         :param str type: (optional) Type of plan. Valid values are `free`, `trial`,
                `paygo`, `bluemix-subscription`, and `ibm-subscription`.
         :param str origin: (optional) Defines where the pricing originates.
@@ -3777,24 +4309,39 @@ class PricingGet:
                price information.
         :param List[Metrics] metrics: (optional) Plan-specific cost metric
                structure.
+        :param List[str] deployment_regions: (optional) List of regions where
+               region pricing is available. Only set on global deployments if enabled by
+               owner.
         """
+        self.deployment_id = deployment_id
+        self.deployment_location = deployment_location
+        self.deployment_location_no_price_available = deployment_location_no_price_available
         self.type = type
         self.origin = origin
         self.starting_price = starting_price
         self.metrics = metrics
+        self.deployment_regions = deployment_regions
 
     @classmethod
     def from_dict(cls, _dict: Dict) -> 'PricingGet':
         """Initialize a PricingGet object from a json dictionary."""
         args = {}
-        if 'type' in _dict:
-            args['type'] = _dict.get('type')
-        if 'origin' in _dict:
-            args['origin'] = _dict.get('origin')
-        if 'starting_price' in _dict:
-            args['starting_price'] = StartingPrice.from_dict(_dict.get('starting_price'))
-        if 'metrics' in _dict:
-            args['metrics'] = [Metrics.from_dict(x) for x in _dict.get('metrics')]
+        if (deployment_id := _dict.get('deployment_id')) is not None:
+            args['deployment_id'] = deployment_id
+        if (deployment_location := _dict.get('deployment_location')) is not None:
+            args['deployment_location'] = deployment_location
+        if (deployment_location_no_price_available := _dict.get('deployment_location_no_price_available')) is not None:
+            args['deployment_location_no_price_available'] = deployment_location_no_price_available
+        if (type := _dict.get('type')) is not None:
+            args['type'] = type
+        if (origin := _dict.get('origin')) is not None:
+            args['origin'] = origin
+        if (starting_price := _dict.get('starting_price')) is not None:
+            args['starting_price'] = StartingPrice.from_dict(starting_price)
+        if (metrics := _dict.get('metrics')) is not None:
+            args['metrics'] = [Metrics.from_dict(v) for v in metrics]
+        if (deployment_regions := _dict.get('deployment_regions')) is not None:
+            args['deployment_regions'] = deployment_regions
         return cls(**args)
 
     @classmethod
@@ -3805,14 +4352,34 @@ class PricingGet:
     def to_dict(self) -> Dict:
         """Return a json dictionary representing this model."""
         _dict = {}
+        if hasattr(self, 'deployment_id') and self.deployment_id is not None:
+            _dict['deployment_id'] = self.deployment_id
+        if hasattr(self, 'deployment_location') and self.deployment_location is not None:
+            _dict['deployment_location'] = self.deployment_location
+        if (
+            hasattr(self, 'deployment_location_no_price_available')
+            and self.deployment_location_no_price_available is not None
+        ):
+            _dict['deployment_location_no_price_available'] = self.deployment_location_no_price_available
         if hasattr(self, 'type') and self.type is not None:
             _dict['type'] = self.type
         if hasattr(self, 'origin') and self.origin is not None:
             _dict['origin'] = self.origin
         if hasattr(self, 'starting_price') and self.starting_price is not None:
-            _dict['starting_price'] = self.starting_price.to_dict()
+            if isinstance(self.starting_price, dict):
+                _dict['starting_price'] = self.starting_price
+            else:
+                _dict['starting_price'] = self.starting_price.to_dict()
         if hasattr(self, 'metrics') and self.metrics is not None:
-            _dict['metrics'] = [x.to_dict() for x in self.metrics]
+            metrics_list = []
+            for v in self.metrics:
+                if isinstance(v, dict):
+                    metrics_list.append(v)
+                else:
+                    metrics_list.append(v.to_dict())
+            _dict['metrics'] = metrics_list
+        if hasattr(self, 'deployment_regions') and self.deployment_regions is not None:
+            _dict['deployment_regions'] = self.deployment_regions
         return _dict
 
     def _to_dict(self):
@@ -3834,18 +4401,170 @@ class PricingGet:
         return not self == other
 
 
+class PricingSearchResult:
+    """
+    A paginated result containing pricing entries.
+
+    :param int offset: (optional) The offset (origin 0) of the first resource in
+          this page of search results.
+    :param int limit: (optional) The maximum number of resources returned in each
+          page of search results.
+    :param int count: (optional) The overall total number of resources in the search
+          result set.
+    :param int resource_count: (optional) The number of resources returned in this
+          page of search results.
+    :param str first: (optional) A URL for retrieving the first page of search
+          results.
+    :param str last: (optional) A URL for retrieving the last page of search
+          results.
+    :param str prev: (optional) A URL for retrieving the previous page of search
+          results.
+    :param str next: (optional) A URL for retrieving the next page of search
+          results.
+    :param List[PricingGet] resources: (optional) The resources (prices) contained
+          in this page of search results.
+    """
+
+    def __init__(
+        self,
+        *,
+        offset: Optional[int] = None,
+        limit: Optional[int] = None,
+        count: Optional[int] = None,
+        resource_count: Optional[int] = None,
+        first: Optional[str] = None,
+        last: Optional[str] = None,
+        prev: Optional[str] = None,
+        next: Optional[str] = None,
+        resources: Optional[List['PricingGet']] = None,
+    ) -> None:
+        """
+        Initialize a PricingSearchResult object.
+
+        :param int offset: (optional) The offset (origin 0) of the first resource
+               in this page of search results.
+        :param int limit: (optional) The maximum number of resources returned in
+               each page of search results.
+        :param int count: (optional) The overall total number of resources in the
+               search result set.
+        :param int resource_count: (optional) The number of resources returned in
+               this page of search results.
+        :param str first: (optional) A URL for retrieving the first page of search
+               results.
+        :param str last: (optional) A URL for retrieving the last page of search
+               results.
+        :param str prev: (optional) A URL for retrieving the previous page of
+               search results.
+        :param str next: (optional) A URL for retrieving the next page of search
+               results.
+        :param List[PricingGet] resources: (optional) The resources (prices)
+               contained in this page of search results.
+        """
+        self.offset = offset
+        self.limit = limit
+        self.count = count
+        self.resource_count = resource_count
+        self.first = first
+        self.last = last
+        self.prev = prev
+        self.next = next
+        self.resources = resources
+
+    @classmethod
+    def from_dict(cls, _dict: Dict) -> 'PricingSearchResult':
+        """Initialize a PricingSearchResult object from a json dictionary."""
+        args = {}
+        if (offset := _dict.get('offset')) is not None:
+            args['offset'] = offset
+        if (limit := _dict.get('limit')) is not None:
+            args['limit'] = limit
+        if (count := _dict.get('count')) is not None:
+            args['count'] = count
+        if (resource_count := _dict.get('resource_count')) is not None:
+            args['resource_count'] = resource_count
+        if (first := _dict.get('first')) is not None:
+            args['first'] = first
+        if (last := _dict.get('last')) is not None:
+            args['last'] = last
+        if (prev := _dict.get('prev')) is not None:
+            args['prev'] = prev
+        if (next := _dict.get('next')) is not None:
+            args['next'] = next
+        if (resources := _dict.get('resources')) is not None:
+            args['resources'] = [PricingGet.from_dict(v) for v in resources]
+        return cls(**args)
+
+    @classmethod
+    def _from_dict(cls, _dict):
+        """Initialize a PricingSearchResult object from a json dictionary."""
+        return cls.from_dict(_dict)
+
+    def to_dict(self) -> Dict:
+        """Return a json dictionary representing this model."""
+        _dict = {}
+        if hasattr(self, 'offset') and self.offset is not None:
+            _dict['offset'] = self.offset
+        if hasattr(self, 'limit') and self.limit is not None:
+            _dict['limit'] = self.limit
+        if hasattr(self, 'count') and self.count is not None:
+            _dict['count'] = self.count
+        if hasattr(self, 'resource_count') and self.resource_count is not None:
+            _dict['resource_count'] = self.resource_count
+        if hasattr(self, 'first') and self.first is not None:
+            _dict['first'] = self.first
+        if hasattr(self, 'last') and self.last is not None:
+            _dict['last'] = self.last
+        if hasattr(self, 'prev') and self.prev is not None:
+            _dict['prev'] = self.prev
+        if hasattr(self, 'next') and self.next is not None:
+            _dict['next'] = self.next
+        if hasattr(self, 'resources') and self.resources is not None:
+            resources_list = []
+            for v in self.resources:
+                if isinstance(v, dict):
+                    resources_list.append(v)
+                else:
+                    resources_list.append(v.to_dict())
+            _dict['resources'] = resources_list
+        return _dict
+
+    def _to_dict(self):
+        """Return a json dictionary representing this model."""
+        return self.to_dict()
+
+    def __str__(self) -> str:
+        """Return a `str` version of this PricingSearchResult object."""
+        return json.dumps(self.to_dict(), indent=2)
+
+    def __eq__(self, other: 'PricingSearchResult') -> bool:
+        """Return `true` when self and other are equal, false otherwise."""
+        if not isinstance(other, self.__class__):
+            return False
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other: 'PricingSearchResult') -> bool:
+        """Return `true` when self and other are not equal, false otherwise."""
+        return not self == other
+
+
 class PricingSet:
     """
     Pricing-related information.
 
-    :attr str type: (optional) Type of plan. Valid values are `free`, `trial`,
+    :param str type: (optional) Type of plan. Valid values are `free`, `trial`,
           `paygo`, `bluemix-subscription`, and `ibm-subscription`.
-    :attr str origin: (optional) Defines where the pricing originates.
-    :attr StartingPrice starting_price: (optional) Plan-specific starting price
+    :param str origin: (optional) Defines where the pricing originates.
+    :param StartingPrice starting_price: (optional) Plan-specific starting price
           information.
     """
 
-    def __init__(self, *, type: str = None, origin: str = None, starting_price: 'StartingPrice' = None) -> None:
+    def __init__(
+        self,
+        *,
+        type: Optional[str] = None,
+        origin: Optional[str] = None,
+        starting_price: Optional['StartingPrice'] = None,
+    ) -> None:
         """
         Initialize a PricingSet object.
 
@@ -3863,12 +4582,12 @@ class PricingSet:
     def from_dict(cls, _dict: Dict) -> 'PricingSet':
         """Initialize a PricingSet object from a json dictionary."""
         args = {}
-        if 'type' in _dict:
-            args['type'] = _dict.get('type')
-        if 'origin' in _dict:
-            args['origin'] = _dict.get('origin')
-        if 'starting_price' in _dict:
-            args['starting_price'] = StartingPrice.from_dict(_dict.get('starting_price'))
+        if (type := _dict.get('type')) is not None:
+            args['type'] = type
+        if (origin := _dict.get('origin')) is not None:
+            args['origin'] = origin
+        if (starting_price := _dict.get('starting_price')) is not None:
+            args['starting_price'] = StartingPrice.from_dict(starting_price)
         return cls(**args)
 
     @classmethod
@@ -3884,7 +4603,10 @@ class PricingSet:
         if hasattr(self, 'origin') and self.origin is not None:
             _dict['origin'] = self.origin
         if hasattr(self, 'starting_price') and self.starting_price is not None:
-            _dict['starting_price'] = self.starting_price.to_dict()
+            if isinstance(self.starting_price, dict):
+                _dict['starting_price'] = self.starting_price
+            else:
+                _dict['starting_price'] = self.starting_price.to_dict()
         return _dict
 
     def _to_dict(self):
@@ -3910,15 +4632,21 @@ class Provider:
     """
     Information related to the provider associated with a catalog entry.
 
-    :attr str email: Provider's email address for this catalog entry.
-    :attr str name: Provider's name, for example, IBM.
-    :attr str contact: (optional) Provider's contact name.
-    :attr str support_email: (optional) Provider's support email.
-    :attr str phone: (optional) Provider's contact phone.
+    :param str email: Provider's email address for this catalog entry.
+    :param str name: Provider's name, for example, IBM.
+    :param str contact: (optional) Provider's contact name.
+    :param str support_email: (optional) Provider's support email.
+    :param str phone: (optional) Provider's contact phone.
     """
 
     def __init__(
-        self, email: str, name: str, *, contact: str = None, support_email: str = None, phone: str = None
+        self,
+        email: str,
+        name: str,
+        *,
+        contact: Optional[str] = None,
+        support_email: Optional[str] = None,
+        phone: Optional[str] = None,
     ) -> None:
         """
         Initialize a Provider object.
@@ -3939,20 +4667,20 @@ class Provider:
     def from_dict(cls, _dict: Dict) -> 'Provider':
         """Initialize a Provider object from a json dictionary."""
         args = {}
-        if 'email' in _dict:
-            args['email'] = _dict.get('email')
+        if (email := _dict.get('email')) is not None:
+            args['email'] = email
         else:
             raise ValueError('Required property \'email\' not present in Provider JSON')
-        if 'name' in _dict:
-            args['name'] = _dict.get('name')
+        if (name := _dict.get('name')) is not None:
+            args['name'] = name
         else:
             raise ValueError('Required property \'name\' not present in Provider JSON')
-        if 'contact' in _dict:
-            args['contact'] = _dict.get('contact')
-        if 'support_email' in _dict:
-            args['support_email'] = _dict.get('support_email')
-        if 'phone' in _dict:
-            args['phone'] = _dict.get('phone')
+        if (contact := _dict.get('contact')) is not None:
+            args['contact'] = contact
+        if (support_email := _dict.get('support_email')) is not None:
+            args['support_email'] = support_email
+        if (phone := _dict.get('phone')) is not None:
+            args['phone'] = phone
         return cls(**args)
 
     @classmethod
@@ -3998,24 +4726,25 @@ class SLAMetaData:
     """
     Service Level Agreement related metadata.
 
-    :attr str terms: (optional) Required Service License Agreement Terms of Use.
-    :attr str tenancy: (optional) Required deployment type. Valid values are
+    :param str terms: (optional) Required Service License Agreement Terms of Use.
+    :param str tenancy: (optional) Required deployment type. Valid values are
           dedicated, local, or public. It can be Single or Multi tennancy, more
           specifically on a Server, VM, Physical, or Pod.
-    :attr str provisioning: (optional) Provisioning reliability, for example, 99.95.
-    :attr str responsiveness: (optional) Uptime reliability of the service, for
+    :param float provisioning: (optional) Provisioning reliability, for example,
+          99.95.
+    :param float responsiveness: (optional) Uptime reliability of the service, for
           example, 99.95.
-    :attr DRMetaData dr: (optional) SLA Disaster Recovery-related metadata.
+    :param DRMetaData dr: (optional) SLA Disaster Recovery-related metadata.
     """
 
     def __init__(
         self,
         *,
-        terms: str = None,
-        tenancy: str = None,
-        provisioning: str = None,
-        responsiveness: str = None,
-        dr: 'DRMetaData' = None,
+        terms: Optional[str] = None,
+        tenancy: Optional[str] = None,
+        provisioning: Optional[float] = None,
+        responsiveness: Optional[float] = None,
+        dr: Optional['DRMetaData'] = None,
     ) -> None:
         """
         Initialize a SLAMetaData object.
@@ -4025,9 +4754,9 @@ class SLAMetaData:
         :param str tenancy: (optional) Required deployment type. Valid values are
                dedicated, local, or public. It can be Single or Multi tennancy, more
                specifically on a Server, VM, Physical, or Pod.
-        :param str provisioning: (optional) Provisioning reliability, for example,
-               99.95.
-        :param str responsiveness: (optional) Uptime reliability of the service,
+        :param float provisioning: (optional) Provisioning reliability, for
+               example, 99.95.
+        :param float responsiveness: (optional) Uptime reliability of the service,
                for example, 99.95.
         :param DRMetaData dr: (optional) SLA Disaster Recovery-related metadata.
         """
@@ -4041,16 +4770,16 @@ class SLAMetaData:
     def from_dict(cls, _dict: Dict) -> 'SLAMetaData':
         """Initialize a SLAMetaData object from a json dictionary."""
         args = {}
-        if 'terms' in _dict:
-            args['terms'] = _dict.get('terms')
-        if 'tenancy' in _dict:
-            args['tenancy'] = _dict.get('tenancy')
-        if 'provisioning' in _dict:
-            args['provisioning'] = _dict.get('provisioning')
-        if 'responsiveness' in _dict:
-            args['responsiveness'] = _dict.get('responsiveness')
-        if 'dr' in _dict:
-            args['dr'] = DRMetaData.from_dict(_dict.get('dr'))
+        if (terms := _dict.get('terms')) is not None:
+            args['terms'] = terms
+        if (tenancy := _dict.get('tenancy')) is not None:
+            args['tenancy'] = tenancy
+        if (provisioning := _dict.get('provisioning')) is not None:
+            args['provisioning'] = provisioning
+        if (responsiveness := _dict.get('responsiveness')) is not None:
+            args['responsiveness'] = responsiveness
+        if (dr := _dict.get('dr')) is not None:
+            args['dr'] = DRMetaData.from_dict(dr)
         return cls(**args)
 
     @classmethod
@@ -4070,7 +4799,10 @@ class SLAMetaData:
         if hasattr(self, 'responsiveness') and self.responsiveness is not None:
             _dict['responsiveness'] = self.responsiveness
         if hasattr(self, 'dr') and self.dr is not None:
-            _dict['dr'] = self.dr.to_dict()
+            if isinstance(self.dr, dict):
+                _dict['dr'] = self.dr
+            else:
+                _dict['dr'] = self.dr.to_dict()
         return _dict
 
     def _to_dict(self):
@@ -4096,12 +4828,18 @@ class SourceMetaData:
     """
     Location of your applications source files.
 
-    :attr str path: (optional) Path to your application.
-    :attr str type: (optional) Type of source, for example, git.
-    :attr str url: (optional) URL to source.
+    :param str path: (optional) Path to your application.
+    :param str type: (optional) Type of source, for example, git.
+    :param str url: (optional) URL to source.
     """
 
-    def __init__(self, *, path: str = None, type: str = None, url: str = None) -> None:
+    def __init__(
+        self,
+        *,
+        path: Optional[str] = None,
+        type: Optional[str] = None,
+        url: Optional[str] = None,
+    ) -> None:
         """
         Initialize a SourceMetaData object.
 
@@ -4117,12 +4855,12 @@ class SourceMetaData:
     def from_dict(cls, _dict: Dict) -> 'SourceMetaData':
         """Initialize a SourceMetaData object from a json dictionary."""
         args = {}
-        if 'path' in _dict:
-            args['path'] = _dict.get('path')
-        if 'type' in _dict:
-            args['type'] = _dict.get('type')
-        if 'url' in _dict:
-            args['url'] = _dict.get('url')
+        if (path := _dict.get('path')) is not None:
+            args['path'] = path
+        if (type := _dict.get('type')) is not None:
+            args['type'] = type
+        if (url := _dict.get('url')) is not None:
+            args['url'] = url
         return cls(**args)
 
     @classmethod
@@ -4164,16 +4902,21 @@ class StartingPrice:
     """
     Plan-specific starting price information.
 
-    :attr str plan_id: (optional) ID of the plan the starting price is calculated.
-    :attr str deployment_id: (optional) ID of the deployment the starting price is
+    :param str plan_id: (optional) ID of the plan the starting price is calculated.
+    :param str deployment_id: (optional) ID of the deployment the starting price is
           calculated.
-    :attr str unit: (optional) Pricing unit.
-    :attr List[Amount] amount: (optional) The pricing per metric by country and
+    :param str unit: (optional) Pricing unit.
+    :param List[Amount] amount: (optional) The pricing per metric by country and
           currency.
     """
 
     def __init__(
-        self, *, plan_id: str = None, deployment_id: str = None, unit: str = None, amount: List['Amount'] = None
+        self,
+        *,
+        plan_id: Optional[str] = None,
+        deployment_id: Optional[str] = None,
+        unit: Optional[str] = None,
+        amount: Optional[List['Amount']] = None,
     ) -> None:
         """
         Initialize a StartingPrice object.
@@ -4195,14 +4938,14 @@ class StartingPrice:
     def from_dict(cls, _dict: Dict) -> 'StartingPrice':
         """Initialize a StartingPrice object from a json dictionary."""
         args = {}
-        if 'plan_id' in _dict:
-            args['plan_id'] = _dict.get('plan_id')
-        if 'deployment_id' in _dict:
-            args['deployment_id'] = _dict.get('deployment_id')
-        if 'unit' in _dict:
-            args['unit'] = _dict.get('unit')
-        if 'amount' in _dict:
-            args['amount'] = [Amount.from_dict(x) for x in _dict.get('amount')]
+        if (plan_id := _dict.get('plan_id')) is not None:
+            args['plan_id'] = plan_id
+        if (deployment_id := _dict.get('deployment_id')) is not None:
+            args['deployment_id'] = deployment_id
+        if (unit := _dict.get('unit')) is not None:
+            args['unit'] = unit
+        if (amount := _dict.get('amount')) is not None:
+            args['amount'] = [Amount.from_dict(v) for v in amount]
         return cls(**args)
 
     @classmethod
@@ -4220,7 +4963,13 @@ class StartingPrice:
         if hasattr(self, 'unit') and self.unit is not None:
             _dict['unit'] = self.unit
         if hasattr(self, 'amount') and self.amount is not None:
-            _dict['amount'] = [x.to_dict() for x in self.amount]
+            amount_list = []
+            for v in self.amount:
+                if isinstance(v, dict):
+                    amount_list.append(v)
+                else:
+                    amount_list.append(v.to_dict())
+            _dict['amount'] = amount_list
         return _dict
 
     def _to_dict(self):
@@ -4246,27 +4995,28 @@ class Strings:
     """
     Information related to a translated text message.
 
-    :attr List[Bullets] bullets: (optional) Presentation information related to list
-          delimiters.
-    :attr List[UIMetaMedia] media: (optional) Media-related metadata.
-    :attr str not_creatable_msg: (optional) Warning that a message is not creatable.
-    :attr str not_creatable_robot_msg: (optional) Warning that a robot message is
+    :param List[Bullets] bullets: (optional) Presentation information related to
+          list delimiters.
+    :param List[UIMetaMedia] media: (optional) Media-related metadata.
+    :param str not_creatable_msg: (optional) Warning that a message is not
+          creatable.
+    :param str not_creatable_robot_msg: (optional) Warning that a robot message is
           not creatable.
-    :attr str deprecation_warning: (optional) Warning for deprecation.
-    :attr str popup_warning_message: (optional) Popup warning message.
-    :attr str instruction: (optional) Instructions for UI strings.
+    :param str deprecation_warning: (optional) Warning for deprecation.
+    :param str popup_warning_message: (optional) Popup warning message.
+    :param str instruction: (optional) Instructions for UI strings.
     """
 
     def __init__(
         self,
         *,
-        bullets: List['Bullets'] = None,
-        media: List['UIMetaMedia'] = None,
-        not_creatable_msg: str = None,
-        not_creatable_robot_msg: str = None,
-        deprecation_warning: str = None,
-        popup_warning_message: str = None,
-        instruction: str = None,
+        bullets: Optional[List['Bullets']] = None,
+        media: Optional[List['UIMetaMedia']] = None,
+        not_creatable_msg: Optional[str] = None,
+        not_creatable_robot_msg: Optional[str] = None,
+        deprecation_warning: Optional[str] = None,
+        popup_warning_message: Optional[str] = None,
+        instruction: Optional[str] = None,
     ) -> None:
         """
         Initialize a Strings object.
@@ -4294,20 +5044,20 @@ class Strings:
     def from_dict(cls, _dict: Dict) -> 'Strings':
         """Initialize a Strings object from a json dictionary."""
         args = {}
-        if 'bullets' in _dict:
-            args['bullets'] = [Bullets.from_dict(x) for x in _dict.get('bullets')]
-        if 'media' in _dict:
-            args['media'] = [UIMetaMedia.from_dict(x) for x in _dict.get('media')]
-        if 'not_creatable_msg' in _dict:
-            args['not_creatable_msg'] = _dict.get('not_creatable_msg')
-        if 'not_creatable__robot_msg' in _dict:
-            args['not_creatable_robot_msg'] = _dict.get('not_creatable__robot_msg')
-        if 'deprecation_warning' in _dict:
-            args['deprecation_warning'] = _dict.get('deprecation_warning')
-        if 'popup_warning_message' in _dict:
-            args['popup_warning_message'] = _dict.get('popup_warning_message')
-        if 'instruction' in _dict:
-            args['instruction'] = _dict.get('instruction')
+        if (bullets := _dict.get('bullets')) is not None:
+            args['bullets'] = [Bullets.from_dict(v) for v in bullets]
+        if (media := _dict.get('media')) is not None:
+            args['media'] = [UIMetaMedia.from_dict(v) for v in media]
+        if (not_creatable_msg := _dict.get('not_creatable_msg')) is not None:
+            args['not_creatable_msg'] = not_creatable_msg
+        if (not_creatable_robot_msg := _dict.get('not_creatable__robot_msg')) is not None:
+            args['not_creatable_robot_msg'] = not_creatable_robot_msg
+        if (deprecation_warning := _dict.get('deprecation_warning')) is not None:
+            args['deprecation_warning'] = deprecation_warning
+        if (popup_warning_message := _dict.get('popup_warning_message')) is not None:
+            args['popup_warning_message'] = popup_warning_message
+        if (instruction := _dict.get('instruction')) is not None:
+            args['instruction'] = instruction
         return cls(**args)
 
     @classmethod
@@ -4319,9 +5069,21 @@ class Strings:
         """Return a json dictionary representing this model."""
         _dict = {}
         if hasattr(self, 'bullets') and self.bullets is not None:
-            _dict['bullets'] = [x.to_dict() for x in self.bullets]
+            bullets_list = []
+            for v in self.bullets:
+                if isinstance(v, dict):
+                    bullets_list.append(v)
+                else:
+                    bullets_list.append(v.to_dict())
+            _dict['bullets'] = bullets_list
         if hasattr(self, 'media') and self.media is not None:
-            _dict['media'] = [x.to_dict() for x in self.media]
+            media_list = []
+            for v in self.media:
+                if isinstance(v, dict):
+                    media_list.append(v)
+                else:
+                    media_list.append(v.to_dict())
+            _dict['media'] = media_list
         if hasattr(self, 'not_creatable_msg') and self.not_creatable_msg is not None:
             _dict['not_creatable_msg'] = self.not_creatable_msg
         if hasattr(self, 'not_creatable_robot_msg') and self.not_creatable_robot_msg is not None:
@@ -4357,34 +5119,34 @@ class TemplateMetaData:
     """
     Template-related metadata.
 
-    :attr List[str] services: (optional) List of required offering or plan IDs.
-    :attr int default_memory: (optional) Cloud Foundry instance memory value.
-    :attr str start_cmd: (optional) Start Command.
-    :attr SourceMetaData source: (optional) Location of your applications source
+    :param List[str] services: (optional) List of required offering or plan IDs.
+    :param int default_memory: (optional) Cloud Foundry instance memory value.
+    :param str start_cmd: (optional) Start Command.
+    :param SourceMetaData source: (optional) Location of your applications source
           files.
-    :attr str runtime_catalog_id: (optional) ID of the runtime.
-    :attr str cf_runtime_id: (optional) ID of the Cloud Foundry runtime.
-    :attr str template_id: (optional) ID of the boilerplate or template.
-    :attr str executable_file: (optional) File path to the executable file for the
+    :param str runtime_catalog_id: (optional) ID of the runtime.
+    :param str cf_runtime_id: (optional) ID of the Cloud Foundry runtime.
+    :param str template_id: (optional) ID of the boilerplate or template.
+    :param str executable_file: (optional) File path to the executable file for the
           template.
-    :attr str buildpack: (optional) ID of the buildpack used by the template.
-    :attr dict environment_variables: (optional) Environment variables (key/value
+    :param str buildpack: (optional) ID of the buildpack used by the template.
+    :param dict environment_variables: (optional) Environment variables (key/value
           pairs) for the template.
     """
 
     def __init__(
         self,
         *,
-        services: List[str] = None,
-        default_memory: int = None,
-        start_cmd: str = None,
-        source: 'SourceMetaData' = None,
-        runtime_catalog_id: str = None,
-        cf_runtime_id: str = None,
-        template_id: str = None,
-        executable_file: str = None,
-        buildpack: str = None,
-        environment_variables: dict = None,
+        services: Optional[List[str]] = None,
+        default_memory: Optional[int] = None,
+        start_cmd: Optional[str] = None,
+        source: Optional['SourceMetaData'] = None,
+        runtime_catalog_id: Optional[str] = None,
+        cf_runtime_id: Optional[str] = None,
+        template_id: Optional[str] = None,
+        executable_file: Optional[str] = None,
+        buildpack: Optional[str] = None,
+        environment_variables: Optional[dict] = None,
     ) -> None:
         """
         Initialize a TemplateMetaData object.
@@ -4419,26 +5181,26 @@ class TemplateMetaData:
     def from_dict(cls, _dict: Dict) -> 'TemplateMetaData':
         """Initialize a TemplateMetaData object from a json dictionary."""
         args = {}
-        if 'services' in _dict:
-            args['services'] = _dict.get('services')
-        if 'default_memory' in _dict:
-            args['default_memory'] = _dict.get('default_memory')
-        if 'start_cmd' in _dict:
-            args['start_cmd'] = _dict.get('start_cmd')
-        if 'source' in _dict:
-            args['source'] = SourceMetaData.from_dict(_dict.get('source'))
-        if 'runtime_catalog_id' in _dict:
-            args['runtime_catalog_id'] = _dict.get('runtime_catalog_id')
-        if 'cf_runtime_id' in _dict:
-            args['cf_runtime_id'] = _dict.get('cf_runtime_id')
-        if 'template_id' in _dict:
-            args['template_id'] = _dict.get('template_id')
-        if 'executable_file' in _dict:
-            args['executable_file'] = _dict.get('executable_file')
-        if 'buildpack' in _dict:
-            args['buildpack'] = _dict.get('buildpack')
-        if 'environment_variables' in _dict:
-            args['environment_variables'] = _dict.get('environment_variables')
+        if (services := _dict.get('services')) is not None:
+            args['services'] = services
+        if (default_memory := _dict.get('default_memory')) is not None:
+            args['default_memory'] = default_memory
+        if (start_cmd := _dict.get('start_cmd')) is not None:
+            args['start_cmd'] = start_cmd
+        if (source := _dict.get('source')) is not None:
+            args['source'] = SourceMetaData.from_dict(source)
+        if (runtime_catalog_id := _dict.get('runtime_catalog_id')) is not None:
+            args['runtime_catalog_id'] = runtime_catalog_id
+        if (cf_runtime_id := _dict.get('cf_runtime_id')) is not None:
+            args['cf_runtime_id'] = cf_runtime_id
+        if (template_id := _dict.get('template_id')) is not None:
+            args['template_id'] = template_id
+        if (executable_file := _dict.get('executable_file')) is not None:
+            args['executable_file'] = executable_file
+        if (buildpack := _dict.get('buildpack')) is not None:
+            args['buildpack'] = buildpack
+        if (environment_variables := _dict.get('environment_variables')) is not None:
+            args['environment_variables'] = environment_variables
         return cls(**args)
 
     @classmethod
@@ -4456,7 +5218,10 @@ class TemplateMetaData:
         if hasattr(self, 'start_cmd') and self.start_cmd is not None:
             _dict['start_cmd'] = self.start_cmd
         if hasattr(self, 'source') and self.source is not None:
-            _dict['source'] = self.source.to_dict()
+            if isinstance(self.source, dict):
+                _dict['source'] = self.source
+            else:
+                _dict['source'] = self.source.to_dict()
         if hasattr(self, 'runtime_catalog_id') and self.runtime_catalog_id is not None:
             _dict['runtime_catalog_id'] = self.runtime_catalog_id
         if hasattr(self, 'cf_runtime_id') and self.cf_runtime_id is not None:
@@ -4490,52 +5255,118 @@ class TemplateMetaData:
         return not self == other
 
 
+class UIMediaSourceMetaData:
+    """
+    Location of your applications media source files.
+
+    :param str type: (optional) Type of source, for example, git.
+    :param str url: (optional) URL to source.
+    """
+
+    def __init__(
+        self,
+        *,
+        type: Optional[str] = None,
+        url: Optional[str] = None,
+    ) -> None:
+        """
+        Initialize a UIMediaSourceMetaData object.
+
+        :param str type: (optional) Type of source, for example, git.
+        :param str url: (optional) URL to source.
+        """
+        self.type = type
+        self.url = url
+
+    @classmethod
+    def from_dict(cls, _dict: Dict) -> 'UIMediaSourceMetaData':
+        """Initialize a UIMediaSourceMetaData object from a json dictionary."""
+        args = {}
+        if (type := _dict.get('type')) is not None:
+            args['type'] = type
+        if (url := _dict.get('url')) is not None:
+            args['url'] = url
+        return cls(**args)
+
+    @classmethod
+    def _from_dict(cls, _dict):
+        """Initialize a UIMediaSourceMetaData object from a json dictionary."""
+        return cls.from_dict(_dict)
+
+    def to_dict(self) -> Dict:
+        """Return a json dictionary representing this model."""
+        _dict = {}
+        if hasattr(self, 'type') and self.type is not None:
+            _dict['type'] = self.type
+        if hasattr(self, 'url') and self.url is not None:
+            _dict['url'] = self.url
+        return _dict
+
+    def _to_dict(self):
+        """Return a json dictionary representing this model."""
+        return self.to_dict()
+
+    def __str__(self) -> str:
+        """Return a `str` version of this UIMediaSourceMetaData object."""
+        return json.dumps(self.to_dict(), indent=2)
+
+    def __eq__(self, other: 'UIMediaSourceMetaData') -> bool:
+        """Return `true` when self and other are equal, false otherwise."""
+        if not isinstance(other, self.__class__):
+            return False
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other: 'UIMediaSourceMetaData') -> bool:
+        """Return `true` when self and other are not equal, false otherwise."""
+        return not self == other
+
+
 class UIMetaData:
     """
     Information related to the UI presentation associated with a catalog entry.
 
-    :attr dict strings: (optional) Language specific translation of translation
+    :param dict strings: (optional) Language specific translation of translation
           properties, like label and description.
-    :attr URLS urls: (optional) UI based URLs.
-    :attr str embeddable_dashboard: (optional) Describes how the embeddable
+    :param URLS urls: (optional) UI based URLs.
+    :param str embeddable_dashboard: (optional) Describes how the embeddable
           dashboard is rendered.
-    :attr bool embeddable_dashboard_full_width: (optional) Describes whether the
+    :param bool embeddable_dashboard_full_width: (optional) Describes whether the
           embeddable dashboard is rendered at the full width.
-    :attr List[str] navigation_order: (optional) Defines the order of information
+    :param List[str] navigation_order: (optional) Defines the order of information
           presented.
-    :attr bool not_creatable: (optional) Describes whether this entry is able to be
+    :param bool not_creatable: (optional) Describes whether this entry is able to be
           created from the UI element or CLI.
-    :attr str primary_offering_id: (optional) ID of the primary offering for a
+    :param str primary_offering_id: (optional) ID of the primary offering for a
           group.
-    :attr bool accessible_during_provision: (optional) Alert to ACE to allow
+    :param bool accessible_during_provision: (optional) Alert to ACE to allow
           instance UI to be accessible while the provisioning state of instance is in
           progress.
-    :attr int side_by_side_index: (optional) Specifies a side by side ordering
+    :param int side_by_side_index: (optional) Specifies a side by side ordering
           weight to the UI.
-    :attr datetime end_of_service_time: (optional) Date and time the service will no
-          longer be available.
-    :attr bool hidden: (optional) Denotes visibility.
-    :attr bool hide_lite_metering: (optional) Denotes lite metering visibility.
-    :attr bool no_upgrade_next_step: (optional) Denotes whether an upgrade should
-          occurr.
+    :param datetime end_of_service_time: (optional) Date and time the service will
+          no longer be available.
+    :param bool hidden: (optional) Denotes visibility.
+    :param bool hide_lite_metering: (optional) Denotes lite metering visibility.
+    :param bool no_upgrade_next_step: (optional) Denotes whether an upgrade should
+          occur.
     """
 
     def __init__(
         self,
         *,
-        strings: dict = None,
-        urls: 'URLS' = None,
-        embeddable_dashboard: str = None,
-        embeddable_dashboard_full_width: bool = None,
-        navigation_order: List[str] = None,
-        not_creatable: bool = None,
-        primary_offering_id: str = None,
-        accessible_during_provision: bool = None,
-        side_by_side_index: int = None,
-        end_of_service_time: datetime = None,
-        hidden: bool = None,
-        hide_lite_metering: bool = None,
-        no_upgrade_next_step: bool = None,
+        strings: Optional[dict] = None,
+        urls: Optional['URLS'] = None,
+        embeddable_dashboard: Optional[str] = None,
+        embeddable_dashboard_full_width: Optional[bool] = None,
+        navigation_order: Optional[List[str]] = None,
+        not_creatable: Optional[bool] = None,
+        primary_offering_id: Optional[str] = None,
+        accessible_during_provision: Optional[bool] = None,
+        side_by_side_index: Optional[int] = None,
+        end_of_service_time: Optional[datetime] = None,
+        hidden: Optional[bool] = None,
+        hide_lite_metering: Optional[bool] = None,
+        no_upgrade_next_step: Optional[bool] = None,
     ) -> None:
         """
         Initialize a UIMetaData object.
@@ -4564,7 +5395,7 @@ class UIMetaData:
         :param bool hide_lite_metering: (optional) Denotes lite metering
                visibility.
         :param bool no_upgrade_next_step: (optional) Denotes whether an upgrade
-               should occurr.
+               should occur.
         """
         self.strings = strings
         self.urls = urls
@@ -4584,32 +5415,32 @@ class UIMetaData:
     def from_dict(cls, _dict: Dict) -> 'UIMetaData':
         """Initialize a UIMetaData object from a json dictionary."""
         args = {}
-        if 'strings' in _dict:
-            args['strings'] = {k: Strings.from_dict(v) for k, v in _dict.get('strings').items()}
-        if 'urls' in _dict:
-            args['urls'] = URLS.from_dict(_dict.get('urls'))
-        if 'embeddable_dashboard' in _dict:
-            args['embeddable_dashboard'] = _dict.get('embeddable_dashboard')
-        if 'embeddable_dashboard_full_width' in _dict:
-            args['embeddable_dashboard_full_width'] = _dict.get('embeddable_dashboard_full_width')
-        if 'navigation_order' in _dict:
-            args['navigation_order'] = _dict.get('navigation_order')
-        if 'not_creatable' in _dict:
-            args['not_creatable'] = _dict.get('not_creatable')
-        if 'primary_offering_id' in _dict:
-            args['primary_offering_id'] = _dict.get('primary_offering_id')
-        if 'accessible_during_provision' in _dict:
-            args['accessible_during_provision'] = _dict.get('accessible_during_provision')
-        if 'side_by_side_index' in _dict:
-            args['side_by_side_index'] = _dict.get('side_by_side_index')
-        if 'end_of_service_time' in _dict:
-            args['end_of_service_time'] = string_to_datetime(_dict.get('end_of_service_time'))
-        if 'hidden' in _dict:
-            args['hidden'] = _dict.get('hidden')
-        if 'hide_lite_metering' in _dict:
-            args['hide_lite_metering'] = _dict.get('hide_lite_metering')
-        if 'no_upgrade_next_step' in _dict:
-            args['no_upgrade_next_step'] = _dict.get('no_upgrade_next_step')
+        if (strings := _dict.get('strings')) is not None:
+            args['strings'] = {k: Strings.from_dict(v) for k, v in strings.items()}
+        if (urls := _dict.get('urls')) is not None:
+            args['urls'] = URLS.from_dict(urls)
+        if (embeddable_dashboard := _dict.get('embeddable_dashboard')) is not None:
+            args['embeddable_dashboard'] = embeddable_dashboard
+        if (embeddable_dashboard_full_width := _dict.get('embeddable_dashboard_full_width')) is not None:
+            args['embeddable_dashboard_full_width'] = embeddable_dashboard_full_width
+        if (navigation_order := _dict.get('navigation_order')) is not None:
+            args['navigation_order'] = navigation_order
+        if (not_creatable := _dict.get('not_creatable')) is not None:
+            args['not_creatable'] = not_creatable
+        if (primary_offering_id := _dict.get('primary_offering_id')) is not None:
+            args['primary_offering_id'] = primary_offering_id
+        if (accessible_during_provision := _dict.get('accessible_during_provision')) is not None:
+            args['accessible_during_provision'] = accessible_during_provision
+        if (side_by_side_index := _dict.get('side_by_side_index')) is not None:
+            args['side_by_side_index'] = side_by_side_index
+        if (end_of_service_time := _dict.get('end_of_service_time')) is not None:
+            args['end_of_service_time'] = string_to_datetime(end_of_service_time)
+        if (hidden := _dict.get('hidden')) is not None:
+            args['hidden'] = hidden
+        if (hide_lite_metering := _dict.get('hide_lite_metering')) is not None:
+            args['hide_lite_metering'] = hide_lite_metering
+        if (no_upgrade_next_step := _dict.get('no_upgrade_next_step')) is not None:
+            args['no_upgrade_next_step'] = no_upgrade_next_step
         return cls(**args)
 
     @classmethod
@@ -4621,9 +5452,18 @@ class UIMetaData:
         """Return a json dictionary representing this model."""
         _dict = {}
         if hasattr(self, 'strings') and self.strings is not None:
-            _dict['strings'] = {k: v.to_dict() for k, v in self.strings.items()}
+            strings_map = {}
+            for k, v in self.strings.items():
+                if isinstance(v, dict):
+                    strings_map[k] = v
+                else:
+                    strings_map[k] = v.to_dict()
+            _dict['strings'] = strings_map
         if hasattr(self, 'urls') and self.urls is not None:
-            _dict['urls'] = self.urls.to_dict()
+            if isinstance(self.urls, dict):
+                _dict['urls'] = self.urls
+            else:
+                _dict['urls'] = self.urls.to_dict()
         if hasattr(self, 'embeddable_dashboard') and self.embeddable_dashboard is not None:
             _dict['embeddable_dashboard'] = self.embeddable_dashboard
         if hasattr(self, 'embeddable_dashboard_full_width') and self.embeddable_dashboard_full_width is not None:
@@ -4671,21 +5511,22 @@ class UIMetaMedia:
     """
     Media-related metadata.
 
-    :attr str caption: (optional) Caption for an image.
-    :attr str thumbnail_url: (optional) URL for thumbnail image.
-    :attr str type: (optional) Type of media.
-    :attr str url: (optional) URL for media.
-    :attr Bullets source: (optional) Information related to list delimiters.
+    :param str caption: (optional) Caption for an image.
+    :param str thumbnail_url: (optional) URL for thumbnail image.
+    :param str type: (optional) Type of media.
+    :param str url: (optional) URL for media.
+    :param List[UIMediaSourceMetaData] source: (optional) UI media source data for
+          for UI media data.
     """
 
     def __init__(
         self,
         *,
-        caption: str = None,
-        thumbnail_url: str = None,
-        type: str = None,
-        url: str = None,
-        source: 'Bullets' = None,
+        caption: Optional[str] = None,
+        thumbnail_url: Optional[str] = None,
+        type: Optional[str] = None,
+        url: Optional[str] = None,
+        source: Optional[List['UIMediaSourceMetaData']] = None,
     ) -> None:
         """
         Initialize a UIMetaMedia object.
@@ -4694,7 +5535,8 @@ class UIMetaMedia:
         :param str thumbnail_url: (optional) URL for thumbnail image.
         :param str type: (optional) Type of media.
         :param str url: (optional) URL for media.
-        :param Bullets source: (optional) Information related to list delimiters.
+        :param List[UIMediaSourceMetaData] source: (optional) UI media source data
+               for for UI media data.
         """
         self.caption = caption
         self.thumbnail_url = thumbnail_url
@@ -4706,16 +5548,16 @@ class UIMetaMedia:
     def from_dict(cls, _dict: Dict) -> 'UIMetaMedia':
         """Initialize a UIMetaMedia object from a json dictionary."""
         args = {}
-        if 'caption' in _dict:
-            args['caption'] = _dict.get('caption')
-        if 'thumbnail_url' in _dict:
-            args['thumbnail_url'] = _dict.get('thumbnail_url')
-        if 'type' in _dict:
-            args['type'] = _dict.get('type')
-        if 'URL' in _dict:
-            args['url'] = _dict.get('URL')
-        if 'source' in _dict:
-            args['source'] = Bullets.from_dict(_dict.get('source'))
+        if (caption := _dict.get('caption')) is not None:
+            args['caption'] = caption
+        if (thumbnail_url := _dict.get('thumbnail_url')) is not None:
+            args['thumbnail_url'] = thumbnail_url
+        if (type := _dict.get('type')) is not None:
+            args['type'] = type
+        if (url := _dict.get('URL')) is not None:
+            args['url'] = url
+        if (source := _dict.get('source')) is not None:
+            args['source'] = [UIMediaSourceMetaData.from_dict(v) for v in source]
         return cls(**args)
 
     @classmethod
@@ -4735,7 +5577,13 @@ class UIMetaMedia:
         if hasattr(self, 'url') and self.url is not None:
             _dict['URL'] = self.url
         if hasattr(self, 'source') and self.source is not None:
-            _dict['source'] = self.source.to_dict()
+            source_list = []
+            for v in self.source:
+                if isinstance(v, dict):
+                    source_list.append(v)
+                else:
+                    source_list.append(v.to_dict())
+            _dict['source'] = source_list
         return _dict
 
     def _to_dict(self):
@@ -4761,37 +5609,37 @@ class URLS:
     """
     UI based URLs.
 
-    :attr str doc_url: (optional) URL for documentation.
-    :attr str instructions_url: (optional) URL for usage instructions.
-    :attr str api_url: (optional) API URL.
-    :attr str create_url: (optional) URL Creation UI / API.
-    :attr str sdk_download_url: (optional) URL to downlaod an SDK.
-    :attr str terms_url: (optional) URL to the terms of use for your service.
-    :attr str custom_create_page_url: (optional) URL to the custom create page for
+    :param str doc_url: (optional) URL for documentation.
+    :param str instructions_url: (optional) URL for usage instructions.
+    :param str api_url: (optional) API URL.
+    :param str create_url: (optional) URL Creation UI / API.
+    :param str sdk_download_url: (optional) URL to downlaod an SDK.
+    :param str terms_url: (optional) URL to the terms of use for your service.
+    :param str custom_create_page_url: (optional) URL to the custom create page for
           your serivce.
-    :attr str catalog_details_url: (optional) URL to the catalog details page for
+    :param str catalog_details_url: (optional) URL to the catalog details page for
           your serivce.
-    :attr str deprecation_doc_url: (optional) URL for deprecation documentation.
-    :attr str dashboard_url: (optional) URL for dashboard.
-    :attr str registration_url: (optional) URL for registration.
-    :attr str apidocsurl: (optional) URL for API documentation.
+    :param str deprecation_doc_url: (optional) URL for deprecation documentation.
+    :param str dashboard_url: (optional) URL for dashboard.
+    :param str registration_url: (optional) URL for registration.
+    :param str apidocsurl: (optional) URL for API documentation.
     """
 
     def __init__(
         self,
         *,
-        doc_url: str = None,
-        instructions_url: str = None,
-        api_url: str = None,
-        create_url: str = None,
-        sdk_download_url: str = None,
-        terms_url: str = None,
-        custom_create_page_url: str = None,
-        catalog_details_url: str = None,
-        deprecation_doc_url: str = None,
-        dashboard_url: str = None,
-        registration_url: str = None,
-        apidocsurl: str = None,
+        doc_url: Optional[str] = None,
+        instructions_url: Optional[str] = None,
+        api_url: Optional[str] = None,
+        create_url: Optional[str] = None,
+        sdk_download_url: Optional[str] = None,
+        terms_url: Optional[str] = None,
+        custom_create_page_url: Optional[str] = None,
+        catalog_details_url: Optional[str] = None,
+        deprecation_doc_url: Optional[str] = None,
+        dashboard_url: Optional[str] = None,
+        registration_url: Optional[str] = None,
+        apidocsurl: Optional[str] = None,
     ) -> None:
         """
         Initialize a URLS object.
@@ -4829,30 +5677,30 @@ class URLS:
     def from_dict(cls, _dict: Dict) -> 'URLS':
         """Initialize a URLS object from a json dictionary."""
         args = {}
-        if 'doc_url' in _dict:
-            args['doc_url'] = _dict.get('doc_url')
-        if 'instructions_url' in _dict:
-            args['instructions_url'] = _dict.get('instructions_url')
-        if 'api_url' in _dict:
-            args['api_url'] = _dict.get('api_url')
-        if 'create_url' in _dict:
-            args['create_url'] = _dict.get('create_url')
-        if 'sdk_download_url' in _dict:
-            args['sdk_download_url'] = _dict.get('sdk_download_url')
-        if 'terms_url' in _dict:
-            args['terms_url'] = _dict.get('terms_url')
-        if 'custom_create_page_url' in _dict:
-            args['custom_create_page_url'] = _dict.get('custom_create_page_url')
-        if 'catalog_details_url' in _dict:
-            args['catalog_details_url'] = _dict.get('catalog_details_url')
-        if 'deprecation_doc_url' in _dict:
-            args['deprecation_doc_url'] = _dict.get('deprecation_doc_url')
-        if 'dashboard_url' in _dict:
-            args['dashboard_url'] = _dict.get('dashboard_url')
-        if 'registration_url' in _dict:
-            args['registration_url'] = _dict.get('registration_url')
-        if 'apidocsurl' in _dict:
-            args['apidocsurl'] = _dict.get('apidocsurl')
+        if (doc_url := _dict.get('doc_url')) is not None:
+            args['doc_url'] = doc_url
+        if (instructions_url := _dict.get('instructions_url')) is not None:
+            args['instructions_url'] = instructions_url
+        if (api_url := _dict.get('api_url')) is not None:
+            args['api_url'] = api_url
+        if (create_url := _dict.get('create_url')) is not None:
+            args['create_url'] = create_url
+        if (sdk_download_url := _dict.get('sdk_download_url')) is not None:
+            args['sdk_download_url'] = sdk_download_url
+        if (terms_url := _dict.get('terms_url')) is not None:
+            args['terms_url'] = terms_url
+        if (custom_create_page_url := _dict.get('custom_create_page_url')) is not None:
+            args['custom_create_page_url'] = custom_create_page_url
+        if (catalog_details_url := _dict.get('catalog_details_url')) is not None:
+            args['catalog_details_url'] = catalog_details_url
+        if (deprecation_doc_url := _dict.get('deprecation_doc_url')) is not None:
+            args['deprecation_doc_url'] = deprecation_doc_url
+        if (dashboard_url := _dict.get('dashboard_url')) is not None:
+            args['dashboard_url'] = dashboard_url
+        if (registration_url := _dict.get('registration_url')) is not None:
+            args['registration_url'] = registration_url
+        if (apidocsurl := _dict.get('apidocsurl')) is not None:
+            args['apidocsurl'] = apidocsurl
         return cls(**args)
 
     @classmethod
@@ -4912,18 +5760,18 @@ class Visibility:
     """
     Information related to the visibility of a catalog entry.
 
-    :attr str restrictions: (optional) This controls the overall visibility. It is
+    :param str restrictions: (optional) This controls the overall visibility. It is
           an enum of *public*, *ibm_only*, and *private*. public means it is visible to
           all. ibm_only means it is visible to all IBM unless their account is explicitly
           excluded. private means it is visible only to the included accounts.
-    :attr str owner: (optional) IAM Scope-related information associated with a
+    :param str owner: (optional) IAM Scope-related information associated with a
           catalog entry.
-    :attr bool extendable: (optional) Allows the visibility to be extenable.
-    :attr VisibilityDetail include: (optional) Visibility details related to a
+    :param bool extendable: (optional) Allows the visibility to be extenable.
+    :param VisibilityDetail include: (optional) Visibility details related to a
           catalog entry.
-    :attr VisibilityDetail exclude: (optional) Visibility details related to a
+    :param VisibilityDetail exclude: (optional) Visibility details related to a
           catalog entry.
-    :attr bool approved: (optional) Determines whether the owning account has full
+    :param bool approved: (optional) Determines whether the owning account has full
           control over the visibility of the entry such as adding non-IBM accounts to the
           whitelist and making entries `private`, `ibm_only` or `public`.
     """
@@ -4931,12 +5779,12 @@ class Visibility:
     def __init__(
         self,
         *,
-        restrictions: str = None,
-        owner: str = None,
-        extendable: bool = None,
-        include: 'VisibilityDetail' = None,
-        exclude: 'VisibilityDetail' = None,
-        approved: bool = None,
+        restrictions: Optional[str] = None,
+        owner: Optional[str] = None,
+        extendable: Optional[bool] = None,
+        include: Optional['VisibilityDetail'] = None,
+        exclude: Optional['VisibilityDetail'] = None,
+        approved: Optional[bool] = None,
     ) -> None:
         """
         Initialize a Visibility object.
@@ -4958,18 +5806,18 @@ class Visibility:
     def from_dict(cls, _dict: Dict) -> 'Visibility':
         """Initialize a Visibility object from a json dictionary."""
         args = {}
-        if 'restrictions' in _dict:
-            args['restrictions'] = _dict.get('restrictions')
-        if 'owner' in _dict:
-            args['owner'] = _dict.get('owner')
-        if 'extendable' in _dict:
-            args['extendable'] = _dict.get('extendable')
-        if 'include' in _dict:
-            args['include'] = VisibilityDetail.from_dict(_dict.get('include'))
-        if 'exclude' in _dict:
-            args['exclude'] = VisibilityDetail.from_dict(_dict.get('exclude'))
-        if 'approved' in _dict:
-            args['approved'] = _dict.get('approved')
+        if (restrictions := _dict.get('restrictions')) is not None:
+            args['restrictions'] = restrictions
+        if (owner := _dict.get('owner')) is not None:
+            args['owner'] = owner
+        if (extendable := _dict.get('extendable')) is not None:
+            args['extendable'] = extendable
+        if (include := _dict.get('include')) is not None:
+            args['include'] = VisibilityDetail.from_dict(include)
+        if (exclude := _dict.get('exclude')) is not None:
+            args['exclude'] = VisibilityDetail.from_dict(exclude)
+        if (approved := _dict.get('approved')) is not None:
+            args['approved'] = approved
         return cls(**args)
 
     @classmethod
@@ -4987,9 +5835,15 @@ class Visibility:
         if hasattr(self, 'extendable') and self.extendable is not None:
             _dict['extendable'] = self.extendable
         if hasattr(self, 'include') and self.include is not None:
-            _dict['include'] = self.include.to_dict()
+            if isinstance(self.include, dict):
+                _dict['include'] = self.include
+            else:
+                _dict['include'] = self.include.to_dict()
         if hasattr(self, 'exclude') and self.exclude is not None:
-            _dict['exclude'] = self.exclude.to_dict()
+            if isinstance(self.exclude, dict):
+                _dict['exclude'] = self.exclude
+            else:
+                _dict['exclude'] = self.exclude.to_dict()
         if hasattr(self, 'approved') and getattr(self, 'approved') is not None:
             _dict['approved'] = getattr(self, 'approved')
         return _dict
@@ -5017,11 +5871,14 @@ class VisibilityDetail:
     """
     Visibility details related to a catalog entry.
 
-    :attr VisibilityDetailAccounts accounts: Information related to the accounts for
-          which a catalog entry is visible.
+    :param VisibilityDetailAccounts accounts: Information related to the accounts
+          for which a catalog entry is visible.
     """
 
-    def __init__(self, accounts: 'VisibilityDetailAccounts') -> None:
+    def __init__(
+        self,
+        accounts: 'VisibilityDetailAccounts',
+    ) -> None:
         """
         Initialize a VisibilityDetail object.
 
@@ -5034,8 +5891,8 @@ class VisibilityDetail:
     def from_dict(cls, _dict: Dict) -> 'VisibilityDetail':
         """Initialize a VisibilityDetail object from a json dictionary."""
         args = {}
-        if 'accounts' in _dict:
-            args['accounts'] = VisibilityDetailAccounts.from_dict(_dict.get('accounts'))
+        if (accounts := _dict.get('accounts')) is not None:
+            args['accounts'] = VisibilityDetailAccounts.from_dict(accounts)
         else:
             raise ValueError('Required property \'accounts\' not present in VisibilityDetail JSON')
         return cls(**args)
@@ -5049,7 +5906,10 @@ class VisibilityDetail:
         """Return a json dictionary representing this model."""
         _dict = {}
         if hasattr(self, 'accounts') and self.accounts is not None:
-            _dict['accounts'] = self.accounts.to_dict()
+            if isinstance(self.accounts, dict):
+                _dict['accounts'] = self.accounts
+            else:
+                _dict['accounts'] = self.accounts.to_dict()
         return _dict
 
     def _to_dict(self):
@@ -5075,12 +5935,16 @@ class VisibilityDetailAccounts:
     """
     Information related to the accounts for which a catalog entry is visible.
 
-    :attr str accountid: (optional) (_accountid_) is the GUID of the account and the
-          value is the scope of who set it. For setting visibility use "" as the value. It
-          is replaced with the owner scope when saved.
+    :param str accountid: (optional) (_accountid_) is the GUID of the account and
+          the value is the scope of who set it. For setting visibility use "" as the
+          value. It is replaced with the owner scope when saved.
     """
 
-    def __init__(self, *, accountid: str = None) -> None:
+    def __init__(
+        self,
+        *,
+        accountid: Optional[str] = None,
+    ) -> None:
         """
         Initialize a VisibilityDetailAccounts object.
 
@@ -5094,8 +5958,8 @@ class VisibilityDetailAccounts:
     def from_dict(cls, _dict: Dict) -> 'VisibilityDetailAccounts':
         """Initialize a VisibilityDetailAccounts object from a json dictionary."""
         args = {}
-        if '_accountid_' in _dict:
-            args['accountid'] = _dict.get('_accountid_')
+        if (accountid := _dict.get('_accountid_')) is not None:
+            args['accountid'] = accountid
         return cls(**args)
 
     @classmethod