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

package/eng/scripts/ci/regenerate.ts

@@ -38,96 +38,171 @@ 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",
+  },
+  "azure/core/lro/rpc": {
+    "package-name": "azurecore-lro-rpc",
+    namespace: "azurecore.lro.rpc",
+  },
+  "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 +216,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

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

@@ -40,7 +40,6 @@ class OptionsRetriever:
         "generate-test": False,
         "from-typespec": False,
         "emit-cross-language-definition-file": False,
-        "enable-typespec-namespace": False,
     }
 
     @property
@@ -317,7 +316,6 @@ class CodeGenerator(Plugin):
             "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/models/code_model.py

@@ -145,12 +145,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 +402,7 @@ 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

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

@@ -197,6 +197,8 @@ class JinjaSerializer(ReaderAndWriter):
             env = Environment(
                 loader=PackageLoader("pygen.codegen", "templates/packaging_templates"),
                 undefined=StrictUndefined,
+                trim_blocks=True,
+                lstrip_blocks=True,
             )
 
             package_files = _PACKAGE_FILES
@@ -460,21 +462,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 +474,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 +518,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/packaging_templates/MANIFEST.in.jinja2

@@ -1,8 +1,12 @@
 include *.md
 include LICENSE
+{% if code_model.is_tsp %}
+include {{ code_model.namespace.replace('.', '/') }}/py.typed
+{% else %}
 include {{ package_name.replace('-', '/') }}/py.typed
+{% endif %}
 recursive-include tests *.py
 recursive-include samples *.py *.md
-{%- for init_name in init_names %}
+{% for init_name in init_names %}
 include {{ init_name }}
-{%- endfor %}
+{% endfor %}

package/generator/build/lib/pygen/codegen/templates/packaging_templates/README.md.jinja2

@@ -1,5 +1,5 @@
 {% if code_model.is_azure_flavor %}
-{% if package_mode == "mgmtplane" -%}
+{% if package_mode == "mgmtplane" %}
 # Microsoft Azure SDK for Python
 
 This is the Microsoft {{package_pprint_name}} Client Library.
@@ -40,7 +40,7 @@ python -m pip install {{ package_name }}
 - You need an [Azure subscription][azure_sub] to use this package.
 - An existing {{ package_pprint_name }} instance.
 
-{%- if token_credential %}
+{% if token_credential %}
 #### Create with an Azure Active Directory Credential
 To use an [Azure Active Directory (AAD) token credential][authenticate_with_token],
 provide an instance of the desired credential type obtained from the
@@ -57,7 +57,7 @@ Set the values of the client ID, tenant ID, and client secret of the AAD applica
 Use the returned token credential to authenticate the client:
 
 ```python
->>> from {{ namespace }} import {{ client_name }}
+>>> from {{ code_model.namespace }} import {{ client_name }}
 >>> from azure.identity import DefaultAzureCredential
 >>> client = {{ client_name }}(endpoint='<endpoint>', credential=DefaultAzureCredential())
 ```
@@ -65,7 +65,7 @@ Use the returned token credential to authenticate the client:
 ## Examples
 
 ```python
->>> from {{ namespace }} import {{ client_name }}
+>>> from {{ code_model.namespace }} import {{ client_name }}
 >>> from azure.identity import DefaultAzureCredential
 >>> from {{ code_model.core_library }}.exceptions import HttpResponseError
 
@@ -76,7 +76,7 @@ Use the returned token credential to authenticate the client:
         print('service responds error: {}'.format(e.response.json()))
 
 ```
-{%- endif %}
+{% endif %}
 
 ## Contributing
 

package/generator/build/lib/pygen/codegen/templates/packaging_templates/dev_requirements.txt.jinja2

@@ -1,9 +1,9 @@
 -e ../../../tools/azure-sdk-tools
 ../../core/azure-core
-{% if token_credential -%}
+{% if token_credential %}
 ../../identity/azure-identity
 {% endif -%}
-{% if azure_arm -%}
+{% if azure_arm %}
 ../../core/azure-mgmt-core
-{% endif -%}
+{% endif %}
 aiohttp

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

@@ -2,19 +2,27 @@
 {{ license_header }}
 # coding: utf-8
 {% if package_mode %}
+
 import os
 import re
-{% endif -%}
+{% endif %}
 from setuptools import setup, find_packages
 
 {% set package_name = package_name or code_model.clients[0].name %}
 
 PACKAGE_NAME = "{{ package_name|lower }}"
-{% if package_mode -%}
+{% if package_mode %}
 PACKAGE_PPRINT_NAME = "{{ package_pprint_name }}"
+{% if code_model.is_tsp %}
+PACKAGE_NAMESPACE = "{{ code_model.namespace|lower }}"
+
+# a.b.c => a/b/c
+package_folder_path = PACKAGE_NAMESPACE.replace(".", "/")
+{% else %}
 
 # a-b-c => a/b/c
 package_folder_path = PACKAGE_NAME.replace("-", "/")
+{% endif %}
 
 # Version extraction inspired from 'requests'
 with open(os.path.join(package_folder_path, "_version.py"), "r") as fd:
@@ -33,7 +41,8 @@ version = "{{ package_version }}"
 {% set long_description = code_model.description %}
 {% set author_email = "" %}
 {% set url = "" %}
-{% endif -%}
+{% endif %}
+
 
 setup(
     name=PACKAGE_NAME,
@@ -70,9 +79,9 @@ setup(
             {% if pkgutil_names %}
             # Exclude packages that will be covered by PEP420 or nspkg
             {% endif %}
-            {%- for pkgutil_name in pkgutil_names %}
+            {% for pkgutil_name in pkgutil_names %}
             "{{ pkgutil_name }}",
-            {%- endfor %}
+            {% endfor %}
         ]
     ),
     include_package_data=True,

package/generator/pygen/codegen/__init__.py

@@ -40,7 +40,6 @@ class OptionsRetriever:
         "generate-test": False,
         "from-typespec": False,
         "emit-cross-language-definition-file": False,
-        "enable-typespec-namespace": False,
     }
 
     @property
@@ -317,7 +316,6 @@ class CodeGenerator(Plugin):
             "flavor",
             "company_name",
             "emit_cross_language_definition_file",
-            "enable_typespec_namespace",
         ]
         return {f: getattr(self.options_retriever, f) for f in flags}
 

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

@@ -145,12 +145,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 +402,7 @@ 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

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

@@ -197,6 +197,8 @@ class JinjaSerializer(ReaderAndWriter):
             env = Environment(
                 loader=PackageLoader("pygen.codegen", "templates/packaging_templates"),
                 undefined=StrictUndefined,
+                trim_blocks=True,
+                lstrip_blocks=True,
             )
 
             package_files = _PACKAGE_FILES
@@ -460,21 +462,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 +474,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 +518,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/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/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/pygen/codegen/templates/packaging_templates/MANIFEST.in.jinja2

@@ -1,8 +1,12 @@
 include *.md
 include LICENSE
+{% if code_model.is_tsp %}
+include {{ code_model.namespace.replace('.', '/') }}/py.typed
+{% else %}
 include {{ package_name.replace('-', '/') }}/py.typed
+{% endif %}
 recursive-include tests *.py
 recursive-include samples *.py *.md
-{%- for init_name in init_names %}
+{% for init_name in init_names %}
 include {{ init_name }}
-{%- endfor %}
+{% endfor %}