@typespec/http-client-python 0.8.0 → 0.9.0-dev.1

package/generator/pygen/codegen/templates/packaging_templates/README.md.jinja2

@@ -1,5 +1,5 @@
 {% if code_model.is_azure_flavor %}
-{% if package_mode == "mgmtplane" -%}
+{% if package_mode == "mgmtplane" %}
 # Microsoft Azure SDK for Python
 
 This is the Microsoft {{package_pprint_name}} Client Library.
@@ -40,7 +40,7 @@ python -m pip install {{ package_name }}
 - You need an [Azure subscription][azure_sub] to use this package.
 - An existing {{ package_pprint_name }} instance.
 
-{%- if token_credential %}
+{% if token_credential %}
 #### Create with an Azure Active Directory Credential
 To use an [Azure Active Directory (AAD) token credential][authenticate_with_token],
 provide an instance of the desired credential type obtained from the
@@ -57,7 +57,7 @@ Set the values of the client ID, tenant ID, and client secret of the AAD applica
 Use the returned token credential to authenticate the client:
 
 ```python
->>> from {{ namespace }} import {{ client_name }}
+>>> from {{ code_model.namespace }} import {{ client_name }}
 >>> from azure.identity import DefaultAzureCredential
 >>> client = {{ client_name }}(endpoint='<endpoint>', credential=DefaultAzureCredential())
 ```
@@ -65,7 +65,7 @@ Use the returned token credential to authenticate the client:
 ## Examples
 
 ```python
->>> from {{ namespace }} import {{ client_name }}
+>>> from {{ code_model.namespace }} import {{ client_name }}
 >>> from azure.identity import DefaultAzureCredential
 >>> from {{ code_model.core_library }}.exceptions import HttpResponseError
 
@@ -76,7 +76,7 @@ Use the returned token credential to authenticate the client:
         print('service responds error: {}'.format(e.response.json()))
 
 ```
-{%- endif %}
+{% endif %}
 
 ## Contributing
 

package/generator/pygen/codegen/templates/packaging_templates/dev_requirements.txt.jinja2

@@ -1,9 +1,9 @@
 -e ../../../tools/azure-sdk-tools
 ../../core/azure-core
-{% if token_credential -%}
+{% if token_credential %}
 ../../identity/azure-identity
 {% endif -%}
-{% if azure_arm -%}
+{% if azure_arm %}
 ../../core/azure-mgmt-core
-{% endif -%}
+{% endif %}
 aiohttp

package/generator/pygen/codegen/templates/packaging_templates/setup.py.jinja2

@@ -2,19 +2,27 @@
 {{ license_header }}
 # coding: utf-8
 {% if package_mode %}
+
 import os
 import re
-{% endif -%}
+{% endif %}
 from setuptools import setup, find_packages
 
 {% set package_name = package_name or code_model.clients[0].name %}
 
 PACKAGE_NAME = "{{ package_name|lower }}"
-{% if package_mode -%}
+{% if package_mode %}
 PACKAGE_PPRINT_NAME = "{{ package_pprint_name }}"
+{% if code_model.is_tsp %}
+PACKAGE_NAMESPACE = "{{ code_model.namespace|lower }}"
+
+# a.b.c => a/b/c
+package_folder_path = PACKAGE_NAMESPACE.replace(".", "/")
+{% else %}
 
 # a-b-c => a/b/c
 package_folder_path = PACKAGE_NAME.replace("-", "/")
+{% endif %}
 
 # Version extraction inspired from 'requests'
 with open(os.path.join(package_folder_path, "_version.py"), "r") as fd:
@@ -33,7 +41,8 @@ version = "{{ package_version }}"
 {% set long_description = code_model.description %}
 {% set author_email = "" %}
 {% set url = "" %}
-{% endif -%}
+{% endif %}
+
 
 setup(
     name=PACKAGE_NAME,
@@ -70,9 +79,9 @@ setup(
             {% if pkgutil_names %}
             # Exclude packages that will be covered by PEP420 or nspkg
             {% endif %}
-            {%- for pkgutil_name in pkgutil_names %}
+            {% for pkgutil_name in pkgutil_names %}
             "{{ pkgutil_name }}",
-            {%- endfor %}
+            {% endfor %}
         ]
     ),
     include_package_data=True,

package/generator/pygen.egg-info/PKG-INFO

@@ -19,9 +19,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: black==24.8.0
 Requires-Dist: docutils>=0.20.1
-Requires-Dist: Jinja2==3.1.3
+Requires-Dist: Jinja2==3.1.6
 Requires-Dist: PyYAML==6.0.1
 Requires-Dist: tomli==2.0.1
-Requires-Dist: setuptools==69.5.1
+Requires-Dist: setuptools==70.0.0
 
 # Core Library for Python Generation

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

@@ -1,6 +1,6 @@
 black==24.8.0
 docutils>=0.20.1
-Jinja2==3.1.3
+Jinja2==3.1.6
 PyYAML==6.0.1
 tomli==2.0.1
-setuptools==69.5.1
+setuptools==70.0.0

package/generator/setup.py

@@ -50,9 +50,9 @@ setup(
     install_requires=[
         "black==24.8.0",
         "docutils>=0.20.1",
-        "Jinja2==3.1.3",
+        "Jinja2==3.1.6",
         "PyYAML==6.0.1",
         "tomli==2.0.1",
-        "setuptools==69.5.1",
+        "setuptools==70.0.0",
     ],
 )

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

@@ -18,6 +18,7 @@ async def client(credential, authentication_policy):
         SUBSCRIPTION_ID,
         "http://localhost:3000",
         authentication_policy=authentication_policy,
+        polling_interval=0,
     ) as client:
         yield client
 

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

@@ -18,6 +18,7 @@ def client(credential, authentication_policy):
         SUBSCRIPTION_ID,
         "http://localhost:3000",
         authentication_policy=authentication_policy,
+        polling_interval=0,
     ) as client:
         yield client
 

package/generator/test/azure/tox.ini

@@ -10,7 +10,7 @@ commands =
     pytest mock_api_tests ../generic_mock_api_tests
 
     # pylint
-    pip install azure-pylint-guidelines-checker==0.5.1 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    pip install azure-pylint-guidelines-checker==0.5.2 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
     python ../../../eng/scripts/ci/run_pylint.py -t azure -s "generated" {posargs}
 
     # mypy
@@ -33,7 +33,7 @@ commands =
 deps=
     -r requirements.txt
 commands =
-    pip install azure-pylint-guidelines-checker==0.5.1 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    pip install azure-pylint-guidelines-checker==0.5.2 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
     python ../../../eng/scripts/ci/run_pylint.py -t azure -s "generated" {posargs}
 
 [testenv:mypy]

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

@@ -107,7 +107,7 @@ def png_data() -> bytes:
 @pytest.mark.asyncio
 async def test_request_body(client: BytesClient, png_data: bytes):
     await client.request_body.default(
-        value=bytes("test", "utf-8"),
+        value=png_data,
     )
     await client.request_body.octet_stream(
         value=png_data,
@@ -126,8 +126,9 @@ async def test_request_body(client: BytesClient, png_data: bytes):
 @pytest.mark.asyncio
 async def test_response_body(client: BytesClient, png_data: bytes):
     expected = b"test"
-    assert expected == await client.response_body.default()
+    assert b"".join([d async for d in (await client.response_body.default())]) == png_data
     assert expected == await client.response_body.base64()
-    assert expected == await client.response_body.base64_url()
     assert b"".join([d async for d in (await client.response_body.octet_stream())]) == png_data
     assert b"".join([d async for d in (await client.response_body.custom_content_type())]) == png_data
+    # will reopen after TCGC release a fix version for https://github.com/Azure/typespec-azure/pull/2411
+    # assert expected == await client.response_body.base64_url()

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

@@ -33,12 +33,6 @@ async def test_query_ssv(client: CollectionFormatClient):
     await client.query.ssv(colors=["blue", "red", "green"])
 
 
-@pytest.mark.asyncio
-@pytest.mark.skip(reason="https://github.com/aio-libs/aiohttp/issues/5904")
-async def test_query_tsv(client: CollectionFormatClient):
-    await client.query.tsv(colors=["blue", "red", "green"])
-
-
 @pytest.mark.asyncio
 async def test_csv_header(client: CollectionFormatClient):
     await client.header.csv(colors=["blue", "red", "green"])

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

@@ -262,6 +262,7 @@ async def test_spread_model_array(client: AdditionalPropertiesClient):
     await client.spread_model_array.put(body)
 
 
+@pytest.mark.skip(reason="https://github.com/microsoft/typespec/pull/6425")
 @pytest.mark.asyncio
 async def test_spread_record_discriminated_union(client: AdditionalPropertiesClient):
     body = {

package/generator/test/generic_mock_api_tests/test_encode_bytes.py

@@ -103,7 +103,7 @@ def png_data() -> bytes:
 
 def test_request_body(client: BytesClient, png_data: bytes):
     client.request_body.default(
-        value=bytes("test", "utf-8"),
+        value=png_data,
     )
     client.request_body.octet_stream(
         value=png_data,
@@ -121,8 +121,9 @@ def test_request_body(client: BytesClient, png_data: bytes):
 
 def test_response_body(client: BytesClient, png_data: bytes):
     expected = b"test"
-    assert expected == client.response_body.default()
+    assert b"".join(client.response_body.default()) == png_data
     assert expected == client.response_body.base64()
-    assert expected == client.response_body.base64_url()
     assert b"".join(client.response_body.octet_stream()) == png_data
     assert b"".join(client.response_body.custom_content_type()) == png_data
+    # will reopen after TCGC release a fix version for https://github.com/Azure/typespec-azure/pull/2411
+    # assert expected == client.response_body.base64_url()

package/generator/test/generic_mock_api_tests/test_parameters_collection_format.py

@@ -29,9 +29,5 @@ def test_query_ssv(client: CollectionFormatClient):
     client.query.ssv(colors=["blue", "red", "green"])
 
 
-def test_query_tsv(client: CollectionFormatClient):
-    client.query.tsv(colors=["blue", "red", "green"])
-
-
 def test_csv_header(client: CollectionFormatClient):
     client.header.csv(colors=["blue", "red", "green"])

package/generator/test/generic_mock_api_tests/test_typetest_property_additionalproperties.py

@@ -236,6 +236,7 @@ def test_spread_model_array(client: AdditionalPropertiesClient):
     client.spread_model_array.put(body)
 
 
+@pytest.mark.skip(reason="https://github.com/microsoft/typespec/pull/6425")
 def test_spread_record_discriminated_union(client: AdditionalPropertiesClient):
     body = {
         "name": "abc",

package/generator/test/unbranded/tox.ini

@@ -10,7 +10,7 @@ commands =
     pytest mock_api_tests ../generic_mock_api_tests
 
     # pylint
-    pip install azure-pylint-guidelines-checker==0.5.1 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    pip install azure-pylint-guidelines-checker==0.5.2 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
     python ../../../eng/scripts/ci/run_pylint.py -t unbranded -s "generated" {posargs}
 
     # mypy
@@ -33,7 +33,7 @@ commands =
 deps=
     -r requirements.txt
 commands =
-    pip install azure-pylint-guidelines-checker==0.5.1 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    pip install azure-pylint-guidelines-checker==0.5.2 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
     python ../../../eng/scripts/ci/run_pylint.py -t unbranded -s "generated" {posargs}
 
 [testenv:mypy]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.8.0",
+  "version": "0.9.0-dev.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -26,13 +26,13 @@
     }
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "scripts": {
     "clean": "rimraf ./dist ./temp ./emitter/temp ./generator/test/azure/generated ./generator/test/unbranded/generated ./venv",
     "build": "tsc -p ./emitter/tsconfig.build.json && tsx ./eng/scripts/setup/build.ts",
     "watch": "tsc -p ./emitter/tsconfig.build.json --watch",
-    "lint": "eslint . --max-warnings=0",
+    "lint": "eslint emitter/ --max-warnings=0",
     "lint:py": "tsx ./eng/scripts/ci/lint.ts --folderName generator/pygen",
     "format": "pnpm -w format:dir packages/http-client-python && tsx ./eng/scripts/ci/format.ts",
     "install": "tsx ./eng/scripts/setup/install.ts",
@@ -53,16 +53,16 @@
     "emitter"
   ],
   "peerDependencies": {
-    "@azure-tools/typespec-autorest": ">=0.52.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.52.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.52.0 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.52.0 <3.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.52.0 <1.0.0",
-    "@typespec/compiler": ">=0.66.0 <1.0.0",
-    "@typespec/http": ">=0.66.0 <1.0.0",
-    "@typespec/openapi": ">=0.66.0 <1.0.0",
-    "@typespec/rest": ">=0.66.0 <1.0.0",
-    "@typespec/versioning": ">=0.66.0 <1.0.0"
+    "@azure-tools/typespec-autorest": ">=0.53.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.53.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.53.0 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.53.0 <3.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.53.1 <1.0.0",
+    "@typespec/compiler": ">=0.67.0 <1.0.0",
+    "@typespec/http": ">=0.67.0 <1.0.0",
+    "@typespec/openapi": ">=0.67.0 <1.0.0",
+    "@typespec/rest": ">=0.67.0 <1.0.0",
+    "@typespec/versioning": ">=0.67.0 <1.0.0"
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
@@ -72,21 +72,21 @@
     "tsx": "~4.19.1"
   },
   "devDependencies": {
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.7",
-    "@azure-tools/typespec-autorest": "~0.52.0",
-    "@azure-tools/typespec-azure-core": "~0.52.0",
-    "@azure-tools/typespec-azure-resource-manager": "~0.52.0",
-    "@azure-tools/typespec-azure-rulesets": "~0.52.0",
-    "@azure-tools/typespec-client-generator-core": "~0.52.0",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.10",
+    "@azure-tools/typespec-autorest": "~0.53.0",
+    "@azure-tools/typespec-azure-core": "~0.53.0",
+    "@azure-tools/typespec-azure-resource-manager": "~0.53.0",
+    "@azure-tools/typespec-azure-rulesets": "~0.53.0",
+    "@azure-tools/typespec-client-generator-core": "~0.53.1",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~22.5.4",
     "@types/semver": "7.5.8",
-    "@typespec/compiler": "~0.66.0",
-    "@typespec/http": "~0.66.0",
-    "@typespec/http-specs": "0.1.0-alpha.11",
-    "@typespec/openapi": "~0.66.0",
-    "@typespec/rest": "~0.66.0",
-    "@typespec/versioning": "~0.66.0",
+    "@typespec/compiler": "~0.67.0",
+    "@typespec/http": "~0.67.0",
+    "@typespec/http-specs": "0.1.0-alpha.15-dev.3",
+    "@typespec/openapi": "~0.67.0",
+    "@typespec/rest": "~0.67.0",
+    "@typespec/versioning": "~0.67.0",
     "c8": "^10.1.3",
     "chalk": "5.3.0",
     "rimraf": "~6.0.1",