@azure-tools/typespec-python 0.34.0 → 0.35.1

package/dist/scripts/eng/lint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../../scripts/eng/lint.ts"],"names":[],"mappings":"AAuCA,wBAAgB,MAAM,SAErB;AAED,wBAAgB,IAAI,SAEnB;AAED,wBAAgB,OAAO,SAEtB;AAED,wBAAgB,MAAM,SAIrB"}
+{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../../scripts/eng/lint.ts"],"names":[],"mappings":"AAyCA,wBAAgB,MAAM,SAErB;AAWD,wBAAgB,IAAI,SAOnB;AAED,wBAAgB,OAAO,SAEtB;AAED,wBAAgB,MAAM,SAIrB"}

package/dist/scripts/eng/lint.js

@@ -2,6 +2,8 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { runCommand, executeCommand } from "./utils.js";
+import fs from "fs";
+import path from "path";
 const validCommands = ["pylint", "mypy", "pyright", "eslint"];
 // PARSE INPUT ARGUMENTS
 const argv = yargs(hideBin(process.argv))
@@ -30,8 +32,23 @@ const argv = yargs(hideBin(process.argv))
 export function pylint() {
     runCommand(`pylint ${argv.folderName}/ --rcfile ./scripts/eng/pylintrc`, "pylint");
 }
+function checkPythonFile(directory) {
+    const files = fs.readdirSync(directory);
+    for (let i = 0; i < files.length; i++) {
+        if (path.extname(files[i]) === ".py") {
+            return true;
+        }
+    }
+    return false;
+}
 export function mypy() {
-    runCommand(`mypy ${argv.folderName}/ --config-file ./scripts/eng/mypy.ini`, "mypy");
+    if (checkPythonFile(argv.folderName)) {
+        runCommand(`mypy ${argv.folderName}/ --config-file ./scripts/eng/mypy.ini`, "mypy");
+    }
+    else {
+        console.log("No python file found in the directory");
+        console.log("mypy passed");
+    }
 }
 export function pyright() {
     runCommand(`pyright ${argv.folderName}/ -p ./scripts/eng/pyrightconfig.json`, "pyright");

package/dist/scripts/eng/lint.js.map

@@ -1 +1 @@
-{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../scripts/eng/lint.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AASxD,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;AAE9D,wBAAwB;AACxB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KACpC,MAAM,CAAC,YAAY,EAAE;IAClB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC;IAClC,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,WAAW;CACvB,CAAC;KACD,MAAM,CAAC,SAAS,EAAE;IACf,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,aAAa;IACtB,WAAW,EAAE,4BAA4B;CAC5C,CAAC;KACD,MAAM,CAAC,aAAa,EAAE;IACnB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,wBAAwB;CACxC,CAAC;KACD,MAAM,CAAC,YAAY,EAAE;IAClB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,sBAAsB;CACtC,CAAC,CAAC,IAAiB,CAAC;AAEzB,MAAM,UAAU,MAAM;IAClB,UAAU,CAAC,UAAU,IAAI,CAAC,UAAU,mCAAmC,EAAE,QAAQ,CAAC,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,IAAI;IAChB,UAAU,CAAC,QAAQ,IAAI,CAAC,UAAU,wCAAwC,EAAE,MAAM,CAAC,CAAC;AACxF,CAAC;AAED,MAAM,UAAU,OAAO;IACnB,UAAU,CAAC,WAAW,IAAI,CAAC,UAAU,uCAAuC,EAAE,SAAS,CAAC,CAAC;AAC7F,CAAC;AAED,MAAM,UAAU,MAAM;IAClB,mEAAmE;IACnE,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,cAAc,CAAC,gBAAgB,YAAY,GAAG,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AAED,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;IAC5B,MAAM,EAAE,CAAC;AACb,CAAC;KAAM,IAAI,IAAI,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;IACjC,IAAI,EAAE,CAAC;AACX,CAAC;KAAM,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;IACpC,OAAO,EAAE,CAAC;AACd,CAAC;KAAM,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACnB,MAAM,EAAE,CAAC;IACb,CAAC;AACL,CAAC;KAAM,CAAC;IACJ,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACnB,MAAM,EAAE,CAAC;IACb,CAAC;AACL,CAAC"}
+{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../scripts/eng/lint.ts"],"names":[],"mappings":"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"}

package/dist/src/emitter.js

@@ -1,5 +1,5 @@
 import { $onEmit as httpClientPythonOnEmit } from "@typespec/http-client-python";
 export async function $onEmit(context) {
-    httpClientPythonOnEmit(context);
+    await httpClientPythonOnEmit(context);
 }
 //# sourceMappingURL=emitter.js.map

package/dist/src/emitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjF,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAA0C;IACpE,sBAAsB,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjF,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAA0C;IACpE,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC"}

package/generator/dev_requirements.txt

@@ -0,0 +1,12 @@
+pyright==1.1.375
+pylint==3.2.6
+tox==4.16.0
+mypy==1.10.1
+azure-pylint-guidelines-checker==0.0.8
+colorama==0.4.6
+debugpy==1.8.2
+pytest==8.3.2
+coverage==7.6.1
+black==24.8.0
+ptvsd==4.3.2
+types-PyYAML==6.0.12.8

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-python",
-  "version": "0.34.0",
+  "version": "0.35.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://github.com/Azure/autorest.python",
@@ -29,7 +29,8 @@
   "files": [
     "dist/**",
     "!dist/test/**",
-    "scripts/**"
+    "scripts/**",
+    "generator/**"
   ],
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0",
@@ -39,7 +40,6 @@
     "@azure-tools/typespec-azure-rulesets": ">=0.46.0 <3.0.0",
     "@typespec/compiler": ">=0.60.0 <1.0.0",
     "@typespec/http": ">=0.60.0 <1.0.0",
-    "@typespec/http-client-python": ">=0.2.0 <1.0.0",
     "@typespec/rest": ">=0.60.0 <1.0.0",
     "@typespec/versioning": ">=0.60.0 <1.0.0",
     "@typespec/openapi": ">=0.60.0 <1.0.0"
@@ -49,6 +49,7 @@
     "@typespec/openapi3": "~0.60.0",
     "semver": "~7.6.2",
     "tsx": "4.17.0",
+    "@typespec/http-client-python": "0.2.0",
     "fs-extra": "~11.2.0"
   },
   "devDependencies": {
@@ -75,7 +76,6 @@
     "@azure-tools/typespec-azure-rulesets": "~0.46.0",
     "yargs": "~17.7.2",
     "chalk": "5.3.0",
-    "@typespec/http-client-python": "~0.2.0",
     "@types/fs-extra": "11.0.4"
   },
   "scripts": {
@@ -85,7 +85,7 @@
     "lint": "tsx ./scripts/eng/lint.ts",
     "lint:fix": "eslint . --fix --ext .ts",
     "format": "npx prettier **/*.ts --write && tsx ./scripts/eng/format.ts",
-    "install": "tsx ./scripts/copy-scripts.ts --force && tsx ./scripts/run-python3.ts ./scripts/install.py",
+    "install": "tsx ./scripts/run-python3.ts ./scripts/install.py",
     "regenerate": "tsx ./scripts/eng/regenerate.ts",
     "test": "tsx ./scripts/eng/run-tests.ts"
   }

package/scripts/eng/lint.ts

@@ -2,6 +2,8 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { runCommand, executeCommand } from "./utils.js";
+import fs from "fs";
+import path from "path";
 
 interface Arguments {
     folderName: string;
@@ -40,9 +42,23 @@ const argv = yargs(hideBin(process.argv))
 export function pylint() {
     runCommand(`pylint ${argv.folderName}/ --rcfile ./scripts/eng/pylintrc`, "pylint");
 }
+function checkPythonFile(directory: string): boolean {
+    const files = fs.readdirSync(directory);
+    for (let i = 0; i < files.length; i++) {
+        if (path.extname(files[i]) === ".py") {
+            return true;
+        }
+    }
+    return false;
+}
 
 export function mypy() {
-    runCommand(`mypy ${argv.folderName}/ --config-file ./scripts/eng/mypy.ini`, "mypy");
+    if (checkPythonFile(argv.folderName)) {
+        runCommand(`mypy ${argv.folderName}/ --config-file ./scripts/eng/mypy.ini`, "mypy");
+    } else {
+        console.log("No python file found in the directory");
+        console.log("mypy passed");
+    }
 }
 
 export function pyright() {

package/scripts/install.py

@@ -42,7 +42,6 @@ def main():
 
         python_run(venv_context, "pip", ["install", "-U", "pip"])
         python_run(venv_context, "pip", ["install", "-r", f"{_ROOT_DIR}/generator/requirements.txt"])
-        python_run(venv_context, "pip", ["install", "-e", f"{_ROOT_DIR}/generator"])
 
 
 if __name__ == "__main__":

package/dist/scripts/copy-scripts.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=copy-scripts.d.ts.map

package/dist/scripts/copy-scripts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"copy-scripts.d.ts","sourceRoot":"","sources":["../../scripts/copy-scripts.ts"],"names":[],"mappings":""}

package/dist/scripts/copy-scripts.js

@@ -1,24 +0,0 @@
-import fsExtra from "fs-extra";
-import { dirname, join, posix, win32 } from "path";
-import { fileURLToPath } from "url";
-const force = process.argv[2] === "--force";
-const __dirname = dirname(fileURLToPath(import.meta.url));
-function copyAndCreateDir(sourceDir, destDir) {
-    // Delete the destination directory if it exists
-    if (fsExtra.existsSync(destDir)) {
-        if (force)
-            fsExtra.removeSync(destDir);
-        else
-            process.exit(0);
-    }
-    // Copy the source directory to the destination directory
-    fsExtra.copySync(sourceDir, destDir, {
-        filter: (src) => {
-            return !src.replaceAll(win32.sep, posix.sep).includes("/test/");
-        },
-    });
-}
-const typespecModulePath = join(__dirname, "..", "node_modules", "@typespec", "http-client-python");
-// Copy the generator directory
-copyAndCreateDir(join(typespecModulePath, "generator"), join(__dirname, "..", "generator"));
-//# sourceMappingURL=copy-scripts.js.map

package/dist/scripts/copy-scripts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"copy-scripts.js","sourceRoot":"","sources":["../../scripts/copy-scripts.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,KAAK,GAAY,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;AACrD,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,SAAS,gBAAgB,CAAC,SAAiB,EAAE,OAAe;IACxD,gDAAgD;IAChD,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,IAAI,KAAK;YAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;;YAClC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE;QACjC,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpE,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,MAAM,kBAAkB,GAAW,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;AAE5G,+BAA+B;AAC/B,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC"}

package/scripts/copy-scripts.ts

@@ -1,26 +0,0 @@
-import fsExtra from "fs-extra";
-import { dirname, join, posix, win32 } from "path";
-import { fileURLToPath } from "url";
-
-const force: boolean = process.argv[2] === "--force";
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-function copyAndCreateDir(sourceDir: string, destDir: string) {
-    // Delete the destination directory if it exists
-    if (fsExtra.existsSync(destDir)) {
-        if (force) fsExtra.removeSync(destDir);
-        else process.exit(0);
-    }
-
-    // Copy the source directory to the destination directory
-    fsExtra.copySync(sourceDir, destDir, {
-        filter: (src: string) => {
-            return !src.replaceAll(win32.sep, posix.sep).includes("/test/");
-        },
-    });
-}
-
-const typespecModulePath: string = join(__dirname, "..", "node_modules", "@typespec", "http-client-python");
-
-// Copy the generator directory
-copyAndCreateDir(join(typespecModulePath, "generator"), join(__dirname, "..", "generator"));