@typespec/http-client-python 0.27.1 → 0.28.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. package/dist/emitter/code-model.d.ts.map +1 -1
  2. package/dist/emitter/code-model.js +20 -15
  3. package/dist/emitter/code-model.js.map +1 -1
  4. package/dist/emitter/emitter.js +1 -1
  5. package/dist/emitter/emitter.js.map +1 -1
  6. package/dist/emitter/http.d.ts.map +1 -1
  7. package/dist/emitter/http.js +2 -3
  8. package/dist/emitter/http.js.map +1 -1
  9. package/emitter/src/code-model.ts +28 -21
  10. package/emitter/src/emitter.ts +1 -1
  11. package/emitter/src/http.ts +1 -4
  12. package/emitter/temp/tsconfig.tsbuildinfo +1 -1
  13. package/eng/scripts/ci/regenerate-common.ts +472 -0
  14. package/eng/scripts/ci/regenerate.ts +41 -437
  15. package/eng/scripts/setup/__pycache__/package_manager.cpython-311.pyc +0 -0
  16. package/eng/scripts/setup/__pycache__/venvtools.cpython-311.pyc +0 -0
  17. package/generator/build/lib/pygen/codegen/models/client.py +5 -5
  18. package/generator/build/lib/pygen/codegen/models/credential_types.py +1 -1
  19. package/generator/build/lib/pygen/codegen/models/enum_type.py +1 -1
  20. package/generator/build/lib/pygen/codegen/models/imports.py +2 -3
  21. package/generator/build/lib/pygen/codegen/models/lro_operation.py +1 -1
  22. package/generator/build/lib/pygen/codegen/models/model_type.py +2 -2
  23. package/generator/build/lib/pygen/codegen/models/operation.py +5 -5
  24. package/generator/build/lib/pygen/codegen/models/operation_group.py +1 -1
  25. package/generator/build/lib/pygen/codegen/models/paging_operation.py +2 -2
  26. package/generator/build/lib/pygen/codegen/models/primitive_types.py +1 -1
  27. package/generator/build/lib/pygen/codegen/models/request_builder.py +1 -1
  28. package/generator/build/lib/pygen/codegen/serializers/builder_serializer.py +16 -7
  29. package/generator/build/lib/pygen/codegen/serializers/import_serializer.py +4 -31
  30. package/generator/build/lib/pygen/codegen/templates/model_base.py.jinja2 +14 -4
  31. package/generator/build/lib/pygen/preprocess/__init__.py +9 -21
  32. package/generator/build/lib/pygen/preprocess/python_mappings.py +0 -2
  33. package/generator/component-detection-pip-report.json +5 -6
  34. package/generator/dist/pygen-0.1.0-py3-none-any.whl +0 -0
  35. package/generator/pygen/codegen/models/client.py +5 -5
  36. package/generator/pygen/codegen/models/credential_types.py +1 -1
  37. package/generator/pygen/codegen/models/enum_type.py +1 -1
  38. package/generator/pygen/codegen/models/imports.py +2 -3
  39. package/generator/pygen/codegen/models/lro_operation.py +1 -1
  40. package/generator/pygen/codegen/models/model_type.py +2 -2
  41. package/generator/pygen/codegen/models/operation.py +5 -5
  42. package/generator/pygen/codegen/models/operation_group.py +1 -1
  43. package/generator/pygen/codegen/models/paging_operation.py +2 -2
  44. package/generator/pygen/codegen/models/primitive_types.py +1 -1
  45. package/generator/pygen/codegen/models/request_builder.py +1 -1
  46. package/generator/pygen/codegen/serializers/builder_serializer.py +16 -7
  47. package/generator/pygen/codegen/serializers/import_serializer.py +4 -31
  48. package/generator/pygen/codegen/templates/model_base.py.jinja2 +14 -4
  49. package/generator/pygen/preprocess/__init__.py +9 -21
  50. package/generator/pygen/preprocess/python_mappings.py +0 -2
  51. package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py +24 -2
  52. package/generator/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py +12 -0
  53. package/generator/test/azure/mock_api_tests/asynctests/test_special_words_async.py +6 -0
  54. package/generator/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py +22 -2
  55. package/generator/test/azure/mock_api_tests/test_azure_core_page.py +11 -0
  56. package/generator/test/azure/mock_api_tests/test_clear_output_folder.py +9 -0
  57. package/generator/test/azure/mock_api_tests/test_special_words.py +5 -0
  58. package/generator/test/azure/requirements.txt +4 -1
  59. package/generator/test/generic_mock_api_tests/asynctests/test_authentication_async.py +13 -1
  60. package/generator/test/generic_mock_api_tests/asynctests/test_encode_bytes_async.py +6 -1
  61. package/generator/test/generic_mock_api_tests/asynctests/test_payload_xml_async.py +21 -0
  62. package/generator/test/generic_mock_api_tests/data/image.jpg +0 -0
  63. package/generator/test/generic_mock_api_tests/data/image.png +0 -0
  64. package/generator/test/generic_mock_api_tests/test_authentication.py +11 -1
  65. package/generator/test/generic_mock_api_tests/test_encode_bytes.py +6 -0
  66. package/generator/test/generic_mock_api_tests/test_payload_xml.py +19 -0
  67. package/generator/test/unbranded/mock_api_tests/asynctests/test_special_words_async.py +7 -0
  68. package/generator/test/unbranded/mock_api_tests/test_special_words.py +6 -0
  69. package/generator/test/unbranded/mock_api_tests/test_unbranded.py +9 -8
  70. package/generator/test/unbranded/requirements.txt +2 -1
  71. package/generator/test/unittests/test_enums.py +37 -0
  72. package/generator/test/unittests/test_model_base_serialization.py +161 -0
  73. package/generator/test/unittests/test_model_base_xml_serialization.py +244 -2
  74. package/generator/test/unittests/test_name_converter.py +0 -8
  75. package/package.json +39 -39
@@ -0,0 +1,472 @@
1
+ import { promises } from "fs";
2
+ import { dirname, join, relative, resolve } from "path";
3
+
4
+ // ---- Shared constants ----
5
+
6
+ export const SKIP_SPECS: string[] = ["type/file"];
7
+
8
+ export const SpecialFlags: Record<string, Record<string, any>> = {
9
+ azure: {
10
+ "generate-test": true,
11
+ "generate-sample": true,
12
+ },
13
+ };
14
+
15
+ // ---- Base emitter options (shared across repos) ----
16
+
17
+ export const BASE_AZURE_EMITTER_OPTIONS: Record<
18
+ string,
19
+ Record<string, string> | Record<string, string>[]
20
+ > = {
21
+ "azure/client-generator-core/access": {
22
+ namespace: "specs.azure.clientgenerator.core.access",
23
+ },
24
+ "azure/client-generator-core/alternate-type": {
25
+ namespace: "specs.azure.clientgenerator.core.alternatetype",
26
+ },
27
+ "azure/client-generator-core/api-version": {
28
+ namespace: "specs.azure.clientgenerator.core.apiversion",
29
+ },
30
+ "azure/client-generator-core/client-initialization/default": {
31
+ namespace: "specs.azure.clientgenerator.core.clientinitialization.default",
32
+ },
33
+ "azure/client-generator-core/client-initialization/individually": {
34
+ namespace: "specs.azure.clientgenerator.core.clientinitialization.individually",
35
+ },
36
+ "azure/client-generator-core/client-initialization/individuallyParent": {
37
+ namespace: "specs.azure.clientgenerator.core.clientinitialization.individuallyparent",
38
+ },
39
+ "azure/client-generator-core/client-location": {
40
+ namespace: "specs.azure.clientgenerator.core.clientlocation",
41
+ },
42
+ "azure/client-generator-core/deserialize-empty-string-as-null": {
43
+ namespace: "specs.azure.clientgenerator.core.emptystring",
44
+ },
45
+ "azure/client-generator-core/flatten-property": {
46
+ namespace: "specs.azure.clientgenerator.core.flattenproperty",
47
+ },
48
+ "azure/client-generator-core/usage": {
49
+ namespace: "specs.azure.clientgenerator.core.usage",
50
+ },
51
+ "azure/client-generator-core/override": {
52
+ namespace: "specs.azure.clientgenerator.core.override",
53
+ },
54
+ "azure/client-generator-core/hierarchy-building": {
55
+ namespace: "specs.azure.clientgenerator.core.hierarchybuilding",
56
+ },
57
+ "azure/core/basic": {
58
+ namespace: "specs.azure.core.basic",
59
+ },
60
+ "azure/core/lro/rpc": {
61
+ namespace: "specs.azure.core.lro.rpc",
62
+ },
63
+ "azure/core/lro/standard": {
64
+ namespace: "specs.azure.core.lro.standard",
65
+ },
66
+ "azure/core/model": {
67
+ namespace: "specs.azure.core.model",
68
+ },
69
+ "azure/core/page": {
70
+ namespace: "specs.azure.core.page",
71
+ },
72
+ "azure/core/scalar": {
73
+ namespace: "specs.azure.core.scalar",
74
+ },
75
+ "azure/core/traits": {
76
+ namespace: "specs.azure.core.traits",
77
+ },
78
+ "azure/encode/duration": {
79
+ namespace: "specs.azure.encode.duration",
80
+ },
81
+ "azure/example/basic": {
82
+ namespace: "specs.azure.example.basic",
83
+ },
84
+ "azure/payload/pageable": {
85
+ namespace: "specs.azure.payload.pageable",
86
+ },
87
+ "azure/versioning/previewVersion": {
88
+ namespace: "specs.azure.versioning.previewversion",
89
+ },
90
+ "client/structure/default": {
91
+ namespace: "client.structure.service",
92
+ },
93
+ "client/structure/multi-client": {
94
+ "package-name": "client-structure-multiclient",
95
+ namespace: "client.structure.multiclient",
96
+ },
97
+ "client/structure/renamed-operation": {
98
+ "package-name": "client-structure-renamedoperation",
99
+ namespace: "client.structure.renamedoperation",
100
+ },
101
+ "client/structure/two-operation-group": {
102
+ "package-name": "client-structure-twooperationgroup",
103
+ namespace: "client.structure.twooperationgroup",
104
+ },
105
+ "client/naming": {
106
+ namespace: "client.naming.main",
107
+ },
108
+ "client/overload": {
109
+ namespace: "client.overload",
110
+ },
111
+ "encode/duration": {
112
+ namespace: "encode.duration",
113
+ },
114
+ "encode/numeric": {
115
+ namespace: "encode.numeric",
116
+ },
117
+ "parameters/basic": {
118
+ namespace: "parameters.basic",
119
+ },
120
+ "parameters/spread": {
121
+ namespace: "parameters.spread",
122
+ },
123
+ "payload/content-negotiation": {
124
+ namespace: "payload.contentnegotiation",
125
+ },
126
+ "payload/multipart": {
127
+ namespace: "payload.multipart",
128
+ },
129
+ "serialization/encoded-name/json": {
130
+ namespace: "serialization.encodedname.json",
131
+ },
132
+ "special-words": {
133
+ namespace: "specialwords",
134
+ },
135
+ "service/multi-service": {
136
+ namespace: "service.multiservice",
137
+ },
138
+ };
139
+
140
+ export const BASE_EMITTER_OPTIONS: Record<
141
+ string,
142
+ Record<string, string> | Record<string, string>[]
143
+ > = {
144
+ "resiliency/srv-driven/old.tsp": {
145
+ "package-name": "resiliency-srv-driven1",
146
+ namespace: "resiliency.srv.driven1",
147
+ "package-mode": "azure-dataplane",
148
+ "package-pprint-name": "ResiliencySrvDriven1",
149
+ },
150
+ "resiliency/srv-driven": {
151
+ "package-name": "resiliency-srv-driven2",
152
+ namespace: "resiliency.srv.driven2",
153
+ "package-mode": "azure-dataplane",
154
+ "package-pprint-name": "ResiliencySrvDriven2",
155
+ },
156
+ "authentication/api-key": {
157
+ "clear-output-folder": "true",
158
+ },
159
+ "authentication/http/custom": {
160
+ "package-name": "authentication-http-custom",
161
+ namespace: "authentication.http.custom",
162
+ "package-pprint-name": "Authentication Http Custom",
163
+ },
164
+ "authentication/union": [
165
+ {
166
+ "package-name": "authentication-union",
167
+ namespace: "authentication.union",
168
+ },
169
+ {
170
+ "package-name": "setuppy-authentication-union",
171
+ namespace: "setuppy.authentication.union",
172
+ "keep-setup-py": "true",
173
+ },
174
+ ],
175
+ "type/array": {
176
+ "package-name": "typetest-array",
177
+ namespace: "typetest.array",
178
+ },
179
+ "type/dictionary": {
180
+ "package-name": "typetest-dictionary",
181
+ namespace: "typetest.dictionary",
182
+ },
183
+ "type/enum/extensible": {
184
+ "package-name": "typetest-enum-extensible",
185
+ namespace: "typetest.enum.extensible",
186
+ },
187
+ "type/enum/fixed": {
188
+ "package-name": "typetest-enum-fixed",
189
+ namespace: "typetest.enum.fixed",
190
+ },
191
+ "type/model/empty": {
192
+ "package-name": "typetest-model-empty",
193
+ namespace: "typetest.model.empty",
194
+ },
195
+ "type/model/inheritance/enum-discriminator": {
196
+ "package-name": "typetest-model-enumdiscriminator",
197
+ namespace: "typetest.model.enumdiscriminator",
198
+ },
199
+ "type/model/inheritance/nested-discriminator": {
200
+ "package-name": "typetest-model-nesteddiscriminator",
201
+ namespace: "typetest.model.nesteddiscriminator",
202
+ },
203
+ "type/model/inheritance/not-discriminated": {
204
+ "package-name": "typetest-model-notdiscriminated",
205
+ namespace: "typetest.model.notdiscriminated",
206
+ },
207
+ "type/model/inheritance/single-discriminator": {
208
+ "package-name": "typetest-model-singlediscriminator",
209
+ namespace: "typetest.model.singlediscriminator",
210
+ },
211
+ "type/model/inheritance/recursive": {
212
+ "package-name": "typetest-model-recursive",
213
+ namespace: "typetest.model.recursive",
214
+ },
215
+ "type/model/usage": {
216
+ "package-name": "typetest-model-usage",
217
+ namespace: "typetest.model.usage",
218
+ },
219
+ "type/model/visibility": [
220
+ {
221
+ "package-name": "typetest-model-visibility",
222
+ namespace: "typetest.model.visibility",
223
+ },
224
+ {
225
+ "package-name": "headasbooleantrue",
226
+ namespace: "headasbooleantrue",
227
+ "head-as-boolean": "true",
228
+ },
229
+ {
230
+ "package-name": "headasbooleanfalse",
231
+ namespace: "headasbooleanfalse",
232
+ "head-as-boolean": "false",
233
+ },
234
+ ],
235
+ "type/property/nullable": {
236
+ "package-name": "typetest-property-nullable",
237
+ namespace: "typetest.property.nullable",
238
+ },
239
+ "type/property/optionality": {
240
+ "package-name": "typetest-property-optional",
241
+ namespace: "typetest.property.optional",
242
+ },
243
+ "type/property/additional-properties": {
244
+ "package-name": "typetest-property-additionalproperties",
245
+ namespace: "typetest.property.additionalproperties",
246
+ },
247
+ "type/scalar": {
248
+ "package-name": "typetest-scalar",
249
+ namespace: "typetest.scalar",
250
+ },
251
+ "type/property/value-types": {
252
+ "package-name": "typetest-property-valuetypes",
253
+ namespace: "typetest.property.valuetypes",
254
+ },
255
+ "type/union": {
256
+ "package-name": "typetest-union",
257
+ namespace: "typetest.union",
258
+ },
259
+ "type/union/discriminated": {
260
+ "package-name": "typetest-discriminatedunion",
261
+ namespace: "typetest.discriminatedunion",
262
+ },
263
+ "type/file": {
264
+ "package-name": "typetest-file",
265
+ namespace: "typetest.file",
266
+ },
267
+ documentation: {
268
+ "package-name": "specs-documentation",
269
+ namespace: "specs.documentation",
270
+ },
271
+ };
272
+
273
+ // ---- Shared interfaces ----
274
+
275
+ export interface TspCommand {
276
+ outputDir: string;
277
+ command: string | string[];
278
+ }
279
+
280
+ export interface RegenerateFlagsInput {
281
+ flavor?: string;
282
+ debug?: boolean;
283
+ name?: string;
284
+ pyodide?: boolean;
285
+ }
286
+
287
+ export interface RegenerateFlags {
288
+ flavor: string;
289
+ debug: boolean;
290
+ name?: string;
291
+ pyodide?: boolean;
292
+ }
293
+
294
+ export interface ProcessedEmitterOption {
295
+ options: Record<string, string>;
296
+ outputDir: string;
297
+ }
298
+
299
+ export interface RegenerateConfig {
300
+ azureHttpSpecs: string;
301
+ httpSpecs: string;
302
+ emitterOptions: Record<string, Record<string, string> | Record<string, string>[]>;
303
+ azureEmitterOptions: Record<string, Record<string, string> | Record<string, string>[]>;
304
+ preprocess: (flags: RegenerateFlagsInput) => Promise<void>;
305
+ getCmdList: (spec: string, flags: RegenerateFlags) => TspCommand[];
306
+ executeCommand: (cmd: TspCommand) => Promise<void>;
307
+ }
308
+
309
+ // ---- Shared utility functions ----
310
+
311
+ export function toPosix(dir: string): string {
312
+ return dir.replace(/\\/g, "/");
313
+ }
314
+
315
+ export function getEmitterOption(
316
+ spec: string,
317
+ flavor: string,
318
+ config: RegenerateConfig,
319
+ ): Record<string, string>[] {
320
+ const specDir = spec.includes("azure") ? config.azureHttpSpecs : config.httpSpecs;
321
+ const relativeSpec = toPosix(relative(specDir, spec));
322
+ const key = relativeSpec.includes("resiliency/srv-driven/old.tsp")
323
+ ? relativeSpec
324
+ : dirname(relativeSpec);
325
+ const emitter_options = config.emitterOptions[key] ||
326
+ (flavor === "azure" ? config.azureEmitterOptions[key] : [{}]) || [{}];
327
+ return Array.isArray(emitter_options) ? emitter_options : [emitter_options];
328
+ }
329
+
330
+ export async function getSubdirectories(
331
+ baseDir: string,
332
+ flags: RegenerateFlags,
333
+ ): Promise<string[]> {
334
+ const subdirectories: string[] = [];
335
+
336
+ async function searchDir(currentDir: string) {
337
+ const items = await promises.readdir(currentDir, { withFileTypes: true });
338
+
339
+ const promisesArray = items.map(async (item) => {
340
+ const subDirPath = join(currentDir, item.name);
341
+ if (item.isDirectory()) {
342
+ const mainTspPath = join(subDirPath, "main.tsp");
343
+ const clientTspPath = join(subDirPath, "client.tsp");
344
+
345
+ const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath));
346
+
347
+ if (SKIP_SPECS.some((skipSpec) => mainTspRelativePath.includes(skipSpec))) return;
348
+
349
+ const hasMainTsp = await promises
350
+ .access(mainTspPath)
351
+ .then(() => true)
352
+ .catch(() => false);
353
+ const hasClientTsp = await promises
354
+ .access(clientTspPath)
355
+ .then(() => true)
356
+ .catch(() => false);
357
+
358
+ if (mainTspRelativePath.toLowerCase().includes(flags.name || "")) {
359
+ if (mainTspRelativePath.includes("resiliency/srv-driven")) {
360
+ subdirectories.push(resolve(subDirPath, "old.tsp"));
361
+ }
362
+ if (hasClientTsp) {
363
+ subdirectories.push(resolve(subDirPath, "client.tsp"));
364
+ } else if (hasMainTsp) {
365
+ subdirectories.push(resolve(subDirPath, "main.tsp"));
366
+ }
367
+ }
368
+
369
+ // Recursively search in the subdirectory
370
+ await searchDir(subDirPath);
371
+ }
372
+ });
373
+
374
+ await Promise.all(promisesArray);
375
+ }
376
+
377
+ await searchDir(baseDir);
378
+ return subdirectories;
379
+ }
380
+
381
+ export function defaultPackageName(spec: string, config: RegenerateConfig): string {
382
+ const specDir = spec.includes("azure") ? config.azureHttpSpecs : config.httpSpecs;
383
+ return toPosix(relative(specDir, dirname(spec)))
384
+ .replace(/\//g, "-")
385
+ .toLowerCase();
386
+ }
387
+
388
+ export function buildOptions(
389
+ spec: string,
390
+ generatedFolder: string,
391
+ flags: RegenerateFlags,
392
+ config: RegenerateConfig,
393
+ ): ProcessedEmitterOption[] {
394
+ const results: ProcessedEmitterOption[] = [];
395
+ for (const emitterConfig of getEmitterOption(spec, flags.flavor, config)) {
396
+ const options: Record<string, string> = { ...emitterConfig };
397
+ if (flags.pyodide) {
398
+ options["use-pyodide"] = "true";
399
+ }
400
+ options["flavor"] = flags.flavor;
401
+ for (const [k, v] of Object.entries(SpecialFlags[flags.flavor] ?? {})) {
402
+ options[k] = v;
403
+ }
404
+ if (options["emitter-output-dir"] === undefined) {
405
+ const packageName = options["package-name"] || defaultPackageName(spec, config);
406
+ options["emitter-output-dir"] = toPosix(
407
+ `${generatedFolder}/test/${flags.flavor}/generated/${packageName}`,
408
+ );
409
+ }
410
+ if (flags.debug) {
411
+ options["debug"] = "true";
412
+ }
413
+ options["examples-dir"] = toPosix(join(dirname(spec), "examples"));
414
+ results.push({
415
+ options,
416
+ outputDir: options["emitter-output-dir"],
417
+ });
418
+ }
419
+ return results;
420
+ }
421
+
422
+ export async function runTaskPool(
423
+ tasks: Array<() => Promise<void>>,
424
+ poolLimit: number,
425
+ ): Promise<void> {
426
+ async function worker(start: number, end: number) {
427
+ while (start < end) {
428
+ await tasks[start]();
429
+ start++;
430
+ }
431
+ }
432
+
433
+ const workers = [];
434
+ let start = 0;
435
+ while (start < tasks.length) {
436
+ const end = Math.min(start + poolLimit, tasks.length);
437
+ workers.push((async () => await worker(start, end))());
438
+ start = end;
439
+ }
440
+ await Promise.all(workers);
441
+ }
442
+
443
+ export async function regenerate(
444
+ flags: RegenerateFlagsInput,
445
+ config: RegenerateConfig,
446
+ ): Promise<void> {
447
+ if (flags.flavor === undefined) {
448
+ await regenerate({ flavor: "azure", ...flags }, config);
449
+ await regenerate({ flavor: "unbranded", ...flags }, config);
450
+ } else {
451
+ await config.preprocess(flags);
452
+
453
+ const flagsResolved: RegenerateFlags = { debug: false, flavor: flags.flavor, ...flags };
454
+ const subdirectoriesForAzure = await getSubdirectories(config.azureHttpSpecs, flagsResolved);
455
+ const subdirectoriesForNonAzure = await getSubdirectories(config.httpSpecs, flagsResolved);
456
+ const subdirectories =
457
+ flags.flavor === "azure"
458
+ ? [...subdirectoriesForAzure, ...subdirectoriesForNonAzure]
459
+ : subdirectoriesForNonAzure;
460
+ const cmdList: TspCommand[] = subdirectories.flatMap((subdirectory) =>
461
+ config.getCmdList(subdirectory, flagsResolved),
462
+ );
463
+
464
+ // Create tasks as functions for the pool
465
+ const tasks: Array<() => Promise<void>> = cmdList.map((tspCommand) => {
466
+ return () => config.executeCommand(tspCommand);
467
+ });
468
+
469
+ // Run tasks with a concurrency limit
470
+ await runTaskPool(tasks, 30);
471
+ }
472
+ }