@typespec/http-client-python 0.17.0 → 0.18.1

package/eng/scripts/setup/install.py

@@ -51,8 +51,7 @@ def main():
         venv_context = create_venv_with_package_manager(venv_path)
 
         # Install required packages - install_packages handles package manager logic
-        install_packages(["-U", "black"], venv_context)
-        install_packages([f"{_ROOT_DIR}/generator"], venv_context)
+        install_packages([f"{_ROOT_DIR}/generator"], venv_context, cwd=_ROOT_DIR)
     except Exception as e:
         # Since Python and package manager are available, any failure here should fail the npm install
         print(f"Error: Installation failed despite Python and package manager being available: {e}")

package/eng/scripts/setup/package_manager.py

@@ -85,7 +85,7 @@ def get_install_command(package_manager: str, venv_context=None) -> list:
         raise ValueError(f"Unknown package manager: {package_manager}")
 
 
-def install_packages(packages: list, venv_context=None, package_manager: str = None) -> None:
+def install_packages(packages: list, venv_context=None, package_manager: str = None, cwd: Path = None) -> None:
     """Install packages using the available package manager.
 
     Args:
@@ -99,7 +99,10 @@ def install_packages(packages: list, venv_context=None, package_manager: str = N
     install_cmd = get_install_command(package_manager, venv_context)
 
     try:
-        subprocess.check_call(install_cmd + packages)
+        if cwd:
+            subprocess.check_call(install_cmd + packages, cwd=cwd)
+        else:
+            subprocess.check_call(install_cmd + packages)
     except subprocess.CalledProcessError as e:
         raise RuntimeError(f"Failed to install packages with {package_manager}: {e}")
 

package/eng/scripts/setup/prepare.py

@@ -27,7 +27,7 @@ def main():
     venv_context = create_venv_with_package_manager(venv_path)
 
     try:
-        install_packages(["-r", f"{_ROOT_DIR}/generator/dev_requirements.txt"], venv_context)
+        install_packages(["-r", f"{_ROOT_DIR}/generator/dev_requirements.txt"], venv_context, cwd=_ROOT_DIR)
     except FileNotFoundError as e:
         raise ValueError(e.filename)
 

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

@@ -96,6 +96,10 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             return self._get_attr_name(wire_name)
         return wire_name
 
+    @property
+    def next_link_is_nested(self) -> bool:
+        return self.yaml_data.get("nextLinkIsNested", False)
+
     @property
     def item_name(self) -> str:
         wire_name = self.yaml_data["itemName"]

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

@@ -63,7 +63,7 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         self.wire_name: str = yaml_data.get("wireName", "")
         self.client_name: str = self.yaml_data["clientName"]
         self.optional: bool = self.yaml_data["optional"]
-        self.implementation: str = yaml_data.get("implementation", None)
+        self.implementation: Optional[str] = yaml_data.get("implementation", None)
         self.location: ParameterLocation = self.yaml_data["location"]
         self.client_default_value = self.yaml_data.get("clientDefaultValue", None)
         self.in_docstring = self.yaml_data.get("inDocstring", True)

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

@@ -1383,6 +1383,13 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 cont_token_property = "None"
             elif self.code_model.options["models-mode"] == "msrest":
                 cont_token_property = f"deserialized.{next_link_name} or None"
+            elif builder.next_link_is_nested:
+                next_link_name_array = next_link_name.split(".")
+                access = (
+                    "".join([f'.get("{i}", {{}})' for i in next_link_name_array[:-1]])
+                    + f'.get("{next_link_name_array[-1]}")'
+                )
+                cont_token_property = f"deserialized{access} or None"
             else:
                 cont_token_property = f'deserialized.get("{next_link_name}") or None'
         list_type = "AsyncList" if self.async_mode else "iter"

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

@@ -783,7 +783,7 @@ class Serializer:  # pylint: disable=too-many-public-methods
 
             # If dependencies is empty, try with current data class
             # It has to be a subclass of Enum anyway
-            enum_type = self.dependencies.get(data_type, data.__class__)
+            enum_type = self.dependencies.get(data_type, cast(type, data.__class__))
             if issubclass(enum_type, Enum):
                 return Serializer.serialize_enum(data, enum_obj=enum_type)
 

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

@@ -213,7 +213,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
             and not any(t for t in ["flattened", "groupedBy"] if body_parameter.get(t))
         ):
             origin_type = body_parameter["type"]["type"]
-            is_dpg_model = body_parameter["type"].get("base") == "dpg"
+            model_type = (
+                body_parameter["type"] if origin_type == "model" else body_parameter["type"].get("elementType", {})
+            )
+            is_dpg_model = model_type.get("base") == "dpg"
             body_parameter["type"] = {
                 "type": "combined",
                 "types": [body_parameter["type"]],
@@ -222,8 +225,15 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if not (self.is_tsp and has_multi_part_content_type(body_parameter)):
                 body_parameter["type"]["types"].append(KNOWN_TYPES["binary"])
 
-            if origin_type == "model" and is_dpg_model and self.options["models-mode"] == "dpg":
-                body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+            if self.options["models-mode"] == "dpg" and is_dpg_model:
+                if origin_type == "model":
+                    body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+                else:
+                    # dict or list
+                    # copy the original dict / list type
+                    any_obj_list_or_dict = copy.deepcopy(body_parameter["type"]["types"][0])
+                    any_obj_list_or_dict["elementType"] = KNOWN_TYPES["any-object"]
+                    body_parameter["type"]["types"].insert(1, any_obj_list_or_dict)
             code_model["types"].append(body_parameter["type"])
 
     def pad_reserved_words(self, name: str, pad_type: PadType):

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

@@ -96,6 +96,10 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             return self._get_attr_name(wire_name)
         return wire_name
 
+    @property
+    def next_link_is_nested(self) -> bool:
+        return self.yaml_data.get("nextLinkIsNested", False)
+
     @property
     def item_name(self) -> str:
         wire_name = self.yaml_data["itemName"]

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

@@ -63,7 +63,7 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         self.wire_name: str = yaml_data.get("wireName", "")
         self.client_name: str = self.yaml_data["clientName"]
         self.optional: bool = self.yaml_data["optional"]
-        self.implementation: str = yaml_data.get("implementation", None)
+        self.implementation: Optional[str] = yaml_data.get("implementation", None)
         self.location: ParameterLocation = self.yaml_data["location"]
         self.client_default_value = self.yaml_data.get("clientDefaultValue", None)
         self.in_docstring = self.yaml_data.get("inDocstring", True)

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

@@ -1383,6 +1383,13 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 cont_token_property = "None"
             elif self.code_model.options["models-mode"] == "msrest":
                 cont_token_property = f"deserialized.{next_link_name} or None"
+            elif builder.next_link_is_nested:
+                next_link_name_array = next_link_name.split(".")
+                access = (
+                    "".join([f'.get("{i}", {{}})' for i in next_link_name_array[:-1]])
+                    + f'.get("{next_link_name_array[-1]}")'
+                )
+                cont_token_property = f"deserialized{access} or None"
             else:
                 cont_token_property = f'deserialized.get("{next_link_name}") or None'
         list_type = "AsyncList" if self.async_mode else "iter"

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

@@ -783,7 +783,7 @@ class Serializer:  # pylint: disable=too-many-public-methods
 
             # If dependencies is empty, try with current data class
             # It has to be a subclass of Enum anyway
-            enum_type = self.dependencies.get(data_type, data.__class__)
+            enum_type = self.dependencies.get(data_type, cast(type, data.__class__))
             if issubclass(enum_type, Enum):
                 return Serializer.serialize_enum(data, enum_obj=enum_type)
 

package/generator/pygen/preprocess/__init__.py

@@ -213,7 +213,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
             and not any(t for t in ["flattened", "groupedBy"] if body_parameter.get(t))
         ):
             origin_type = body_parameter["type"]["type"]
-            is_dpg_model = body_parameter["type"].get("base") == "dpg"
+            model_type = (
+                body_parameter["type"] if origin_type == "model" else body_parameter["type"].get("elementType", {})
+            )
+            is_dpg_model = model_type.get("base") == "dpg"
             body_parameter["type"] = {
                 "type": "combined",
                 "types": [body_parameter["type"]],
@@ -222,8 +225,15 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if not (self.is_tsp and has_multi_part_content_type(body_parameter)):
                 body_parameter["type"]["types"].append(KNOWN_TYPES["binary"])
 
-            if origin_type == "model" and is_dpg_model and self.options["models-mode"] == "dpg":
-                body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+            if self.options["models-mode"] == "dpg" and is_dpg_model:
+                if origin_type == "model":
+                    body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+                else:
+                    # dict or list
+                    # copy the original dict / list type
+                    any_obj_list_or_dict = copy.deepcopy(body_parameter["type"]["types"][0])
+                    any_obj_list_or_dict["elementType"] = KNOWN_TYPES["any-object"]
+                    body_parameter["type"]["types"].insert(1, any_obj_list_or_dict)
             code_model["types"].append(body_parameter["type"])
 
     def pad_reserved_words(self, name: str, pad_type: PadType):

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

@@ -0,0 +1,248 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from azure.resourcemanager.methodsubscriptionid.aio import MethodSubscriptionIdClient
+from azure.resourcemanager.methodsubscriptionid import models
+
+SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
+RESOURCE_GROUP_NAME = "test-rg"
+
+
+@pytest.fixture
+async def client(credential, authentication_policy):
+    async with MethodSubscriptionIdClient(
+        credential,
+        SUBSCRIPTION_ID,
+        "http://localhost:3000",
+        authentication_policy=authentication_policy,
+    ) as client:
+        yield client
+
+
+@pytest.mark.asyncio
+async def test_operations_list(client):
+    """Test Operations.list() endpoint."""
+    operations = client.operations.list()
+    operations_list = [op async for op in operations]
+    assert len(operations_list) > 0
+
+    operation = operations_list[0]
+    assert operation.name == "Azure.ResourceManager.MethodSubscriptionId/services/read"
+    assert operation.is_data_action is False
+    assert operation.display.provider == "Azure.ResourceManager.MethodSubscriptionId"
+    assert operation.display.resource == "services"
+    assert operation.display.operation == "Lists services"
+    assert operation.display.description == "Lists registered services"
+
+
+@pytest.mark.asyncio
+async def test_two_subscription_resources_method_level_subscription_resource1_operations_get(client):
+    """Test get operation for SubscriptionResource1 with method-level subscription ID."""
+    result = await client.two_subscription_resources_method_level.subscription_resource1_operations.get(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource1_name="sub-resource-1",
+    )
+
+    assert (
+        result.id
+        == f"/subscriptions/{SUBSCRIPTION_ID}/providers/Azure.ResourceManager.MethodSubscriptionId/subscriptionResource1s/sub-resource-1"
+    )
+    assert result.name == "sub-resource-1"
+    assert result.type == "Azure.ResourceManager.MethodSubscriptionId/subscriptionResource1s"
+    assert result.properties.description == "Valid subscription resource 1"
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.system_data.created_by == "AzureSDK"
+
+
+@pytest.mark.asyncio
+async def test_two_subscription_resources_method_level_subscription_resource1_operations_put(client):
+    """Test put operation for SubscriptionResource1 with method-level subscription ID."""
+    resource = models.SubscriptionResource1(
+        properties=models.SubscriptionResource1Properties(description="Valid subscription resource 1")
+    )
+
+    result = await client.two_subscription_resources_method_level.subscription_resource1_operations.put(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource1_name="sub-resource-1",
+        resource=resource,
+    )
+
+    assert (
+        result.id
+        == f"/subscriptions/{SUBSCRIPTION_ID}/providers/Azure.ResourceManager.MethodSubscriptionId/subscriptionResource1s/sub-resource-1"
+    )
+    assert result.name == "sub-resource-1"
+    assert result.type == "Azure.ResourceManager.MethodSubscriptionId/subscriptionResource1s"
+    assert result.properties.description == "Valid subscription resource 1"
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.system_data.created_by == "AzureSDK"
+
+
+@pytest.mark.asyncio
+async def test_two_subscription_resources_method_level_subscription_resource1_operations_delete(client):
+    """Test delete operation for SubscriptionResource1 with method-level subscription ID."""
+    await client.two_subscription_resources_method_level.subscription_resource1_operations.delete(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource1_name="sub-resource-1",
+    )
+
+
+@pytest.mark.asyncio
+async def test_two_subscription_resources_method_level_subscription_resource2_operations_get(client):
+    """Test get operation for SubscriptionResource2 with method-level subscription ID."""
+    result = await client.two_subscription_resources_method_level.subscription_resource2_operations.get(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource2_name="sub-resource-2",
+    )
+
+    assert (
+        result.id
+        == f"/subscriptions/{SUBSCRIPTION_ID}/providers/Azure.ResourceManager.MethodSubscriptionId/subscriptionResource2s/sub-resource-2"
+    )
+    assert result.name == "sub-resource-2"
+    assert result.type == "Azure.ResourceManager.MethodSubscriptionId/subscriptionResource2s"
+    assert result.properties.config_value == "test-config"
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.system_data.created_by == "AzureSDK"
+
+
+@pytest.mark.asyncio
+async def test_two_subscription_resources_method_level_subscription_resource2_operations_put(client):
+    """Test put operation for SubscriptionResource2 with method-level subscription ID."""
+    resource = models.SubscriptionResource2(
+        properties=models.SubscriptionResource2Properties(config_value="test-config")
+    )
+
+    result = await client.two_subscription_resources_method_level.subscription_resource2_operations.put(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource2_name="sub-resource-2",
+        resource=resource,
+    )
+
+    assert (
+        result.id
+        == f"/subscriptions/{SUBSCRIPTION_ID}/providers/Azure.ResourceManager.MethodSubscriptionId/subscriptionResource2s/sub-resource-2"
+    )
+    assert result.name == "sub-resource-2"
+    assert result.type == "Azure.ResourceManager.MethodSubscriptionId/subscriptionResource2s"
+    assert result.properties.config_value == "test-config"
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.system_data.created_by == "AzureSDK"
+
+
+@pytest.mark.asyncio
+async def test_two_subscription_resources_method_level_subscription_resource2_operations_delete(client):
+    """Test delete operation for SubscriptionResource2 with method-level subscription ID."""
+    await client.two_subscription_resources_method_level.subscription_resource2_operations.delete(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource2_name="sub-resource-2",
+    )
+
+
+@pytest.mark.asyncio
+async def test_mixed_subscription_placement_subscription_resource_operations_get(client):
+    """Test get operation for SubscriptionResource in mixed placement scenario."""
+    result = await client.mixed_subscription_placement.subscription_resource_operations.get(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource_name="sub-resource",
+    )
+
+    assert (
+        result.id
+        == f"/subscriptions/{SUBSCRIPTION_ID}/providers/Azure.ResourceManager.MethodSubscriptionId/subscriptionResources/sub-resource"
+    )
+    assert result.name == "sub-resource"
+    assert result.type == "Azure.ResourceManager.MethodSubscriptionId/subscriptionResources"
+    assert result.properties.subscription_setting == "test-sub-setting"
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.system_data.created_by == "AzureSDK"
+
+
+@pytest.mark.asyncio
+async def test_mixed_subscription_placement_subscription_resource_operations_put(client):
+    """Test put operation for SubscriptionResource in mixed placement scenario."""
+    resource = models.SubscriptionResource(
+        properties=models.SubscriptionResourceProperties(subscription_setting="test-sub-setting")
+    )
+
+    result = await client.mixed_subscription_placement.subscription_resource_operations.put(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource_name="sub-resource",
+        resource=resource,
+    )
+
+    assert (
+        result.id
+        == f"/subscriptions/{SUBSCRIPTION_ID}/providers/Azure.ResourceManager.MethodSubscriptionId/subscriptionResources/sub-resource"
+    )
+    assert result.name == "sub-resource"
+    assert result.type == "Azure.ResourceManager.MethodSubscriptionId/subscriptionResources"
+    assert result.properties.subscription_setting == "test-sub-setting"
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.system_data.created_by == "AzureSDK"
+
+
+@pytest.mark.asyncio
+async def test_mixed_subscription_placement_subscription_resource_operations_delete(client):
+    """Test delete operation for SubscriptionResource in mixed placement scenario."""
+    await client.mixed_subscription_placement.subscription_resource_operations.delete(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource_name="sub-resource",
+    )
+
+
+@pytest.mark.asyncio
+async def test_mixed_subscription_placement_resource_group_resource_operations_get(client):
+    """Test get operation for ResourceGroupResource with client-level subscription ID."""
+    result = await client.mixed_subscription_placement.resource_group_resource_operations.get(
+        resource_group_name=RESOURCE_GROUP_NAME,
+        resource_group_resource_name="rg-resource",
+    )
+
+    assert (
+        result.id
+        == f"/subscriptions/{SUBSCRIPTION_ID}/resourceGroups/{RESOURCE_GROUP_NAME}/providers/Azure.ResourceManager.MethodSubscriptionId/resourceGroupResources/rg-resource"
+    )
+    assert result.name == "rg-resource"
+    assert result.type == "Azure.ResourceManager.MethodSubscriptionId/resourceGroupResources"
+    assert result.location == "eastus"
+    assert result.properties.resource_group_setting == "test-setting"
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.system_data.created_by == "AzureSDK"
+
+
+@pytest.mark.asyncio
+async def test_mixed_subscription_placement_resource_group_resource_operations_put(client):
+    """Test put operation for ResourceGroupResource with client-level subscription ID."""
+    resource = models.ResourceGroupResource(
+        location="eastus", properties=models.ResourceGroupResourceProperties(resource_group_setting="test-setting")
+    )
+
+    result = await client.mixed_subscription_placement.resource_group_resource_operations.put(
+        resource_group_name=RESOURCE_GROUP_NAME,
+        resource_group_resource_name="rg-resource",
+        resource=resource,
+    )
+
+    assert (
+        result.id
+        == f"/subscriptions/{SUBSCRIPTION_ID}/resourceGroups/{RESOURCE_GROUP_NAME}/providers/Azure.ResourceManager.MethodSubscriptionId/resourceGroupResources/rg-resource"
+    )
+    assert result.name == "rg-resource"
+    assert result.type == "Azure.ResourceManager.MethodSubscriptionId/resourceGroupResources"
+    assert result.location == "eastus"
+    assert result.properties.resource_group_setting == "test-setting"
+    assert result.properties.provisioning_state == "Succeeded"
+    assert result.system_data.created_by == "AzureSDK"
+
+
+@pytest.mark.asyncio
+async def test_mixed_subscription_placement_resource_group_resource_operations_delete(client):
+    """Test delete operation for ResourceGroupResource with client-level subscription ID."""
+    await client.mixed_subscription_placement.resource_group_resource_operations.delete(
+        resource_group_name=RESOURCE_GROUP_NAME,
+        resource_group_resource_name="rg-resource",
+    )