@typespec/http-client-python 0.10.0 → 0.11.1

package/generator/pygen/codegen/templates/{vendor.py.jinja2 → utils.py.jinja2}

@@ -5,20 +5,19 @@
 
 {{ imports }}
 
-{% if code_model.need_vendored_mixin(client_namespace) %}
-    {% for client in clients | selectattr("has_mixin") %}
-{% set pylint_disable = "# pylint: disable=name-too-long" if (client.name | length) + ("MixinABC" | length) > 40 else "" %}
-class {{ client.name }}MixinABC(  {{ pylint_disable }}
-    ABC
-):
+{% if code_model.need_utils_mixin %}
+
+TClient = TypeVar("TClient")
+TConfig = TypeVar("TConfig")
+
+class ClientMixinABC(ABC, Generic[TClient, TConfig]):
     """DO NOT use this class. It is for internal typing use only."""
-    _client: "{{ keywords.async_class }}PipelineClient"
-    _config: {{ client.name }}Configuration
+    _client: TClient
+    _config: TConfig
     _serialize: "Serializer"
     _deserialize: "Deserializer"
-    {% endfor %}
 {% endif %}
-{% if code_model.need_vendored_abstract(client_namespace) %}
+{% if code_model.need_utils_abstract(client_namespace) %}
 
 def raise_if_not_implemented(cls, abstract_methods):
     not_implemented = [f for f in abstract_methods if not callable(getattr(cls, f, None))]
@@ -29,7 +28,7 @@ def raise_if_not_implemented(cls, abstract_methods):
         )
 {% endif %}
 
-{% if code_model.need_vendored_etag(client_namespace) %}
+{% if code_model.need_utils_etag(client_namespace) %}
 def quote_etag(etag: Optional[str]) -> Optional[str]:
     if not etag or etag == "*":
         return etag
@@ -59,7 +58,7 @@ def prep_if_none_match(etag: Optional[str], match_condition: Optional[MatchCondi
         return "*"
     return None
 {% endif %}
-{% if code_model.need_vendored_form_data(async_mode, client_namespace)  %}
+{% if code_model.need_utils_form_data(async_mode, client_namespace)  %}
 # file-like tuple could be `(filename, IO (or bytes))` or `(filename, IO (or bytes), content_type)`
 FileContent = Union[str, bytes, IO[str], IO[bytes]]
 

package/generator/pygen.egg-info/SOURCES.txt

@@ -92,8 +92,8 @@ pygen/codegen/templates/serialization.py.jinja2
 pygen/codegen/templates/test.py.jinja2
 pygen/codegen/templates/testpreparer.py.jinja2
 pygen/codegen/templates/types.py.jinja2
+pygen/codegen/templates/utils.py.jinja2
 pygen/codegen/templates/validation.py.jinja2
-pygen/codegen/templates/vendor.py.jinja2
 pygen/codegen/templates/version.py.jinja2
 pygen/codegen/templates/packaging_templates/CHANGELOG.md.jinja2
 pygen/codegen/templates/packaging_templates/LICENSE.jinja2

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

@@ -0,0 +1,50 @@
+# -------------------------------------------------------------------------
+# 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 specs.azure.clientgenerator.core.clientinitialization.aio import (
+    HeaderParamClient,
+    MultipleParamsClient,
+    MixedParamsClient,
+    PathParamClient,
+    ParamAliasClient,
+)
+from specs.azure.clientgenerator.core.clientinitialization.models import Input
+
+
+@pytest.mark.asyncio
+async def test_header_param_client():
+    async with HeaderParamClient("test-name-value") as client:
+        await client.with_query(id="test-id")
+        await client.with_body(Input(name="test-name"))
+
+
+@pytest.mark.asyncio
+async def test_multiple_params_client():
+    async with MultipleParamsClient("test-name-value", "us-west") as client:
+        await client.with_query(id="test-id")
+        await client.with_body(Input(name="test-name"))
+
+
+@pytest.mark.asyncio
+async def test_mixed_params_client():
+    async with MixedParamsClient("test-name-value") as client:
+        await client.with_query(region="us-west", id="test-id")
+        await client.with_body(Input(name="test-name"), region="us-west")
+
+
+@pytest.mark.asyncio
+async def test_path_param_client():
+    async with PathParamClient("sample-blob") as client:
+        await client.with_query(format="text")
+        await client.get_standalone()
+        await client.delete_standalone()
+
+
+@pytest.mark.asyncio
+async def test_param_alias_client():
+    async with ParamAliasClient("sample-blob") as client:
+        await client.with_aliased_name()
+        await client.with_original_name()

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

@@ -0,0 +1,44 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+from specs.azure.clientgenerator.core.clientinitialization import (
+    HeaderParamClient,
+    MultipleParamsClient,
+    MixedParamsClient,
+    PathParamClient,
+    ParamAliasClient,
+)
+from specs.azure.clientgenerator.core.clientinitialization.models import Input
+
+
+def test_header_param_client():
+    with HeaderParamClient("test-name-value") as client:
+        client.with_query(id="test-id")
+        client.with_body(Input(name="test-name"))
+
+
+def test_multiple_params_client():
+    with MultipleParamsClient("test-name-value", "us-west") as client:
+        client.with_query(id="test-id")
+        client.with_body(Input(name="test-name"))
+
+
+def test_mixed_params_client():
+    with MixedParamsClient("test-name-value") as client:
+        client.with_query(region="us-west", id="test-id")
+        client.with_body(Input(name="test-name"), region="us-west")
+
+
+def test_path_param_client():
+    with PathParamClient("sample-blob") as client:
+        client.with_query(format="text")
+        client.get_standalone()
+        client.delete_standalone()
+
+
+def test_param_alias_client():
+    with ParamAliasClient("sample-blob") as client:
+        client.with_aliased_name()
+        client.with_original_name()

package/generator/test/azure/requirements.txt

@@ -4,8 +4,9 @@ azure-mgmt-core==1.5.0
 
 # only for azure
 -e ./generated/azure-client-generator-core-access
--e ./generated/azure-client-generator-core-usage
+-e ./generated/azure-client-generator-core-client-initialization
 -e ./generated/azure-client-generator-core-flatten-property
+-e ./generated/azure-client-generator-core-usage
 -e ./generated/azure-core-basic
 -e ./generated/azure-core-scalar
 -e ./generated/azure-core-lro-rpc
@@ -37,6 +38,7 @@ azure-mgmt-core==1.5.0
 -e ./generated/encode-numeric
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
+-e ./generated/parameters-path
 -e ./generated/parameters-spread
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined

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

@@ -97,6 +97,7 @@ async def test_header(client: BytesClient):
         ],
     )
 
+
 @pytest.mark.asyncio
 async def test_request_body(client: BytesClient, png_data: bytes):
     await client.request_body.default(

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

@@ -0,0 +1,24 @@
+# -------------------------------------------------------------------------
+# 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 parameters.path.aio import PathClient
+
+
+@pytest.fixture
+async def client():
+    async with PathClient() as client:
+        yield client
+
+
+@pytest.mark.asyncio
+async def test_normal(client: PathClient):
+    await client.normal("foo")
+
+
+@pytest.mark.asyncio
+async def test_optional(client: PathClient):
+    await client.optional()
+    await client.optional(name="foo")

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

@@ -28,7 +28,7 @@ async def test_create_resource(client: JsonMergePatchClient):
         map={"key": inner_madge},
         array=[inner_madge],
         int_value=1,
-        float_value=1.1,
+        float_value=1.25,
         inner_model=inner_madge,
         int_array=[1, 2, 3],
     )

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

@@ -8,7 +8,7 @@ import json
 import pytest
 from typetest.property.nullable import models
 from typetest.property.nullable.aio import NullableClient
-from typetest.property.nullable._model_base import (  # pylint: disable=protected-access
+from typetest.property.nullable._utils.model_base import (  # pylint: disable=protected-access
     SdkJSONEncoder,
 )
 

package/generator/test/generic_mock_api_tests/test_encode_bytes.py

@@ -94,6 +94,7 @@ def test_header(client: BytesClient):
         ],
     )
 
+
 def test_request_body(client: BytesClient, png_data: bytes):
     client.request_body.default(
         value=png_data,

package/generator/test/generic_mock_api_tests/test_parameters_path.py

@@ -0,0 +1,22 @@
+# -------------------------------------------------------------------------
+# 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 parameters.path import PathClient
+
+
+@pytest.fixture
+def client():
+    with PathClient() as client:
+        yield client
+
+
+def test_normal(client: PathClient):
+    client.normal("foo")
+
+
+def test_optional(client: PathClient):
+    client.optional()
+    client.optional(name="foo")

package/generator/test/generic_mock_api_tests/test_payload_json_merge_patch.py

@@ -27,7 +27,7 @@ def test_create_resource(client: JsonMergePatchClient):
         map={"key": inner_madge},
         array=[inner_madge],
         int_value=1,
-        float_value=1.1,
+        float_value=1.25,
         inner_model=inner_madge,
         int_array=[1, 2, 3],
     )

package/generator/test/generic_mock_api_tests/test_typetest_property_nullable.py

@@ -7,7 +7,7 @@
 import json
 import pytest
 from typetest.property.nullable import NullableClient, models
-from typetest.property.nullable._model_base import (  # pylint: disable=protected-access
+from typetest.property.nullable._utils.model_base import (  # pylint: disable=protected-access
     SdkJSONEncoder,
 )
 

package/generator/test/unbranded/requirements.txt

@@ -10,6 +10,7 @@
 -e ./generated/encode-numeric
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
+-e ./generated/parameters-path
 -e ./generated/parameters-spread
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined

package/generator/test/unittests/conftest.py

@@ -6,6 +6,7 @@
 import importlib
 import pytest
 
+
 @pytest.fixture
 def core_library():
     try:

package/generator/test/unittests/test_model_base_serialization.py

@@ -26,7 +26,7 @@ import isodate
 import sys
 from enum import Enum
 
-from specialwords._model_base import (
+from specialwords._utils.model_base import (
     SdkJSONEncoder,
     Model,
     rest_field,

package/generator/test/unittests/test_model_base_xml_serialization.py

@@ -10,7 +10,7 @@ from typing import (
     Dict,
 )
 
-from specialwords._model_base import (
+from specialwords._utils.model_base import (
     _get_element,
     Model,
     rest_field,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -58,7 +58,7 @@
     "@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.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",
@@ -81,8 +81,8 @@
     "@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.0",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.13",
+    "@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",
@@ -92,7 +92,7 @@
     "@typespec/sse": "~0.68.0",
     "@typespec/streams": "~0.68.0",
     "@typespec/xml": "~0.68.0",
-    "@typespec/http-specs": "0.1.0-alpha.17",
+    "@typespec/http-specs": "0.1.0-alpha.19",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~22.13.14",
     "@types/semver": "7.5.8",