@typespec/http-client-python 0.13.0-dev.3 → 0.13.0

package/eng/scripts/setup/build_pygen_wheel.py

@@ -12,6 +12,7 @@ if not sys.version_info >= (3, 9, 0):
 
 try:
     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")

package/eng/scripts/setup/install.py

@@ -14,6 +14,7 @@ if not sys.version_info >= (3, 9, 0):
 
 try:
     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(
@@ -37,11 +38,12 @@ _ROOT_DIR = Path(__file__).parent.parent.parent.parent
 
 def main():
     venv_path = _ROOT_DIR / "venv"
-    
+
     # 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)

package/eng/scripts/setup/package_manager.py

@@ -16,6 +16,7 @@ from venvtools import ExtendedEnvBuilder
 
 class PackageManagerNotFoundError(Exception):
     """Raised when no suitable package manager is found."""
+
     pass
 
 
@@ -30,41 +31,38 @@ def _check_command_available(command: str) -> bool:
 
 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)
+        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."
-    )
+
+    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
     """
@@ -89,7 +87,7 @@ def get_install_command(package_manager: str, venv_context=None) -> list:
 
 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)
@@ -97,9 +95,9 @@ def install_packages(packages: list, venv_context=None, package_manager: str = N
     """
     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:
@@ -108,25 +106,29 @@ def install_packages(packages: list, venv_context=None, package_manager: str = N
 
 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")
-        
+                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
@@ -136,4 +138,4 @@ def create_venv_with_package_manager(venv_path):
         else:
             env_builder = ExtendedEnvBuilder(with_pip=True, upgrade_deps=True)
             env_builder.create(venv_path)
-            return env_builder.context
+            return env_builder.context

package/eng/scripts/setup/prepare.py

@@ -25,7 +25,7 @@ def main():
     assert venv_preexists  # Otherwise install was not done
 
     venv_context = create_venv_with_package_manager(venv_path)
-    
+
     try:
         install_packages(["-r", f"{_ROOT_DIR}/generator/dev_requirements.txt"], venv_context)
     except FileNotFoundError as e:

package/eng/scripts/setup/venvtools.py

@@ -29,12 +29,10 @@ class ExtendedEnvBuilder(venv.EnvBuilder):
         return self.context
 
 
-
-
 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/client.py

@@ -322,11 +322,13 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
         )
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         for og in self.operation_groups:
+            suffix = f".{og.filename}" if (not self.code_model.options["multiapi"]) and og.is_mixin else ""
             file_import.add_submodule_import(
                 self.code_model.get_relative_import_path(
                     serialize_namespace,
                     self.code_model.get_imported_namespace_for_operation(og.client_namespace, async_mode),
-                ),
+                )
+                + suffix,
                 og.class_name,
                 ImportType.LOCAL,
             )

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

@@ -34,7 +34,6 @@ class OperationGroup(BaseModel):
     ) -> None:
         super().__init__(yaml_data, code_model)
         self.client = client
-        self.class_name: str = yaml_data["className"]
         self.identify_name: str = yaml_data["identifyName"]
         self.property_name: str = yaml_data["propertyName"]
         self.operations = operations
@@ -51,6 +50,13 @@ class OperationGroup(BaseModel):
         for og in self.operation_groups:
             og.has_parent_operation_group = True
 
+    @property
+    def class_name(self) -> str:
+        """The class name of the operation group."""
+        if self.is_mixin and not self.code_model.options["multiapi"]:
+            return "_" + self.yaml_data["className"]
+        return self.yaml_data["className"]
+
     @property
     def has_abstract_operations(self) -> bool:
         return any(o for o in self.operations if o.abstract) or any(
@@ -89,7 +95,7 @@ class OperationGroup(BaseModel):
             retval = add_to_pylint_disable(retval, "abstract-class-instantiated")
         if len(self.operations) > 20:
             retval = add_to_pylint_disable(retval, "too-many-public-methods")
-        if len(self.class_name) > NAME_LENGTH_LIMIT:
+        if len(self.class_name) > NAME_LENGTH_LIMIT and self.class_name[0] != "_":
             retval = add_to_pylint_disable(retval, "name-too-long")
         if len(self.operation_groups) > 6:
             retval = add_to_pylint_disable(retval, "too-many-instance-attributes")

package/generator/build/lib/pygen/codegen/serializers/client_serializer.py

@@ -50,7 +50,8 @@ class ClientSerializer:
         class_name = self.client.name
         base_class = ""
         if self.client.has_mixin:
-            base_class = f"{class_name}OperationsMixin"
+            prefix = "" if self.client.code_model.options["multiapi"] else "_"
+            base_class = f"{prefix}{class_name}OperationsMixin"
         pylint_disable = self.client.pylint_disable()
         if base_class:
             return f"class {class_name}({base_class}):{pylint_disable}"

package/generator/build/lib/pygen/codegen/serializers/operations_init_serializer.py

@@ -26,7 +26,11 @@ class OperationsInitSerializer:
         def _get_filename(operation_group: OperationGroup) -> str:
             return "_operations" if self.code_model.options["combine-operation-files"] else operation_group.filename
 
-        return [f"from .{_get_filename(og)} import {og.class_name}  # type: ignore" for og in self.operation_groups]
+        return [
+            f"from .{_get_filename(og)} import {og.class_name}  # type: ignore"
+            for og in self.operation_groups
+            if not og.is_mixin or self.code_model.options["multiapi"]
+        ]
 
     def serialize(self) -> str:
         operation_group_init_template = self.env.get_template("operations_folder_init.py.jinja2")

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

@@ -10,7 +10,9 @@
 {{ keywords.patch_imports() }}
 __all__ = [
       {% for operation_group in operation_groups %}
+      {% if not operation_group.is_mixin or code_model.options["multiapi"] %}
     '{{ operation_group.class_name }}',
+      {% endif %}
       {% endfor %}
 ]
 {{ keywords.extend_all }}

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

@@ -322,11 +322,13 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
         )
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         for og in self.operation_groups:
+            suffix = f".{og.filename}" if (not self.code_model.options["multiapi"]) and og.is_mixin else ""
             file_import.add_submodule_import(
                 self.code_model.get_relative_import_path(
                     serialize_namespace,
                     self.code_model.get_imported_namespace_for_operation(og.client_namespace, async_mode),
-                ),
+                )
+                + suffix,
                 og.class_name,
                 ImportType.LOCAL,
             )

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

@@ -34,7 +34,6 @@ class OperationGroup(BaseModel):
     ) -> None:
         super().__init__(yaml_data, code_model)
         self.client = client
-        self.class_name: str = yaml_data["className"]
         self.identify_name: str = yaml_data["identifyName"]
         self.property_name: str = yaml_data["propertyName"]
         self.operations = operations
@@ -51,6 +50,13 @@ class OperationGroup(BaseModel):
         for og in self.operation_groups:
             og.has_parent_operation_group = True
 
+    @property
+    def class_name(self) -> str:
+        """The class name of the operation group."""
+        if self.is_mixin and not self.code_model.options["multiapi"]:
+            return "_" + self.yaml_data["className"]
+        return self.yaml_data["className"]
+
     @property
     def has_abstract_operations(self) -> bool:
         return any(o for o in self.operations if o.abstract) or any(
@@ -89,7 +95,7 @@ class OperationGroup(BaseModel):
             retval = add_to_pylint_disable(retval, "abstract-class-instantiated")
         if len(self.operations) > 20:
             retval = add_to_pylint_disable(retval, "too-many-public-methods")
-        if len(self.class_name) > NAME_LENGTH_LIMIT:
+        if len(self.class_name) > NAME_LENGTH_LIMIT and self.class_name[0] != "_":
             retval = add_to_pylint_disable(retval, "name-too-long")
         if len(self.operation_groups) > 6:
             retval = add_to_pylint_disable(retval, "too-many-instance-attributes")

package/generator/pygen/codegen/serializers/client_serializer.py

@@ -50,7 +50,8 @@ class ClientSerializer:
         class_name = self.client.name
         base_class = ""
         if self.client.has_mixin:
-            base_class = f"{class_name}OperationsMixin"
+            prefix = "" if self.client.code_model.options["multiapi"] else "_"
+            base_class = f"{prefix}{class_name}OperationsMixin"
         pylint_disable = self.client.pylint_disable()
         if base_class:
             return f"class {class_name}({base_class}):{pylint_disable}"

package/generator/pygen/codegen/serializers/operations_init_serializer.py

@@ -26,7 +26,11 @@ class OperationsInitSerializer:
         def _get_filename(operation_group: OperationGroup) -> str:
             return "_operations" if self.code_model.options["combine-operation-files"] else operation_group.filename
 
-        return [f"from .{_get_filename(og)} import {og.class_name}  # type: ignore" for og in self.operation_groups]
+        return [
+            f"from .{_get_filename(og)} import {og.class_name}  # type: ignore"
+            for og in self.operation_groups
+            if not og.is_mixin or self.code_model.options["multiapi"]
+        ]
 
     def serialize(self) -> str:
         operation_group_init_template = self.env.get_template("operations_folder_init.py.jinja2")

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

@@ -10,7 +10,9 @@
 {{ keywords.patch_imports() }}
 __all__ = [
       {% for operation_group in operation_groups %}
+      {% if not operation_group.is_mixin or code_model.options["multiapi"] %}
     '{{ operation_group.class_name }}',
+      {% endif %}
       {% endfor %}
 ]
 {{ keywords.extend_all }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.13.0-dev.3",
+  "version": "0.13.0",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",