Generator improvements

* Minor improvements for library and snippets generators

Author: TKIPisalegacycipher

generator/generate_library.py

@@ -46,16 +46,17 @@ def generate_pagination_parameters(operation: str):
 
 def check_python_version():
     # Check minimum Python version
-    version_warning_string = f'The generator requires Python 3.10 at minimum. ' \
-                             f'Your interpreter version details are: \n' \
-                             f'platform.python_version_tuple()[0] = {platform.python_version_tuple()[0]}\n' \
-                             f'platform.python_version_tuple()[1] = {platform.python_version_tuple()[1]}\n' \
-                             f'platform.python_version is {platform.python_version()}\n' \
-                             f'Please consult the generator readme at your convenience: ' \
-                             f'https://github.com/meraki/dashboard-api-python/blob/main/generator/readme.md'
-    if int(platform.python_version_tuple()[0]) != 3:
-        sys.exit(version_warning_string)
-    elif int(platform.python_version_tuple()[1]) < 7:
+    version_warning_string = (
+            f"This library generator requires Python 3.10 at minimum. "
+            f"Your interpreter version is: {platform.python_version()}. "
+            f"Please consult the readme at your convenience: "
+            f"https://github.com/meraki/dashboard-api-python/blob/main/generator/readme.md "
+            f"Additional details: "
+            f"python_version_tuple()[0] = {platform.python_version_tuple()[0]}; "
+            f"python_version_tuple()[1] = {platform.python_version_tuple()[1]} "
+        )
+
+    if not (int(platform.python_version_tuple()[0]) == 3 and int(platform.python_version_tuple()[1]) >= 10):
         sys.exit(version_warning_string)
 
 
@@ -223,7 +224,7 @@ def generate_library(spec: dict, version_number: str, is_github_action: bool):
             os.mkdir(directory)
 
     # Files that are not generated
-    non_generated = ['__init__.py', 'config.py', 'exceptions.py', 'rest_session.py', 'api/__init__.py',
+    non_generated = ['__init__.py', 'config.py', 'common.py', 'exceptions.py', 'rest_session.py', 'api/__init__.py',
                      'aio/__init__.py', 'aio/rest_session.py', 'aio/api/__init__.py', 'api/batch/__init__.py']
     base_url = 'https://raw.githubusercontent.com/meraki/dashboard-api-python/master/meraki/'
     for file in non_generated:

generator/generate_snippets.py

@@ -6,11 +6,13 @@
 
 CALL_TEMPLATE = Template('''import meraki
 
-# Defining your API key as a variable in source code is not recommended
-API_KEY = '6bec40cf957de430a6f1f2baa056b99a4fac9ea0'
-# Instead, use an environment variable as shown under the Usage section
+# Defining your API key as a variable in source code is discouraged.
+# This API key is for a read-only docs-specific environment.
+# In your own code, use an environment variable as shown under the Usage section
 # @ https://github.com/meraki/dashboard-api-python/
 
+API_KEY = '75dd5334bef4d2bc96f26138c163c0a3fa0b5ca6'
+
 dashboard = meraki.DashboardAPI(API_KEY)
 {{ parameter_assignments }}
 response = dashboard.{{ section }}.{{ operation }}({{ parameters }})