@typespec/http-client-python 0.3.4 → 0.3.5

package/generator/test/azure/mock_api_tests/{test_azure_arm_models_resource.py → test_azure_arm_resource.py}

@@ -4,8 +4,8 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
-from azure.resourcemanager.models.resources import ResourcesClient
-from azure.resourcemanager.models.resources import models
+from azure.resourcemanager.resources import ResourcesClient
+from azure.resourcemanager.resources import models
 
 SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
 RESOURCE_GROUP_NAME = "test-rg"
@@ -33,15 +33,15 @@ def test_client_signature(credential, authentication_policy):
     )
     for client in [client1, client2]:
         # make sure signautre order is correct
-        client.top_level_tracked_resources.get(RESOURCE_GROUP_NAME, "top")
+        client.top_level.get(RESOURCE_GROUP_NAME, "top")
         # make sure signautre name is correct
-        client.top_level_tracked_resources.get(
+        client.top_level.get(
             resource_group_name=RESOURCE_GROUP_NAME, top_level_tracked_resource_name="top"
         )
 
 
-def test_top_level_tracked_resources_begin_create_or_replace(client):
-    result = client.top_level_tracked_resources.begin_create_or_replace(
+def test_top_level_begin_create_or_replace(client):
+    result = client.top_level.begin_create_or_replace(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         resource=models.TopLevelTrackedResource(
@@ -56,12 +56,12 @@ def test_top_level_tracked_resources_begin_create_or_replace(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "top"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_top_level_tracked_resources_begin_update(client):
-    result = client.top_level_tracked_resources.begin_update(
+def test_top_level_begin_update(client):
+    result = client.top_level.begin_update(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         properties=models.TopLevelTrackedResource(
@@ -76,20 +76,20 @@ def test_top_level_tracked_resources_begin_update(client):
     assert result.properties.description == "valid2"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "top"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_top_level_tracked_resources_begin_delete(client):
-    client.top_level_tracked_resources.begin_delete(
+def test_top_level_begin_delete(client):
+    client.top_level.begin_delete(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         polling_interval=0,  # set polling_interval to 0 s to make the test faster since default is 30s
     ).result()
 
 
-def test_top_level_tracked_resources_list_by_resource_group(client):
-    response = client.top_level_tracked_resources.list_by_resource_group(
+def test_top_level_list_by_resource_group(client):
+    response = client.top_level.list_by_resource_group(
         resource_group_name=RESOURCE_GROUP_NAME,
     )
     result = [r for r in response]
@@ -98,24 +98,24 @@ def test_top_level_tracked_resources_list_by_resource_group(client):
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "top"
-        assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+        assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
         assert result.system_data.created_by == "AzureSDK"
 
 
-def test_top_level_tracked_resources_list_by_subscription(client):
-    response = client.top_level_tracked_resources.list_by_subscription()
+def test_top_level_list_by_subscription(client):
+    response = client.top_level.list_by_subscription()
     result = [r for r in response]
     for result in result:
         assert result.location == "eastus"
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "top"
-        assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+        assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
         assert result.system_data.created_by == "AzureSDK"
 
 
-def test_nested_proxy_resources_get(client):
-    result = client.nested_proxy_resources.get(
+def test_nested_get(client):
+    result = client.nested.get(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         nexted_proxy_resource_name="nested",
@@ -123,12 +123,12 @@ def test_nested_proxy_resources_get(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "nested"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_nested_proxy_resources_begin_create_or_replace(client):
-    result = client.nested_proxy_resources.begin_create_or_replace(
+def test_nested_begin_create_or_replace(client):
+    result = client.nested.begin_create_or_replace(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         nexted_proxy_resource_name="nested",
@@ -142,12 +142,12 @@ def test_nested_proxy_resources_begin_create_or_replace(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "nested"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_nested_proxy_resources_begin_update(client):
-    result = client.nested_proxy_resources.begin_update(
+def test_nested_begin_update(client):
+    result = client.nested.begin_update(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         nexted_proxy_resource_name="nested",
@@ -161,12 +161,12 @@ def test_nested_proxy_resources_begin_update(client):
     assert result.properties.description == "valid2"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "nested"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_nested_proxy_resources_begin_delete(client):
-    client.nested_proxy_resources.begin_delete(
+def test_nested_begin_delete(client):
+    client.nested.begin_delete(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         nexted_proxy_resource_name="nested",
@@ -174,8 +174,8 @@ def test_nested_proxy_resources_begin_delete(client):
     ).result()
 
 
-def test_nested_proxy_resources_list_by_top_level_tracked_resource(client):
-    response = client.nested_proxy_resources.list_by_top_level_tracked_resource(
+def test_nested_list_by_top_level_tracked_resource(client):
+    response = client.nested.list_by_top_level_tracked_resource(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
     )
@@ -184,31 +184,31 @@ def test_nested_proxy_resources_list_by_top_level_tracked_resource(client):
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "nested"
-        assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+        assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
         assert result.system_data.created_by == "AzureSDK"
 
 
-def test_top_level_tracked_resources_action_sync(client):
-    client.top_level_tracked_resources.action_sync(
+def test_top_level_action_sync(client):
+    client.top_level.action_sync(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         body={"message": "Resource action at top level.", "urgent": True},
     )
 
 
-def test_singleton_tracked_resources_get_by_resource_group(client):
-    result = client.singleton_tracked_resources.get_by_resource_group(
+def test_singleton_get_by_resource_group(client):
+    result = client.singleton.get_by_resource_group(
         resource_group_name=RESOURCE_GROUP_NAME,
     )
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "default"
-    assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_singleton_tracked_resources_begin_create_or_replace(client):
-    result = client.singleton_tracked_resources.begin_create_or_update(
+def test_singleton_begin_create_or_replace(client):
+    result = client.singleton.begin_create_or_update(
         resource_group_name=RESOURCE_GROUP_NAME,
         resource=models.SingletonTrackedResource(
             location="eastus",
@@ -220,12 +220,12 @@ def test_singleton_tracked_resources_begin_create_or_replace(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "default"
-    assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_singleton_tracked_resources_update(client):
-    result = client.singleton_tracked_resources.update(
+def test_singleton_update(client):
+    result = client.singleton.update(
         resource_group_name=RESOURCE_GROUP_NAME,
         properties=models.SingletonTrackedResource(
             location="eastus2",
@@ -237,12 +237,12 @@ def test_singleton_tracked_resources_update(client):
     assert result.properties.description == "valid2"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "default"
-    assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_singleton_tracked_resources_list_by_resource_group(client):
-    response = client.singleton_tracked_resources.list_by_resource_group(
+def test_singleton_list_by_resource_group(client):
+    response = client.singleton.list_by_resource_group(
         resource_group_name=RESOURCE_GROUP_NAME,
     )
     result = [r for r in response]
@@ -250,5 +250,5 @@ def test_singleton_tracked_resources_list_by_resource_group(client):
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "default"
-        assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+        assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
         assert result.system_data.created_by == "AzureSDK"

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

@@ -15,60 +15,60 @@ def client():
 
 
 def test_no_decorator_in_public(client: AccessClient):
-    result = client.public_operation.no_decorator_in_public(name="test")
-    assert result == models.NoDecoratorModelInPublic(name="test")
+    result = client.public_operation.no_decorator_in_public(name="sample")
+    assert result == models.NoDecoratorModelInPublic(name="sample")
 
 
 def test_public_decorator_in_public(client: AccessClient):
-    result = client.public_operation.public_decorator_in_public(name="test")
-    assert result == models.PublicDecoratorModelInPublic(name="test")
+    result = client.public_operation.public_decorator_in_public(name="sample")
+    assert result == models.PublicDecoratorModelInPublic(name="sample")
 
 
 def test_no_decorator_in_internal(client: AccessClient):
-    result = client.internal_operation._no_decorator_in_internal(name="test")
-    assert result == models._models.NoDecoratorModelInInternal(name="test")
+    result = client.internal_operation._no_decorator_in_internal(name="sample")
+    assert result == models._models.NoDecoratorModelInInternal(name="sample")
 
     with pytest.raises(ImportError):
         from specs.azure.clientgenerator.core.access.models import NoDecoratorModelInInternal
 
     with pytest.raises(AttributeError):
-        client.internal_operation.no_decorator_in_internal(name="test")
+        client.internal_operation.no_decorator_in_internal(name="sample")
 
 
 def test_internal_decorator_in_internal(client: AccessClient):
-    result = client.internal_operation._internal_decorator_in_internal(name="test")
-    assert result == models._models.InternalDecoratorModelInInternal(name="test")
+    result = client.internal_operation._internal_decorator_in_internal(name="sample")
+    assert result == models._models.InternalDecoratorModelInInternal(name="sample")
 
     with pytest.raises(ImportError):
         from specs.azure.clientgenerator.core.access.models import InternalDecoratorModelInInternal
 
     with pytest.raises(AttributeError):
-        client.internal_operation.internal_decorator_in_internal(name="test")
+        client.internal_operation.internal_decorator_in_internal(name="sample")
 
 
 def test_public_decorator_in_internal(client: AccessClient):
-    result = client.internal_operation._public_decorator_in_internal(name="test")
-    assert result == models.PublicDecoratorModelInInternal(name="test")
+    result = client.internal_operation._public_decorator_in_internal(name="sample")
+    assert result == models.PublicDecoratorModelInInternal(name="sample")
 
     with pytest.raises(AttributeError):
-        client.internal_operation.public_decorator_in_internal(name="test")
+        client.internal_operation.public_decorator_in_internal(name="sample")
 
 
 def test_public(client: AccessClient):
-    result = client.shared_model_in_operation.public(name="test")
-    assert result == models.SharedModel(name="test")
+    result = client.shared_model_in_operation.public(name="sample")
+    assert result == models.SharedModel(name="sample")
 
 
 def test_internal(client: AccessClient):
-    result = client.shared_model_in_operation._internal(name="test")
-    assert result == models.SharedModel(name="test")
+    result = client.shared_model_in_operation._internal(name="sample")
+    assert result == models.SharedModel(name="sample")
 
     with pytest.raises(AttributeError):
-        client.shared_model_in_operation.internal(name="test")
+        client.shared_model_in_operation.internal(name="sample")
 
 
 def test_operation(client: AccessClient):
-    result = client.relative_model_in_operation._operation(name="test")
+    result = client.relative_model_in_operation._operation(name="Madge")
     assert result == models._models.OuterModel(name="Madge", inner=models._models.InnerModel(name="Madge"))
 
     with pytest.raises(ImportError):
@@ -78,7 +78,7 @@ def test_operation(client: AccessClient):
         from specs.azure.clientgenerator.core.access.models import InnerModel
 
     with pytest.raises(AttributeError):
-        client.shared_model_in_operation.operation(name="test")
+        client.shared_model_in_operation.operation(name="sample")
 
 
 def test_discriminator(client: AccessClient):

package/generator/test/azure/requirements.txt

@@ -22,8 +22,8 @@ mypy==1.10.1
 -e ./generated/azure-core-page
 -e ./generated/azure-special-headers-client-request-id/
 -e ./generated/azure-example-basic
--e ./generated/azure-resource-manager-models-common-types-managed-identity
--e ./generated/azure-resource-manager-models-resources
+-e ./generated/azure-resource-manager-common-properties
+-e ./generated/azure-resource-manager-resources
 
 # common test case
 -e ./generated/authentication-api-key

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

@@ -17,8 +17,8 @@ from authentication.union.aio import UnionClient
 async def api_key_client(key_credential):
     client = None
 
-    def _build_client(client_type):
-        client = client_type(key_credential("valid-key"))
+    def _build_client(client_type, key: str = "valid-key"):
+        client = client_type(key_credential(key))
         return client
 
     yield _build_client
@@ -53,8 +53,8 @@ async def oauth2_client(token_credential):
 async def http_custom_client(key_credential):
     client = None
 
-    def _build_client():
-        client = CustomClient(key_credential("valid-key"))
+    def _build_client(key: str = "valid-key"):
+        client = CustomClient(key_credential(key))
         return client
 
     yield _build_client
@@ -73,7 +73,7 @@ async def test_api_key_valid(api_key_client):
 
 @pytest.mark.asyncio
 async def test_api_key_invalid(api_key_client, core_library):
-    client = api_key_client(ApiKeyClient)
+    client = api_key_client(ApiKeyClient, "invalid-key")
     with pytest.raises(core_library.exceptions.HttpResponseError) as ex:
         await client.invalid()
     assert ex.value.status_code == 403
@@ -114,7 +114,7 @@ async def test_http_custom_valid(http_custom_client):
 
 @pytest.mark.asyncio
 async def test_http_custom_invalid(http_custom_client, core_library):
-    client = http_custom_client()
+    client = http_custom_client(key="invalid-key")
     with pytest.raises(core_library.exceptions.HttpResponseError) as ex:
         await client.invalid()
     assert ex.value.status_code == 403

package/generator/test/generic_mock_api_tests/test_authentication.py

@@ -17,8 +17,8 @@ from authentication.http.custom import CustomClient
 def api_key_client(key_credential):
     client = None
 
-    def _build_client(client_type):
-        client = client_type(key_credential("valid-key"))
+    def _build_client(client_type, key: str = "valid-key"):
+        client = client_type(key_credential(key))
         return client
 
     yield _build_client
@@ -53,8 +53,8 @@ def oauth2_client(token_credential):
 def http_custom_client(key_credential):
     client = None
 
-    def _build_client():
-        client = CustomClient(key_credential("valid-key"))
+    def _build_client(key: str = "valid-key"):
+        client = CustomClient(key_credential(key))
         return client
 
     yield _build_client
@@ -71,7 +71,7 @@ def test_api_key_valid(api_key_client):
 
 
 def test_api_key_invalid(api_key_client, core_library):
-    client = api_key_client(ApiKeyClient)
+    client = api_key_client(ApiKeyClient, "invalid-key")
     with pytest.raises(core_library.exceptions.HttpResponseError) as ex:
         client.invalid()
     assert ex.value.status_code == 403
@@ -106,7 +106,7 @@ def test_http_custom_valid(http_custom_client):
 
 
 def test_http_custom_invalid(http_custom_client, core_library):
-    client = http_custom_client()
+    client = http_custom_client("invalid-key")
     with pytest.raises(core_library.exceptions.HttpResponseError) as ex:
         client.invalid()
     assert ex.value.status_code == 403

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -54,7 +54,7 @@
     "@azure-tools/typespec-azure-core": ">=0.47.0 <1.0.0",
     "@azure-tools/typespec-azure-resource-manager": ">=0.47.0 <1.0.0",
     "@azure-tools/typespec-autorest": ">=0.47.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.47.1 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.47.4 <1.0.0",
     "@azure-tools/typespec-azure-rulesets": ">=0.47.0 <3.0.0",
     "@typespec/compiler": ">=0.61.0 <1.0.0",
     "@typespec/http": ">=0.61.0 <1.0.0",
@@ -69,8 +69,8 @@
   "devDependencies": {
     "@azure-tools/typespec-azure-resource-manager": "~0.47.0",
     "@azure-tools/typespec-autorest": "~0.47.0",
-    "@azure-tools/cadl-ranch-expect": "0.15.5",
-    "@azure-tools/cadl-ranch-specs": "0.37.6",
+    "@azure-tools/cadl-ranch-expect": "~0.15.5",
+    "@azure-tools/cadl-ranch-specs": "~0.39.0",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~22.5.4",
     "@types/semver": "7.5.8",
@@ -80,7 +80,7 @@
     "typescript": "~5.6.2",
     "typescript-eslint": "^8.5.0",
     "@azure-tools/typespec-azure-core": "~0.47.0",
-    "@azure-tools/typespec-client-generator-core": "~0.47.1",
+    "@azure-tools/typespec-client-generator-core": "~0.47.4",
     "@typespec/compiler": "~0.61.0",
     "@typespec/http": "~0.61.0",
     "@typespec/rest": "~0.61.0",