chore: update services to version 3.97.0 of sdk generator

Author: apaparazzi0329

ibm_watson/assistant_v1.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# IBM OpenAPI SDK Code Generator Version: 3.85.0-75c38f8f-20240206-210220
+# IBM OpenAPI SDK Code Generator Version: 3.97.0-0e90eab1-20241120-170029
 """
 IBM Watson® Discovery is a cognitive search and content analytics engine that you can
 add to applications to identify patterns, trends and actionable insights to drive better
@@ -4112,6 +4112,9 @@ class AnalyzedResult:
     Result of the document analysis.
 
     :param dict metadata: (optional) Metadata that was specified with the request.
+
+    This type supports additional properties of type object. The remaining key-value
+    pairs.
     """
 
     # The set of defined properties for the class
@@ -4121,27 +4124,41 @@ def __init__(
         self,
         *,
         metadata: Optional[dict] = None,
-        **kwargs,
+        **kwargs: Optional[object],
     ) -> None:
         """
         Initialize a AnalyzedResult object.
 
         :param dict metadata: (optional) Metadata that was specified with the
                request.
-        :param **kwargs: (optional) Any additional properties.
+        :param object **kwargs: (optional) The remaining key-value pairs.
         """
         self.metadata = metadata
-        for _key, _value in kwargs.items():
-            setattr(self, _key, _value)
+        for k, v in kwargs.items():
+            if k not in AnalyzedResult._properties:
+                if not isinstance(v, object):
+                    raise ValueError(
+                        'Value for additional property {} must be of type object'
+                        .format(k))
+                setattr(self, k, v)
+            else:
+                raise ValueError(
+                    'Property {} cannot be specified as an additional property'.
+                    format(k))
 
     @classmethod
     def from_dict(cls, _dict: Dict) -> 'AnalyzedResult':
         """Initialize a AnalyzedResult object from a json dictionary."""
         args = {}
         if (metadata := _dict.get('metadata')) is not None:
             args['metadata'] = metadata
-        args.update(
-            {k: v for (k, v) in _dict.items() if k not in cls._properties})
+        for k, v in _dict.items():
+            if k not in cls._properties:
+                if not isinstance(v, object):
+                    raise ValueError(
+                        'Value for additional property {} must be of type object'
+                        .format(k))
+                args[k] = v
         return cls(**args)
 
     @classmethod
@@ -4154,39 +4171,45 @@ def to_dict(self) -> Dict:
         _dict = {}
         if hasattr(self, 'metadata') and self.metadata is not None:
             _dict['metadata'] = self.metadata
-        for _key in [
-                k for k in vars(self).keys()
-                if k not in AnalyzedResult._properties
+        for k in [
+                _k for _k in vars(self).keys()
+                if _k not in AnalyzedResult._properties
         ]:
-            _dict[_key] = getattr(self, _key)
+            _dict[k] = getattr(self, k)
         return _dict
 
     def _to_dict(self):
         """Return a json dictionary representing this model."""
         return self.to_dict()
 
     def get_properties(self) -> Dict:
-        """Return a dictionary of arbitrary properties from this instance of AnalyzedResult"""
+        """Return the additional properties from this instance of AnalyzedResult in the form of a dict."""
         _dict = {}
-
-        for _key in [
-                k for k in vars(self).keys()
-                if k not in AnalyzedResult._properties
+        for k in [
+                _k for _k in vars(self).keys()
+                if _k not in AnalyzedResult._properties
         ]:
-            _dict[_key] = getattr(self, _key)
+            _dict[k] = getattr(self, k)
         return _dict
 
     def set_properties(self, _dict: dict):
-        """Set a dictionary of arbitrary properties to this instance of AnalyzedResult"""
-        for _key in [
-                k for k in vars(self).keys()
-                if k not in AnalyzedResult._properties
+        """Set a dictionary of additional properties in this instance of AnalyzedResult"""
+        for k in [
+                _k for _k in vars(self).keys()
+                if _k not in AnalyzedResult._properties
         ]:
-            delattr(self, _key)
-
-        for _key, _value in _dict.items():
-            if _key not in AnalyzedResult._properties:
-                setattr(self, _key, _value)
+            delattr(self, k)
+        for k, v in _dict.items():
+            if k not in AnalyzedResult._properties:
+                if not isinstance(v, object):
+                    raise ValueError(
+                        'Value for additional property {} must be of type object'
+                        .format(k))
+                setattr(self, k, v)
+            else:
+                raise ValueError(
+                    'Property {} cannot be specified as an additional property'.
+                    format(k))
 
     def __str__(self) -> str:
         """Return a `str` version of this AnalyzedResult object."""
@@ -10266,6 +10289,9 @@ class QueryResult:
     :param List[QueryResultPassage] document_passages: (optional) Passages from the
           document that best matches the query. Returned if **passages.per_document** is
           `true`.
+
+    This type supports additional properties of type object. The remaining key-value
+    pairs.
     """
 
     # The set of defined properties for the class
@@ -10279,7 +10305,7 @@ def __init__(
         *,
         metadata: Optional[dict] = None,
         document_passages: Optional[List['QueryResultPassage']] = None,
-        **kwargs,
+        **kwargs: Optional[object],
     ) -> None:
         """
         Initialize a QueryResult object.
@@ -10290,14 +10316,23 @@ def __init__(
         :param List[QueryResultPassage] document_passages: (optional) Passages from
                the document that best matches the query. Returned if
                **passages.per_document** is `true`.
-        :param **kwargs: (optional) Any additional properties.
+        :param object **kwargs: (optional) The remaining key-value pairs.
         """
         self.document_id = document_id
         self.metadata = metadata
         self.result_metadata = result_metadata
         self.document_passages = document_passages
-        for _key, _value in kwargs.items():
-            setattr(self, _key, _value)
+        for k, v in kwargs.items():
+            if k not in QueryResult._properties:
+                if not isinstance(v, object):
+                    raise ValueError(
+                        'Value for additional property {} must be of type object'
+                        .format(k))
+                setattr(self, k, v)
+            else:
+                raise ValueError(
+                    'Property {} cannot be specified as an additional property'.
+                    format(k))
 
     @classmethod
     def from_dict(cls, _dict: Dict) -> 'QueryResult':
@@ -10322,8 +10357,13 @@ def from_dict(cls, _dict: Dict) -> 'QueryResult':
             args['document_passages'] = [
                 QueryResultPassage.from_dict(v) for v in document_passages
             ]
-        args.update(
-            {k: v for (k, v) in _dict.items() if k not in cls._properties})
+        for k, v in _dict.items():
+            if k not in cls._properties:
+                if not isinstance(v, object):
+                    raise ValueError(
+                        'Value for additional property {} must be of type object'
+                        .format(k))
+                args[k] = v
         return cls(**args)
 
     @classmethod
@@ -10353,36 +10393,45 @@ def to_dict(self) -> Dict:
                 else:
                     document_passages_list.append(v.to_dict())
             _dict['document_passages'] = document_passages_list
-        for _key in [
-                k for k in vars(self).keys() if k not in QueryResult._properties
+        for k in [
+                _k for _k in vars(self).keys()
+                if _k not in QueryResult._properties
         ]:
-            _dict[_key] = getattr(self, _key)
+            _dict[k] = getattr(self, k)
         return _dict
 
     def _to_dict(self):
         """Return a json dictionary representing this model."""
         return self.to_dict()
 
     def get_properties(self) -> Dict:
-        """Return a dictionary of arbitrary properties from this instance of QueryResult"""
+        """Return the additional properties from this instance of QueryResult in the form of a dict."""
         _dict = {}
-
-        for _key in [
-                k for k in vars(self).keys() if k not in QueryResult._properties
+        for k in [
+                _k for _k in vars(self).keys()
+                if _k not in QueryResult._properties
         ]:
-            _dict[_key] = getattr(self, _key)
+            _dict[k] = getattr(self, k)
         return _dict
 
     def set_properties(self, _dict: dict):
-        """Set a dictionary of arbitrary properties to this instance of QueryResult"""
-        for _key in [
-                k for k in vars(self).keys() if k not in QueryResult._properties
+        """Set a dictionary of additional properties in this instance of QueryResult"""
+        for k in [
+                _k for _k in vars(self).keys()
+                if _k not in QueryResult._properties
         ]:
-            delattr(self, _key)
-
-        for _key, _value in _dict.items():
-            if _key not in QueryResult._properties:
-                setattr(self, _key, _value)
+            delattr(self, k)
+        for k, v in _dict.items():
+            if k not in QueryResult._properties:
+                if not isinstance(v, object):
+                    raise ValueError(
+                        'Value for additional property {} must be of type object'
+                        .format(k))
+                setattr(self, k, v)
+            else:
+                raise ValueError(
+                    'Property {} cannot be specified as an additional property'.
+                    format(k))
 
     def __str__(self) -> str:
         """Return a `str` version of this QueryResult object."""

ibm_watson/discovery_v2.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# IBM OpenAPI SDK Code Generator Version: 3.85.0-75c38f8f-20240206-210220
+# IBM OpenAPI SDK Code Generator Version: 3.97.0-0e90eab1-20241120-170029
 """
 Analyze various features of text content at scale. Provide text, raw HTML, or a public URL
 and IBM Watson Natural Language Understanding will give you results for the features you

ibm_watson/natural_language_understanding_v1.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# IBM OpenAPI SDK Code Generator Version: 3.85.0-75c38f8f-20240206-210220
+# IBM OpenAPI SDK Code Generator Version: 3.97.0-0e90eab1-20241120-170029
 """
 The IBM Watson™ Speech to Text service provides APIs that use IBM's
 speech-recognition capabilities to produce transcripts of spoken audio. The service can

ibm_watson/speech_to_text_v1.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# IBM OpenAPI SDK Code Generator Version: 3.85.0-75c38f8f-20240206-210220
+# IBM OpenAPI SDK Code Generator Version: 3.97.0-0e90eab1-20241120-170029
 """
 The IBM Watson™ Text to Speech service provides APIs that use IBM's speech-synthesis
 capabilities to synthesize text into natural-sounding speech in a variety of languages,

ibm_watson/text_to_speech_v1.py

@@ -6,17 +6,22 @@
 import json
 import time
 from ibm_watson.natural_language_understanding_v1 import Features, EntitiesOptions, KeywordsOptions
+from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
 
-@pytest.mark.skipif(os.getenv('NATURAL_LANGUAGE_UNDERSTANDING_APIKEY') is None,
-                    reason='requires NATURAL_LANGUAGE_UNDERSTANDING_APIKEY')
 class TestNaturalLanguageUnderstandingV1(TestCase):
 
     def setUp(self):
-        self.natural_language_understanding = ibm_watson.NaturalLanguageUnderstandingV1(version='2018-03-16')
-        self.natural_language_understanding.set_default_headers({
-            'X-Watson-Learning-Opt-Out': '1',
-            'X-Watson-Test': '1'
-        })
+        
+        with open('./auth.json') as f:
+            data = json.load(f)
+            nlu_auth = data.get("nlu")
+
+            self.authenticator = IAMAuthenticator(nlu_auth.get("apikey"))
+            self.natural_language_understanding = ibm_watson.NaturalLanguageUnderstandingV1(version='2018-03-16', authenticator=self.authenticator)
+            self.natural_language_understanding.set_default_headers({
+                'X-Watson-Learning-Opt-Out': '1',
+                'X-Watson-Test': '1'
+            })
 
     def test_analyze(self):
         response = self.natural_language_understanding.analyze(

test/integration/test_natural_language_understanding_v1.py

@@ -47,20 +47,13 @@ def preprocess_url(operation_path: str):
     The returned request URL is used to register the mock response so it needs
     to match the request URL that is formed by the requests library.
     """
-    # First, unquote the path since it might have some quoted/escaped characters in it
-    # due to how the generator inserts the operation paths into the unit test code.
-    operation_path = urllib.parse.unquote(operation_path)
 
-    # Next, quote the path using urllib so that we approximate what will
-    # happen during request processing.
-    operation_path = urllib.parse.quote(operation_path, safe='/')
-
-    # Finally, form the request URL from the base URL and operation path.
+    # Form the request URL from the base URL and operation path.
     request_url = _base_url + operation_path
 
     # If the request url does NOT end with a /, then just return it as-is.
     # Otherwise, return a regular expression that matches one or more trailing /.
-    if re.fullmatch('.*/+', request_url) is None:
+    if not request_url.endswith('/'):
         return request_url
     return re.compile(request_url.rstrip('/') + '/+')
 
@@ -8539,7 +8532,7 @@ def test_context_serialization(self):
         expected_dict = {'foo': 'testString'}
         context_model.set_properties(expected_dict)
         actual_dict = context_model.get_properties()
-        assert actual_dict == expected_dict
+        assert actual_dict.keys() == expected_dict.keys()
 
 
 class TestModel_Counterexample:
@@ -8995,7 +8988,7 @@ def test_dialog_node_context_serialization(self):
         expected_dict = {'foo': 'testString'}
         dialog_node_context_model.set_properties(expected_dict)
         actual_dict = dialog_node_context_model.get_properties()
-        assert actual_dict == expected_dict
+        assert actual_dict.keys() == expected_dict.keys()
 
 
 class TestModel_DialogNodeNextStep:
@@ -9088,7 +9081,7 @@ def test_dialog_node_output_serialization(self):
         expected_dict = {'foo': 'testString'}
         dialog_node_output_model.set_properties(expected_dict)
         actual_dict = dialog_node_output_model.get_properties()
-        assert actual_dict == expected_dict
+        assert actual_dict.keys() == expected_dict.keys()
 
 
 class TestModel_DialogNodeOutputConnectToAgentTransferInfo:
@@ -10476,7 +10469,7 @@ def test_message_input_serialization(self):
         expected_dict = {'foo': 'testString'}
         message_input_model.set_properties(expected_dict)
         actual_dict = message_input_model.get_properties()
-        assert actual_dict == expected_dict
+        assert actual_dict.keys() == expected_dict.keys()
 
 
 class TestModel_MessageRequest:
@@ -10819,7 +10812,7 @@ def test_output_data_serialization(self):
         expected_dict = {'foo': 'testString'}
         output_data_model.set_properties(expected_dict)
         actual_dict = output_data_model.get_properties()
-        assert actual_dict == expected_dict
+        assert actual_dict.keys() == expected_dict.keys()
 
 
 class TestModel_Pagination:
@@ -11823,7 +11816,7 @@ def test_workspace_system_settings_serialization(self):
         expected_dict = {'foo': 'testString'}
         workspace_system_settings_model.set_properties(expected_dict)
         actual_dict = workspace_system_settings_model.get_properties()
-        assert actual_dict == expected_dict
+        assert actual_dict.keys() == expected_dict.keys()
 
 
 class TestModel_WorkspaceSystemSettingsDisambiguation: