@typespec/http-client-python 0.15.2 → 0.16.1-dev.0

package/eng/scripts/ci/regenerate.ts

@@ -22,11 +22,7 @@ const argv = parseArgs({
 });
 
 // Add this near the top with other constants
-const SKIP_SPECS = [
-  "type/union/discriminated",
-  "client-operation-group",
-  "azure/client-generator-core/hierarchy-building",
-];
+const SKIP_SPECS = ["type/union/discriminated", "client-operation-group"];
 
 // Get the directory of the current file
 const PLUGIN_DIR = argv.values.pluginDir
@@ -68,6 +64,9 @@ const AZURE_EMITTER_OPTIONS: Record<string, Record<string, string> | Record<stri
   "azure/client-generator-core/override": {
     namespace: "specs.azure.clientgenerator.core.override",
   },
+  "azure/client-generator-core/hierarchy-building": {
+    namespace: "specs.azure.clientgenerator.core.hierarchybuilding",
+  },
   "azure/core/basic": {
     namespace: "specs.azure.core.basic",
   },
@@ -114,7 +113,7 @@ const AZURE_EMITTER_OPTIONS: Record<string, Record<string, string> | Record<stri
     namespace: "client.structure.twooperationgroup",
   },
   "client/naming": {
-    namespace: "client.naming",
+    namespace: "client.naming.main",
   },
   "client/overload": {
     namespace: "client.overload",

package/eng/scripts/ci/util.py

@@ -25,7 +25,7 @@ def run_check(name, call_back, log_info):
         "-t",
         "--test-folder",
         dest="test_folder",
-        help="The test folder we're in. Can be 'azure', 'multiapi', or 'vanilla'",
+        help="The test folder we're in. Can be 'azure' or 'vanilla'",
         required=True,
     )
     parser.add_argument(

package/eng/scripts/setup/install.py

@@ -8,28 +8,33 @@
 import sys
 
 if not sys.version_info >= (3, 9, 0):
-    raise Warning(
-        "Autorest for Python extension requires Python 3.9 at least. We will run your code with Pyodide since your Python version isn't adequate."
+    print(
+        "Warning: Autorest for Python extension requires Python 3.9 at least. We will run your code with Pyodide since your Python version isn't adequate."
     )
+    sys.exit(2)  # Exit code 2 for inadequate environment
 
 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(
-        "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."
+    print(
+        "Warning: 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."
     )
+    sys.exit(2)  # Exit code 2 for inadequate environment
 
 try:
     import venv
 except (ImportError, ModuleNotFoundError):
-    raise Warning(
-        "Your Python installation doesn't have venv available. We will run your code with Pyodide since your Python version isn't adequate."
+    print(
+        "Warning: Your Python installation doesn't have venv available. We will run your code with Pyodide since your Python version isn't adequate."
     )
+    sys.exit(2)  # Exit code 2 for inadequate environment
 
 
-# Now we have a package manager (uv or pip) and Py >= 3.8, go to work
+# Now we have a package manager (uv or pip) and Py >= 3.9, go to work
+# At this point, both Python and package manager are confirmed to be available
+# Any failures from here should fail the npm install, not fallback to Pyodide
 
 from pathlib import Path
 
@@ -42,11 +47,16 @@ def main():
     # 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)
+    try:
+        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)
+        # Install required packages - install_packages handles package manager logic
+        install_packages(["-U", "black"], venv_context)
+        install_packages([f"{_ROOT_DIR}/generator"], venv_context)
+    except Exception as e:
+        # Since Python and package manager are available, any failure here should fail the npm install
+        print(f"Error: Installation failed despite Python and package manager being available: {e}")
+        sys.exit(1)  # Exit code 1 for installation failure
 
 
 if __name__ == "__main__":

package/eng/scripts/setup/install.ts

@@ -1,11 +1,36 @@
-import { runPython3 } from "./run-python3.js";
+import cp from "child_process";
+import { patchPythonPath } from "./system-requirements.js";
 
 async function main() {
+  let pythonCommand: string[];
+
   try {
-    await runPython3("./eng/scripts/setup/install.py");
-    console.log("Found Python on your local environment and created a venv with all requirements."); // eslint-disable-line no-console
+    // First try to resolve Python path
+    pythonCommand = await patchPythonPath(["python", "./eng/scripts/setup/install.py"], {
+      version: ">=3.9",
+      environmentVariable: "AUTOREST_PYTHON_EXE",
+    });
   } catch (error) {
-    console.log("No Python found on your local environment. We will use Pyodide instead."); // eslint-disable-line no-console
+    console.log(`Ran into the following error when setting up your local environment: ${error}`); // eslint-disable-line no-console
+    return;
+  }
+
+  try {
+    // Python found, now try to run the installation script
+    cp.execSync(pythonCommand.join(" "), {
+      stdio: [0, 1, 2],
+    });
+    console.log("Found Python on your local environment and created a venv with all requirements."); // eslint-disable-line no-console
+  } catch (error: any) {
+    // Check the exit code to determine the type of error
+    if (error.status === 2) {
+      // Exit code 2: Python/pip not adequate - use Pyodide
+      console.log("No Python found on your local environment. We will use Pyodide instead."); // eslint-disable-line no-console
+    } else {
+      // Exit code 1 or other: Python and pip were found but installation failed - fail the npm install
+      console.error("Python and package manager found but installation failed."); // eslint-disable-line no-console
+      process.exit(1);
+    }
   }
 }
 

package/eng/scripts/setup/run-python3.ts

@@ -11,7 +11,7 @@ import { patchPythonPath } from "./system-requirements.js";
 
 export async function runPython3(...args: string[]) {
   const command = await patchPythonPath(["python", ...args], {
-    version: ">=3.8",
+    version: ">=3.9",
     environmentVariable: "AUTOREST_PYTHON_EXE",
   });
   cp.execSync(command.join(" "), {

package/eng/scripts/setup/system-requirements.ts

@@ -1,5 +1,4 @@
 import { ChildProcess, spawn, SpawnOptions } from "child_process";
-import { coerce, satisfies } from "semver";
 
 /*
  * Copied from @autorest/system-requirements
@@ -46,12 +45,21 @@ const execute = (
   });
 };
 
+// Simple version comparison without semver dependency
 const versionIsSatisfied = (version: string, requirement: string): boolean => {
-  const cleanedVersion = coerce(version);
-  if (!cleanedVersion) {
-    throw new Error(`Invalid version ${version}.`);
+  // For now, support only >= requirements since that's what we use
+  if (requirement.startsWith(">=")) {
+    const requiredVersion = requirement.substring(2);
+    return parseVersionNumber(version) >= parseVersionNumber(requiredVersion);
   }
-  return satisfies(cleanedVersion, requirement, true);
+  // Fallback to true for other version requirements
+  return true;
+};
+
+const parseVersionNumber = (version: string): number => {
+  // Parse version like "3.9.0" to a comparable number
+  const parts = version.split(".").map((p) => parseInt(p.replace(/[^0-9]/g, ""), 10) || 0);
+  return parts[0] * 10000 + (parts[1] || 0) * 100 + (parts[2] || 0);
 };
 
 /**

package/generator/build/lib/pygen/__init__.py

@@ -8,7 +8,7 @@ import logging
 from pathlib import Path
 import json
 from abc import ABC, abstractmethod
-from typing import Any, Dict, Iterator, Optional, Union, List
+from typing import Any, Iterator, Optional, Union
 
 import yaml
 from .utils import TYPESPEC_PACKAGE_MODE, VALID_PACKAGE_MODE
@@ -33,7 +33,6 @@ class OptionsDict(MutableMapping):
         "head-as-boolean": True,
         "keep-version-file": False,
         "low-level-client": False,
-        "multiapi": False,
         "no-async": False,
         "no-namespace-folders": False,
         "polymorphic-examples": 5,
@@ -42,7 +41,7 @@ class OptionsDict(MutableMapping):
         "generation-subdir": None,  # subdirectory to generate the code in
     }
 
-    def __init__(self, options: Optional[Dict[str, Any]] = None) -> None:
+    def __init__(self, options: Optional[dict[str, Any]] = None) -> None:
         self._data = options.copy() if options else {}
         self._validate_combinations()
 
@@ -148,16 +147,6 @@ class OptionsDict(MutableMapping):
                 "If you want operation files, pass in flag --show-operations"
             )
 
-        if self.get("multiapi") and self.get("version-tolerant"):
-            raise ValueError(
-                "Can not currently generate version tolerant multiapi SDKs. "
-                "We are working on creating a new multiapi SDK for version tolerant and it is not available yet."
-            )
-
-        # If multiapi, do not generate default pyproject.toml
-        if self.get("multiapi"):
-            self["keep-setup-py"] = True
-
         if self.get("client-side-validation") and self.get("version-tolerant"):
             raise ValueError("Can not generate version tolerant with --client-side-validation. ")
 
@@ -205,7 +194,7 @@ class OptionsDict(MutableMapping):
         for key in self.DEFAULTS:
             if key not in all_keys:
                 all_keys.add(key)
-        all_keys.update(self.DEFAULTS.keys())
+        all_keys |= self.DEFAULTS.keys()
         return KeysView({key: None for key in all_keys})
 
     def values(self) -> ValuesView[Any]:
@@ -218,7 +207,7 @@ class OptionsDict(MutableMapping):
 class ReaderAndWriter:
     def __init__(self, *, output_folder: Union[str, Path], **kwargs: Any) -> None:
         self.output_folder = Path(output_folder)
-        self._list_file: List[str] = []
+        self._list_file: list[str] = []
         try:
             with open(
                 Path(self.output_folder) / Path("..") / Path("python.json"),
@@ -234,9 +223,6 @@ class ReaderAndWriter:
             _LOGGER.warning("Loading python.json file. This behavior will be depreacted")
         self.options.update(python_json)
 
-    def get_output_folder(self) -> Path:
-        return self.output_folder
-
     def read_file(self, path: Union[str, Path]) -> str:
         """Directly reading from disk"""
         # make path relative to output folder
@@ -262,7 +248,7 @@ class ReaderAndWriter:
         except FileNotFoundError:
             pass
 
-    def list_file(self) -> List[str]:
+    def list_file(self) -> list[str]:
         return [str(f.relative_to(self.output_folder)) for f in self.output_folder.glob("**/*") if f.is_file()]
 
 
@@ -286,7 +272,7 @@ class Plugin(ReaderAndWriter, ABC):
 class YamlUpdatePlugin(Plugin):
     """A plugin that update the YAML as input."""
 
-    def get_yaml(self) -> Dict[str, Any]:
+    def get_yaml(self) -> dict[str, Any]:
         # tsp file doesn't have to be relative to output folder
         with open(self.options["tsp_file"], "r", encoding="utf-8-sig") as fd:
             return yaml.safe_load(fd.read())
@@ -307,7 +293,7 @@ class YamlUpdatePlugin(Plugin):
         return True
 
     @abstractmethod
-    def update_yaml(self, yaml_data: Dict[str, Any]) -> None:
+    def update_yaml(self, yaml_data: dict[str, Any]) -> None:
         """The code-model-v4-no-tags yaml model tree.
 
         :rtype: updated yaml

package/generator/build/lib/pygen/black.py

@@ -69,9 +69,9 @@ class BlackScriptPlugin(Plugin):
                 pylint_disables.append("too-many-lines")
             if pylint_disables:
                 file_content = (
-                    "\n".join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
+                    os.linesep.join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
                     if "pylint: disable=" in lines[0]
-                    else f"# pylint: disable={','.join(pylint_disables)}\n" + file_content
+                    else f"# pylint: disable={','.join(pylint_disables)}{os.linesep}" + file_content
                 )
         self.write_file(file, file_content)
 

package/generator/build/lib/pygen/codegen/__init__.py

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
-from typing import Dict, Any
+from typing import Any
 import yaml
 
 
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 class CodeGenerator(Plugin):
 
     @staticmethod
-    def sort_exceptions(yaml_data: Dict[str, Any]) -> None:
+    def sort_exceptions(yaml_data: dict[str, Any]) -> None:
         for client in yaml_data["clients"]:
             for group in client.get("operationGroups", []):
                 for operation in group.get("operations", []):
@@ -37,7 +37,7 @@ class CodeGenerator(Plugin):
                     )
 
     @staticmethod
-    def remove_cloud_errors(yaml_data: Dict[str, Any]) -> None:
+    def remove_cloud_errors(yaml_data: dict[str, Any]) -> None:
         for client in yaml_data["clients"]:
             for group in client.get("operationGroups", []):
                 for operation in group.get("operations", []):
@@ -60,7 +60,7 @@ class CodeGenerator(Plugin):
                     del yaml_data["schemas"]["objects"][i]
                     break
 
-    def get_yaml(self) -> Dict[str, Any]:
+    def get_yaml(self) -> dict[str, Any]:
         # tsp file doesn't have to be relative to output folder
         with open(self.options["tsp_file"], "r", encoding="utf-8-sig") as fd:
             return yaml.safe_load(fd.read())

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

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
-from typing import Any, Dict, Union, Optional
+from typing import Any, Union, Optional
 from .base import BaseModel
 from .base_builder import BaseBuilder, ParameterListType
 from .code_model import CodeModel
@@ -155,7 +155,7 @@ TYPE_TO_OBJECT = {
 _LOGGER = logging.getLogger(__name__)
 
 
-def build_type(yaml_data: Dict[str, Any], code_model: CodeModel) -> BaseType:
+def build_type(yaml_data: dict[str, Any], code_model: CodeModel) -> BaseType:
     yaml_id = id(yaml_data)
     try:
         return code_model.lookup_type(yaml_id)

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

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Any, Dict, TYPE_CHECKING, List, Optional
+from typing import Any, TYPE_CHECKING, Optional
 from abc import ABC, abstractmethod
 from .imports import FileImport
 
@@ -20,7 +20,7 @@ class BaseModel:
     :type yaml_data: dict[str, Any]
     """
 
-    def __init__(self, yaml_data: Dict[str, Any], code_model: "CodeModel") -> None:
+    def __init__(self, yaml_data: dict[str, Any], code_model: "CodeModel") -> None:
         self.yaml_data = yaml_data
         self.code_model = code_model
 
@@ -39,21 +39,18 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
     :type yaml_data: dict[str, Any]
     """
 
-    def __init__(self, yaml_data: Dict[str, Any], code_model: "CodeModel") -> None:
+    def __init__(self, yaml_data: dict[str, Any], code_model: "CodeModel") -> None:
         super().__init__(yaml_data, code_model)
         self.type = yaml_data["type"]  # the type discriminator
-        self.api_versions: List[str] = yaml_data.get("apiVersions", [])  # api versions this type is in.
+        self.api_versions: list[str] = yaml_data.get("apiVersions", [])  # api versions this type is in.
 
     @classmethod
-    def from_yaml(cls, yaml_data: Dict[str, Any], code_model: "CodeModel") -> "BaseType":
+    def from_yaml(cls, yaml_data: dict[str, Any], code_model: "CodeModel") -> "BaseType":
         return cls(yaml_data=yaml_data, code_model=code_model)
 
     def imports(self, **kwargs) -> FileImport:  # pylint: disable=unused-argument
         return FileImport(self.code_model)
 
-    def imports_for_multiapi(self, **kwargs: Any) -> FileImport:
-        return self.imports(**kwargs)
-
     def imports_for_sample(self) -> FileImport:
         return FileImport(self.code_model)
 
@@ -62,7 +59,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         return repr(value)
 
     @property
-    def xml_metadata(self) -> Dict[str, Any]:
+    def xml_metadata(self) -> dict[str, Any]:
         """XML metadata for the type, if the type has it."""
         return self.yaml_data.get("xmlMetadata", {})
 
@@ -132,7 +129,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         """
 
     @property
-    def validation(self) -> Optional[Dict[str, Any]]:
+    def validation(self) -> Optional[dict[str, Any]]:
         """Whether there's any validation constraints on this type.
 
         Even though we generate validation maps if there are validation constraints,
@@ -162,7 +159,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         """Template of what this schema would look like as JSON input"""
 
     def get_polymorphic_subtypes(
-        self, polymorphic_subtypes: List["ModelType"]  # pylint: disable=unused-argument
+        self, polymorphic_subtypes: list["ModelType"]  # pylint: disable=unused-argument
     ) -> None:
         return None
 
@@ -172,7 +169,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         """Template of what an instance check of a variable for this type would look like"""
 
     @property
-    def serialization_constraints(self) -> List[str]:
+    def serialization_constraints(self) -> list[str]:
         """Whether there are any serialization constraints when serializing this type."""
         return []
 

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

@@ -5,8 +5,6 @@
 # --------------------------------------------------------------------------
 import logging
 from typing import (
-    List,
-    Dict,
     Any,
     Generic,
     TypeVar,
@@ -52,7 +50,7 @@ class BaseBuilder(
 
     def __init__(
         self,
-        yaml_data: Dict[str, Any],
+        yaml_data: dict[str, Any],
         code_model: "CodeModel",
         client: "Client",
         name: str,
@@ -70,9 +68,9 @@ class BaseBuilder(
         self.want_tracing: bool = yaml_data.get("wantTracing", True)
         self.group_name: str = yaml_data["groupName"]  # either operationGroup or client I am on
         self.is_overload: bool = yaml_data["isOverload"]
-        self.api_versions: List[str] = yaml_data["apiVersions"]
+        self.api_versions: list[str] = yaml_data["apiVersions"]
         self.added_on: Optional[str] = yaml_data.get("addedOn")
-        self.external_docs: Optional[Dict[str, Any]] = yaml_data.get("externalDocs")
+        self.external_docs: Optional[dict[str, Any]] = yaml_data.get("externalDocs")
         self.client_namespace: str = yaml_data.get("clientNamespace", code_model.namespace)
 
         if code_model.options["version-tolerant"] and yaml_data.get("abstract"):
@@ -114,7 +112,7 @@ class BaseBuilder(
             )
         return self._description or self.name
 
-    def method_signature(self, async_mode: bool, **kwargs: Any) -> List[str]:
+    def method_signature(self, async_mode: bool, **kwargs: Any) -> list[str]:
         if self.abstract:
             return ["*args,", "**kwargs"]
         return self.parameters.method_signature(async_mode, **kwargs)