@typespec/http-client-python 0.14.0 → 0.14.1-dev.1

package/emitter/vitest.config.ts

@@ -1,4 +1,4 @@
 import { defineConfig, mergeConfig } from "vitest/config";
-import { defaultTypeSpecVitestConfig } from "../../../vitest.workspace.js";
+import { defaultTypeSpecVitestConfig } from "../../../vitest.config.js";
 
 export default mergeConfig(defaultTypeSpecVitestConfig, defineConfig({}));

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

@@ -322,13 +322,11 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
         )
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         for og in self.operation_groups:
-            suffix = f".{og.filename}" if (not self.code_model.options["multiapi"]) and og.is_mixin else ""
             file_import.add_submodule_import(
                 self.code_model.get_relative_import_path(
                     serialize_namespace,
                     self.code_model.get_imported_namespace_for_operation(og.client_namespace, async_mode),
-                )
-                + suffix,
+                ),
                 og.class_name,
                 ImportType.LOCAL,
             )

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

@@ -20,7 +20,7 @@ VERSION_MAP = {
     "msrest": "0.7.1",
     "isodate": "0.6.1",
     "azure-mgmt-core": "1.5.0",
-    "azure-core": "1.30.0",
+    "azure-core": "1.35.0",
     "typing-extensions": "4.6.0",
     "corehttp": "1.0.0b6",
 }

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

@@ -9,6 +9,12 @@ from jinja2 import Environment
 from ..models import CodeModel, OperationGroup
 
 
+def get_pylint_disable(code_model: CodeModel, og: OperationGroup) -> str:
+    if og.is_mixin and not code_model.options["multiapi"]:
+        return " # pylint: disable=unused-import"
+    return ""
+
+
 class OperationsInitSerializer:
     def __init__(
         self,
@@ -27,9 +33,8 @@ class OperationsInitSerializer:
             return "_operations" if self.code_model.options["combine-operation-files"] else operation_group.filename
 
         return [
-            f"from .{_get_filename(og)} import {og.class_name}  # type: ignore"
+            f"from .{_get_filename(og)} import {og.class_name} # type: ignore{get_pylint_disable(self.code_model, og)}"
             for og in self.operation_groups
-            if not og.is_mixin or self.code_model.options["multiapi"]
         ]
 
     def serialize(self) -> str:

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

@@ -69,7 +69,7 @@ class SampleSerializer(BaseSerializer):
     def _client_params(self) -> Dict[str, Any]:
         # client params
         special_param = {}
-        credential_type = getattr(self.code_model.clients[0].credential, "type", None)
+        credential_type = getattr(self.operation_group.client.credential, "type", None)
         if isinstance(credential_type, TokenCredentialType):
             special_param.update({"credential": "DefaultAzureCredential()"})
         elif isinstance(credential_type, KeyCredentialType):
@@ -78,7 +78,7 @@ class SampleSerializer(BaseSerializer):
         params = [
             p
             for p in (
-                self.code_model.clients[0].parameters.positional + self.code_model.clients[0].parameters.keyword_only
+                self.operation_group.client.parameters.positional + self.operation_group.client.parameters.keyword_only
             )
             if not p.optional and p.client_default_value is None
         ]
@@ -153,6 +153,7 @@ class SampleSerializer(BaseSerializer):
         operation_result, return_var = self._operation_result()
         return self.env.get_template("sample.py.jinja2").render(
             code_model=self.code_model,
+            client=self.operation_group.client,
             file_name=self.file_name,
             operation_result=operation_result,
             operation_params=self._operation_params(),

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

@@ -27,7 +27,7 @@
     {% endif %}
 """
 def main():
-    client = {{ code_model.clients[0].name }}(
+    client = {{ client.name }}(
         {% for key,value in client_params.items() %}
         {{ key }}={{ value }},
         {% endfor %}

package/generator/build/lib/pygen/preprocess/python_mappings.py

@@ -97,7 +97,7 @@ _always_reserved = [
     "int",
 ]
 
-RESERVED_MODEL_PROPERTIES = [
+RESERVED_TSP_MODEL_PROPERTIES = [
     "keys",
     "items",
     "values",
@@ -109,6 +109,8 @@ RESERVED_MODEL_PROPERTIES = [
     "get",
     "copy",
     "as_dict",
+    # following are reserved special words for TSP models
+    "datetime",
 ]
 
 RESERVED_WORDS = {
@@ -187,7 +189,7 @@ RESERVED_WORDS = {
 
 TSP_RESERVED_WORDS = {
     PadType.PARAMETER: ["stream"],
-    PadType.PROPERTY: RESERVED_MODEL_PROPERTIES,
+    PadType.PROPERTY: RESERVED_TSP_MODEL_PROPERTIES,
 }
 
 REDEFINED_BUILTINS = [  # we don't pad, but we need to do lint ignores

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

@@ -322,13 +322,11 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
         )
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         for og in self.operation_groups:
-            suffix = f".{og.filename}" if (not self.code_model.options["multiapi"]) and og.is_mixin else ""
             file_import.add_submodule_import(
                 self.code_model.get_relative_import_path(
                     serialize_namespace,
                     self.code_model.get_imported_namespace_for_operation(og.client_namespace, async_mode),
-                )
-                + suffix,
+                ),
                 og.class_name,
                 ImportType.LOCAL,
             )

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

@@ -20,7 +20,7 @@ VERSION_MAP = {
     "msrest": "0.7.1",
     "isodate": "0.6.1",
     "azure-mgmt-core": "1.5.0",
-    "azure-core": "1.30.0",
+    "azure-core": "1.35.0",
     "typing-extensions": "4.6.0",
     "corehttp": "1.0.0b6",
 }

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

@@ -9,6 +9,12 @@ from jinja2 import Environment
 from ..models import CodeModel, OperationGroup
 
 
+def get_pylint_disable(code_model: CodeModel, og: OperationGroup) -> str:
+    if og.is_mixin and not code_model.options["multiapi"]:
+        return " # pylint: disable=unused-import"
+    return ""
+
+
 class OperationsInitSerializer:
     def __init__(
         self,
@@ -27,9 +33,8 @@ class OperationsInitSerializer:
             return "_operations" if self.code_model.options["combine-operation-files"] else operation_group.filename
 
         return [
-            f"from .{_get_filename(og)} import {og.class_name}  # type: ignore"
+            f"from .{_get_filename(og)} import {og.class_name} # type: ignore{get_pylint_disable(self.code_model, og)}"
             for og in self.operation_groups
-            if not og.is_mixin or self.code_model.options["multiapi"]
         ]
 
     def serialize(self) -> str:

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

@@ -69,7 +69,7 @@ class SampleSerializer(BaseSerializer):
     def _client_params(self) -> Dict[str, Any]:
         # client params
         special_param = {}
-        credential_type = getattr(self.code_model.clients[0].credential, "type", None)
+        credential_type = getattr(self.operation_group.client.credential, "type", None)
         if isinstance(credential_type, TokenCredentialType):
             special_param.update({"credential": "DefaultAzureCredential()"})
         elif isinstance(credential_type, KeyCredentialType):
@@ -78,7 +78,7 @@ class SampleSerializer(BaseSerializer):
         params = [
             p
             for p in (
-                self.code_model.clients[0].parameters.positional + self.code_model.clients[0].parameters.keyword_only
+                self.operation_group.client.parameters.positional + self.operation_group.client.parameters.keyword_only
             )
             if not p.optional and p.client_default_value is None
         ]
@@ -153,6 +153,7 @@ class SampleSerializer(BaseSerializer):
         operation_result, return_var = self._operation_result()
         return self.env.get_template("sample.py.jinja2").render(
             code_model=self.code_model,
+            client=self.operation_group.client,
             file_name=self.file_name,
             operation_result=operation_result,
             operation_params=self._operation_params(),

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

@@ -27,7 +27,7 @@
     {% endif %}
 """
 def main():
-    client = {{ code_model.clients[0].name }}(
+    client = {{ client.name }}(
         {% for key,value in client_params.items() %}
         {{ key }}={{ value }},
         {% endfor %}

package/generator/pygen/preprocess/python_mappings.py

@@ -97,7 +97,7 @@ _always_reserved = [
     "int",
 ]
 
-RESERVED_MODEL_PROPERTIES = [
+RESERVED_TSP_MODEL_PROPERTIES = [
     "keys",
     "items",
     "values",
@@ -109,6 +109,8 @@ RESERVED_MODEL_PROPERTIES = [
     "get",
     "copy",
     "as_dict",
+    # following are reserved special words for TSP models
+    "datetime",
 ]
 
 RESERVED_WORDS = {
@@ -187,7 +189,7 @@ RESERVED_WORDS = {
 
 TSP_RESERVED_WORDS = {
     PadType.PARAMETER: ["stream"],
-    PadType.PROPERTY: RESERVED_MODEL_PROPERTIES,
+    PadType.PROPERTY: RESERVED_TSP_MODEL_PROPERTIES,
 }
 
 REDEFINED_BUILTINS = [  # we don't pad, but we need to do lint ignores

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

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import inspect
 import pytest
 from specs.azure.clientgenerator.core.override.aio import OverrideClient
 
@@ -21,3 +22,22 @@ async def test_reorder_parameters(client: OverrideClient):
 @pytest.mark.asyncio
 async def test_group_parameters(client: OverrideClient):
     await client.group_parameters.group(param1="param1", param2="param2")
+
+
+def test_reorder_parameters_unit_async(client: OverrideClient):
+    # make sure signature name of `reorder_parameters` are ["param1", "param2"]
+    # Get the reorder method from the reorder_parameters operation
+    reorder_method = client.reorder_parameters.reorder
+
+    # Inspect the method signature
+    sig = inspect.signature(reorder_method)
+
+    # Get parameter names excluding 'self' and '**kwargs'
+    param_names = [
+        param_name
+        for param_name, param in sig.parameters.items()
+        if param_name not in ("self", "kwargs") and param.kind != param.VAR_KEYWORD
+    ]
+
+    # Assert that the parameter names are exactly ["param1", "param2"]
+    assert param_names == ["param1", "param2"], f"Expected parameter names ['param1', 'param2'], but got {param_names}"

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

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import inspect
 import pytest
 from specs.azure.clientgenerator.core.override import OverrideClient
 
@@ -19,3 +20,22 @@ def test_reorder_parameters(client: OverrideClient):
 
 def test_group_parameters(client: OverrideClient):
     client.group_parameters.group(param1="param1", param2="param2")
+
+
+# make sure signature name of `reorder_parameters` are ["param1", "param2"]
+def test_reorder_parameters_unit(client: OverrideClient):
+    # Get the reorder method from the reorder_parameters operation
+    reorder_method = client.reorder_parameters.reorder
+
+    # Inspect the method signature
+    sig = inspect.signature(reorder_method)
+
+    # Get parameter names excluding 'self' and '**kwargs'
+    param_names = [
+        param_name
+        for param_name, param in sig.parameters.items()
+        if param_name not in ("self", "kwargs") and param.kind != param.VAR_KEYWORD
+    ]
+
+    # Assert that the parameter names are exactly ["param1", "param2"]
+    assert param_names == ["param1", "param2"], f"Expected parameter names ['param1', 'param2'], but got {param_names}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.14.0",
+  "version": "0.14.1-dev.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",