@typespec/http-client-python 0.8.1 → 0.8.3-dev.1

package/eng/scripts/ci/regenerate.ts

@@ -38,96 +38,167 @@ interface TspCommand {
   command: string;
 }
 
+const AZURE_EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, string>[]> = {
+  "azure/example/basic": {
+    namespace: "specs.azure.example.basic",
+  },
+  "azure/client-generator-core/access": {
+    namespace: "specs.azure.clientgenerator.core.access",
+  },
+  "azure/client-generator-core/usage": {
+    namespace: "specs.azure.clientgenerator.core.usage",
+  },
+  "client/structure/default": {
+    namespace: "client.structure.service",
+  },
+  "client/structure/multi-client": {
+    "package-name": "client-structure-multiclient",
+    namespace: "client.structure.multiclient",
+  },
+  "client/structure/renamed-operation": {
+    "package-name": "client-structure-renamedoperation",
+    namespace: "client.structure.renamedoperation",
+  },
+  "client/structure/two-operation-group": {
+    "package-name": "client-structure-twooperationgroup",
+    namespace: "client.structure.twooperationgroup",
+  },
+  "client/naming": {
+    namespace: "client.naming",
+  },
+  "encode/duration": {
+    namespace: "encode.duration",
+  },
+  "encode/numeric": {
+    namespace: "encode.numeric",
+  },
+  "parameters/basic": {
+    namespace: "parameters.basic",
+  },
+  "parameters/spread": {
+    namespace: "parameters.spread",
+  },
+  "payload/content-negotiation": {
+    namespace: "payload.contentnegotiation",
+  },
+  "payload/multipart": {
+    namespace: "payload.multipart",
+  },
+  "serialization/encoded-name/json": {
+    namespace: "serialization.encodedname.json",
+  },
+  "special-words": {
+    namespace: "specialwords",
+  },
+};
+
 const EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, string>[]> = {
   "resiliency/srv-driven/old.tsp": {
     "package-name": "resiliency-srv-driven1",
+    namespace: "resiliency.srv.driven1",
     "package-mode": "azure-dataplane",
     "package-pprint-name": "ResiliencySrvDriven1",
   },
   "resiliency/srv-driven": {
     "package-name": "resiliency-srv-driven2",
+    namespace: "resiliency.srv.driven2",
     "package-mode": "azure-dataplane",
     "package-pprint-name": "ResiliencySrvDriven2",
   },
   "authentication/http/custom": {
     "package-name": "authentication-http-custom",
+    namespace: "authentication.http.custom",
     "package-pprint-name": "Authentication Http Custom",
   },
   "authentication/union": {
     "package-name": "authentication-union",
+    namespace: "authentication.union",
   },
   "type/array": {
     "package-name": "typetest-array",
+    namespace: "typetest.array",
     "use-pyodide": "true",
   },
   "type/dictionary": {
     "package-name": "typetest-dictionary",
+    namespace: "typetest.dictionary",
   },
   "type/enum/extensible": {
     "package-name": "typetest-enum-extensible",
+    namespace: "typetest.enum.extensible",
   },
   "type/enum/fixed": {
     "package-name": "typetest-enum-fixed",
+    namespace: "typetest.enum.fixed",
   },
   "type/model/empty": {
     "package-name": "typetest-model-empty",
+    namespace: "typetest.model.empty",
   },
   "type/model/inheritance/enum-discriminator": {
     "package-name": "typetest-model-enumdiscriminator",
+    namespace: "typetest.model.enumdiscriminator",
   },
   "type/model/inheritance/nested-discriminator": {
     "package-name": "typetest-model-nesteddiscriminator",
+    namespace: "typetest.model.nesteddiscriminator",
   },
   "type/model/inheritance/not-discriminated": {
     "package-name": "typetest-model-notdiscriminated",
+    namespace: "typetest.model.notdiscriminated",
   },
   "type/model/inheritance/single-discriminator": {
     "package-name": "typetest-model-singlediscriminator",
+    namespace: "typetest.model.singlediscriminator",
   },
   "type/model/inheritance/recursive": {
     "package-name": "typetest-model-recursive",
+    namespace: "typetest.model.recursive",
     "use-pyodide": "true",
   },
   "type/model/usage": {
     "package-name": "typetest-model-usage",
+    namespace: "typetest.model.usage",
   },
   "type/model/visibility": [
-    { "package-name": "typetest-model-visibility" },
-    { "package-name": "headasbooleantrue", "head-as-boolean": "true" },
-    { "package-name": "headasbooleanfalse", "head-as-boolean": "false" },
+    {
+      "package-name": "typetest-model-visibility",
+      namespace: "typetest.model.visibility",
+    },
+    {
+      "package-name": "headasbooleantrue",
+      namespace: "headasbooleantrue",
+      "head-as-boolean": "true",
+    },
+    {
+      "package-name": "headasbooleanfalse",
+      namespace: "headasbooleanfalse",
+      "head-as-boolean": "false",
+    },
   ],
   "type/property/nullable": {
     "package-name": "typetest-property-nullable",
+    namespace: "typetest.property.nullable",
   },
   "type/property/optionality": {
     "package-name": "typetest-property-optional",
+    namespace: "typetest.property.optional",
   },
   "type/property/additional-properties": {
     "package-name": "typetest-property-additionalproperties",
+    namespace: "typetest.property.additionalproperties",
   },
   "type/scalar": {
     "package-name": "typetest-scalar",
+    namespace: "typetest.scalar",
   },
   "type/property/value-types": {
     "package-name": "typetest-property-valuetypes",
+    namespace: "typetest.property.valuetypes",
   },
   "type/union": {
     "package-name": "typetest-union",
-  },
-  "azure/core/lro/rpc": {
-    "package-name": "azurecore-lro-rpc",
-  },
-  "client/structure/multi-client": {
-    "package-name": "client-structure-multiclient",
-  },
-  "client/structure/renamed-operation": {
-    "package-name": "client-structure-renamedoperation",
-  },
-  "client/structure/two-operation-group": {
-    "package-name": "client-structure-twooperationgroup",
-  },
-  "client/namespace": {
-    "enable-typespec-namespace": "true",
+    namespace: "typetest.union",
   },
 };
 
@@ -141,29 +212,9 @@ function getEmitterOption(spec: string, flavor: string): Record<string, string>[
   const key = relativeSpec.includes("resiliency/srv-driven/old.tsp")
     ? relativeSpec
     : dirname(relativeSpec);
-  const emitter_options = EMITTER_OPTIONS[key] || [{}];
-  const result = Array.isArray(emitter_options) ? emitter_options : [emitter_options];
-
-  function updateOptions(options: Record<string, string>): void {
-    if (options["package-name"] && options["enable-typespec-namespace"] === undefined) {
-      options["enable-typespec-namespace"] = "false";
-    }
-  }
-
-  // when package name is different with typespec namespace, disable typespec namespace
-  if (flavor !== "azure") {
-    for (const options of result) {
-      if (Array.isArray(options)) {
-        for (const option of options) {
-          updateOptions(option);
-        }
-      } else {
-        updateOptions(options);
-      }
-    }
-  }
-
-  return result;
+  const emitter_options = EMITTER_OPTIONS[key] ||
+    (flavor === "azure" ? AZURE_EMITTER_OPTIONS[key] : [{}]) || [{}];
+  return Array.isArray(emitter_options) ? emitter_options : [emitter_options];
 }
 
 // Function to execute CLI commands asynchronously
@@ -293,9 +344,6 @@ 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}`;

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:
@@ -40,7 +40,6 @@ class OptionsRetriever:
         "generate-test": False,
         "from-typespec": False,
         "emit-cross-language-definition-file": False,
-        "enable-typespec-namespace": False,
     }
 
     @property
@@ -54,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)
@@ -169,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:
@@ -287,7 +273,7 @@ class CodeGenerator(Plugin):
         flags = [
             "azure_arm",
             "head_as_boolean",
-            "license_header",
+            "header_text",
             "keep_version_file",
             "no_async",
             "no_namespace_folders",
@@ -315,9 +301,7 @@ class CodeGenerator(Plugin):
             "default_api_version",
             "from_typespec",
             "flavor",
-            "company_name",
             "emit_cross_language_definition_file",
-            "enable_typespec_namespace",
         ]
         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:
@@ -145,12 +146,8 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
             return result
         return f"{result}{module_name}" if result.endswith(".") else f"{result}.{module_name}"
 
-    @property
-    def need_unique_model_alias(self) -> bool:
-        return self.has_subnamespace and self.options["enable_typespec_namespace"]
-
     def get_unique_models_alias(self, serialize_namespace: str, imported_namespace: str) -> str:
-        if not self.need_unique_model_alias:
+        if not self.has_subnamespace:
             return "_models"
         relative_path = self.get_relative_import_path(
             serialize_namespace, self.get_imported_namespace_for_model(imported_namespace)
@@ -406,3 +403,39 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
     @staticmethod
     def has_non_json_models(models: List[ModelType]) -> bool:
         return any(m for m in models if m.base != "json")
+
+    @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/serializers/__init__.py

@@ -197,9 +197,13 @@ class JinjaSerializer(ReaderAndWriter):
             env = Environment(
                 loader=PackageLoader("pygen.codegen", "templates/packaging_templates"),
                 undefined=StrictUndefined,
+                trim_blocks=True,
+                lstrip_blocks=True,
             )
 
             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"]))),
@@ -271,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(
@@ -460,21 +464,11 @@ class JinjaSerializer(ReaderAndWriter):
         metadata_serializer = MetadataSerializer(self.code_model, env, client_namespace=namespace)
         self.write_file(self.exec_path(namespace) / Path("_metadata.json"), metadata_serializer.serialize())
 
-    @property
-    def _namespace_from_package_name(self) -> str:
-        return get_namespace_from_package_name(self.code_model.options["package_name"])
-
-    def _name_space(self) -> str:
-        if self.code_model.namespace.count(".") >= self._namespace_from_package_name.count("."):
-            return self.code_model.namespace
-
-        return self._namespace_from_package_name
-
     @property
     def exec_path_compensation(self) -> Path:
         """Assume the process is running in the root folder of the package. If not, we need the path compensation."""
         return (
-            Path("../" * (self._name_space().count(".") + 1))
+            Path("../" * (self.code_model.namespace.count(".") + 1))
             if self.code_model.options["no_namespace_folders"]
             else Path(".")
         )
@@ -482,16 +476,28 @@ class JinjaSerializer(ReaderAndWriter):
     def exec_path_for_test_sample(self, namespace: str) -> Path:
         return self.exec_path_compensation / Path(*namespace.split("."))
 
+    # pylint: disable=line-too-long
     def exec_path(self, namespace: str) -> Path:
         if self.code_model.options["no_namespace_folders"] and not self.code_model.options["multiapi"]:
+            # when output folder contains parts different from the namespace, we fall back to current folder directly.
+            # (e.g. https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/communication/azure-communication-callautomation/swagger/SWAGGER.md)
             return Path(".")
         return self.exec_path_compensation / Path(*namespace.split("."))
 
+    # pylint: disable=line-too-long
     @property
-    def _additional_folder(self) -> Path:
+    def sample_additional_folder(self) -> Path:
+        # For special package, we need to additional folder when generate samples.
+        # For example, azure-mgmt-resource is combined by multiple modules, and each module is multiapi package.
+        # one of namespace is "azure.mgmt.resource.resources.v2020_01_01", then additional folder is "resources"
+        # so that we could avoid conflict when generate samples.
+        # python config: https://github.com/Azure/azure-rest-api-specs/blob/main/specification/resources/resource-manager/readme.python.md
+        # generated SDK: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource/generated_samples
         namespace_config = get_namespace_config(self.code_model.namespace, self.code_model.options["multiapi"])
         num_of_namespace = namespace_config.count(".") + 1
-        num_of_package_namespace = self._namespace_from_package_name.count(".") + 1
+        num_of_package_namespace = (
+            get_namespace_from_package_name(self.code_model.options["package_name"]).count(".") + 1
+        )
         if num_of_namespace > num_of_package_namespace:
             return Path("/".join(namespace_config.split(".")[num_of_package_namespace:]))
         return Path("")
@@ -514,7 +520,7 @@ class JinjaSerializer(ReaderAndWriter):
                         file_name = to_snake_case(extract_sample_name(file)) + ".py"
                         try:
                             self.write_file(
-                                out_path / self._additional_folder / _sample_output_path(file) / file_name,
+                                out_path / self.sample_additional_folder / _sample_output_path(file) / file_name,
                                 SampleSerializer(
                                     code_model=self.code_model,
                                     env=env,

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

@@ -28,7 +28,11 @@ class GeneralSerializer(BaseSerializer):
 
     def serialize_package_file(self, template_name: str, **kwargs: Any) -> str:
         template = self.env.get_template(template_name)
-        package_parts = (self.code_model.options["package_name"] or "").split("-")[:-1]
+        package_parts = (
+            self.code_model.namespace.split(".")[:-1]
+            if self.code_model.is_tsp
+            else (self.code_model.options["package_name"] or "").split("-")[:-1]
+        )
         token_credential = any(
             c for c in self.code_model.clients if isinstance(getattr(c.credential, "type", None), TokenCredentialType)
         )
@@ -44,7 +48,6 @@ class GeneralSerializer(BaseSerializer):
             "pkgutil_names": [".".join(package_parts[: i + 1]) for i in range(len(package_parts))],
             "init_names": ["/".join(package_parts[: i + 1]) + "/__init__.py" for i in range(len(package_parts))],
             "client_name": self.code_model.clients[0].name,
-            "namespace": self.code_model.namespace,
         }
         params.update(self.code_model.options)
         params.update(kwargs)

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

@@ -19,7 +19,7 @@ from ..models import (
     CombinedType,
     FileImport,
 )
-from .utils import get_namespace_from_package_name, json_dumps_template
+from .utils import json_dumps_template
 
 
 def is_lro(operation_type: str) -> bool:

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 }}