@typespec/http-client-python 0.6.11 → 0.7.1

package/eng/scripts/ci/regenerate.ts

@@ -58,6 +58,7 @@ const EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, st
   },
   "type/array": {
     "package-name": "typetest-array",
+    "use-pyodide": "true",
   },
   "type/dictionary": {
     "package-name": "typetest-dictionary",
@@ -85,6 +86,7 @@ const EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, st
   },
   "type/model/inheritance/recursive": {
     "package-name": "typetest-model-recursive",
+    "use-pyodide": "true",
   },
   "type/model/usage": {
     "package-name": "typetest-model-usage",
@@ -314,10 +316,24 @@ function _getCmdList(spec: string, flags: RegenerateFlags): TspCommand[] {
   });
 }
 
+async function runTaskPool(tasks: Array<() => Promise<void>>, poolLimit: number): Promise<void> {
+  let currentIndex = 0;
+
+  async function worker() {
+    while (currentIndex < tasks.length) {
+      const index = currentIndex++;
+      await tasks[index]();
+    }
+  }
+
+  const workers = new Array(Math.min(poolLimit, tasks.length)).fill(null).map(() => worker());
+  await Promise.all(workers);
+}
+
 async function regenerate(flags: RegenerateFlagsInput): Promise<void> {
   if (flags.flavor === undefined) {
     await regenerate({ flavor: "azure", ...flags });
-    await regenerate({ flavor: "unbranded", pyodide: true, ...flags });
+    await regenerate({ flavor: "unbranded", ...flags });
   } else {
     const flagsResolved = { debug: false, flavor: flags.flavor, ...flags };
     const subdirectoriesForAzure = await getSubdirectories(AZURE_HTTP_SPECS, flagsResolved);
@@ -329,11 +345,22 @@ async function regenerate(flags: RegenerateFlagsInput): Promise<void> {
     const cmdList: TspCommand[] = subdirectories.flatMap((subdirectory) =>
       _getCmdList(subdirectory, flagsResolved),
     );
-    const PromiseCommands = cmdList.map((tspCommand) => executeCommand(tspCommand));
-    await Promise.all(PromiseCommands);
+
+    // Create tasks as functions for the pool
+    const tasks: Array<() => Promise<void>> = cmdList.map((tspCommand) => {
+      return () => executeCommand(tspCommand);
+    });
+
+    // Run tasks with a concurrency limit
+    await runTaskPool(tasks, 30);
   }
 }
 
+const start = performance.now();
 regenerate(argv.values)
-  .then(() => console.log("Regeneration successful"))
+  .then(() =>
+    console.log(
+      `Regeneration successful, time taken: ${Math.round((performance.now() - start) / 1000)} s`,
+    ),
+  )
   .catch((error) => console.error(`Regeneration failed: ${error.message}`));

package/eng/scripts/ci/run_apiview.py

@@ -8,6 +8,8 @@
 # This script is used to execute apiview generation within a tox environment. Depending on which package is being executed against,
 # a failure may be suppressed.
 
+import os
+import sys
 from subprocess import check_call, CalledProcessError
 import logging
 from util import run_check
@@ -37,4 +39,7 @@ def _single_dir_apiview(mod):
 
 
 if __name__ == "__main__":
+    if os.name == "nt":
+        logging.info("Skip running ApiView on Windows for now to reduce time cost in CI")
+        sys.exit(0)
     run_check("apiview", _single_dir_apiview, "APIView")

package/eng/scripts/setup/run_tsp.py

@@ -7,7 +7,7 @@ import sys
 import venv
 import logging
 from pathlib import Path
-from pygen import m2r, preprocess, codegen, black
+from pygen import preprocess, codegen, black
 from pygen.utils import parse_args
 
 _ROOT_DIR = Path(__file__).parent.parent.parent.parent
@@ -34,9 +34,8 @@ if __name__ == "__main__":
         debugpy.wait_for_client()
         breakpoint()  # pylint: disable=undefined-variable
 
-    # run m2r
+    # pre-process and run black
     args, unknown_args = parse_args()
-    m2r.M2R(output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args).process()
     preprocess.PreProcessPlugin(output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args).process()
     codegen.CodeGenerator(output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args).process()
     black.BlackScriptPlugin(output_folder=args.output_folder, **unknown_args).process()

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

@@ -8,16 +8,6 @@
 
     {{ serializer.discriminator_docstring(model) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ') }}
     {% endif %}
-    {% if model.has_readonly_or_constant_property %}
-
-    Readonly variables are only populated by the server, and will be ignored when sending a request.
-    {% endif %}
-    {% if (model.properties | selectattr('optional', "equalto", false) | first) is defined %}
-
-    {% if not model.is_usage_output %}
-    All required parameters must be populated in order to send to server.
-    {% endif %}
-    {% endif %}
 
     {% if model.properties != None %}
         {% for p in model.properties %}

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

@@ -410,7 +410,7 @@ class Model:
         :param function key_extractors: A key extractor function.
         :param str content_type: JSON by default, set application/xml if XML.
         :returns: An instance of this model
-        :raises: DeserializationError if something went wrong
+        :raises DeserializationError: if something went wrong
         :rtype: Self
         """
         deserializer = Deserializer(cls._infer_class_models())

package/generator/component-detection-pip-report.json

@@ -126,9 +126,9 @@
     "implementation_version": "3.8.10",
     "os_name": "posix",
     "platform_machine": "x86_64",
-    "platform_release": "5.15.0-1079-azure",
+    "platform_release": "5.15.0-1081-azure",
     "platform_system": "Linux",
-    "platform_version": "#88~20.04.1-Ubuntu SMP Fri Jan 17 18:28:29 UTC 2025",
+    "platform_version": "#90~20.04.1-Ubuntu SMP Tue Jan 28 05:34:18 UTC 2025",
     "python_full_version": "3.8.10",
     "platform_python_implementation": "CPython",
     "python_version": "3.8",

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

@@ -8,16 +8,6 @@
 
     {{ serializer.discriminator_docstring(model) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ') }}
     {% endif %}
-    {% if model.has_readonly_or_constant_property %}
-
-    Readonly variables are only populated by the server, and will be ignored when sending a request.
-    {% endif %}
-    {% if (model.properties | selectattr('optional', "equalto", false) | first) is defined %}
-
-    {% if not model.is_usage_output %}
-    All required parameters must be populated in order to send to server.
-    {% endif %}
-    {% endif %}
 
     {% if model.properties != None %}
         {% for p in model.properties %}

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

@@ -410,7 +410,7 @@ class Model:
         :param function key_extractors: A key extractor function.
         :param str content_type: JSON by default, set application/xml if XML.
         :returns: An instance of this model
-        :raises: DeserializationError if something went wrong
+        :raises DeserializationError: if something went wrong
         :rtype: Self
         """
         deserializer = Deserializer(cls._infer_class_models())

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

@@ -20,7 +20,6 @@ License-File: LICENSE
 Requires-Dist: black==24.8.0
 Requires-Dist: docutils>=0.20.1
 Requires-Dist: Jinja2==3.1.3
-Requires-Dist: m2r2==0.3.3.post2
 Requires-Dist: PyYAML==6.0.1
 Requires-Dist: tomli==2.0.1
 Requires-Dist: setuptools==69.5.1

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

@@ -5,7 +5,6 @@ setup.py
 pygen/__init__.py
 pygen/_version.py
 pygen/black.py
-pygen/m2r.py
 pygen/utils.py
 pygen.egg-info/PKG-INFO
 pygen.egg-info/SOURCES.txt

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

@@ -1,7 +1,6 @@
 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

package/generator/setup.py

@@ -51,7 +51,6 @@ setup(
         "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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.6.11",
+  "version": "0.7.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -53,39 +53,40 @@
     "emitter"
   ],
   "peerDependencies": {
-    "@azure-tools/typespec-autorest": ">=0.51.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.51.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.51.0 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.51.0 <3.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.51.1 <1.0.0",
-    "@typespec/compiler": ">=0.65.0 <1.0.0",
-    "@typespec/http": ">=0.65.0 <1.0.0",
-    "@typespec/openapi": ">=0.65.0 <1.0.0",
-    "@typespec/rest": ">=0.65.0 <1.0.0",
-    "@typespec/versioning": ">=0.65.0 <1.0.0"
+    "@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"
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
+    "marked": "^15.0.6",
     "pyodide": "0.26.2",
     "semver": "~7.6.2",
     "tsx": "~4.19.1"
   },
   "devDependencies": {
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.6",
-    "@azure-tools/typespec-autorest": "~0.51.0",
-    "@azure-tools/typespec-azure-core": "~0.51.0",
-    "@azure-tools/typespec-azure-resource-manager": "~0.51.0",
-    "@azure-tools/typespec-azure-rulesets": "~0.51.0",
-    "@azure-tools/typespec-client-generator-core": "~0.51.1",
+    "@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",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~22.5.4",
     "@types/semver": "7.5.8",
-    "@typespec/compiler": "~0.65.0",
-    "@typespec/http": "~0.65.0",
-    "@typespec/http-specs": "0.1.0-alpha.9",
-    "@typespec/openapi": "~0.65.0",
-    "@typespec/rest": "~0.65.0",
-    "@typespec/versioning": "~0.65.0",
+    "@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",
     "c8": "^10.1.3",
     "chalk": "5.3.0",
     "rimraf": "~6.0.1",

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

@@ -1,65 +0,0 @@
-# -------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
-"""An MD to RST plugin.
-"""
-import logging
-from typing import Any, Dict, Set, Union
-
-import m2r2
-
-from . import YamlUpdatePlugin
-from .utils import parse_args
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class GeneratorRenderer(m2r2.RestRenderer):
-    """Redefine the concept of inline HTML in the renderer, we don't want to define a new format
-    in the description/summary.
-    """
-
-    def inline_html(self, html: str) -> str:
-        """Do not render inline HTML with a role definition."""
-        return r"\ :code:`{}`".format(html)
-
-
-class M2R(YamlUpdatePlugin):
-    """A plugin to convert any description and summary from MD to RST."""
-
-    def update_yaml(self, yaml_data: Dict[str, Any]) -> None:
-        """Convert in place the YAML str."""
-        self._convert_docstring_no_cycles(yaml_data, set())
-
-    def _convert_docstring_no_cycles(self, yaml_data: Union[Dict[str, Any], str], node_list: Set[int]) -> None:
-        """Walk the YAML tree to convert MD to RST."""
-        if id(yaml_data) in node_list:
-            return
-        node_list.add(id(yaml_data))
-
-        if isinstance(yaml_data, list):
-            for elt in yaml_data:
-                self._convert_docstring_no_cycles(elt, node_list)
-        elif isinstance(yaml_data, dict):
-            for key, value in yaml_data.items():
-                if key in ["description", "summary"]:
-                    yaml_data[key] = self.convert_to_rst(value)
-                    continue
-                self._convert_docstring_no_cycles(value, node_list)
-
-    @staticmethod
-    def convert_to_rst(string_to_convert: str) -> str:
-        """Convert that string from MD to RST."""
-        try:
-            return m2r2.convert(string_to_convert, renderer=GeneratorRenderer()).strip()
-        except Exception:  # pylint: disable=broad-except
-            return string_to_convert
-
-
-if __name__ == "__main__":
-    # CADL pipeline will call this
-    args, unknown_args = parse_args()
-    M2R(output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args).process()

package/generator/pygen/m2r.py

@@ -1,65 +0,0 @@
-# -------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
-"""An MD to RST plugin.
-"""
-import logging
-from typing import Any, Dict, Set, Union
-
-import m2r2
-
-from . import YamlUpdatePlugin
-from .utils import parse_args
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class GeneratorRenderer(m2r2.RestRenderer):
-    """Redefine the concept of inline HTML in the renderer, we don't want to define a new format
-    in the description/summary.
-    """
-
-    def inline_html(self, html: str) -> str:
-        """Do not render inline HTML with a role definition."""
-        return r"\ :code:`{}`".format(html)
-
-
-class M2R(YamlUpdatePlugin):
-    """A plugin to convert any description and summary from MD to RST."""
-
-    def update_yaml(self, yaml_data: Dict[str, Any]) -> None:
-        """Convert in place the YAML str."""
-        self._convert_docstring_no_cycles(yaml_data, set())
-
-    def _convert_docstring_no_cycles(self, yaml_data: Union[Dict[str, Any], str], node_list: Set[int]) -> None:
-        """Walk the YAML tree to convert MD to RST."""
-        if id(yaml_data) in node_list:
-            return
-        node_list.add(id(yaml_data))
-
-        if isinstance(yaml_data, list):
-            for elt in yaml_data:
-                self._convert_docstring_no_cycles(elt, node_list)
-        elif isinstance(yaml_data, dict):
-            for key, value in yaml_data.items():
-                if key in ["description", "summary"]:
-                    yaml_data[key] = self.convert_to_rst(value)
-                    continue
-                self._convert_docstring_no_cycles(value, node_list)
-
-    @staticmethod
-    def convert_to_rst(string_to_convert: str) -> str:
-        """Convert that string from MD to RST."""
-        try:
-            return m2r2.convert(string_to_convert, renderer=GeneratorRenderer()).strip()
-        except Exception:  # pylint: disable=broad-except
-            return string_to_convert
-
-
-if __name__ == "__main__":
-    # CADL pipeline will call this
-    args, unknown_args = parse_args()
-    M2R(output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args).process()

package/generator/test/generic_mock_api_tests/unittests/test_m2r.py

@@ -1,10 +0,0 @@
-# ------------------------------------
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-# ------------------------------------
-from pygen.m2r import M2R
-
-
-def test_inline_html():
-    des = "Format: <MajorVersion>.<MinorVersion>.<Patch>"
-    M2R.convert_to_rst(des) == r"Format: \ :code:`<MajorVersion>`.\ :code:`<MinorVersion>`.\ :code:`<Patch>`"