fix: resolve CI failures in type checking, lint, and mock API tests

- Add 'List' import to ListType.imports() when property/operation named 'list'
  exists (fixes NameError in special-words types.py)
- Use has_non_json_models() for has_models in ModelInitSerializer to avoid
  generating 'from . import _models' when _models.py doesn't exist
- Remove 'from . import types' from __init__.py — each TypedDict type's
  imports() already handles adding the types import where needed (operations)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: iscai-msft

packages/http-client-python/generator/pygen/codegen/models/list_type.py

@@ -5,7 +5,7 @@
 # --------------------------------------------------------------------------
 from typing import Any, Optional, Union, TYPE_CHECKING
 from .base import BaseType
-from .imports import FileImport
+from .imports import FileImport, ImportType
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
@@ -136,6 +136,12 @@ def from_yaml(cls, yaml_data: dict[str, Any], code_model: "CodeModel") -> "ListT
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)
         file_import.merge(self.element_type.imports(**kwargs))
+        is_operation_file = kwargs.get("is_operation_file", False)
+        use_list_import = (self.code_model.has_operation_named_list and is_operation_file) or (
+            self.code_model.has_property_named_list and not is_operation_file
+        )
+        if use_list_import:
+            file_import.add_submodule_import("typing", "List", ImportType.STDLIB)
         return file_import
 
     @property

packages/http-client-python/generator/pygen/codegen/serializers/__init__.py

@@ -182,14 +182,8 @@ def serialize(self) -> None:
                     )
             elif client_namespace_type.clients:
                 # add clients folder if there are clients in this namespace
-                # compute has_types early so __init__.py can include `from . import types`
-                has_types_models = any(
-                    m.is_used_in_operations_via_types for m in client_namespace_type.models if m.base != "json"
-                )
-                has_types_enums = any(e.is_typeddict_mode for e in client_namespace_type.enums)
-                has_types = has_types_models or has_types_enums
                 self._serialize_client_and_config_files(
-                    client_namespace, client_namespace_type.clients, env, has_types=has_types
+                    client_namespace, client_namespace_type.clients, env
                 )
                 # When generation-subdir is configured, generated code goes into a subdirectory
                 # (e.g., _generated/). We also need an __init__.py in the parent namespace dir
@@ -471,7 +465,6 @@ def _serialize_client_and_config_files(
         namespace: str,
         clients: list[Client],
         env: Environment,
-        has_types: bool = False,
     ) -> None:
         generation_path = self.code_model.get_generation_dir(namespace)
         for async_mode, async_path in self.serialize_loop:
@@ -483,8 +476,6 @@ def _serialize_client_and_config_files(
                 generation_path / Path(f"{async_path}__init__.py"),
                 general_serializer.serialize_init_file(
                     [c for c in clients if c.has_operations],
-                    # types.py is only generated at the sync (non-aio) level
-                    has_types=has_types and not async_mode,
                 ),
             )
 

packages/http-client-python/generator/pygen/codegen/serializers/general_serializer.py

@@ -198,14 +198,13 @@ def serialize_pkgutil_init_file(self) -> str:
         template = self.env.get_template("pkgutil_init.py.jinja2")
         return template.render()
 
-    def serialize_init_file(self, clients: list[Client], has_types: bool = False) -> str:
+    def serialize_init_file(self, clients: list[Client]) -> str:
         template = self.env.get_template("init.py.jinja2")
         return template.render(
             code_model=self.code_model,
             clients=clients,
             async_mode=self.async_mode,
             serialize_namespace=self.serialize_namespace,
-            has_types=has_types,
         )
 
     def serialize_service_client_file(self, clients: list[Client]) -> str:

packages/http-client-python/generator/pygen/codegen/serializers/model_init_serializer.py

@@ -32,7 +32,7 @@ def serialize(self) -> str:
                         ", ".join(model_enum_name_intersection)
                     )
                 )
-        has_models = self.models
+        has_models = self.code_model.has_non_json_models(self.models)
         has_enums = self.enums
         template = self.env.get_template("model_init.py.jinja2")
         return template.render(

packages/http-client-python/generator/pygen/codegen/templates/init.py.jinja2

@@ -9,9 +9,6 @@
 from .{{ client.filename }} import {{ client.name }}  # type: ignore
     {% endfor %}
 {% endif %}
-{% if has_types %}
-from . import types  # type: ignore
-{% endif %}
 {% if not async_mode and code_model.options.get("package-version") %}
 from {{ code_model.get_relative_import_path(serialize_namespace, module_name="_version") }} import VERSION