@typespec/http-client-python 0.6.2 → 0.6.4

package/eng/scripts/ci/regenerate.ts

@@ -132,14 +132,35 @@ function toPosix(dir: string): string {
   return dir.replace(/\\/g, "/");
 }
 
-function getEmitterOption(spec: string): Record<string, string>[] {
+function getEmitterOption(spec: string, flavor: string): Record<string, string>[] {
   const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS;
   const relativeSpec = toPosix(relative(specDir, spec));
   const key = relativeSpec.includes("resiliency/srv-driven/old.tsp")
     ? relativeSpec
     : dirname(relativeSpec);
-  const result = EMITTER_OPTIONS[key] || [{}];
-  return Array.isArray(result) ? result : [result];
+  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;
 }
 
 // Function to execute CLI commands asynchronously
@@ -172,7 +193,6 @@ interface RegenerateFlags {
   debug: boolean;
   name?: string;
   pyodide?: boolean;
-  "enable-typespec-namespace"?: boolean;
 }
 
 const SpecialFlags: Record<string, Record<string, any>> = {
@@ -249,7 +269,7 @@ function addOptions(
   flags: RegenerateFlags,
 ): EmitterConfig[] {
   const emitterConfigs: EmitterConfig[] = [];
-  for (const config of getEmitterOption(spec)) {
+  for (const config of getEmitterOption(spec, flags.flavor)) {
     const options: Record<string, string> = { ...config };
     if (flags.pyodide) {
       options["use-pyodide"] = "true";
@@ -271,9 +291,6 @@ function addOptions(
       options["company-name"] = "Unbranded";
     }
     options["examples-dir"] = toPosix(join(dirname(spec), "examples"));
-    if (options["enable-typespec-namespace"] === undefined) {
-      options["enable-typespec-namespace"] = "false";
-    }
     const configs = Object.entries(options).flatMap(([k, v]) => {
       return `--option ${argv.values.emitterName || "@typespec/http-client-python"}.${k}=${v}`;
     });

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

@@ -402,3 +402,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
     @property
     def is_legacy(self) -> bool:
         return _is_legacy(self.options)
+
+    @staticmethod
+    def has_non_json_models(models: List[ModelType]) -> bool:
+        return any(m for m in models if m.base != "json")

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

@@ -53,9 +53,10 @@ class CombinedType(BaseType):
         return self.yaml_data.get("clientDefaultValue")
 
     def description(self, *, is_operation_file: bool) -> str:
-        if len(self.types) == 2:
-            return f"Is either a {self.types[0].type_description} type or a {self.types[1].type_description} type."
-        return f"Is one of the following types: {', '.join([t.type_description for t in self.types])}"
+        type_descriptions = list({t.type_description: None for t in self.types}.keys())
+        if len(type_descriptions) == 2:
+            return f"Is either a {type_descriptions[0]} type or a {type_descriptions[1]} type."
+        return f"Is one of the following types: {', '.join(t for t in type_descriptions)}"
 
     def docstring_text(self, **kwargs: Any) -> str:
         return " or ".join(t.docstring_text(**kwargs) for t in self.types)

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

@@ -198,6 +198,10 @@ class KeyCredentialType(CredentialType[KeyCredentialPolicyType]):
     def type_annotation(self, **kwargs: Any) -> str:
         return self.policy.credential_name
 
+    @property
+    def type_description(self) -> str:
+        return "key credential"
+
     @property
     def instance_check_template(self) -> str:
         return "isinstance({}, " + f"{self.policy.credential_name})"

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

@@ -35,6 +35,7 @@ from .parameter import (
 )
 from .parameter_list import ParameterList
 from .model_type import ModelType
+from .primitive_types import BinaryIteratorType, BinaryType
 from .base import BaseType
 from .combined_type import CombinedType
 from .request_builder import OverloadedRequestBuilder, RequestBuilder
@@ -313,6 +314,10 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             )
         return file_import
 
+    @property
+    def need_deserialize(self) -> bool:
+        return any(r.type and not isinstance(r.type, BinaryIteratorType) for r in self.responses)
+
     def imports(  # pylint: disable=too-many-branches, disable=too-many-statements
         self, async_mode: bool, **kwargs: Any
     ) -> FileImport:
@@ -432,7 +437,8 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
         if self.code_model.options["models_mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(serialize_namespace, module_name="_model_base")
-            if self.parameters.has_body:
+            body_param = self.parameters.body_parameter if self.parameters.has_body else None
+            if body_param and not isinstance(body_param.type, BinaryType):
                 if self.has_form_data_body:
                     file_import.add_submodule_import(
                         self.code_model.get_relative_import_path(serialize_namespace), "_model_base", ImportType.LOCAL
@@ -452,7 +458,7 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
                     file_import.add_import("json", ImportType.STDLIB)
             if any(xml_serializable(str(r.default_content_type)) for r in self.responses):
                 file_import.add_submodule_import(relative_path, "_deserialize_xml", ImportType.LOCAL)
-            elif any(r.type for r in self.responses):
+            elif self.need_deserialize:
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
             if self.default_error_deserialization or self.non_default_errors:
                 file_import.add_submodule_import(relative_path, "_failsafe_deserialize", ImportType.LOCAL)

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

@@ -9,7 +9,7 @@ from .utils import OrderedSet
 
 from .base import BaseModel
 from .operation import get_operation
-from .imports import FileImport, ImportType, TypingSection
+from .imports import FileImport, ImportType, TypingSection, MsrestImportType
 from .utils import add_to_pylint_disable, NamespaceType
 from .lro_operation import LROOperation
 from .lro_paging_operation import LROPagingOperation
@@ -152,6 +152,31 @@ class OperationGroup(BaseModel):
                 f"{self.client.name}MixinABC",
                 ImportType.LOCAL,
             )
+        else:
+            file_import.add_submodule_import(
+                "" if self.code_model.is_azure_flavor else "runtime",
+                f"{'Async' if async_mode else ''}PipelineClient",
+                ImportType.SDKCORE,
+            )
+            file_import.add_submodule_import(
+                self.code_model.get_relative_import_path(
+                    serialize_namespace,
+                    self.code_model.get_imported_namespace_for_client(self.client.client_namespace, async_mode),
+                    module_name="_configuration",
+                ),
+                f"{self.client.name}Configuration",
+                ImportType.LOCAL,
+            )
+            file_import.add_msrest_import(
+                serialize_namespace=kwargs.get("serialize_namespace", self.code_model.namespace),
+                msrest_import_type=MsrestImportType.Serializer,
+                typing_section=TypingSection.REGULAR,
+            )
+            file_import.add_msrest_import(
+                serialize_namespace=kwargs.get("serialize_namespace", self.code_model.namespace),
+                msrest_import_type=MsrestImportType.SerializerDeserializer,
+                typing_section=TypingSection.REGULAR,
+            )
         if self.has_abstract_operations:
             file_import.add_submodule_import(
                 # raise_if_not_implemented is always defined in _vendor of top namespace

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

@@ -150,7 +150,7 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
         if self.code_model.options["models_mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(serialize_namespace, module_name="_model_base")
             file_import.merge(self.item_type.imports(**kwargs))
-            if self.default_error_deserialization or any(r.type for r in self.responses):
+            if self.default_error_deserialization or self.need_deserialize:
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
         return file_import
 

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

@@ -102,7 +102,7 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         if self.is_base_discriminator:
             return "str"
         types_type_annotation = self.type.type_annotation(is_operation_file=is_operation_file, **kwargs)
-        if self.optional and self.client_default_value is None:
+        if (self.optional and self.client_default_value is None) or self.readonly:
             return f"Optional[{types_type_annotation}]"
         return types_type_annotation
 
@@ -144,7 +144,7 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         if self.is_discriminator and isinstance(self.type, EnumType):
             return file_import
         file_import.merge(self.type.imports(**kwargs))
-        if self.optional and self.client_default_value is None:
+        if (self.optional and self.client_default_value is None) or self.readonly:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
         if self.code_model.options["models_mode"] == "dpg":
             serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)

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

@@ -159,7 +159,9 @@ class JinjaSerializer(ReaderAndWriter):
                 self._serialize_and_write_top_level_folder(env=env, namespace=client_namespace)
 
             # add models folder if there are models in this namespace
-            if (client_namespace_type.models or client_namespace_type.enums) and self.code_model.options["models_mode"]:
+            if (
+                self.code_model.has_non_json_models(client_namespace_type.models) or client_namespace_type.enums
+            ) and self.code_model.options["models_mode"]:
                 self._serialize_and_write_models_folder(
                     env=env,
                     namespace=client_namespace,
@@ -181,6 +183,14 @@ class JinjaSerializer(ReaderAndWriter):
                 if self.code_model.options["multiapi"]:
                     self._serialize_and_write_metadata(env=env, namespace=client_namespace)
 
+            # if there are only operations under this namespace, we need to add general __init__.py into `aio` folder
+            # to make sure all generated files could be packed into .zip/.whl/.tgz package
+            if not client_namespace_type.clients and client_namespace_type.operation_groups and self.has_aio_folder:
+                self.write_file(
+                    exec_path / Path("aio/__init__.py"),
+                    general_serializer.serialize_pkgutil_init_file(),
+                )
+
     def _serialize_and_write_package_files(self, client_namespace: str) -> None:
         root_of_sdk = self.exec_path(client_namespace)
         if self.code_model.options["package_mode"] in VALID_PACKAGE_MODE:
@@ -230,7 +240,7 @@ class JinjaSerializer(ReaderAndWriter):
         # Write the models folder
         models_path = self.exec_path(namespace + ".models")
         serializer = DpgModelSerializer if self.code_model.options["models_mode"] == "dpg" else MsrestModelSerializer
-        if models:
+        if self.code_model.has_non_json_models(models):
             self.write_file(
                 models_path / Path(f"{self.code_model.models_filename}.py"),
                 serializer(code_model=self.code_model, env=env, client_namespace=namespace, models=models).serialize(),

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

@@ -192,9 +192,9 @@ class MsrestModelSerializer(_ModelSerializer):
             if prop.is_discriminator:
                 init_args.append(self.initialize_discriminator_property(model, prop))
             elif prop.readonly:
-                init_args.append(f"self.{prop.client_name} = None")
+                init_args.append(f"self.{prop.client_name}: {prop.type_annotation()} = None")
             elif not prop.constant:
-                init_args.append(f"self.{prop.client_name} = {prop.client_name}")
+                init_args.append(f"self.{prop.client_name}: {prop.type_annotation()} = {prop.client_name}")
         return init_args
 
     @staticmethod

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

@@ -89,4 +89,5 @@ class OperationGroupsSerializer(BaseSerializer):
                 client_namespace=self.client_namespace,
             ),
             get_request_builders=self._get_request_builders,
+            need_declare_serializer=any(operation_group.operations for operation_group in self.operation_groups),
         )

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

@@ -31,10 +31,10 @@ class {{ operation_group.class_name }}: {{ operation_group.pylint_disable() }}
 {% endif %}
     def __init__(self, *args, **kwargs){{ return_none_type_annotation }}:
         input_args = list(args)
-        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
-        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
-        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
-        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._client: {{ 'Async' if async_mode else ''}}PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config: {{ operation_group.client.name }}Configuration = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
         {% if code_model.options["multiapi"] %}
         self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
         {% endif %}

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

@@ -6,7 +6,9 @@
 {{ imports }}
 {{ unset }}
 {% if code_model.options["builders_visibility"] == "embedded" and not async_mode %}
+  {% if need_declare_serializer %}
 {{ op_tools.declare_serializer(code_model) }}
+  {% endif %}
     {% for operation_group in operation_groups %}
         {% for request_builder in get_request_builders(operation_group) %}
 

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

@@ -184,73 +184,7 @@ try:
 except NameError:
     _long_type = int
 
-
-class UTC(datetime.tzinfo):
-    """Time Zone info for handling UTC"""
-
-    def utcoffset(self, dt):
-        """UTF offset for UTC is 0.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The offset
-        :rtype: datetime.timedelta
-        """
-        return datetime.timedelta(0)
-
-    def tzname(self, dt):
-        """Timestamp representation.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The timestamp representation
-        :rtype: str
-        """
-        return "Z"
-
-    def dst(self, dt):
-        """No daylight saving for UTC.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The daylight saving time
-        :rtype: datetime.timedelta
-        """
-        return datetime.timedelta(hours=1)
-
-
-try:
-    from datetime import timezone as _FixedOffset  # type: ignore
-except ImportError:  # Python 2.7
-
-    class _FixedOffset(datetime.tzinfo):  # type: ignore
-        """Fixed offset in minutes east from UTC.
-        Copy/pasted from Python doc
-        :param datetime.timedelta offset: offset in timedelta format
-        """
-
-        def __init__(self, offset) -> None:
-            self.__offset = offset
-
-        def utcoffset(self, dt):
-            return self.__offset
-
-        def tzname(self, dt):
-            return str(self.__offset.total_seconds() / 3600)
-
-        def __repr__(self):
-            return "<FixedOffset {}>".format(self.tzname(None))
-
-        def dst(self, dt):
-            return datetime.timedelta(0)
-
-        def __getinitargs__(self):
-            return (self.__offset,)
-
-
-try:
-    from datetime import timezone
-
-    TZ_UTC = timezone.utc
-except ImportError:
-    TZ_UTC = UTC()  # type: ignore
+TZ_UTC = datetime.timezone.utc
 
 _FLATTEN = re.compile(r"(?<!\\)\.")
 
@@ -2050,7 +1984,7 @@ class Deserializer:
         try:
             parsed_date = email.utils.parsedate_tz(attr)  # type: ignore
             date_obj = datetime.datetime(
-                *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60))
+                *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60))
             )
             if not date_obj.tzinfo:
                 date_obj = date_obj.astimezone(tz=TZ_UTC)

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

@@ -402,3 +402,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
     @property
     def is_legacy(self) -> bool:
         return _is_legacy(self.options)
+
+    @staticmethod
+    def has_non_json_models(models: List[ModelType]) -> bool:
+        return any(m for m in models if m.base != "json")

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

@@ -53,9 +53,10 @@ class CombinedType(BaseType):
         return self.yaml_data.get("clientDefaultValue")
 
     def description(self, *, is_operation_file: bool) -> str:
-        if len(self.types) == 2:
-            return f"Is either a {self.types[0].type_description} type or a {self.types[1].type_description} type."
-        return f"Is one of the following types: {', '.join([t.type_description for t in self.types])}"
+        type_descriptions = list({t.type_description: None for t in self.types}.keys())
+        if len(type_descriptions) == 2:
+            return f"Is either a {type_descriptions[0]} type or a {type_descriptions[1]} type."
+        return f"Is one of the following types: {', '.join(t for t in type_descriptions)}"
 
     def docstring_text(self, **kwargs: Any) -> str:
         return " or ".join(t.docstring_text(**kwargs) for t in self.types)

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

@@ -198,6 +198,10 @@ class KeyCredentialType(CredentialType[KeyCredentialPolicyType]):
     def type_annotation(self, **kwargs: Any) -> str:
         return self.policy.credential_name
 
+    @property
+    def type_description(self) -> str:
+        return "key credential"
+
     @property
     def instance_check_template(self) -> str:
         return "isinstance({}, " + f"{self.policy.credential_name})"

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

@@ -35,6 +35,7 @@ from .parameter import (
 )
 from .parameter_list import ParameterList
 from .model_type import ModelType
+from .primitive_types import BinaryIteratorType, BinaryType
 from .base import BaseType
 from .combined_type import CombinedType
 from .request_builder import OverloadedRequestBuilder, RequestBuilder
@@ -313,6 +314,10 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             )
         return file_import
 
+    @property
+    def need_deserialize(self) -> bool:
+        return any(r.type and not isinstance(r.type, BinaryIteratorType) for r in self.responses)
+
     def imports(  # pylint: disable=too-many-branches, disable=too-many-statements
         self, async_mode: bool, **kwargs: Any
     ) -> FileImport:
@@ -432,7 +437,8 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
         if self.code_model.options["models_mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(serialize_namespace, module_name="_model_base")
-            if self.parameters.has_body:
+            body_param = self.parameters.body_parameter if self.parameters.has_body else None
+            if body_param and not isinstance(body_param.type, BinaryType):
                 if self.has_form_data_body:
                     file_import.add_submodule_import(
                         self.code_model.get_relative_import_path(serialize_namespace), "_model_base", ImportType.LOCAL
@@ -452,7 +458,7 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
                     file_import.add_import("json", ImportType.STDLIB)
             if any(xml_serializable(str(r.default_content_type)) for r in self.responses):
                 file_import.add_submodule_import(relative_path, "_deserialize_xml", ImportType.LOCAL)
-            elif any(r.type for r in self.responses):
+            elif self.need_deserialize:
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
             if self.default_error_deserialization or self.non_default_errors:
                 file_import.add_submodule_import(relative_path, "_failsafe_deserialize", ImportType.LOCAL)

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

@@ -9,7 +9,7 @@ from .utils import OrderedSet
 
 from .base import BaseModel
 from .operation import get_operation
-from .imports import FileImport, ImportType, TypingSection
+from .imports import FileImport, ImportType, TypingSection, MsrestImportType
 from .utils import add_to_pylint_disable, NamespaceType
 from .lro_operation import LROOperation
 from .lro_paging_operation import LROPagingOperation
@@ -152,6 +152,31 @@ class OperationGroup(BaseModel):
                 f"{self.client.name}MixinABC",
                 ImportType.LOCAL,
             )
+        else:
+            file_import.add_submodule_import(
+                "" if self.code_model.is_azure_flavor else "runtime",
+                f"{'Async' if async_mode else ''}PipelineClient",
+                ImportType.SDKCORE,
+            )
+            file_import.add_submodule_import(
+                self.code_model.get_relative_import_path(
+                    serialize_namespace,
+                    self.code_model.get_imported_namespace_for_client(self.client.client_namespace, async_mode),
+                    module_name="_configuration",
+                ),
+                f"{self.client.name}Configuration",
+                ImportType.LOCAL,
+            )
+            file_import.add_msrest_import(
+                serialize_namespace=kwargs.get("serialize_namespace", self.code_model.namespace),
+                msrest_import_type=MsrestImportType.Serializer,
+                typing_section=TypingSection.REGULAR,
+            )
+            file_import.add_msrest_import(
+                serialize_namespace=kwargs.get("serialize_namespace", self.code_model.namespace),
+                msrest_import_type=MsrestImportType.SerializerDeserializer,
+                typing_section=TypingSection.REGULAR,
+            )
         if self.has_abstract_operations:
             file_import.add_submodule_import(
                 # raise_if_not_implemented is always defined in _vendor of top namespace

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

@@ -150,7 +150,7 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
         if self.code_model.options["models_mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(serialize_namespace, module_name="_model_base")
             file_import.merge(self.item_type.imports(**kwargs))
-            if self.default_error_deserialization or any(r.type for r in self.responses):
+            if self.default_error_deserialization or self.need_deserialize:
                 file_import.add_submodule_import(relative_path, "_deserialize", ImportType.LOCAL)
         return file_import
 

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

@@ -102,7 +102,7 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         if self.is_base_discriminator:
             return "str"
         types_type_annotation = self.type.type_annotation(is_operation_file=is_operation_file, **kwargs)
-        if self.optional and self.client_default_value is None:
+        if (self.optional and self.client_default_value is None) or self.readonly:
             return f"Optional[{types_type_annotation}]"
         return types_type_annotation
 
@@ -144,7 +144,7 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         if self.is_discriminator and isinstance(self.type, EnumType):
             return file_import
         file_import.merge(self.type.imports(**kwargs))
-        if self.optional and self.client_default_value is None:
+        if (self.optional and self.client_default_value is None) or self.readonly:
             file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
         if self.code_model.options["models_mode"] == "dpg":
             serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)

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

@@ -159,7 +159,9 @@ class JinjaSerializer(ReaderAndWriter):
                 self._serialize_and_write_top_level_folder(env=env, namespace=client_namespace)
 
             # add models folder if there are models in this namespace
-            if (client_namespace_type.models or client_namespace_type.enums) and self.code_model.options["models_mode"]:
+            if (
+                self.code_model.has_non_json_models(client_namespace_type.models) or client_namespace_type.enums
+            ) and self.code_model.options["models_mode"]:
                 self._serialize_and_write_models_folder(
                     env=env,
                     namespace=client_namespace,
@@ -181,6 +183,14 @@ class JinjaSerializer(ReaderAndWriter):
                 if self.code_model.options["multiapi"]:
                     self._serialize_and_write_metadata(env=env, namespace=client_namespace)
 
+            # if there are only operations under this namespace, we need to add general __init__.py into `aio` folder
+            # to make sure all generated files could be packed into .zip/.whl/.tgz package
+            if not client_namespace_type.clients and client_namespace_type.operation_groups and self.has_aio_folder:
+                self.write_file(
+                    exec_path / Path("aio/__init__.py"),
+                    general_serializer.serialize_pkgutil_init_file(),
+                )
+
     def _serialize_and_write_package_files(self, client_namespace: str) -> None:
         root_of_sdk = self.exec_path(client_namespace)
         if self.code_model.options["package_mode"] in VALID_PACKAGE_MODE:
@@ -230,7 +240,7 @@ class JinjaSerializer(ReaderAndWriter):
         # Write the models folder
         models_path = self.exec_path(namespace + ".models")
         serializer = DpgModelSerializer if self.code_model.options["models_mode"] == "dpg" else MsrestModelSerializer
-        if models:
+        if self.code_model.has_non_json_models(models):
             self.write_file(
                 models_path / Path(f"{self.code_model.models_filename}.py"),
                 serializer(code_model=self.code_model, env=env, client_namespace=namespace, models=models).serialize(),

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

@@ -192,9 +192,9 @@ class MsrestModelSerializer(_ModelSerializer):
             if prop.is_discriminator:
                 init_args.append(self.initialize_discriminator_property(model, prop))
             elif prop.readonly:
-                init_args.append(f"self.{prop.client_name} = None")
+                init_args.append(f"self.{prop.client_name}: {prop.type_annotation()} = None")
             elif not prop.constant:
-                init_args.append(f"self.{prop.client_name} = {prop.client_name}")
+                init_args.append(f"self.{prop.client_name}: {prop.type_annotation()} = {prop.client_name}")
         return init_args
 
     @staticmethod

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

@@ -89,4 +89,5 @@ class OperationGroupsSerializer(BaseSerializer):
                 client_namespace=self.client_namespace,
             ),
             get_request_builders=self._get_request_builders,
+            need_declare_serializer=any(operation_group.operations for operation_group in self.operation_groups),
         )

package/generator/pygen/codegen/templates/operation_group.py.jinja2

@@ -31,10 +31,10 @@ class {{ operation_group.class_name }}: {{ operation_group.pylint_disable() }}
 {% endif %}
     def __init__(self, *args, **kwargs){{ return_none_type_annotation }}:
         input_args = list(args)
-        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
-        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
-        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
-        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._client: {{ 'Async' if async_mode else ''}}PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config: {{ operation_group.client.name }}Configuration = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
         {% if code_model.options["multiapi"] %}
         self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
         {% endif %}

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

@@ -6,7 +6,9 @@
 {{ imports }}
 {{ unset }}
 {% if code_model.options["builders_visibility"] == "embedded" and not async_mode %}
+  {% if need_declare_serializer %}
 {{ op_tools.declare_serializer(code_model) }}
+  {% endif %}
     {% for operation_group in operation_groups %}
         {% for request_builder in get_request_builders(operation_group) %}