@autorest/python 6.14.3 → 6.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.14.3",
+  "version": "6.15.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.25.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:])