@typespec/http-client-python 0.5.0 → 0.6.0

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

@@ -5,6 +5,6 @@
 from enum import Enum
 from {{ code_model.core_library }}{{ "" if code_model.is_azure_flavor else ".utils" }} import CaseInsensitiveEnumMeta
 
-{% for enum in code_model.enums | sort %}
+{% for enum in enums | sort %}
 {% include "enum.py.jinja2" %}
 {% endfor %}

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

@@ -8,7 +8,7 @@ from .{{ client.filename }} import {{ client.name }}  # type: ignore
     {% endfor %}
 {% endif %}
 {% if not async_mode and code_model.options['package_version']%}
-from ._version import VERSION
+from {{ code_model.get_relative_import_path(serialize_namespace, module_name="_version") }} import VERSION
 
 __version__ = VERSION
 {% endif %}

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

@@ -6,7 +6,7 @@
 {% endif %}
 
 {{ imports }}
-{% for model in code_model.model_types %}
+{% for model in models %}
 {% if model.base == "dpg" %}
 {% include "model_dpg.py.jinja2" %}
 {% elif model.base == "msrest" %}

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

@@ -7,11 +7,9 @@
 {{ op_tools.serialize(operation_group_imports()) }}
 {{ keywords.patch_imports() }}
 __all__ = [
-    {% for client in clients %}
-        {% for operation_group in client.operation_groups %}
+      {% for operation_group in operation_groups %}
     '{{ operation_group.class_name }}',
-        {% endfor %}
-    {% endfor %}
+      {% endfor %}
 ]
 {{ keywords.extend_all }}
 _patch_sdk()

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

@@ -1,7 +1,7 @@
 {% set prefix_lower = test.prefix|lower %}
 {% set client_var = "self.client" if code_model.options["azure_arm"] else "client" %}
-{% set async = "async " if test.is_async else "" %}
-{% set async_suffix = "_async" if test.is_async else "" %}
+{% set async = "async " if test.async_mode else "" %}
+{% set async_suffix = "_async" if test.async_mode else "" %}
 # coding=utf-8
 {{ code_model.options['license_header'] }}
 import pytest
@@ -15,7 +15,7 @@ AZURE_LOCATION = "eastus"
 class {{ test.test_class_name }}({{ test.base_test_class_name }}):
 {% if code_model.options["azure_arm"] %}
     def setup_method(self, method):
-        {% if test.is_async %}
+        {% if test.async_mode %}
         self.client = self.create_mgmt_client({{ test.client_name }}, is_async=True)
         {% else %}
         self.client = self.create_mgmt_client({{ test.client_name }})

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

@@ -3,7 +3,7 @@
 {{ imports }}
 
 {% for test_name in test_names %}
-{% set extra_async = ", is_async=True" if test_name.is_async else ""%}
+{% set extra_async = ", is_async=True" if test_name.async_mode else ""%}
 {% set prefix_lower = test_name.prefix|lower %}
 class {{ test_name.base_test_class_name }}(AzureRecordedTestCase):
 
@@ -15,7 +15,7 @@ class {{ test_name.base_test_class_name }}(AzureRecordedTestCase):
             endpoint=endpoint,
         )
 
-{% if not test_name.is_async %}
+{% if not test_name.async_mode %}
 {{ test_name.preparer_name }} = functools.partial(
     PowerShellPreparer,
     "{{ prefix_lower }}",

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

@@ -3,7 +3,7 @@
 
 {{ imports }}
 
-{% if code_model.need_mixin_abc %}
+{% 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 }}
@@ -16,7 +16,7 @@ class {{ client.name }}MixinABC(  {{ pylint_disable }}
     _deserialize: "Deserializer"
     {% endfor %}
 {% endif %}
-{% if code_model.has_abstract_operations %}
+{% if code_model.need_vendored_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))]
@@ -27,7 +27,7 @@ def raise_if_not_implemented(cls, abstract_methods):
         )
 {% endif %}
 
-{% if code_model.has_etag %}
+{% if code_model.need_vendored_etag(client_namespace) %}
 def quote_etag(etag: Optional[str]) -> Optional[str]:
     if not etag or etag == "*":
         return etag
@@ -57,7 +57,7 @@ def prep_if_none_match(etag: Optional[str], match_condition: Optional[MatchCondi
         return "*"
     return None
 {% endif %}
-{% if code_model.has_form_data and code_model.options["models_mode"] == "dpg" and not async_mode  %}
+{% if code_model.need_vendored_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/preprocess/__init__.py

@@ -501,10 +501,6 @@ class PreProcessPlugin(YamlUpdatePlugin):
         for client in yaml_data["clients"]:
             self.update_client(client)
             self.update_operation_groups(yaml_data, client)
-        for clients in yaml_data["subnamespaceToClients"].values():
-            for client in clients:
-                self.update_client(client)
-                self.update_operation_groups(yaml_data, client)
         if yaml_data.get("namespace"):
             yaml_data["namespace"] = pad_builtin_namespaces(yaml_data["namespace"])
 

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

@@ -19,7 +19,7 @@ async def client():
         yield client
 
 
-# ========== test for cadl-ranch ==========
+# ========== test for spector ==========
 
 
 @pytest.mark.asyncio

package/generator/test/{generic_mock_api_tests/asynctests/test_payload_pageable_async.py → azure/mock_api_tests/asynctests/test_azure_payload_pageable_async.py}

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
-from payload.pageable.aio import PageableClient
+from specs.azure.payload.pageable.aio import PageableClient
 
 
 @pytest.fixture

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

@@ -0,0 +1,31 @@
+# -------------------------------------------------------------------------
+# 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 client.clientnamespace.aio import ClientNamespaceFirstClient
+# from client.clientnamespace.first.models import FirstClientResult
+
+# from client.clientnamespace.second.aio import ClientNamespaceSecondClient
+# from client.clientnamespace.second.models import SecondClientResult
+# from client.clientnamespace.second.sub.models import SecondClientEnumType
+
+
+# @pytest.fixture
+# async def first_client():
+#     async with ClientNamespaceFirstClient() as client:
+#         yield client
+
+# @pytest.fixture
+# async def second_client():
+#     async with ClientNamespaceSecondClient() as client:
+#         yield client
+
+# @pytest.mark.asyncio
+# async def test_get_first(first_client: ClientNamespaceFirstClient):
+#     assert await first_client.get_first() == FirstClientResult(name="first")
+
+# @pytest.mark.asyncio
+# async def test_get_second(second_client: ClientNamespaceSecondClient):
+#     assert await second_client.get_second() == SecondClientResult(type=SecondClientEnumType.SECOND)

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

@@ -13,9 +13,10 @@ from pathlib import Path
 
 
 def start_server_process():
-    path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@azure-tools/cadl-ranch-specs")
-    os.chdir(path.resolve())
-    cmd = "cadl-ranch serve ./http  --coverageFile ./cadl-ranch-coverage-python-standard.json"
+    azure_http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@azure-tools/azure-http-specs")
+    http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@typespec/http-specs")
+    os.chdir(azure_http_path.resolve())
+    cmd = f"tsp-spector serve ./specs  {(http_path / 'specs').resolve()}"
     if os.name == "nt":
         return subprocess.Popen(cmd, shell=True)
     return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid)
@@ -30,7 +31,7 @@ def terminate_server_process(process):
 
 @pytest.fixture(scope="session", autouse=True)
 def testserver():
-    """Start cadl ranch mock api tests"""
+    """Start spector ranch mock api tests"""
     server = start_server_process()
     yield
     terminate_server_process(server)

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

@@ -19,7 +19,7 @@ def client():
         yield client
 
 
-# ========== test for cadl-ranch ==========
+# ========== test for spector ==========
 
 
 def test_put_flatten_model(client: FlattenPropertyClient):

package/generator/test/{generic_mock_api_tests/test_payload_pageable.py → azure/mock_api_tests/test_azure_payload_pageable.py}

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
-from payload.pageable import PageableClient
+from specs.azure.payload.pageable import PageableClient
 
 
 @pytest.fixture

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

@@ -0,0 +1,29 @@
+# -------------------------------------------------------------------------
+# 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 client.clientnamespace import ClientNamespaceFirstClient
+# from client.clientnamespace.first.models import FirstClientResult
+
+# from client.clientnamespace.second import ClientNamespaceSecondClient
+# from client.clientnamespace.second.models import SecondClientResult
+# from client.clientnamespace.second.sub.models import SecondClientEnumType
+
+
+# @pytest.fixture
+# def first_client():
+#     with ClientNamespaceFirstClient() as client:
+#         yield client
+
+# @pytest.fixture
+# def second_client():
+#     with ClientNamespaceSecondClient() as client:
+#         yield client
+
+# def test_get_first(first_client: ClientNamespaceFirstClient):
+#     assert first_client.get_first() == FirstClientResult(name="first")
+
+# def test_get_second(second_client: ClientNamespaceSecondClient):
+#     assert second_client.get_second() == SecondClientResult(type=SecondClientEnumType.SECOND)

package/generator/test/{generic_mock_api_tests → azure/mock_api_tests}/test_resiliency_srv_driven.py

@@ -90,8 +90,10 @@ def test_add_optional_param_from_one_optional():
         client.from_one_optional(parameter="optional", new_parameter="new")
 
 
-def test_break_the_glass(core_library):
-    request = core_library.rest.HttpRequest(method="DELETE", url="/add-operation")
+def test_break_the_glass():
+    from azure.core.rest import HttpRequest
+
+    request = HttpRequest(method="DELETE", url="/add-operation")
     with V1Client(
         endpoint="http://localhost:3000",
         service_deployment_version="v2",

package/generator/test/{generic_mock_api_tests/asynctests → azure/mock_api_tests}/test_resiliency_srv_driven_async.py

@@ -94,8 +94,10 @@ async def test_add_optional_param_from_one_optional():
 
 
 @pytest.mark.asyncio
-async def test_break_the_glass(core_library):
-    request = core_library.rest.HttpRequest(method="DELETE", url="/add-operation")
+async def test_break_the_glass():
+    from azure.core.rest import HttpRequest
+
+    request = HttpRequest(method="DELETE", url="/add-operation")
     async with V1Client(
         endpoint="http://localhost:3000",
         service_deployment_version="v2",

package/generator/test/azure/requirements.txt

@@ -6,10 +6,10 @@ pytest
 pytest-asyncio==0.14.0;python_full_version>="3.5.2"
 azure-core==1.30.0
 azure-mgmt-core==1.3.2
-pyright==1.1.389
+pyright==1.1.391
 pylint==3.2.7
 tox==4.18.1
-mypy==1.13.0
+mypy==1.14.1
 
 # only for azure
 -e ./generated/azure-client-generator-core-access
@@ -26,20 +26,26 @@ mypy==1.13.0
 -e ./generated/azure-example-basic
 -e ./generated/azure-resource-manager-common-properties
 -e ./generated/azure-resource-manager-resources
+# -e ./generated/client-namespace
+-e ./generated/azure-payload-pageable
+-e ./generated/client-naming
+-e ./generated/client-structure-default
+-e ./generated/client-structure-multiclient
+-e ./generated/client-structure-renamedoperation
+-e ./generated/client-structure-twooperationgroup
+-e ./generated/resiliency-srv-driven1
+-e ./generated/resiliency-srv-driven2
 
 # common test case
 -e ./generated/authentication-api-key
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-oauth2
 -e ./generated/authentication-union
--e ./generated/client-naming
 -e ./generated/encode-duration
 -e ./generated/encode-numeric
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
 -e ./generated/parameters-spread
--e ./generated/resiliency-srv-driven1
--e ./generated/resiliency-srv-driven2
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined
 -e ./generated/server-path-multiple
@@ -72,10 +78,6 @@ mypy==1.13.0
 -e ./generated/special-headers-conditional-request
 -e ./generated/encode-datetime
 -e ./generated/encode-bytes
--e ./generated/client-structure-default
--e ./generated/client-structure-multiclient
--e ./generated/client-structure-renamedoperation
--e ./generated/client-structure-twooperationgroup
 -e ./generated/payload-content-negotiation
 -e ./generated/payload-json-merge-patch
 -e ./generated/payload-pageable

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.4.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.0 --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.4.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.0 --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/conftest.py

@@ -15,9 +15,14 @@ FILE_FOLDER = Path(__file__).parent
 
 
 def start_server_process():
-    path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@azure-tools/cadl-ranch-specs")
-    os.chdir(path.resolve())
-    cmd = "cadl-ranch serve ./http"
+    azure_http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@azure-tools/azure-http-specs")
+    http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@typespec/http-specs")
+    if "unbranded" in Path(os.getcwd()).parts:
+        os.chdir(http_path.resolve())
+        cmd = "npx tsp-spector serve ./specs"
+    else:
+        os.chdir(azure_http_path.resolve())
+        cmd = f"npx tsp-spector serve ./specs {(http_path / 'specs').resolve()}"
     if os.name == "nt":
         return subprocess.Popen(cmd, shell=True)
     return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid)
@@ -32,7 +37,7 @@ def terminate_server_process(process):
 
 @pytest.fixture(scope="session", autouse=True)
 def testserver():
-    """Start cadl ranch mock api tests"""
+    """Start spector mock api tests"""
     server = start_server_process()
     yield
     terminate_server_process(server)

package/generator/test/unbranded/mock_api_tests/conftest.py

@@ -12,9 +12,9 @@ from pathlib import Path
 
 
 def start_server_process():
-    path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@azure-tools/cadl-ranch-specs")
-    os.chdir(path.resolve())
-    cmd = "cadl-ranch serve ./http"
+    http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@typespec/http-specs")
+    os.chdir(http_path.resolve())
+    cmd = "tsp-spector serve ./specs"
     if os.name == "nt":
         return subprocess.Popen(cmd, shell=True)
     return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid)
@@ -29,7 +29,7 @@ def terminate_server_process(process):
 
 @pytest.fixture(scope="session", autouse=True)
 def testserver():
-    """Start cadl ranch mock api tests"""
+    """Start spector mock api tests"""
     server = start_server_process()
     yield
     terminate_server_process(server)

package/generator/test/unbranded/mock_api_tests/test_unbranded.py

@@ -53,5 +53,5 @@ def check_sensitive_word(folder: Path, word: str) -> str:
 def test_sensitive_word():
     check_folder = (Path(os.path.dirname(__file__)) / "../generated").resolve()
     assert [] == check_sensitive_word(check_folder, "azure")
-    # after update cadl-ranch, it shall also equal to []
+    # after update spector, it shall also equal to []
     assert ["authentication-oauth2", "authentication-union"] == check_sensitive_word(check_folder, "microsoft")

package/generator/test/unbranded/requirements.txt

@@ -4,10 +4,10 @@ aiohttp;python_full_version>="3.5.2"
 requests==2.32.2
 pytest
 pytest-asyncio==0.14.0;python_full_version>="3.5.2"
-pyright==1.1.389
+pyright==1.1.391
 pylint==3.2.7
 tox==4.18.1
-mypy==1.13.0
+mypy==1.14.1
 
 
 # common test case
@@ -15,14 +15,11 @@ mypy==1.13.0
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-oauth2
 -e ./generated/authentication-union
--e ./generated/client-naming
 -e ./generated/encode-duration
 -e ./generated/encode-numeric
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
 -e ./generated/parameters-spread
--e ./generated/resiliency-srv-driven1
--e ./generated/resiliency-srv-driven2
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined
 -e ./generated/server-path-multiple
@@ -55,10 +52,6 @@ mypy==1.13.0
 -e ./generated/special-headers-conditional-request
 -e ./generated/encode-datetime
 -e ./generated/encode-bytes
--e ./generated/client-structure-default
--e ./generated/client-structure-multiclient
--e ./generated/client-structure-renamedoperation
--e ./generated/client-structure-twooperationgroup
 -e ./generated/payload-content-negotiation
 -e ./generated/payload-json-merge-patch
 -e ./generated/payload-pageable

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.4.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.0 --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.4.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.0 --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.5.0",
+  "version": "0.6.0",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -60,7 +60,7 @@
     "@azure-tools/typespec-azure-resource-manager": ">=0.49.0 <1.0.0",
     "@azure-tools/typespec-autorest": ">=0.49.0 <1.0.0",
     "@azure-tools/typespec-azure-rulesets": ">=0.49.0 <3.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.49.0 <1.0.0"
+    "@azure-tools/typespec-client-generator-core": ">=0.49.1 <1.0.0"
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
@@ -78,10 +78,9 @@
     "@azure-tools/typespec-azure-core": "~0.49.0",
     "@azure-tools/typespec-azure-rulesets": "~0.49.0",
     "@azure-tools/typespec-azure-resource-manager": "~0.49.0",
-    "@azure-tools/typespec-client-generator-core": "~0.49.0",
-    "@azure-tools/cadl-ranch-specs": "~0.39.6",
-    "@azure-tools/cadl-ranch-expect": "~0.15.7",
-    "@azure-tools/cadl-ranch": "~0.16.2",
+    "@azure-tools/typespec-client-generator-core": "~0.49.1",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.4",
+    "@typespec/http-specs": "0.1.0-alpha.5",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~22.5.4",
     "@types/semver": "7.5.8",

package/generator/requirements.txt

@@ -1,7 +0,0 @@
-black==24.8.0
-docutils>=0.20.1
-Jinja2==3.1.3
-m2r2==0.3.3.post2
-PyYAML==6.0.1
-tomli==2.0.1
-setuptools==69.5.1