@typespec/http-client-python 0.17.0 → 0.18.1

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

@@ -0,0 +1,235 @@
+# -------------------------------------------------------------------------
+# 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 import MethodSubscriptionIdClient
+from azure.resourcemanager.methodsubscriptionid import models
+
+SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
+RESOURCE_GROUP_NAME = "test-rg"
+
+
+@pytest.fixture
+def client(credential, authentication_policy):
+    with MethodSubscriptionIdClient(
+        credential,
+        SUBSCRIPTION_ID,
+        "http://localhost:3000",
+        authentication_policy=authentication_policy,
+    ) as client:
+        yield client
+
+
+def test_operations_list(client):
+    """Test Operations.list() endpoint."""
+    operations = client.operations.list()
+    operations_list = [op 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"
+
+
+def test_two_subscription_resources_method_level_subscription_resource1_operations_get(client):
+    """Test get operation for SubscriptionResource1 with method-level subscription ID."""
+    result = 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"
+
+
+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 = 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"
+
+
+def test_two_subscription_resources_method_level_subscription_resource1_operations_delete(client):
+    """Test delete operation for SubscriptionResource1 with method-level subscription ID."""
+    client.two_subscription_resources_method_level.subscription_resource1_operations.delete(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource1_name="sub-resource-1",
+    )
+
+
+def test_two_subscription_resources_method_level_subscription_resource2_operations_get(client):
+    """Test get operation for SubscriptionResource2 with method-level subscription ID."""
+    result = 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"
+
+
+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 = 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"
+
+
+def test_two_subscription_resources_method_level_subscription_resource2_operations_delete(client):
+    """Test delete operation for SubscriptionResource2 with method-level subscription ID."""
+    client.two_subscription_resources_method_level.subscription_resource2_operations.delete(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource2_name="sub-resource-2",
+    )
+
+
+def test_mixed_subscription_placement_subscription_resource_operations_get(client):
+    """Test get operation for SubscriptionResource in mixed placement scenario."""
+    result = 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"
+
+
+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 = 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"
+
+
+def test_mixed_subscription_placement_subscription_resource_operations_delete(client):
+    """Test delete operation for SubscriptionResource in mixed placement scenario."""
+    client.mixed_subscription_placement.subscription_resource_operations.delete(
+        subscription_id=SUBSCRIPTION_ID,
+        subscription_resource_name="sub-resource",
+    )
+
+
+def test_mixed_subscription_placement_resource_group_resource_operations_get(client):
+    """Test get operation for ResourceGroupResource with client-level subscription ID."""
+    result = 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"
+
+
+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 = 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"
+
+
+def test_mixed_subscription_placement_resource_group_resource_operations_delete(client):
+    """Test delete operation for ResourceGroupResource with client-level subscription ID."""
+    client.mixed_subscription_placement.resource_group_resource_operations.delete(
+        resource_group_name=RESOURCE_GROUP_NAME,
+        resource_group_resource_name="rg-resource",
+    )

package/generator/test/azure/requirements.txt

@@ -29,6 +29,7 @@ azure-mgmt-core==1.6.0
 -e ./generated/azure-resource-manager-non-resource
 -e ./generated/azure-resource-manager-operation-templates
 -e ./generated/azure-resource-manager-resources
+-e ./generated/azure-resource-manager-method-subscription-id
 -e ./generated/client-namespace
 -e ./generated/azure-payload-pageable
 -e ./generated/client-naming

package/generator/test/generic_mock_api_tests/asynctests/test_payload_pageable_async.py

@@ -31,6 +31,12 @@ async def test_link(client: PageableClient):
     assert_result(result)
 
 
+@pytest.mark.asyncio
+async def test_link_string(client: PageableClient):
+    result = [p async for p in client.server_driven_pagination.link_string()]
+    assert_result(result)
+
+
 @pytest.mark.asyncio
 async def test_request_query_response_body(client: PageableClient):
     result = [
@@ -73,3 +79,37 @@ async def test_request_header_response_header(client: PageableClient):
         )
     ]
     assert_result(result)
+
+
+@pytest.mark.asyncio
+async def test_nested_link(client: PageableClient):
+    result = [p async for p in client.server_driven_pagination.nested_link()]
+    assert_result(result)
+
+
+@pytest.mark.asyncio
+async def test_request_query_nested_response_body(client: PageableClient):
+    result = [
+        p
+        async for p in client.server_driven_pagination.continuation_token.request_query_nested_response_body(
+            foo="foo", bar="bar"
+        )
+    ]
+    assert_result(result)
+
+
+@pytest.mark.asyncio
+async def test_request_header_nested_response_body(client: PageableClient):
+    result = [
+        p
+        async for p in client.server_driven_pagination.continuation_token.request_header_nested_response_body(
+            foo="foo", bar="bar"
+        )
+    ]
+    assert_result(result)
+
+
+@pytest.mark.asyncio
+async def test_list_without_continuation(client: PageableClient):
+    result = [p async for p in client.list_without_continuation()]
+    assert_result(result)

package/generator/test/generic_mock_api_tests/asynctests/test_typetest_array_async.py

@@ -58,6 +58,7 @@ async def test_model_value(client: ArrayClient):
         models.InnerModel(property="hello"),
         models.InnerModel(property="world"),
     ]
+    # test list[model]
     await client.model_value.put(
         [
             models.InnerModel(property="hello"),
@@ -65,6 +66,14 @@ async def test_model_value(client: ArrayClient):
         ]
     )
 
+    # test list[JSON]
+    await client.model_value.put(
+        [
+            {"property": "hello"},
+            {"property": "world"},
+        ]
+    )
+
 
 @pytest.mark.asyncio
 async def test_nullable_boolean_value(client: ArrayClient):

package/generator/test/generic_mock_api_tests/test_payload_pageable.py

@@ -30,6 +30,11 @@ def test_link(client: PageableClient):
     assert_result(result)
 
 
+def test_link_string(client: PageableClient):
+    result = list(client.server_driven_pagination.link_string())
+    assert_result(result)
+
+
 def test_request_query_response_body(client: PageableClient):
     result = list(client.server_driven_pagination.continuation_token.request_query_response_body(foo="foo", bar="bar"))
     assert_result(result)
@@ -52,3 +57,27 @@ def test_request_header_response_header(client: PageableClient):
         client.server_driven_pagination.continuation_token.request_header_response_header(foo="foo", bar="bar")
     )
     assert_result(result)
+
+
+def test_nested_link(client: PageableClient):
+    result = list(client.server_driven_pagination.nested_link())
+    assert_result(result)
+
+
+def test_request_query_nested_response_body(client: PageableClient):
+    result = list(
+        client.server_driven_pagination.continuation_token.request_query_nested_response_body(foo="foo", bar="bar")
+    )
+    assert_result(result)
+
+
+def test_request_header_nested_response_body(client: PageableClient):
+    result = list(
+        client.server_driven_pagination.continuation_token.request_header_nested_response_body(foo="foo", bar="bar")
+    )
+    assert_result(result)
+
+
+def test_list_without_continuation(client: PageableClient):
+    result = list(client.list_without_continuation())
+    assert_result(result)

package/generator/test/generic_mock_api_tests/test_typetest_array.py

@@ -50,12 +50,20 @@ def test_model_value(client: ArrayClient):
         models.InnerModel(property="hello"),
         models.InnerModel(property="world"),
     ]
+    # test list[model]
     client.model_value.put(
         [
             models.InnerModel(property="hello"),
             models.InnerModel(property="world"),
         ]
     )
+    # test list[JSON]
+    client.model_value.put(
+        [
+            {"property": "hello"},
+            {"property": "world"},
+        ]
+    )
 
 
 def test_nullable_boolean_value(client: ArrayClient):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -58,7 +58,7 @@
     "@azure-tools/typespec-azure-core": ">=0.60.0 <1.0.0",
     "@azure-tools/typespec-azure-resource-manager": ">=0.60.0 <1.0.0",
     "@azure-tools/typespec-azure-rulesets": ">=0.60.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.60.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.60.2 <1.0.0",
     "@typespec/compiler": "^1.4.0",
     "@typespec/http": "^1.4.0",
     "@typespec/openapi": "^1.4.0",
@@ -81,7 +81,7 @@
     "@azure-tools/typespec-azure-core": "~0.60.0",
     "@azure-tools/typespec-azure-resource-manager": "~0.60.0",
     "@azure-tools/typespec-azure-rulesets": "~0.60.0",
-    "@azure-tools/typespec-client-generator-core": "~0.60.0",
+    "@azure-tools/typespec-client-generator-core": "~0.60.2",
     "@azure-tools/azure-http-specs": "0.1.0-alpha.28",
     "@typespec/compiler": "^1.4.0",
     "@typespec/http": "^1.4.0",