@typespec/http-client-python 0.8.2 → 0.8.3-dev.2

package/eng/scripts/ci/regenerate.ts

@@ -1,5 +1,6 @@
 /* eslint-disable no-console */
-import { exec as execCallback } from "child_process";
+import chalk from "chalk";
+import { execFile } from "child_process";
 import { promises, rmSync } from "fs";
 import { dirname, join, relative, resolve } from "path";
 import { fileURLToPath } from "url";
@@ -20,9 +21,6 @@ const argv = parseArgs({
   },
 });
 
-// Promisify the exec function
-const exec = promisify(execCallback);
-
 // Get the directory of the current file
 const PLUGIN_DIR = argv.values.pluginDir
   ? resolve(argv.values.pluginDir)
@@ -35,7 +33,7 @@ const GENERATED_FOLDER = argv.values.generatedFolder
 
 interface TspCommand {
   outputDir: string;
-  command: string;
+  command: string[];
 }
 
 const AZURE_EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, string>[]> = {
@@ -222,16 +220,15 @@ async function executeCommand(tspCommand: TspCommand): Promise<void> {
   try {
     rmSync(tspCommand.outputDir, { recursive: true, force: true });
   } catch (error) {
-    console.error(`rm error: ${error}`);
+    console.error(chalk.red(`rm error: ${error}`));
   }
+  const execFileAsync = promisify(execFile);
   try {
-    console.log(`exec: ${tspCommand.command}`);
-    const { stdout, stderr } = await exec(tspCommand.command);
-    if (stdout) console.log(`stdout: ${stdout}`);
-    if (stderr) console.error(`stderr: ${stderr}`);
-  } catch (error) {
-    console.error(`exec error: ${error}`);
-    throw error;
+    await execFileAsync("tsp", tspCommand.command, { shell: true });
+    console.log(chalk.green(`tsp ${tspCommand.command.join(" ")} succeeded`));
+  } catch (err) {
+    console.error(chalk.red(`exec error: ${err}`));
+    throw err;
   }
 }
 
@@ -316,7 +313,7 @@ function defaultPackageName(spec: string): string {
 }
 
 interface EmitterConfig {
-  optionsStr: string;
+  options: string[];
   outputDir: string;
 }
 
@@ -344,15 +341,15 @@ function addOptions(
     if (flags.debug) {
       options["debug"] = "true";
     }
-    if (flags.flavor === "unbranded") {
-      options["company-name"] = "Unbranded";
-    }
     options["examples-dir"] = toPosix(join(dirname(spec), "examples"));
     const configs = Object.entries(options).flatMap(([k, v]) => {
-      return `--option ${argv.values.emitterName || "@typespec/http-client-python"}.${k}=${typeof v === "string" && v.indexOf(" ") > -1 ? `"${v}"` : v}`;
+      return [
+        "--option",
+        `${argv.values.emitterName || "@typespec/http-client-python"}.${k}="${v}"`,
+      ];
     });
     emitterConfigs.push({
-      optionsStr: configs.join(" "),
+      options: configs,
       outputDir: options["emitter-output-dir"],
     });
   }
@@ -362,7 +359,7 @@ function _getCmdList(spec: string, flags: RegenerateFlags): TspCommand[] {
   return addOptions(spec, GENERATED_FOLDER, flags).map((option) => {
     return {
       outputDir: option.outputDir,
-      command: `tsp compile ${spec} --emit=${toPosix(PLUGIN_DIR)} ${option.optionsStr}`,
+      command: ["compile", spec, "--emit", toPosix(PLUGIN_DIR), ...option.options],
     };
   });
 }
@@ -411,7 +408,9 @@ const start = performance.now();
 regenerate(argv.values)
   .then(() =>
     console.log(
-      `Regeneration successful, time taken: ${Math.round((performance.now() - start) / 1000)} s`,
+      chalk.green(
+        `Regeneration successful, time taken: ${Math.round((performance.now() - start) / 1000)} s`,
+      ),
     ),
   )
-  .catch((error) => console.error(`Regeneration failed: ${error.message}`));
+  .catch((error) => console.error(chalk.red(`Regeneration failed: ${error.message}`)));

package/eng/scripts/ci/utils.ts

@@ -1,11 +1,11 @@
 /* eslint-disable no-console */
 import chalk from "chalk";
-import { exec } from "child_process";
+import { execFile } from "child_process";
 import { existsSync } from "fs";
 import { dirname, join, resolve } from "path";
 import process from "process";
 import { fileURLToPath } from "url";
-import { parseArgs } from "util";
+import { parseArgs, promisify } from "util";
 
 const argv = parseArgs({
   args: process.argv.slice(2),
@@ -17,24 +17,19 @@ const argv = parseArgs({
 });
 
 // execute the command
-export function executeCommand(command: string, prettyName: string) {
-  exec(command, (error, stdout, stderr) => {
-    if (error) {
-      console.error(chalk.red(`Error executing ${command}(stdout): ${stdout}`));
-      console.error(chalk.red(`Error executing ${command}{stderr}: ${stderr}`));
-      process.exit(1);
-    }
-    if (stderr) {
-      // Process stderr output
-      console.log(chalk.yellow(`${command}:\n${stderr}`));
-      return;
-    }
-    console.log(chalk.green(`${prettyName} passed`));
-  });
+export async function executeCommand(command: string, args: string[]) {
+  const execFileAsync = promisify(execFile);
+  try {
+    await execFileAsync(command, args);
+    console.log(chalk.green(`${command} passed`));
+  } catch (err) {
+    console.error(chalk.red(`Error executing ${command}: ${err}`));
+    process.exit(1);
+  }
 }
 
 // Function to run a command and log the output
-export function runCommand(command: string, prettyName: string) {
+export function runCommand(command: string, args: string[]) {
   let pythonPath = argv.values.pythonPath
     ? resolve(argv.values.pythonPath)
     : join(dirname(fileURLToPath(import.meta.url)), "..", "..", "..", "venv/");
@@ -46,5 +41,5 @@ export function runCommand(command: string, prettyName: string) {
     throw new Error(pythonPath);
   }
   command = `${pythonPath} -m ${command}`;
-  executeCommand(command, prettyName);
+  executeCommand(command, args);
 }

package/generator/build/lib/pygen/codegen/__init__.py

@@ -13,7 +13,7 @@ from .. import Plugin
 from ..utils import parse_args
 from .models.code_model import CodeModel
 from .serializers import JinjaSerializer
-from ._utils import DEFAULT_HEADER_TEXT, VALID_PACKAGE_MODE, TYPESPEC_PACKAGE_MODE
+from ._utils import VALID_PACKAGE_MODE, TYPESPEC_PACKAGE_MODE
 
 
 def _default_pprint(package_name: str) -> str:
@@ -53,24 +53,6 @@ class OptionsRetriever:
         key = prop.replace("_", "-")
         return self.options.get(key, self.OPTIONS_TO_DEFAULT.get(key))
 
-    @property
-    def company_name(self) -> str:
-        return self.options.get("company-name", "Microsoft" if self.is_azure_flavor else "")
-
-    @property
-    def license_header(self) -> str:
-        license_header = self.options.get(
-            "header-text",
-            (DEFAULT_HEADER_TEXT.format(company_name=self.company_name) if self.company_name else ""),
-        )
-        if license_header:
-            license_header = license_header.replace("\n", "\n# ")
-            license_header = (
-                "# --------------------------------------------------------------------------\n# " + license_header
-            )
-            license_header += "\n# --------------------------------------------------------------------------"
-        return license_header
-
     @property
     def show_operations(self) -> bool:
         return self.options.get("show-operations", not self.low_level_client)
@@ -168,6 +150,11 @@ class OptionsRetriever:
     def package_version(self) -> Optional[str]:
         return str(self.options.get("package-version", ""))
 
+    
+    @property
+    def header_text(self) -> Optional[str]:
+        return self.options.get("header-text")
+
 
 class CodeGenerator(Plugin):
     def __init__(self, *args, **kwargs: Any) -> None:
@@ -286,7 +273,7 @@ class CodeGenerator(Plugin):
         flags = [
             "azure_arm",
             "head_as_boolean",
-            "license_header",
+            "header_text",
             "keep_version_file",
             "no_async",
             "no_namespace_folders",
@@ -314,7 +301,6 @@ class CodeGenerator(Plugin):
             "default_api_version",
             "from_typespec",
             "flavor",
-            "company_name",
             "emit_cross_language_definition_file",
         ]
         return {f: getattr(self.options_retriever, f) for f in flags}

package/generator/build/lib/pygen/codegen/_utils.py

@@ -5,12 +5,36 @@
 # --------------------------------------------------------------------------
 
 DEFAULT_HEADER_TEXT = (
-    "Copyright (c) {company_name} Corporation. All rights reserved.\n"
+    "Copyright (c) Microsoft Corporation. All rights reserved.\n"
     "Licensed under the MIT License. See License.txt in the project root for license information.\n"
-    "Code generated by {company_name} (R) Python Code Generator.\n"
+    "Code generated by Microsoft (R) Python Code Generator.\n"
     "Changes may cause incorrect behavior and will be lost if the code is regenerated."
 )
 
+DEFAULT_LICENSE_DESCRIPTION = (
+    "Copyright (c) Microsoft Corporation.\n"
+    "\n"
+    "MIT License\n"
+    "\n"
+    "Permission is hereby granted, free of charge, to any person obtaining a copy\n"
+    "of this software and associated documentation files (the \"Software\"), to deal\n"
+    "in the Software without restriction, including without limitation the rights\n"
+    "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n"
+    "copies of the Software, and to permit persons to whom the Software is\n"
+    "furnished to do so, subject to the following conditions:\n"
+    "\n"
+    "The above copyright notice and this permission notice shall be included in all\n"
+    "copies or substantial portions of the Software.\n"
+    "\n"
+    "THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
+    "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
+    "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n"
+    "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n"
+    "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n"
+    "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n"
+    "SOFTWARE."
+)
+
 SWAGGER_PACKAGE_MODE = ["mgmtplane", "dataplane"]  # for backward compatibility
 TYPESPEC_PACKAGE_MODE = ["azure-mgmt", "azure-dataplane", "generic"]
 VALID_PACKAGE_MODE = SWAGGER_PACKAGE_MODE + TYPESPEC_PACKAGE_MODE

package/generator/build/lib/pygen/codegen/models/code_model.py

@@ -13,6 +13,7 @@ from .client import Client
 from .request_builder import RequestBuilder, OverloadedRequestBuilder
 from .operation_group import OperationGroup
 from .utils import NamespaceType
+from .._utils import DEFAULT_HEADER_TEXT, DEFAULT_LICENSE_DESCRIPTION
 
 
 def _is_legacy(options) -> bool:
@@ -406,3 +407,35 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
     @property
     def is_tsp(self) -> bool:
         return self.options.get("tsp_file") is not None
+
+    @property
+    def license_header(self) -> str:
+        if self.yaml_data.get("licenseInfo") or not self.is_azure_flavor:
+            # typespec unbranded case and azure case with custom license
+            license_header = self.yaml_data.get("licenseInfo", {}).get("header", "")
+        else:
+            # typespec azure case without custom license and swagger case
+            license_header = self.options.get("header_text", DEFAULT_HEADER_TEXT)
+        if license_header:
+            license_header = license_header.replace("\n", "\n# ")
+            license_header = (
+                "# --------------------------------------------------------------------------\n# " + license_header
+            )
+            license_header += "\n# --------------------------------------------------------------------------"
+        return license_header
+
+    @property
+    def license_description(self) -> str:
+        if self.yaml_data.get("licenseInfo") or not self.is_azure_flavor:
+            # typespec unbranded case and azure case with custom license
+            return self.yaml_data.get("licenseInfo", {}).get("description", "")
+        # typespec azure case without custom license and swagger case
+        return DEFAULT_LICENSE_DESCRIPTION
+
+    @property
+    def company_name(self) -> str:
+        if self.yaml_data.get("licenseInfo") or not self.is_azure_flavor:
+            # typespec unbranded case and azure case with custom license
+            return self.yaml_data.get("licenseInfo", {}).get("company", "")
+        # typespec azure case without custom license and swagger case
+        return "Microsoft Corporation"

package/generator/build/lib/pygen/codegen/models/credential_types.py

@@ -48,17 +48,20 @@ class BearerTokenCredentialPolicyType(_CredentialPolicyBaseType):
         yaml_data: Dict[str, Any],
         code_model: "CodeModel",
         credential_scopes: List[str],
+        flows: Optional[Dict[str, Any]] = None,
     ) -> None:
         super().__init__(yaml_data, code_model)
         self.credential_scopes = credential_scopes
+        self.flows = flows
 
     def call(self, async_mode: bool) -> str:
         policy_name = f"{'Async' if async_mode else ''}BearerTokenCredentialPolicy"
-        return f"policies.{policy_name}(self.credential, *self.credential_scopes, **kwargs)"
+        auth_flows = f"auth_flows={self.flows}, " if self.flows else ""
+        return f"policies.{policy_name}(self.credential, *self.credential_scopes, {auth_flows}**kwargs)"
 
     @classmethod
     def from_yaml(cls, yaml_data: Dict[str, Any], code_model: "CodeModel") -> "BearerTokenCredentialPolicyType":
-        return cls(yaml_data, code_model, yaml_data["credentialScopes"])
+        return cls(yaml_data, code_model, yaml_data["credentialScopes"], yaml_data.get("flows"))
 
 
 class ARMChallengeAuthenticationPolicyType(BearerTokenCredentialPolicyType):

package/generator/build/lib/pygen/codegen/serializers/__init__.py

@@ -202,6 +202,8 @@ class JinjaSerializer(ReaderAndWriter):
             )
 
             package_files = _PACKAGE_FILES
+            if not self.code_model.license_description:
+                package_files.remove("LICENSE.jinja2")
         elif Path(self.code_model.options["package_mode"]).exists():
             env = Environment(
                 loader=FileSystemLoader(str(Path(self.code_model.options["package_mode"]))),
@@ -273,7 +275,7 @@ class JinjaSerializer(ReaderAndWriter):
         if not "" in group_names:
             self.write_file(
                 rest_path / Path("__init__.py"),
-                self.code_model.options["license_header"],
+                self.code_model.license_header,
             )
 
     def _serialize_and_write_single_rest_layer(

package/generator/build/lib/pygen/codegen/templates/client_container.py.jinja2

@@ -2,7 +2,9 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 {# actual template starts here #}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 
 {{ imports }}
 

package/generator/build/lib/pygen/codegen/templates/config_container.py.jinja2

@@ -2,7 +2,9 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 {# actual template starts here #}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 
 {{ imports }}
 

package/generator/build/lib/pygen/codegen/templates/conftest.py.jinja2

@@ -1,5 +1,7 @@
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 import os
 import pytest
 from dotenv import load_dotenv

package/generator/build/lib/pygen/codegen/templates/enum_container.py.jinja2

@@ -1,6 +1,8 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 
 from enum import Enum
 from {{ code_model.core_library }}{{ "" if code_model.is_azure_flavor else ".utils" }} import CaseInsensitiveEnumMeta

package/generator/build/lib/pygen/codegen/templates/init.py.jinja2

@@ -1,6 +1,8 @@
 {% import 'keywords.jinja2' as keywords %}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 {{ keywords.path_type_checking_imports() }}
 {% if clients %}
     {% for client in clients %}

package/generator/build/lib/pygen/codegen/templates/model_base.py.jinja2

@@ -1,9 +1,7 @@
 # coding=utf-8
-# --------------------------------------------------------------------------
-# Copyright (c) {{ code_model.options["company_name"] }} Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 # pylint: disable=protected-access, broad-except
 
 import copy

package/generator/build/lib/pygen/codegen/templates/model_container.py.jinja2

@@ -1,6 +1,8 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 {% if serializer.global_pylint_disables() %}
 {{ serializer.global_pylint_disables() }}
 {% endif %}

package/generator/build/lib/pygen/codegen/templates/model_init.py.jinja2

@@ -1,6 +1,8 @@
 {% import 'keywords.jinja2' as keywords %}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 {{ keywords.path_type_checking_imports() }}
 {% if schemas %}
 

package/generator/build/lib/pygen/codegen/templates/operation_groups_container.py.jinja2

@@ -2,7 +2,9 @@
 {% set operations_description = "async operations" if async_mode else "operations" %}
 {% set return_none_type_annotation = " -> None" if async_mode else "" %}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 {{ imports }}
 {{ unset }}
 {% if code_model.options["builders_visibility"] == "embedded" and not async_mode %}

package/generator/build/lib/pygen/codegen/templates/operations_folder_init.py.jinja2

@@ -2,7 +2,9 @@
 {% import 'keywords.jinja2' as keywords %}
 {# actual template starts here #}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 {{ keywords.path_type_checking_imports() }}
 {{ op_tools.serialize(operation_group_imports()) }}
 {{ keywords.patch_imports() }}

package/generator/build/lib/pygen/codegen/templates/packaging_templates/LICENSE.jinja2

@@ -1,21 +1 @@
-Copyright (c) {{ code_model.options["company_name"] }} Corporation.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+{{ code_model.license_description }}

package/generator/build/lib/pygen/codegen/templates/packaging_templates/setup.py.jinja2

@@ -1,6 +1,8 @@
 # coding=utf-8
-{{ license_header }}
-# coding: utf-8
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
+
 {% if package_mode %}
 
 import os
@@ -32,7 +34,7 @@ with open(os.path.join(package_folder_path, "_version.py"), "r") as fd:
 
 if not version:
     raise RuntimeError("Cannot find version information")
-{% set description = "\"" + code_model.options["company_name"] + " {} Client Library for Python\".format(PACKAGE_PPRINT_NAME)" %}
+{% set description = "\"" + code_model.company_name + " {} Client Library for Python\".format(PACKAGE_PPRINT_NAME)" %}
 {% set author_email = "azpysdkhelp@microsoft.com" %}
 {% set url = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk" %}
 {% else %}
@@ -52,7 +54,7 @@ setup(
     long_description=open("README.md", "r").read(),
     long_description_content_type="text/markdown",
     license="MIT License",
-    author="{{ code_model.options["company_name"] }} Corporation",
+    author="{{ code_model.company_name }}",
     {% endif %}
     {% if code_model.is_azure_flavor %}
     author_email="{{ author_email }}",

package/generator/build/lib/pygen/codegen/templates/patch.py.jinja2

@@ -1,7 +1,12 @@
-# ------------------------------------
-# Copyright (c) {{ code_model.options["company_name"] }} Corporation.
-# Licensed under the MIT License.
-# ------------------------------------
+# coding=utf-8
+{% if not code_model.is_azure_flavor %}
+{{ code_model.license_header }}
+{% else %}
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------
+{% endif %}
 """Customize generated code here.
 
 Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize

package/generator/build/lib/pygen/codegen/templates/request_builders.py.jinja2

@@ -1,6 +1,8 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 {{ imports }}
 
 {{ op_tools.declare_serializer(code_model) }}

package/generator/build/lib/pygen/codegen/templates/rest_init.py.jinja2

@@ -1,5 +1,7 @@
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 
 {% for request_builder in request_builders %}
 from ._request_builders import {{ request_builder.name }}

package/generator/build/lib/pygen/codegen/templates/sample.py.jinja2

@@ -1,7 +1,9 @@
 # coding=utf-8
 {% set aad_token = "DefaultAzureCredential" %}
 {% set azure_key = "AzureKeyCredential" %}
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 
 {{ imports }}
 """

package/generator/build/lib/pygen/codegen/templates/serialization.py.jinja2

@@ -1,28 +1,7 @@
-# --------------------------------------------------------------------------
-#
-# Copyright (c) {{ code_model.options["company_name"] }} Corporation. All rights reserved.
-#
-# The MIT License (MIT)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the ""Software""), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#
-# --------------------------------------------------------------------------
+# coding=utf-8
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 
 # pyright: reportUnnecessaryTypeIgnoreComment=false
 

package/generator/build/lib/pygen/codegen/templates/test.py.jinja2

@@ -3,7 +3,9 @@
 {% set async = "async " if test.async_mode else "" %}
 {% set async_suffix = "_async" if test.async_mode else "" %}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 import pytest
 {{ imports }}
 

package/generator/build/lib/pygen/codegen/templates/testpreparer.py.jinja2

@@ -1,5 +1,7 @@
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 {{ imports }}
 
 {% for test_name in test_names %}

package/generator/build/lib/pygen/codegen/templates/types.py.jinja2

@@ -1,5 +1,7 @@
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 
 {{ imports }}
 {% for nu in code_model.named_unions %}

package/generator/build/lib/pygen/codegen/templates/validation.py.jinja2

@@ -1,4 +1,6 @@
-{{ code_model.options['license_header'] }}
+{% if code_model.license_header %}
+{{ code_model.license_header }}
+{% endif %}
 import functools
 
 def api_version_validation(**kwargs):