@typespec/http-client-python 0.12.0-dev.1 → 0.12.0-dev.3

package/eng/scripts/ci/regenerate.ts

@@ -46,6 +46,9 @@ const AZURE_EMITTER_OPTIONS: Record<string, Record<string, string> | Record<stri
   "azure/client-generator-core/client-initialization": {
     namespace: "specs.azure.clientgenerator.core.clientinitialization",
   },
+  "azure/client-generator-core/deserialize-empty-string-as-null": {
+    namespace: "specs.azure.clientgenerator.core.emptystring",
+  },
   "azure/client-generator-core/flatten-property": {
     namespace: "specs.azure.clientgenerator.core.flattenproperty",
   },
@@ -260,6 +263,7 @@ async function executeCommand(tspCommand: TspCommand): Promise<void> {
   }
   const execFileAsync = promisify(execFile);
   try {
+    console.log(chalk.green(`start tsp ${tspCommand.command.join(" ")}`));
     await execFileAsync("tsp", tspCommand.command, { shell: true });
     console.log(chalk.green(`tsp ${tspCommand.command.join(" ")} succeeded`));
   } catch (err) {
@@ -401,16 +405,20 @@ function _getCmdList(spec: string, flags: RegenerateFlags): TspCommand[] {
 }
 
 async function runTaskPool(tasks: Array<() => Promise<void>>, poolLimit: number): Promise<void> {
-  let currentIndex = 0;
-
-  async function worker() {
-    while (currentIndex < tasks.length) {
-      const index = currentIndex++;
-      await tasks[index]();
+  async function worker(start: number, end: number) {
+    while (start < end) {
+      await tasks[start]();
+      start++;
     }
   }
 
-  const workers = new Array(Math.min(poolLimit, tasks.length)).fill(null).map(() => worker());
+  const workers = [];
+  let start = 0;
+  while (start < tasks.length) {
+    const end = Math.min(start + poolLimit, tasks.length);
+    workers.push((async () => await worker(start, end))());
+    start = end;
+  }
   await Promise.all(workers);
 }
 

package/eng/scripts/ci/run_pyright.py

@@ -31,6 +31,10 @@ def _single_dir_pyright(mod):
     retries = 3
     while retries:
         try:
+            # After fully support client hierarchy, we can remove this check
+            if "azure-client-generator-core-client-initialization" in str(inner_class.absolute()):
+                return True
+
             check_output(
                 [
                     sys.executable,

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

@@ -64,7 +64,9 @@ class OperationGroup(BaseModel):
         )
 
     def base_class(self, async_mode: bool) -> str:
-        pipeline_client = f"{'Async' if async_mode else ''}PipelineClient"
+        pipeline_client = (
+            f"{'Async' if async_mode else ''}PipelineClient[HttpRequest, {'Async' if async_mode else ''}HttpResponse]"
+        )
         base_classes: List[str] = []
         if self.is_mixin:
             base_classes.append(f"ClientMixinABC[{pipeline_client}, {self.client.name}Configuration]")
@@ -166,6 +168,16 @@ class OperationGroup(BaseModel):
                 "ClientMixinABC",
                 ImportType.LOCAL,
             )
+            file_import.add_submodule_import(
+                "rest",
+                "HttpRequest",
+                ImportType.SDKCORE,
+            )
+            file_import.add_submodule_import(
+                "rest",
+                f"{'Async' if async_mode else ''}HttpResponse",
+                ImportType.SDKCORE,
+            )
         else:
             file_import.add_msrest_import(
                 serialize_namespace=kwargs.get("serialize_namespace", self.code_model.namespace),

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

@@ -16,6 +16,7 @@ from .imports import ImportType, FileImport, TypingSection
 from .parameter_list import ParameterList
 from .model_type import ModelType
 from .list_type import ListType
+from .parameter import Parameter
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
@@ -59,6 +60,9 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
         self.pager_sync: str = yaml_data.get("pagerSync") or f"{self.code_model.core_library}.paging.ItemPaged"
         self.pager_async: str = yaml_data.get("pagerAsync") or f"{self.code_model.core_library}.paging.AsyncItemPaged"
         self.continuation_token: Dict[str, Any] = yaml_data.get("continuationToken", {})
+        self.next_link_reinjected_parameters: List[Parameter] = [
+            Parameter.from_yaml(p, code_model) for p in yaml_data.get("nextLinkReInjectedParameters", [])
+        ]
 
     @property
     def has_continuation_token(self) -> bool:
@@ -118,9 +122,17 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
     def _imports_shared(self, async_mode: bool, **kwargs: Any) -> FileImport:
         file_import = super()._imports_shared(async_mode, **kwargs)
         if async_mode:
-            file_import.add_submodule_import("typing", "AsyncIterable", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            default_paging_submodule = f"{'async_' if self.code_model.is_azure_flavor else ''}paging"
+            file_import.add_submodule_import(
+                f"{self.code_model.core_library}.{default_paging_submodule}",
+                "AsyncItemPaged",
+                ImportType.SDKCORE,
+                TypingSection.CONDITIONAL,
+            )
         else:
-            file_import.add_submodule_import("typing", "Iterable", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            file_import.add_submodule_import(
+                f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.CONDITIONAL
+            )
         if (
             self.next_request_builder
             and self.code_model.options["builders_visibility"] == "embedded"

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

@@ -186,7 +186,7 @@ class PagingResponse(Response):
         return self.get_pager_path(async_mode).split(".")[-1]
 
     def type_annotation(self, **kwargs: Any) -> str:
-        iterable = "AsyncIterable" if kwargs["async_mode"] else "Iterable"
+        iterable = "AsyncItemPaged" if kwargs["async_mode"] else "ItemPaged"
         return f"{iterable}[{self.item_type.type_annotation(**kwargs)}]"
 
     def docstring_text(self, **kwargs: Any) -> str:

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

@@ -1276,6 +1276,17 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 else api_version_param.full_client_name
             )
             retval.append(f'_next_request_params["api-version"] = {api_version}')
+            if builder.next_link_reinjected_parameters:
+                for param in builder.next_link_reinjected_parameters:
+                    if param.location == ParameterLocation.QUERY:
+                        retval.extend(
+                            self.parameter_serializer.serialize_query_header(
+                                param,
+                                "next_request_params",
+                                self.serializer_name,
+                                self.code_model.is_legacy,
+                            )
+                        )
             query_str = ", params=_next_request_params"
             next_link_str = "urllib.parse.urljoin(next_link, _parsed_next_link.path)"
         except StopIteration:

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

@@ -29,7 +29,7 @@ class {{ operation_group.class_name }}: {{ operation_group.pylint_disable() }}
     models = _models
 
 {% endif %}
-    def __init__(self, *args, **kwargs){{ return_none_type_annotation }}:
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         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")
@@ -48,7 +48,7 @@ class {{ operation_group.class_name }}: {{ operation_group.pylint_disable() }}
 {{ check_abstract_methods() }}
 {% elif operation_group.has_abstract_operations %}
 
-    def __init__(self){{ return_none_type_annotation }}:
+    def __init__(self) -> None:
 {{ check_abstract_methods() }}
 {% endif %}
 {% if operation_group.is_mixin and code_model.options["multiapi"] %}

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

@@ -1,6 +1,5 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 {% set operations_description = "async operations" if async_mode else "operations" %}
-{% set return_none_type_annotation = " -> None" if async_mode else "" %}
 # coding=utf-8
 {% if code_model.license_header %}
 {{ code_model.license_header }}

package/generator/component-detection-pip-report.json

@@ -1,14 +1,14 @@
 {
   "version": "1",
-  "pip_version": "25.0.1",
+  "pip_version": "25.1.1",
   "install": [
     {
       "download_info": {
-        "url": "https://files.pythonhosted.org/packages/cc/ea/d53f2f8897c46a36df085964d07761ea4c2d1f2cf92019693b6742b7aabb/setuptools-79.0.0-py3-none-any.whl",
+        "url": "https://files.pythonhosted.org/packages/a1/18/0e835c3a557dc5faffc8f91092f62fc337c1dab1066715842e7a4b318ec4/setuptools-80.7.1-py3-none-any.whl",
         "archive_info": {
-          "hash": "sha256=b9ab3a104bedb292323f53797b00864e10e434a3ab3906813a7169e4745b912a",
+          "hash": "sha256=ca5cc1069b85dc23070a6628e6bcecb3292acac802399c7f8edc0100619f9009",
           "hashes": {
-            "sha256": "b9ab3a104bedb292323f53797b00864e10e434a3ab3906813a7169e4745b912a"
+            "sha256": "ca5cc1069b85dc23070a6628e6bcecb3292acac802399c7f8edc0100619f9009"
           }
         }
       },
@@ -18,7 +18,7 @@
       "metadata": {
         "metadata_version": "2.4",
         "name": "setuptools",
-        "version": "79.0.0",
+        "version": "80.7.1",
         "dynamic": [
           "license-file"
         ],
@@ -33,6 +33,7 @@
           "management"
         ],
         "author_email": "Python Packaging Authority <distutils-sig@python.org>",
+        "license_expression": "MIT",
         "license_file": [
           "LICENSE"
         ],
@@ -125,9 +126,9 @@
     "implementation_version": "3.9.21",
     "os_name": "posix",
     "platform_machine": "x86_64",
-    "platform_release": "5.15.0-1086-azure",
+    "platform_release": "5.15.0-1088-azure",
     "platform_system": "Linux",
-    "platform_version": "#95~20.04.1-Ubuntu SMP Thu Mar 27 18:45:17 UTC 2025",
+    "platform_version": "#97~20.04.1-Ubuntu SMP Wed Apr 23 13:25:03 UTC 2025",
     "python_full_version": "3.9.21",
     "platform_python_implementation": "CPython",
     "python_version": "3.9",

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

@@ -64,7 +64,9 @@ class OperationGroup(BaseModel):
         )
 
     def base_class(self, async_mode: bool) -> str:
-        pipeline_client = f"{'Async' if async_mode else ''}PipelineClient"
+        pipeline_client = (
+            f"{'Async' if async_mode else ''}PipelineClient[HttpRequest, {'Async' if async_mode else ''}HttpResponse]"
+        )
         base_classes: List[str] = []
         if self.is_mixin:
             base_classes.append(f"ClientMixinABC[{pipeline_client}, {self.client.name}Configuration]")
@@ -166,6 +168,16 @@ class OperationGroup(BaseModel):
                 "ClientMixinABC",
                 ImportType.LOCAL,
             )
+            file_import.add_submodule_import(
+                "rest",
+                "HttpRequest",
+                ImportType.SDKCORE,
+            )
+            file_import.add_submodule_import(
+                "rest",
+                f"{'Async' if async_mode else ''}HttpResponse",
+                ImportType.SDKCORE,
+            )
         else:
             file_import.add_msrest_import(
                 serialize_namespace=kwargs.get("serialize_namespace", self.code_model.namespace),

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

@@ -16,6 +16,7 @@ from .imports import ImportType, FileImport, TypingSection
 from .parameter_list import ParameterList
 from .model_type import ModelType
 from .list_type import ListType
+from .parameter import Parameter
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
@@ -59,6 +60,9 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
         self.pager_sync: str = yaml_data.get("pagerSync") or f"{self.code_model.core_library}.paging.ItemPaged"
         self.pager_async: str = yaml_data.get("pagerAsync") or f"{self.code_model.core_library}.paging.AsyncItemPaged"
         self.continuation_token: Dict[str, Any] = yaml_data.get("continuationToken", {})
+        self.next_link_reinjected_parameters: List[Parameter] = [
+            Parameter.from_yaml(p, code_model) for p in yaml_data.get("nextLinkReInjectedParameters", [])
+        ]
 
     @property
     def has_continuation_token(self) -> bool:
@@ -118,9 +122,17 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
     def _imports_shared(self, async_mode: bool, **kwargs: Any) -> FileImport:
         file_import = super()._imports_shared(async_mode, **kwargs)
         if async_mode:
-            file_import.add_submodule_import("typing", "AsyncIterable", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            default_paging_submodule = f"{'async_' if self.code_model.is_azure_flavor else ''}paging"
+            file_import.add_submodule_import(
+                f"{self.code_model.core_library}.{default_paging_submodule}",
+                "AsyncItemPaged",
+                ImportType.SDKCORE,
+                TypingSection.CONDITIONAL,
+            )
         else:
-            file_import.add_submodule_import("typing", "Iterable", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            file_import.add_submodule_import(
+                f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.CONDITIONAL
+            )
         if (
             self.next_request_builder
             and self.code_model.options["builders_visibility"] == "embedded"

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

@@ -186,7 +186,7 @@ class PagingResponse(Response):
         return self.get_pager_path(async_mode).split(".")[-1]
 
     def type_annotation(self, **kwargs: Any) -> str:
-        iterable = "AsyncIterable" if kwargs["async_mode"] else "Iterable"
+        iterable = "AsyncItemPaged" if kwargs["async_mode"] else "ItemPaged"
         return f"{iterable}[{self.item_type.type_annotation(**kwargs)}]"
 
     def docstring_text(self, **kwargs: Any) -> str:

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

@@ -1276,6 +1276,17 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 else api_version_param.full_client_name
             )
             retval.append(f'_next_request_params["api-version"] = {api_version}')
+            if builder.next_link_reinjected_parameters:
+                for param in builder.next_link_reinjected_parameters:
+                    if param.location == ParameterLocation.QUERY:
+                        retval.extend(
+                            self.parameter_serializer.serialize_query_header(
+                                param,
+                                "next_request_params",
+                                self.serializer_name,
+                                self.code_model.is_legacy,
+                            )
+                        )
             query_str = ", params=_next_request_params"
             next_link_str = "urllib.parse.urljoin(next_link, _parsed_next_link.path)"
         except StopIteration:

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

@@ -29,7 +29,7 @@ class {{ operation_group.class_name }}: {{ operation_group.pylint_disable() }}
     models = _models
 
 {% endif %}
-    def __init__(self, *args, **kwargs){{ return_none_type_annotation }}:
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         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")
@@ -48,7 +48,7 @@ class {{ operation_group.class_name }}: {{ operation_group.pylint_disable() }}
 {{ check_abstract_methods() }}
 {% elif operation_group.has_abstract_operations %}
 
-    def __init__(self){{ return_none_type_annotation }}:
+    def __init__(self) -> None:
 {{ check_abstract_methods() }}
 {% endif %}
 {% if operation_group.is_mixin and code_model.options["multiapi"] %}

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

@@ -1,6 +1,5 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 {% set operations_description = "async operations" if async_mode else "operations" %}
-{% set return_none_type_annotation = " -> None" if async_mode else "" %}
 # coding=utf-8
 {% if code_model.license_header %}
 {{ code_model.license_header }}

package/generator/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py

@@ -56,3 +56,13 @@ async def test_two_models_as_page_item(client: aio.PageClient):
     result = [item async for item in client.two_models_as_page_item.list_second_item()]
     assert len(result) == 1
     assert result[0].name == "Madge"
+
+
+@pytest.mark.asyncio
+async def test_list_with_parameterized_next_link(client: aio.PageClient):
+    result = [item async for item in client.with_parameterized_next_link(select="name", include_pending=True)]
+    assert len(result) == 2
+    assert result[0].id == 1
+    assert result[0].name == "User1"
+    assert result[1].id == 2
+    assert result[1].name == "User2"

package/generator/test/azure/mock_api_tests/test_azure_core_page.py

@@ -49,3 +49,12 @@ def test_two_models_as_page_item(client: PageClient):
     result = list(client.two_models_as_page_item.list_second_item())
     assert len(result) == 1
     assert result[0].name == "Madge"
+
+
+def test_list_with_parameterized_next_link(client: PageClient):
+    result = list(client.with_parameterized_next_link(select="name", include_pending=True))
+    assert len(result) == 2
+    assert result[0].id == 1
+    assert result[0].name == "User1"
+    assert result[1].id == 2
+    assert result[1].name == "User2"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.12.0-dev.1",
+  "version": "0.12.0-dev.3",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -54,20 +54,20 @@
     "emitter"
   ],
   "peerDependencies": {
-    "@azure-tools/typespec-autorest": ">=0.54.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.54.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.54.0 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.54.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.54.2 <1.0.0",
-    "@typespec/compiler": "^1.0.0-0",
-    "@typespec/http": "^1.0.0-0",
-    "@typespec/openapi": "^1.0.0-0",
-    "@typespec/rest": ">=0.68.0 <1.0.0",
-    "@typespec/versioning": ">=0.68.0 <1.0.0",
-    "@typespec/events": ">=0.68.0 <1.0.0",
-    "@typespec/sse": ">=0.68.0 <1.0.0",
-    "@typespec/streams": ">=0.68.0 <1.0.0",
-    "@typespec/xml": ">=0.68.0 <1.0.0"
+    "@azure-tools/typespec-autorest": ">=0.56.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.56.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.56.0 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.56.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.56.1 <1.0.0",
+    "@typespec/compiler": "^1.0.0",
+    "@typespec/http": "^1.0.0",
+    "@typespec/openapi": "^1.0.0",
+    "@typespec/rest": ">=0.70.0 <1.0.0",
+    "@typespec/versioning": ">=0.70.0 <1.0.0",
+    "@typespec/events": ">=0.70.0 <1.0.0",
+    "@typespec/sse": ">=0.70.0 <1.0.0",
+    "@typespec/streams": ">=0.70.0 <1.0.0",
+    "@typespec/xml": ">=0.70.0 <1.0.0"
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
@@ -77,22 +77,24 @@
     "tsx": "~4.19.1"
   },
   "devDependencies": {
-    "@azure-tools/typespec-autorest": "~0.54.0",
-    "@azure-tools/typespec-azure-core": "~0.54.0",
-    "@azure-tools/typespec-azure-resource-manager": "~0.54.0",
-    "@azure-tools/typespec-azure-rulesets": "~0.54.0",
-    "@azure-tools/typespec-client-generator-core": "~0.54.2",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.14",
-    "@typespec/compiler": "^1.0.0-0",
-    "@typespec/http": "^1.0.0-0",
-    "@typespec/openapi": "^1.0.0-0",
-    "@typespec/rest": "~0.68.0",
-    "@typespec/versioning": "~0.68.0",
-    "@typespec/events": "~0.68.0",
-    "@typespec/sse": "~0.68.0",
-    "@typespec/streams": "~0.68.0",
-    "@typespec/xml": "~0.68.0",
-    "@typespec/http-specs": "0.1.0-alpha.19",
+    "@azure-tools/typespec-autorest": "~0.56.0",
+    "@azure-tools/typespec-azure-core": "~0.56.0",
+    "@azure-tools/typespec-azure-resource-manager": "~0.56.0",
+    "@azure-tools/typespec-azure-rulesets": "~0.56.0",
+    "@azure-tools/typespec-client-generator-core": "~0.56.1",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.17",
+    "@typespec/compiler": "^1.0.0",
+    "@typespec/http": "^1.0.0",
+    "@typespec/openapi": "^1.0.0",
+    "@typespec/rest": "~0.70.0",
+    "@typespec/versioning": "~0.70.0",
+    "@typespec/events": "~0.70.0",
+    "@typespec/spector": "0.1.0-alpha.13",
+    "@typespec/spec-api": "0.1.0-alpha.6",
+    "@typespec/sse": "~0.70.0",
+    "@typespec/streams": "~0.70.0",
+    "@typespec/xml": "~0.70.0",
+    "@typespec/http-specs": "0.1.0-alpha.22",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~22.13.14",
     "@types/semver": "7.5.8",