@azure-tools/typespec-python 0.30.0 → 0.31.1

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

@@ -29,9 +29,9 @@ class {{ test.test_class_name }}({{ test.base_test_class_name }}):
     {% endif %}
     @recorded_by_proxy{{ async_suffix }}
     {% if code_model.options["azure_arm"] %}
-    {{ async }}def test_{{ testcase.operation.name }}(self, resource_group):
+    {{ async }}def test_{{ testcase.name }}(self, resource_group):
     {% else %}
-    {{ async }}def test_{{ testcase.operation.name }}(self, {{ prefix_lower }}_endpoint):
+    {{ async }}def test_{{ testcase.name }}(self, {{ prefix_lower }}_endpoint):
         {{ client_var }} = self.{{ test.create_client_name }}(endpoint={{ prefix_lower }}_endpoint)
     {% endif %}
         {{testcase.response }}{{ client_var }}{{ testcase.operation_group_prefix }}.{{ testcase.operation.name }}(

package/generator/pygen/utils.py

@@ -105,6 +105,7 @@ KNOWN_TYPES: Dict[str, Dict[str, Any]] = {
 }
 
 JSON_REGEXP = re.compile(r"^(application|text)/(.+\+)?json$")
+XML_REGEXP = re.compile(r"^(application|text)/(.+\+)?xml$")
 
 
 def build_policies(
@@ -149,3 +150,11 @@ def build_policies(
 
 def extract_original_name(name: str) -> str:
     return name[1 : -len("_initial")]
+
+
+def json_serializable(content_type: str) -> bool:
+    return bool(JSON_REGEXP.match(content_type.split(";")[0].strip().lower()))
+
+
+def xml_serializable(content_type: str) -> bool:
+    return bool(XML_REGEXP.match(content_type.split(";")[0].strip().lower()))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-python",
-  "version": "0.30.0",
+  "version": "0.31.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://github.com/Azure/autorest.python",
@@ -53,8 +53,8 @@
   "devDependencies": {
     "@azure-tools/typespec-azure-resource-manager": "~0.45.0",
     "@azure-tools/typespec-autorest": "~0.45.0",
-    "@azure-tools/cadl-ranch-expect": "~0.15.1",
-    "@azure-tools/cadl-ranch-specs": "~0.36.1",
+    "@azure-tools/cadl-ranch-expect": "~0.15.3",
+    "@azure-tools/cadl-ranch-specs": "~0.37.1",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "^18.16.3",
     "@types/yargs": "17.0.32",
@@ -62,8 +62,9 @@
     "@typespec/eslint-config-typespec": "~0.55.0",
     "@typespec/openapi": "~0.59.0",
     "c8": "~7.13.0",
+    "vitest": "^2.0.4",
     "rimraf": "~5.0.0",
-    "typescript": "~5.1.3",
+    "typescript": "~5.5.4",
     "@azure-tools/typespec-azure-core": "~0.45.0",
     "@azure-tools/typespec-client-generator-core": "0.45.4",
     "@typespec/compiler": "~0.59.1",
@@ -83,6 +84,6 @@
     "format": "npx prettier **/*.ts --write && tsx ./scripts/eng/format.ts",
     "install": "tsx ./scripts/run-python3.ts ./scripts/install.py",
     "regenerate": "tsx ./scripts/eng/regenerate.ts",
-    "test": "tsx ./scripts/eng/run-tests.ts"
+    "test": "npx vitest run ./test && tsx ./scripts/eng/run-tests.ts"
   }
 }

package/scripts/eng/regenerate.ts

@@ -50,9 +50,6 @@ const EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, st
     "type/model/empty": {
         "package-name": "typetest-model-empty",
     },
-    "type/model/flatten": {
-        "package-name": "typetest-model-flatten",
-    },
     "type/model/inheritance/enum-discriminator": {
         "package-name": "typetest-model-enumdiscriminator",
     },
@@ -172,9 +169,6 @@ async function getSubdirectories(baseDir: string, flags: RegenerateFlags): Promi
                 const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath));
                 if (flags.flavor === "unbranded" && mainTspRelativePath.includes("azure")) return;
 
-                // after xml support, remove this check
-                if (mainTspRelativePath.includes("xml")) return;
-
                 // after fix test generation for nested operation group, remove this check
                 if (mainTspRelativePath.includes("client-operation-group")) return;
 

package/scripts/eng/run-tests.ts

@@ -10,6 +10,7 @@ interface Arguments {
     validFolders: string[];
     folder?: string;
     command?: string;
+    name?: string;
 }
 
 const validCommands = ["ci", "lint", "mypy", "pyright", "apiview"];
@@ -32,15 +33,24 @@ const argv = yargs(hideBin(process.argv))
         describe: "Specify the command to run",
         choices: validCommands,
         type: "string",
+    })
+    .option("name", {
+        alias: "n",
+        describe: "Specify the name of the test",
+        type: "string",
     }).argv as Arguments;
 
 const foldersToProcess = argv.folder ? [argv.folder] : argv.validFolders;
 
 const commandToRun = argv.command || "all";
 
-function getCommand(command: string, folder: string) {
+function getCommand(command: string, folder: string, name?: string): string {
     if (!validCommands.includes(command)) throw new Error(`Unknown command '${command}'.`);
-    return `FOLDER=${folder} tox -c ./test/${folder}/tox.ini -e ${command}`;
+    const retval = `FOLDER=${folder} tox -c ./test/${folder}/tox.ini -e ${command}`;
+    if (name) {
+        return `${retval} -- -f ${name}`;
+    }
+    return retval;
 }
 
 function sectionExistsInToxIni(command: string, folder: string): boolean {
@@ -50,12 +60,12 @@ function sectionExistsInToxIni(command: string, folder: string): boolean {
     return toxIniContent.includes(sectionHeader);
 }
 
-function myExecSync(command: string, folder: string): void {
+function myExecSync(command: string, folder: string, name?: string): void {
     if (!sectionExistsInToxIni(command, folder)) {
         console.log(`No section for ${command} in tox.ini for folder ${folder}. Skipping...`);
         return;
     }
-    execSync(getCommand(command, folder), { stdio: "inherit" });
+    execSync(getCommand(command, folder, name), { stdio: "inherit" });
 }
 
 foldersToProcess.forEach((folder) => {
@@ -63,11 +73,11 @@ foldersToProcess.forEach((folder) => {
         if (commandToRun === "all") {
             for (const key of validCommands) {
                 console.log(`Running ${key} for folder ${folder}...`);
-                myExecSync(key, folder);
+                myExecSync(key, folder, argv.name);
             }
-        } else if (getCommand(commandToRun, folder)) {
+        } else if (getCommand(commandToRun, folder, argv.name)) {
             console.log(`Running ${commandToRun} for folder ${folder}...`);
-            myExecSync(commandToRun, folder);
+            myExecSync(commandToRun, folder, argv.name);
         } else {
             console.error(`Error: Unknown command '${commandToRun}'.`);
             process.exit(1);