Merge pull request #37 from FreeClimbAPI/fix-percl-generation

Fix PerCL generation

Author: ngarg-vail

CHANGELOG.md

@@ -9,6 +9,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 None
 
+<a name="4.2.1"></a>
+## [4.2.1] - 2023-04-27
+
+### Changed
+
+- Fix the PerCL generation (using attribute map to ensure keys are cased correctly)
+
 <a name="4.2.0"></a>
 
 ## [4.2.0] - 2023-04-03

README.md

@@ -4,7 +4,7 @@ FreeClimb is a cloud-based application programming interface (API) that puts the
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 1.0.0
-- Package version: 4.2.0
+- Package version: 4.2.1
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://www.freeclimb.com/support/](https://www.freeclimb.com/support/)
 
@@ -313,6 +313,7 @@ Class | Method | HTTP request | Description
 
 - **Type**: HTTP basic authentication
 
+
 <a name="documentation-for-verify-request-signature"></a>
 
 ## Documentation for verifying request signature
@@ -338,6 +339,7 @@ Class | Method | HTTP request | Description
             request_header = "t=1679944186,v1=c3957749baf61df4b1506802579cc69a74c77a1ae21447b930e5a704f9ec4120,v1=1ba18712726898fbbe48cd862dd096a709f7ad761a5bab14bda9ac24d963a6a8"
             RequestVerifier.verify_request_signature(request_body, request_header, signing_secret, tolerance)
   ```
+
 ## Author
 
 [email protected]
@@ -361,4 +363,3 @@ import freeclimb
 from freeclimb.apis import *
 from freeclimb.models import *
 ```
-

freeclimb/__init__.py

@@ -11,7 +11,7 @@
 """
 
 
-__version__ = "4.2.0"
+__version__ = "4.2.1"
 
 # import ApiClient
 from freeclimb.api_client import ApiClient

freeclimb/api_client.py

@@ -77,7 +77,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/4.2.0/python'
+        self.user_agent = 'OpenAPI-Generator/4.2.1/python'
 
     def __enter__(self):
         return self

freeclimb/configuration.py

@@ -405,7 +405,7 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 1.0.0\n"\
-               "SDK Package Version: 4.2.0".\
+               "SDK Package Version: 4.2.1".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

freeclimb/model/percl_script.py

@@ -271,16 +271,17 @@ def to_percl_dict(self, percl_command_inst):
         attributes = [attribute for attribute in percl_command_inst.openapi_types if attribute != 'command']
         attribute_map = {}
         for attribute in attributes:
+            key = percl_command_inst.attribute_map.get(attribute)
             val = percl_command_inst.get(attribute)
             if val is None:
                 continue
             if hasattr(val, 'command'):
-                attribute_map[attribute] = self.to_percl_dict(val)
+                attribute_map[key] = self.to_percl_dict(val)
                 continue
             if isinstance(val, list):
-                attribute_map[attribute] = [self.to_percl_dict(item) if hasattr(item, 'command') else item for item in val]
+                attribute_map[key] = [self.to_percl_dict(item) if hasattr(item, 'command') else item for item in val]
                 continue
-            attribute_map[attribute] = val 
+            attribute_map[key] = val
         percl_dict = {
             command: attribute_map
         }

setup.py

@@ -12,7 +12,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "FreeClimb"
-VERSION = "4.2.0"
+VERSION = "4.2.1"
 # To install the library, run the following
 #
 # python setup.py install

test-requirements.txt

@@ -1,3 +1,3 @@
-pytest~=4.6.7 # needed for python 2.7+3.4
+pytest~=7.3.1 # needed for python 2.7+3.4
 pytest-cov>=2.8.1
 pytest-randomly==1.2.3 # needed for python 2.7+3.4

test/manual/test_percl_generation.py

@@ -0,0 +1,63 @@
+
+"""
+    FreeClimb API
+
+    This is a manually implemented test to validate the 
+    contents of https://github.com/FreeClimbAPI/Python-Getting-Started-Tutorial/blob/master/python-getting-started.py
+    are functioning as expected
+"""
+
+import unittest
+
+import freeclimb
+import json
+
+
+class TestQuickStart(unittest.TestCase):
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPerclGeneration(self):
+        message = "Hello, FreeClimb!"
+        say = freeclimb.Say(text=message)
+        get_speech = freeclimb.GetSpeech(
+            action_url="http://example.com/actionurl/getspeech", prompts=[say], grammar_file="grammar.xml")
+        record_utterance = freeclimb.RecordUtterance(
+            action_url="http://example.actionurl/recordutterance", silence_timeout_ms=1000)
+        script = freeclimb.PerclScript(commands=[say, get_speech, record_utterance])
+        data = script.to_json()
+        expected_json = json.dumps(
+            [
+                {
+                    "Say": {
+                        "text": "Hello, FreeClimb!"
+                    }
+                },
+                {
+                    "GetSpeech": {
+                        "actionUrl": "http://example.com/actionurl/getspeech",
+                        "grammarFile": "grammar.xml",
+                        "prompts": [
+                            {
+                                "Say": {
+                                    "text": "Hello, FreeClimb!"
+                                }
+                            }
+                        ]
+                    }
+                },
+                {
+                    "RecordUtterance": {
+                        "actionUrl": "http://example.actionurl/recordutterance",
+                        "silenceTimeoutMs": 1000
+                    }
+                }
+            ])
+        self.assertEqual(data, expected_json)
+
+
+if __name__ == '__main__':
+    unittest.main()