@autorest/python 6.14.3 → 6.16.0

package/{autorest → generator/pygen}/preprocess/__init__.py

@@ -8,7 +8,7 @@
 import copy
 from typing import Callable, Dict, Any, List, Optional
 
-from .._utils import to_snake_case
+from ..utils import to_snake_case, extract_original_name
 from .helpers import (
     add_redefined_builtin_info,
     pad_builtin_namespaces,
@@ -16,8 +16,8 @@ from .helpers import (
 )
 from .python_mappings import CADL_RESERVED_WORDS, RESERVED_WORDS, PadType
 
-from .. import YamlUpdatePlugin, YamlUpdatePluginAutorest
-from .._utils import parse_args, get_body_type_for_description, JSON_REGEXP, KNOWN_TYPES, update_enum_value
+from .. import YamlUpdatePlugin
+from ..utils import parse_args, get_body_type_for_description, JSON_REGEXP, KNOWN_TYPES, update_enum_value
 
 
 def update_overload_section(
@@ -235,7 +235,8 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
                 property["clientName"] = self.pad_reserved_words(property["clientName"].lower(), PadType.PROPERTY)
                 add_redefined_builtin_info(property["clientName"], property)
             if type.get("name"):
-                name = self.pad_reserved_words(type["name"], PadType.MODEL)
+                pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS
+                name = self.pad_reserved_words(type["name"], pad_type)
                 type["name"] = name[0].upper() + name[1:]
                 type["description"] = update_description(type.get("description", ""), type["name"])
                 type["snakeCaseName"] = to_snake_case(type["name"])
@@ -243,7 +244,7 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
                 # we're enums
                 values_to_add = []
                 for value in type["values"]:
-                    padded_name = self.pad_reserved_words(value["name"].lower(), PadType.ENUM).upper()
+                    padded_name = self.pad_reserved_words(value["name"].lower(), PadType.ENUM_VALUE).upper()
                     if self.version_tolerant:
                         if padded_name[0] in "0123456789":
                             padded_name = "ENUM_" + padded_name
@@ -362,7 +363,12 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
         yaml_data["groupName"] = self.pad_reserved_words(yaml_data["groupName"], PadType.OPERATION_GROUP)
         yaml_data["groupName"] = to_snake_case(yaml_data["groupName"])
         yaml_data["name"] = yaml_data["name"].lower()
-        yaml_data["name"] = self.pad_reserved_words(yaml_data["name"], PadType.METHOD)
+        if yaml_data.get("isLroInitialOperation") is True:
+            yaml_data["name"] = (
+                "_" + self.pad_reserved_words(extract_original_name(yaml_data["name"]), PadType.METHOD) + "_initial"
+            )
+        else:
+            yaml_data["name"] = self.pad_reserved_words(yaml_data["name"], PadType.METHOD)
         yaml_data["description"] = update_description(yaml_data["description"], yaml_data["name"])
         yaml_data["summary"] = update_description(yaml_data.get("summary", ""))
         body_parameter = yaml_data.get("bodyParameter")
@@ -497,16 +503,6 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
             yaml_data["namespace"] = pad_builtin_namespaces(yaml_data["namespace"])
 
 
-class PreProcessPluginAutorest(YamlUpdatePluginAutorest, PreProcessPlugin):
-    def get_options(self) -> Dict[str, Any]:
-        options = {
-            "version-tolerant": self._autorestapi.get_boolean_value("version-tolerant"),
-            "azure-arm": self._autorestapi.get_boolean_value("azure-arm"),
-            "models-mode": self._autorestapi.get_value("models-mode"),
-        }
-        return {k: v for k, v in options.items() if v is not None}
-
-
 if __name__ == "__main__":
     # CADL pipeline will call this
     args, unknown_args = parse_args()

package/{autorest → generator/pygen}/preprocess/python_mappings.py

@@ -53,9 +53,10 @@ basic_latin_chars = {
 
 class PadType(str, Enum):
     MODEL = "Model"
+    ENUM_CLASS = "Enum"
     METHOD = "_method"
     PARAMETER = "_parameter"
-    ENUM = "_enum"
+    ENUM_VALUE = "_enum"
     PROPERTY = "_property"
     OPERATION_GROUP = "Operations"
 
@@ -112,7 +113,7 @@ RESERVED_WORDS = {
     PadType.METHOD: [*_always_reserved],
     PadType.PARAMETER: [
         "self",
-        # these are kwargs we've reserved for our autorest generated operations
+        # these are kwargs we've reserved for our generated operations
         "content_type",
         "accept",
         "cls",
@@ -175,9 +176,10 @@ RESERVED_WORDS = {
         "retry_on_status_codes",
         *_always_reserved,
     ],
-    PadType.MODEL: [*_always_reserved],
+    PadType.MODEL: ["enum", *_always_reserved],
     PadType.PROPERTY: ["self", *_always_reserved],
-    PadType.ENUM: ["mro", *_always_reserved],
+    PadType.ENUM_CLASS: ["enum", *_always_reserved],
+    PadType.ENUM_VALUE: ["mro", *_always_reserved],
     PadType.OPERATION_GROUP: [*_always_reserved],
 }
 

package/{autorest/_utils.py → generator/pygen/utils.py}

@@ -147,3 +147,7 @@ def build_policies(
             "self._config.logging_policy",
         ]
     return [p for p in policies if p]
+
+
+def extract_original_name(name: str) -> str:
+    return name[1 : -len("_initial")]

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

@@ -0,0 +1,25 @@
+Metadata-Version: 2.1
+Name: pygen
+Version: 0.1.0
+Summary: Core Library for Python Generation
+Home-page: https://github.com/Azure/autorest.python/packages/core
+Author: Microsoft Corporation
+Author-email: azpysdkhelp@microsoft.com
+License: MIT License
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: License :: OSI Approved :: MIT License
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: Jinja2>=2.11
+Requires-Dist: pyyaml
+Requires-Dist: m2r2
+Requires-Dist: black
+
+# Core Library for Python Generation

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

@@ -0,0 +1,66 @@
+LICENSE
+README.md
+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
+pygen.egg-info/dependency_links.txt
+pygen.egg-info/requires.txt
+pygen.egg-info/top_level.txt
+pygen/codegen/__init__.py
+pygen/codegen/_utils.py
+pygen/codegen/models/__init__.py
+pygen/codegen/models/base.py
+pygen/codegen/models/base_builder.py
+pygen/codegen/models/client.py
+pygen/codegen/models/code_model.py
+pygen/codegen/models/combined_type.py
+pygen/codegen/models/constant_type.py
+pygen/codegen/models/credential_types.py
+pygen/codegen/models/dictionary_type.py
+pygen/codegen/models/enum_type.py
+pygen/codegen/models/imports.py
+pygen/codegen/models/list_type.py
+pygen/codegen/models/lro_operation.py
+pygen/codegen/models/lro_paging_operation.py
+pygen/codegen/models/model_type.py
+pygen/codegen/models/operation.py
+pygen/codegen/models/operation_group.py
+pygen/codegen/models/paging_operation.py
+pygen/codegen/models/parameter.py
+pygen/codegen/models/parameter_list.py
+pygen/codegen/models/primitive_types.py
+pygen/codegen/models/property.py
+pygen/codegen/models/request_builder.py
+pygen/codegen/models/request_builder_parameter.py
+pygen/codegen/models/response.py
+pygen/codegen/models/utils.py
+pygen/codegen/serializers/__init__.py
+pygen/codegen/serializers/base_serializer.py
+pygen/codegen/serializers/builder_serializer.py
+pygen/codegen/serializers/client_serializer.py
+pygen/codegen/serializers/enum_serializer.py
+pygen/codegen/serializers/general_serializer.py
+pygen/codegen/serializers/import_serializer.py
+pygen/codegen/serializers/metadata_serializer.py
+pygen/codegen/serializers/model_init_serializer.py
+pygen/codegen/serializers/model_serializer.py
+pygen/codegen/serializers/operation_groups_serializer.py
+pygen/codegen/serializers/operations_init_serializer.py
+pygen/codegen/serializers/parameter_serializer.py
+pygen/codegen/serializers/patch_serializer.py
+pygen/codegen/serializers/request_builders_serializer.py
+pygen/codegen/serializers/sample_serializer.py
+pygen/codegen/serializers/test_serializer.py
+pygen/codegen/serializers/types_serializer.py
+pygen/codegen/serializers/utils.py
+pygen/postprocess/__init__.py
+pygen/postprocess/get_all.py
+pygen/postprocess/venvtools.py
+pygen/preprocess/__init__.py
+pygen/preprocess/helpers.py
+pygen/preprocess/python_mappings.py

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

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,4 @@
+Jinja2>=2.11
+pyyaml
+m2r2
+black

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

@@ -0,0 +1 @@
+pygen

package/generator/requirements.txt

@@ -0,0 +1,12 @@
+black==24.4.0
+click==8.1.3
+docutils==0.19
+Jinja2==3.1.4
+m2r2==0.3.3
+MarkupSafe==2.1.2
+mistune==0.8.4
+pathspec==0.11.1
+platformdirs==3.2.0
+PyYAML==6.0.1
+tomli==2.0.1
+setuptools==69.2.0

package/generator/setup.py

@@ -0,0 +1,55 @@
+#!/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.
+# --------------------------------------------------------------------------
+
+
+import os
+import re
+
+from setuptools import setup, find_packages
+
+
+# Version extraction inspired from 'requests'
+with open(os.path.join("pygen", "_version.py"), "r") as fd:
+    version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)
+
+if not version:
+    raise RuntimeError("Cannot find version information")
+
+setup(
+    name="pygen",
+    version=version,
+    description="Core Library for Python Generation",
+    long_description=open("README.md", "r").read(),
+    long_description_content_type="text/markdown",
+    license="MIT License",
+    author="Microsoft Corporation",
+    author_email="azpysdkhelp@microsoft.com",
+    url="https://github.com/Azure/autorest.python/packages/core",
+    classifiers=[
+        "Development Status :: 4 - Beta",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "License :: OSI Approved :: MIT License",
+    ],
+    packages=find_packages(
+        exclude=[
+            "test",
+        ]
+    ),
+    install_requires=[
+        "Jinja2 >= 2.11",  # I need "include" and auto-context + blank line are not indented by default
+        "pyyaml",
+        "m2r2",
+        "black",
+    ],
+)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.14.3",
+  "version": "6.16.0",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -19,27 +19,26 @@
   },
   "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "dependencies": {
-    "@autorest/system-requirements": "~1.0.2"
+    "@autorest/system-requirements": "~1.0.2",
+    "fs-extra": "~11.2.0"
   },
   "devDependencies": {
     "@microsoft.azure/autorest.testserver": "^3.3.46",
-    "typescript": "~5.1.3"
+    "typescript": "~5.1.3",
+    "@azure-tools/typespec-python": "^0.26.0"
   },
   "files": [
     "autorest/**/*.py",
     "autorest/**/*.jinja2",
+    "scripts/",
     "setup.py",
-    "install.py",
-    "prepare.py",
-    "start.py",
-    "venvtools.py",
-    "run-python3.js",
     "requirements.txt",
-    "run_cadl.py"
+    "generator/"
   ],
   "scripts": {
-    "start": "node run-python3.js start.py",
-    "install": "node run-python3.js install.py",
-    "debug": "node run-python3.js start.py --debug"
+    "start": "node ./scripts/run-python3.js ./scripts/start.py",
+    "build": "node ./scripts/copy-generator.js --force",
+    "install": "node ./scripts/copy-generator.js && node ./scripts/run-python3.js ./scripts/install.py",
+    "debug": "node ./scripts/run-python3.js ./scripts/start.py --debug"
   }
 }

package/requirements.txt

@@ -2,7 +2,6 @@ black==24.4.0
 click==8.1.3
 docutils==0.19
 Jinja2==3.1.4
-json-rpc==1.14.0
 m2r2==0.3.3
 MarkupSafe==2.1.2
 mistune==0.8.4
@@ -11,3 +10,4 @@ platformdirs==3.2.0
 PyYAML==6.0.1
 tomli==2.0.1
 setuptools==69.2.0
+json-rpc==1.14.0

package/scripts/copy-generator.js

@@ -0,0 +1,19 @@
+const fs = require("fs-extra");
+const path = require("path");
+
+const force = process.argv[2] === "--force" ? true : false;
+
+const typespecModulePath = path.join(__dirname, "..", "node_modules", "@azure-tools", "typespec-python");
+
+// Define the source and destination directories
+const sourceDir = path.join(typespecModulePath, "generator");
+const destDir = path.join(__dirname, "..", "generator");
+
+// Delete the destination directory if it exists
+if (fs.existsSync(destDir)) {
+    if (force) fs.removeSync(destDir);
+    else process.exit(0);
+}
+
+// Copy the source directory to the destination directory
+fs.copySync(sourceDir, destDir);

package/{install.py → scripts/install.py}

@@ -23,17 +23,15 @@ except ImportError:
 
 # Now we have pip and Py >= 3.8, go to work
 
-import subprocess
 from pathlib import Path
 
 from venvtools import ExtendedEnvBuilder, python_run
 
-_ROOT_DIR = Path(__file__).parent
+_ROOT_DIR = Path(__file__).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)
@@ -43,8 +41,8 @@ def main():
         venv_context = env_builder.context
 
         python_run(venv_context, "pip", ["install", "-U", "pip"])
-        python_run(venv_context, "pip", ["install", "-r", "requirements.txt"])
-        python_run(venv_context, "pip", ["install", "-e", str(_ROOT_DIR)])
+        python_run(venv_context, "pip", ["install", "-r", f"{_ROOT_DIR}/requirements.txt"])
+        python_run(venv_context, "pip", ["install", "-e", f"{_ROOT_DIR}/generator"])
 
 
 if __name__ == "__main__":

package/{prepare.py → scripts/prepare.py}

@@ -6,6 +6,8 @@
 # license information.
 # --------------------------------------------------------------------------
 import sys
+import os
+import argparse
 
 if not sys.version_info >= (3, 8, 0):
     raise Exception("Autorest for Python extension requires Python 3.8 at least")
@@ -15,7 +17,7 @@ import venv
 
 from venvtools import python_run
 
-_ROOT_DIR = Path(__file__).parent
+_ROOT_DIR = Path(__file__).parent.parent
 
 
 def main():
@@ -26,9 +28,10 @@ def main():
 
     env_builder = venv.EnvBuilder(with_pip=True)
     venv_context = env_builder.ensure_directories(venv_path)
-    requirements_path = _ROOT_DIR / "dev_requirements.txt"
-
-    python_run(venv_context, "pip", ["install", "-r", str(requirements_path)])
+    try:
+        python_run(venv_context, "pip", ["install", "-r", f"{_ROOT_DIR}/dev_requirements.txt"])
+    except FileNotFoundError as e:
+        raise ValueError(e.filename)
 
 
 if __name__ == "__main__":

package/{start.py → scripts/start.py}

@@ -15,7 +15,7 @@ import venv
 
 from venvtools import python_run
 
-_ROOT_DIR = Path(__file__).parent
+_ROOT_DIR = Path(__file__).parent.parent
 
 
 def main():

package/{venvtools.py → scripts/venvtools.py}

@@ -11,7 +11,7 @@ import sys
 from pathlib import Path
 
 
-_ROOT_DIR = Path(__file__).parent
+_ROOT_DIR = Path(__file__).parent.parent
 
 
 class ExtendedEnvBuilder(venv.EnvBuilder):

package/autorest/codegen/templates/test.py.jinja2

@@ -1,26 +0,0 @@
-{% set prefix_lower = test.prefix|lower %}
-{% set async = "async " if test.is_async else "" %}
-{% set async_suffix = "_async" if test.is_async else "" %}
-# coding=utf-8
-{{ code_model.options['license_header'] }}
-import pytest
-{{ imports }}
-
-
-@pytest.mark.skip("you may need to update the auto-generated test case before run it")
-class {{ test.test_class_name }}({{ test.base_test_class_name }}):
-{% for testcase in test.testcases %}
-    @{{ test.preparer_name }}()
-    @recorded_by_proxy{{ async_suffix }}
-    {{ async }}def test_{{ testcase.operation.name }}(self, {{ prefix_lower }}_endpoint):
-        client = self.{{ test.create_client_name }}(endpoint={{ prefix_lower }}_endpoint)
-        {{testcase.response }}client{{ testcase.operation_group_prefix }}.{{ testcase.operation.name }}(
-            {% for key, value in testcase.params.items() %}
-            {{ key }}={{ value|indent(12) }},
-            {% endfor %}
-        ){{ testcase.operation_suffix }}
-        {{ testcase.extra_operation }}
-        # please add some check logic here by yourself
-        # ...
-
-{% endfor %}

package/run_cadl.py

@@ -1,40 +0,0 @@
-# -------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
-import sys
-import venv
-import logging
-from pathlib import Path
-from venvtools import python_run
-
-_ROOT_DIR = Path(__file__).parent
-
-_LOGGER = logging.getLogger(__name__)
-
-if __name__ == "__main__":
-    venv_path = _ROOT_DIR / "venv"
-    venv_prexists = venv_path.exists()
-
-    assert venv_prexists  # Otherwise install was not done
-
-    env_builder = venv.EnvBuilder(with_pip=True)
-    venv_context = env_builder.ensure_directories(venv_path)
-
-    if "--debug" in sys.argv or "--debug=true" in sys.argv:
-        try:
-            import debugpy  # pylint: disable=import-outside-toplevel
-        except ImportError:
-            raise SystemExit("Please pip install ptvsd in order to use VSCode debugging")
-
-        # 5678 is the default attach port in the VS Code debug configurations
-        debugpy.listen(("localhost", 5678))
-        debugpy.wait_for_client()
-        breakpoint()  # pylint: disable=undefined-variable
-
-    # run m2r
-    python_run(venv_context, "autorest.m2r.__init__", command=sys.argv[1:])
-    python_run(venv_context, "autorest.preprocess.__init__", command=sys.argv[1:])
-    python_run(venv_context, "autorest.codegen.__init__", command=sys.argv[1:])
-    python_run(venv_context, "autorest.black.__init__", command=sys.argv[1:])