@typespec/http-client-python 0.12.3 → 0.12.5

package/eng/scripts/setup/build_pygen_wheel.py

@@ -11,28 +11,27 @@ if not sys.version_info >= (3, 9, 0):
     raise Exception("Autorest for Python extension requires Python 3.9 at least")
 
 try:
-    import pip
-except (ImportError, ModuleNotFoundError):
-    raise Exception("Your Python installation doesn't have pip available")
+    from package_manager import detect_package_manager, PackageManagerNotFoundError
+    detect_package_manager()  # Just check if we have a package manager
+except (ImportError, ModuleNotFoundError, PackageManagerNotFoundError):
+    raise Exception("Your Python installation doesn't have a suitable package manager (pip or uv) available")
 
 
-# Now we have pip and Py >= 3.9, go to work
+# Now we have a package manager (pip or uv) and Py >= 3.9, go to work
 
 from pathlib import Path
 
-from venvtools import ExtendedEnvBuilder, python_run
+from venvtools import python_run
+from package_manager import install_packages, create_venv_with_package_manager
 
 _ROOT_DIR = Path(__file__).parent.parent.parent.parent
 
 
 def main():
     venv_path = _ROOT_DIR / "venv_build_wheel"
-    env_builder = ExtendedEnvBuilder(with_pip=True, upgrade_deps=True)
-    env_builder.create(venv_path)
-    venv_context = env_builder.context
+    venv_context = create_venv_with_package_manager(venv_path)
 
-    python_run(venv_context, "pip", ["install", "-U", "pip"])
-    python_run(venv_context, "pip", ["install", "build"])
+    install_packages(["build"], venv_context)
     python_run(venv_context, "build", ["--wheel"], additional_dir="generator")
 
 

package/eng/scripts/setup/install.py

@@ -13,10 +13,11 @@ if not sys.version_info >= (3, 9, 0):
     )
 
 try:
-    import pip
-except (ImportError, ModuleNotFoundError):
+    from package_manager import detect_package_manager, PackageManagerNotFoundError
+    detect_package_manager()  # Just check if we have a package manager
+except (ImportError, ModuleNotFoundError, PackageManagerNotFoundError):
     raise Warning(
-        "Your Python installation doesn't have pip available. We will run your code with Pyodide since your Python version isn't adequate."
+        "Your Python installation doesn't have a suitable package manager (pip or uv) available. We will run your code with Pyodide since your Python environment isn't adequate."
     )
 
 try:
@@ -27,28 +28,23 @@ except (ImportError, ModuleNotFoundError):
     )
 
 
-# Now we have pip and Py >= 3.8, go to work
+# Now we have a package manager (uv or pip) and Py >= 3.8, go to work
 
 from pathlib import Path
 
-from venvtools import ExtendedEnvBuilder, python_run
-
 _ROOT_DIR = Path(__file__).parent.parent.parent.parent
 
 
 def main():
     venv_path = _ROOT_DIR / "venv"
-    if venv_path.exists():
-        env_builder = venv.EnvBuilder(with_pip=True)
-        venv_context = env_builder.ensure_directories(venv_path)
-    else:
-        env_builder = ExtendedEnvBuilder(with_pip=True, upgrade_deps=True)
-        env_builder.create(venv_path)
-        venv_context = env_builder.context
-
-        python_run(venv_context, "pip", ["install", "-U", "pip"])
-        python_run(venv_context, "pip", ["install", "-U", "black"])
-        python_run(venv_context, "pip", ["install", "-e", f"{_ROOT_DIR}/generator"])
+    
+    # Create virtual environment using package manager abstraction
+    from package_manager import create_venv_with_package_manager, install_packages
+    venv_context = create_venv_with_package_manager(venv_path)
+    
+    # Install required packages - install_packages handles package manager logic
+    install_packages(["-U", "black"], venv_context)
+    install_packages(["-e", f"{_ROOT_DIR}/generator"], venv_context)
 
 
 if __name__ == "__main__":

package/eng/scripts/setup/package_manager.py

@@ -0,0 +1,139 @@
+#!/usr/bin/env python
+
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+"""Package manager utilities for detecting and using pip or uv."""
+
+import subprocess
+import sys
+import venv
+from pathlib import Path
+from venvtools import ExtendedEnvBuilder
+
+
+class PackageManagerNotFoundError(Exception):
+    """Raised when no suitable package manager is found."""
+    pass
+
+
+def _check_command_available(command: str) -> bool:
+    """Check if a command is available in the environment."""
+    try:
+        subprocess.run([command, "--version"], capture_output=True, check=True)
+        return True
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return False
+
+
+def detect_package_manager() -> str:
+    """Detect the best available package manager.
+    
+    Returns:
+        str: The package manager command ('uv' or 'pip')
+        
+    Raises:
+        PackageManagerNotFoundError: If no suitable package manager is found
+    """
+    # Check for uv first since it's more modern and faster
+    if _check_command_available("uv"):
+        return "uv"
+    
+    # Fall back to pip
+    if _check_command_available("pip"):
+        return "pip"
+    
+    # As a last resort, try using python -m pip
+    try:
+        subprocess.run([sys.executable, "-m", "pip", "--version"], 
+                      capture_output=True, check=True)
+        return "python -m pip"
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        pass
+    
+    raise PackageManagerNotFoundError(
+        "No suitable package manager found. Please install either uv or pip."
+    )
+
+
+def get_install_command(package_manager: str, venv_context=None) -> list:
+    """Get the install command for the given package manager.
+    
+    Args:
+        package_manager: The package manager command ('uv', 'pip', or 'python -m pip')
+        venv_context: The virtual environment context (optional, used for pip)
+        
+    Returns:
+        list: The base install command as a list
+    """
+    if package_manager == "uv":
+        cmd = ["uv", "pip", "install"]
+        if venv_context:
+            cmd.extend(["--python", venv_context.env_exe])
+        return cmd
+    elif package_manager == "pip":
+        if venv_context:
+            return [venv_context.env_exe, "-m", "pip", "install"]
+        else:
+            return ["pip", "install"]
+    elif package_manager == "python -m pip":
+        if venv_context:
+            return [venv_context.env_exe, "-m", "pip", "install"]
+        else:
+            return [sys.executable, "-m", "pip", "install"]
+    else:
+        raise ValueError(f"Unknown package manager: {package_manager}")
+
+
+def install_packages(packages: list, venv_context=None, package_manager: str = None) -> None:
+    """Install packages using the available package manager.
+    
+    Args:
+        packages: List of packages to install
+        venv_context: Virtual environment context (optional)
+        package_manager: Package manager to use (auto-detected if None)
+    """
+    if package_manager is None:
+        package_manager = detect_package_manager()
+    
+    install_cmd = get_install_command(package_manager, venv_context)
+    
+    try:
+        subprocess.check_call(install_cmd + packages)
+    except subprocess.CalledProcessError as e:
+        raise RuntimeError(f"Failed to install packages with {package_manager}: {e}")
+
+
+def create_venv_with_package_manager(venv_path):
+    """Create virtual environment using the best available package manager.
+    
+    Args:
+        venv_path: Path where to create the virtual environment
+        
+    Returns:
+        venv_context: Virtual environment context object
+    """
+    package_manager = detect_package_manager()
+    
+    if package_manager == "uv":
+        # Use uv to create and manage the virtual environment
+        if not venv_path.exists():
+            subprocess.check_call(["uv", "venv", str(venv_path)])
+        
+        # Create a mock venv_context for compatibility
+        class MockVenvContext:
+            def __init__(self, venv_path):
+                self.env_exe = str(venv_path / "bin" / "python") if sys.platform != "win32" else str(venv_path / "Scripts" / "python.exe")
+        
+        return MockVenvContext(venv_path)
+    else:
+        # Use standard venv for pip
+        if venv_path.exists():
+            env_builder = venv.EnvBuilder(with_pip=True)
+            return env_builder.ensure_directories(venv_path)
+        else:
+            env_builder = ExtendedEnvBuilder(with_pip=True, upgrade_deps=True)
+            env_builder.create(venv_path)
+            return env_builder.context

package/eng/scripts/setup/prepare.py

@@ -6,8 +6,6 @@
 # license information.
 # --------------------------------------------------------------------------
 import sys
-import os
-import argparse
 
 if not sys.version_info >= (3, 9, 0):
     raise Warning(
@@ -15,9 +13,7 @@ if not sys.version_info >= (3, 9, 0):
     )
 
 from pathlib import Path
-import venv
-
-from venvtools import python_run
+from package_manager import create_venv_with_package_manager, install_packages
 
 _ROOT_DIR = Path(__file__).parent.parent.parent.parent
 
@@ -28,14 +24,10 @@ def main():
 
     assert venv_preexists  # Otherwise install was not done
 
-    env_builder = venv.EnvBuilder(with_pip=True)
-    venv_context = env_builder.ensure_directories(venv_path)
+    venv_context = create_venv_with_package_manager(venv_path)
+    
     try:
-        python_run(
-            venv_context,
-            "pip",
-            ["install", "-r", f"{_ROOT_DIR}/generator/dev_requirements.txt"],
-        )
+        install_packages(["-r", f"{_ROOT_DIR}/generator/dev_requirements.txt"], venv_context)
     except FileNotFoundError as e:
         raise ValueError(e.filename)
 

package/eng/scripts/setup/venvtools.py

@@ -3,8 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from contextlib import contextmanager
-import tempfile
 import subprocess
 import venv
 import sys
@@ -31,51 +29,12 @@ class ExtendedEnvBuilder(venv.EnvBuilder):
         return self.context
 
 
-def create(
-    env_dir,
-    system_site_packages=False,
-    clear=False,
-    symlinks=False,
-    with_pip=False,
-    prompt=None,
-    upgrade_deps=False,
-):
-    """Create a virtual environment in a directory."""
-    builder = ExtendedEnvBuilder(
-        system_site_packages=system_site_packages,
-        clear=clear,
-        symlinks=symlinks,
-        with_pip=with_pip,
-        prompt=prompt,
-        upgrade_deps=upgrade_deps,
-    )
-    builder.create(env_dir)
-    return builder.context
-
-
-@contextmanager
-def create_venv_with_package(packages):
-    """Create a venv with these packages in a temp dir and yield the env.
-
-    packages should be an iterable of pip version instruction (e.g. package~=1.2.3)
-    """
-    with tempfile.TemporaryDirectory() as tempdir:
-        my_env = create(tempdir, with_pip=True, upgrade_deps=True)
-        pip_call = [
-            my_env.env_exe,
-            "-m",
-            "pip",
-            "install",
-        ]
-        subprocess.check_call(pip_call + ["-U", "pip"])
-        if packages:
-            subprocess.check_call(pip_call + packages)
-        yield my_env
 
 
 def python_run(venv_context, module, command=None, *, additional_dir="."):
     try:
         cmd_line = [venv_context.env_exe, "-m", module] + (command if command else [])
+        
         print("Executing: {}".format(" ".join(cmd_line)))
         subprocess.run(
             cmd_line,

package/generator/build/lib/pygen/codegen/models/property.py

@@ -87,11 +87,17 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
     def is_enum_discriminator(self) -> bool:
         return self.is_discriminator and self.type.type == "enum"
 
+    @property
+    def is_combined_discriminator(self) -> bool:
+        return self.is_discriminator and self.type.type == "combined"
+
     @property
     def is_base_discriminator(self) -> bool:
         """If this discriminator is on the base model for polymorphic inheritance"""
         if self.is_enum_discriminator:
             return self.is_polymorphic and self.client_default_value is None
+        if self.is_combined_discriminator:
+            return True
         return self.is_discriminator and self.is_polymorphic and cast(ConstantType, self.type).value is None
 
     @property

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

@@ -104,4 +104,35 @@ additional questions or comments.
 [pip]: https://pypi.org/project/pip/
 [azure_sub]: https://azure.microsoft.com/free/
 {% endif %}
+{% else %}
+# Overview
+
+This package is generated by `@typespec/http-client-python` with Typespec.
+
+## Getting started
+
+### Prequisites
+
+- Python 3.9 or later is required to use this package.
+
+### Install the package
+
+Step into folder where setup.py is then run:
+
+```bash
+pip install -e .
+```
+
+### Examples
+
+```python
+>>> from {{ code_model.namespace }} import {{ client_name }}
+>>> from {{ code_model.core_library }}.exceptions import HttpResponseError
+
+>>> client = {{ client_name }}(endpoint='<endpoint>')
+>>> try:
+        <!-- write code here -->
+    except HttpResponseError as e:
+        print('service responds error: {}'.format(e.response.json()))
+```
 {% endif %}

package/generator/pygen/codegen/models/property.py

@@ -87,11 +87,17 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
     def is_enum_discriminator(self) -> bool:
         return self.is_discriminator and self.type.type == "enum"
 
+    @property
+    def is_combined_discriminator(self) -> bool:
+        return self.is_discriminator and self.type.type == "combined"
+
     @property
     def is_base_discriminator(self) -> bool:
         """If this discriminator is on the base model for polymorphic inheritance"""
         if self.is_enum_discriminator:
             return self.is_polymorphic and self.client_default_value is None
+        if self.is_combined_discriminator:
+            return True
         return self.is_discriminator and self.is_polymorphic and cast(ConstantType, self.type).value is None
 
     @property

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

@@ -104,4 +104,35 @@ additional questions or comments.
 [pip]: https://pypi.org/project/pip/
 [azure_sub]: https://azure.microsoft.com/free/
 {% endif %}
+{% else %}
+# Overview
+
+This package is generated by `@typespec/http-client-python` with Typespec.
+
+## Getting started
+
+### Prequisites
+
+- Python 3.9 or later is required to use this package.
+
+### Install the package
+
+Step into folder where setup.py is then run:
+
+```bash
+pip install -e .
+```
+
+### Examples
+
+```python
+>>> from {{ code_model.namespace }} import {{ client_name }}
+>>> from {{ code_model.core_library }}.exceptions import HttpResponseError
+
+>>> client = {{ client_name }}(endpoint='<endpoint>')
+>>> try:
+        <!-- write code here -->
+    except HttpResponseError as e:
+        print('service responds error: {}'.format(e.response.json()))
+```
 {% endif %}

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

@@ -6,6 +6,7 @@
 import pytest
 from azure.resourcemanager.commonproperties.aio import CommonPropertiesClient
 from azure.resourcemanager.commonproperties import models
+from azure.core import exceptions
 
 SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
 RESOURCE_GROUP_NAME = "test-rg"
@@ -61,3 +62,33 @@ async def test_managed_identity_update_with_user_assigned_and_system_assigned(cl
     assert result.location == "eastus"
     assert result.identity.type == "SystemAssigned,UserAssigned"
     assert result.properties.provisioning_state == "Succeeded"
+
+
+@pytest.mark.asyncio
+async def test_error_get_for_predefined_error(client):
+    try:
+        await client.error.get_for_predefined_error(
+            resource_group_name=RESOURCE_GROUP_NAME,
+            confidential_resource_name="confidential",
+        )
+    except exceptions.ResourceNotFoundError as e:
+        assert e.status_code == 404
+        assert (
+            e.error.message
+            == "The Resource 'Azure.ResourceManager.CommonProperties/confidentialResources/confidential' under resource group 'test-rg' was not found."
+        )
+
+
+@pytest.mark.asyncio
+async def test_error_create_for_user_defined_error(client):
+    try:
+        await client.error.create_for_user_defined_error(
+            resource_group_name=RESOURCE_GROUP_NAME,
+            confidential_resource_name="confidential",
+            resource=models.ConfidentialResource(
+                location="eastus", properties=models.ConfidentialResourceProperties(username="00")
+            ),
+        )
+    except exceptions.HttpResponseError as e:
+        assert e.status_code == 400
+        assert e.error.message == "Username should not contain only numbers."

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

@@ -0,0 +1,30 @@
+# -------------------------------------------------------------------------
+# 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.largeheader.aio import LargeHeaderClient
+from azure.resourcemanager.largeheader import models
+
+SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
+RESOURCE_GROUP_NAME = "test-rg"
+
+
+@pytest.fixture
+async def client(credential, authentication_policy):
+    async with LargeHeaderClient(
+        credential, SUBSCRIPTION_ID, "http://localhost:3000", authentication_policy=authentication_policy
+    ) as client:
+        yield client
+
+
+@pytest.mark.asyncio
+async def test_large_headers_begin_two6_k(client: LargeHeaderClient):
+    result = await (
+        await client.large_headers.begin_two6_k(
+            resource_group_name=RESOURCE_GROUP_NAME,
+            large_header_name="header1",
+        )
+    ).result()
+    assert result == models.CancelResult(succeeded=True)

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

@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------
+# 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.nonresource.aio import NonResourceClient
+from azure.resourcemanager.nonresource import models
+
+SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
+RESOURCE_GROUP_NAME = "test-rg"
+
+
+@pytest.fixture
+async def client(credential, authentication_policy):
+    async with NonResourceClient(
+        credential, SUBSCRIPTION_ID, "http://localhost:3000", authentication_policy=authentication_policy
+    ) as client:
+        yield client
+
+
+@pytest.mark.asyncio
+async def test_non_resource_create(client: NonResourceClient):
+    result = await client.non_resource_operations.create(
+        location="eastus", parameter="hello", body=models.NonResource(id="id", name="hello", type="nonResource")
+    )
+    assert result == models.NonResource(id="id", name="hello", type="nonResource")
+
+
+@pytest.mark.asyncio
+async def test_non_resource_get(client: NonResourceClient):
+    result = await client.non_resource_operations.get(
+        location="eastus",
+        parameter="hello",
+    )
+    assert result == models.NonResource(id="id", name="hello", type="nonResource")

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

@@ -10,6 +10,7 @@ from specs.azure.clientgenerator.core.clientinitialization.aio import (
     MixedParamsClient,
     PathParamClient,
     ParamAliasClient,
+    ParentClient,
 )
 from specs.azure.clientgenerator.core.clientinitialization.models import Input
 
@@ -48,3 +49,11 @@ async def test_param_alias_client():
     async with ParamAliasClient("sample-blob") as client:
         await client.with_aliased_name()
         await client.with_original_name()
+
+
+# @pytest.mark.asyncio
+# async def test_parent_child_client():
+#     async with ParentClient() as client:
+#         await client.child_client.with_query()
+#         await client.child_client.get_standalone()
+#         await client.child_client.delete_standalone()

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

@@ -0,0 +1,20 @@
+# -------------------------------------------------------------------------
+# 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.emptystring.aio import DeserializeEmptyStringAsNullClient
+from specs.azure.clientgenerator.core.emptystring import models
+
+
+@pytest.fixture
+async def client():
+    async with DeserializeEmptyStringAsNullClient() as client:
+        yield client
+
+
+@pytest.mark.asyncio
+async def test_get(client: DeserializeEmptyStringAsNullClient):
+    result = await client.get()
+    assert result == models.ResponseModel(sample_url="")

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

@@ -29,3 +29,10 @@ async def test_model_usage(client: UsageClient):
     assert models.RoundTripModel(
         result=models.ResultModel(name="Madge")
     ) == await client.model_in_operation.model_in_read_only_property(body=models.RoundTripModel())
+
+
+# @pytest.mark.asyncio
+# async def test_orphan_model_serializable(client: UsageClient):
+#     await client.model_in_operation.orphan_model_serializable(
+#         body=models.OrphanModel(model_name="name", description="desc")
+#     )

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

@@ -0,0 +1,19 @@
+# -------------------------------------------------------------------------
+# 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.encode.duration.aio import DurationClient
+from specs.azure.encode.duration import models
+
+
+@pytest.fixture
+async def client():
+    async with DurationClient() as client:
+        yield client
+
+
+@pytest.mark.asyncio
+async def test_duration_constant(client: DurationClient):
+    await client.duration_constant(models.DurationModel(input="1.02:59:59.5000000"))

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

@@ -6,6 +6,7 @@
 import pytest
 from azure.resourcemanager.commonproperties import CommonPropertiesClient
 from azure.resourcemanager.commonproperties import models
+from azure.core import exceptions
 
 SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
 RESOURCE_GROUP_NAME = "test-rg"
@@ -58,3 +59,31 @@ def test_managed_identity_update_with_user_assigned_and_system_assigned(client):
     assert result.location == "eastus"
     assert result.identity.type == "SystemAssigned,UserAssigned"
     assert result.properties.provisioning_state == "Succeeded"
+
+
+def test_error_get_for_predefined_error(client):
+    try:
+        client.error.get_for_predefined_error(
+            resource_group_name=RESOURCE_GROUP_NAME,
+            confidential_resource_name="confidential",
+        )
+    except exceptions.ResourceNotFoundError as e:
+        assert e.status_code == 404
+        assert (
+            e.error.message
+            == "The Resource 'Azure.ResourceManager.CommonProperties/confidentialResources/confidential' under resource group 'test-rg' was not found."
+        )
+
+
+def test_error_create_for_user_defined_error(client):
+    try:
+        client.error.create_for_user_defined_error(
+            resource_group_name=RESOURCE_GROUP_NAME,
+            confidential_resource_name="confidential",
+            resource=models.ConfidentialResource(
+                location="eastus", properties=models.ConfidentialResourceProperties(username="00")
+            ),
+        )
+    except exceptions.HttpResponseError as e:
+        assert e.status_code == 400
+        assert e.error.message == "Username should not contain only numbers."