@typespec/http-client-python 0.4.4 → 0.5.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.
- package/dist/emitter/emitter.d.ts.map +1 -1
- package/dist/emitter/emitter.js +85 -24
- package/dist/emitter/emitter.js.map +1 -1
- package/dist/emitter/lib.d.ts +1 -0
- package/dist/emitter/lib.d.ts.map +1 -1
- package/dist/emitter/lib.js +1 -0
- package/dist/emitter/lib.js.map +1 -1
- package/dist/emitter/run-python3.d.ts +2 -0
- package/dist/emitter/run-python3.d.ts.map +1 -0
- package/dist/emitter/run-python3.js +19 -0
- package/dist/emitter/run-python3.js.map +1 -0
- package/dist/emitter/system-requirements.d.ts +17 -0
- package/dist/emitter/system-requirements.d.ts.map +1 -0
- package/dist/emitter/system-requirements.js +167 -0
- package/dist/emitter/system-requirements.js.map +1 -0
- package/emitter/src/emitter.ts +88 -23
- package/emitter/src/lib.ts +2 -0
- package/emitter/src/run-python3.ts +20 -0
- package/emitter/src/system-requirements.ts +261 -0
- package/emitter/temp/tsconfig.tsbuildinfo +1 -1
- package/eng/scripts/ci/regenerate.ts +16 -4
- package/eng/scripts/setup/__pycache__/venvtools.cpython-38.pyc +0 -0
- package/eng/scripts/setup/build.ts +16 -0
- package/eng/scripts/setup/build_pygen_wheel.py +40 -0
- package/eng/scripts/setup/install.py +9 -3
- package/eng/scripts/setup/install.ts +32 -0
- package/eng/scripts/setup/prepare.py +3 -1
- package/eng/scripts/setup/prepare.ts +11 -0
- package/eng/scripts/setup/run-python3.ts +1 -6
- package/generator/build/lib/pygen/__init__.py +107 -0
- package/generator/build/lib/pygen/_version.py +7 -0
- package/generator/build/lib/pygen/black.py +71 -0
- package/generator/build/lib/pygen/codegen/__init__.py +357 -0
- package/generator/build/lib/pygen/codegen/_utils.py +17 -0
- package/generator/build/lib/pygen/codegen/models/__init__.py +204 -0
- package/generator/build/lib/pygen/codegen/models/base.py +186 -0
- package/generator/build/lib/pygen/codegen/models/base_builder.py +118 -0
- package/generator/build/lib/pygen/codegen/models/client.py +435 -0
- package/generator/build/lib/pygen/codegen/models/code_model.py +237 -0
- package/generator/build/lib/pygen/codegen/models/combined_type.py +149 -0
- package/generator/build/lib/pygen/codegen/models/constant_type.py +129 -0
- package/generator/build/lib/pygen/codegen/models/credential_types.py +214 -0
- package/generator/build/lib/pygen/codegen/models/dictionary_type.py +127 -0
- package/generator/build/lib/pygen/codegen/models/enum_type.py +238 -0
- package/generator/build/lib/pygen/codegen/models/imports.py +291 -0
- package/generator/build/lib/pygen/codegen/models/list_type.py +143 -0
- package/generator/build/lib/pygen/codegen/models/lro_operation.py +142 -0
- package/generator/build/lib/pygen/codegen/models/lro_paging_operation.py +32 -0
- package/generator/build/lib/pygen/codegen/models/model_type.py +357 -0
- package/generator/build/lib/pygen/codegen/models/operation.py +509 -0
- package/generator/build/lib/pygen/codegen/models/operation_group.py +184 -0
- package/generator/build/lib/pygen/codegen/models/paging_operation.py +155 -0
- package/generator/build/lib/pygen/codegen/models/parameter.py +412 -0
- package/generator/build/lib/pygen/codegen/models/parameter_list.py +387 -0
- package/generator/build/lib/pygen/codegen/models/primitive_types.py +659 -0
- package/generator/build/lib/pygen/codegen/models/property.py +170 -0
- package/generator/build/lib/pygen/codegen/models/request_builder.py +189 -0
- package/generator/build/lib/pygen/codegen/models/request_builder_parameter.py +115 -0
- package/generator/build/lib/pygen/codegen/models/response.py +348 -0
- package/generator/build/lib/pygen/codegen/models/utils.py +21 -0
- package/generator/build/lib/pygen/codegen/serializers/__init__.py +574 -0
- package/generator/build/lib/pygen/codegen/serializers/base_serializer.py +21 -0
- package/generator/build/lib/pygen/codegen/serializers/builder_serializer.py +1533 -0
- package/generator/build/lib/pygen/codegen/serializers/client_serializer.py +294 -0
- package/generator/build/lib/pygen/codegen/serializers/enum_serializer.py +15 -0
- package/generator/build/lib/pygen/codegen/serializers/general_serializer.py +213 -0
- package/generator/build/lib/pygen/codegen/serializers/import_serializer.py +126 -0
- package/generator/build/lib/pygen/codegen/serializers/metadata_serializer.py +198 -0
- package/generator/build/lib/pygen/codegen/serializers/model_init_serializer.py +33 -0
- package/generator/build/lib/pygen/codegen/serializers/model_serializer.py +335 -0
- package/generator/build/lib/pygen/codegen/serializers/operation_groups_serializer.py +89 -0
- package/generator/build/lib/pygen/codegen/serializers/operations_init_serializer.py +44 -0
- package/generator/build/lib/pygen/codegen/serializers/parameter_serializer.py +221 -0
- package/generator/build/lib/pygen/codegen/serializers/patch_serializer.py +19 -0
- package/generator/build/lib/pygen/codegen/serializers/request_builders_serializer.py +52 -0
- package/generator/build/lib/pygen/codegen/serializers/sample_serializer.py +168 -0
- package/generator/build/lib/pygen/codegen/serializers/test_serializer.py +292 -0
- package/generator/build/lib/pygen/codegen/serializers/types_serializer.py +31 -0
- package/generator/build/lib/pygen/codegen/serializers/utils.py +68 -0
- package/generator/build/lib/pygen/codegen/templates/client.py.jinja2 +37 -0
- package/generator/build/lib/pygen/codegen/templates/client_container.py.jinja2 +12 -0
- package/generator/build/lib/pygen/codegen/templates/config.py.jinja2 +73 -0
- package/generator/build/lib/pygen/codegen/templates/config_container.py.jinja2 +16 -0
- package/generator/build/lib/pygen/codegen/templates/conftest.py.jinja2 +28 -0
- package/generator/build/lib/pygen/codegen/templates/enum.py.jinja2 +13 -0
- package/generator/build/lib/pygen/codegen/templates/enum_container.py.jinja2 +10 -0
- package/generator/build/lib/pygen/codegen/templates/init.py.jinja2 +24 -0
- package/generator/build/lib/pygen/codegen/templates/keywords.jinja2 +27 -0
- package/generator/build/lib/pygen/codegen/templates/lro_operation.py.jinja2 +16 -0
- package/generator/build/lib/pygen/codegen/templates/lro_paging_operation.py.jinja2 +18 -0
- package/generator/build/lib/pygen/codegen/templates/macros.jinja2 +12 -0
- package/generator/build/lib/pygen/codegen/templates/metadata.json.jinja2 +167 -0
- package/generator/build/lib/pygen/codegen/templates/model_base.py.jinja2 +1174 -0
- package/generator/build/lib/pygen/codegen/templates/model_container.py.jinja2 +15 -0
- package/generator/build/lib/pygen/codegen/templates/model_dpg.py.jinja2 +97 -0
- package/generator/build/lib/pygen/codegen/templates/model_init.py.jinja2 +33 -0
- package/generator/build/lib/pygen/codegen/templates/model_msrest.py.jinja2 +92 -0
- package/generator/build/lib/pygen/codegen/templates/operation.py.jinja2 +21 -0
- package/generator/build/lib/pygen/codegen/templates/operation_group.py.jinja2 +75 -0
- package/generator/build/lib/pygen/codegen/templates/operation_groups_container.py.jinja2 +19 -0
- package/generator/build/lib/pygen/codegen/templates/operation_tools.jinja2 +81 -0
- package/generator/build/lib/pygen/codegen/templates/operations_folder_init.py.jinja2 +17 -0
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/CHANGELOG.md.jinja2 +6 -0
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/LICENSE.jinja2 +21 -0
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/MANIFEST.in.jinja2 +8 -0
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/README.md.jinja2 +107 -0
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/dev_requirements.txt.jinja2 +9 -0
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/setup.py.jinja2 +108 -0
- package/generator/build/lib/pygen/codegen/templates/paging_operation.py.jinja2 +21 -0
- package/generator/build/lib/pygen/codegen/templates/patch.py.jinja2 +19 -0
- package/generator/build/lib/pygen/codegen/templates/pkgutil_init.py.jinja2 +1 -0
- package/generator/build/lib/pygen/codegen/templates/request_builder.py.jinja2 +28 -0
- package/generator/build/lib/pygen/codegen/templates/request_builders.py.jinja2 +10 -0
- package/generator/build/lib/pygen/codegen/templates/rest_init.py.jinja2 +12 -0
- package/generator/build/lib/pygen/codegen/templates/sample.py.jinja2 +44 -0
- package/generator/build/lib/pygen/codegen/templates/serialization.py.jinja2 +2117 -0
- package/generator/build/lib/pygen/codegen/templates/test.py.jinja2 +50 -0
- package/generator/build/lib/pygen/codegen/templates/testpreparer.py.jinja2 +26 -0
- package/generator/build/lib/pygen/codegen/templates/types.py.jinja2 +7 -0
- package/generator/build/lib/pygen/codegen/templates/validation.py.jinja2 +38 -0
- package/generator/build/lib/pygen/codegen/templates/vendor.py.jinja2 +96 -0
- package/generator/build/lib/pygen/codegen/templates/version.py.jinja2 +4 -0
- package/generator/build/lib/pygen/m2r.py +65 -0
- package/generator/build/lib/pygen/preprocess/__init__.py +515 -0
- package/generator/build/lib/pygen/preprocess/helpers.py +27 -0
- package/generator/build/lib/pygen/preprocess/python_mappings.py +226 -0
- package/generator/build/lib/pygen/utils.py +163 -0
- package/generator/component-detection-pip-report.json +134 -0
- package/generator/dev_requirements.txt +0 -1
- package/generator/dist/pygen-0.1.0-py3-none-any.whl +0 -0
- package/generator/pygen.egg-info/PKG-INFO +7 -4
- package/generator/pygen.egg-info/requires.txt +7 -4
- package/generator/requirements.txt +5 -10
- package/generator/setup.py +7 -4
- package/generator/test/azure/requirements.txt +1 -1
- package/generator/test/unbranded/requirements.txt +1 -1
- package/package.json +6 -5
|
@@ -0,0 +1,261 @@
|
|
|
1
|
+
import { ChildProcess, spawn, SpawnOptions } from "child_process";
|
|
2
|
+
import { coerce, satisfies } from "semver";
|
|
3
|
+
|
|
4
|
+
/*
|
|
5
|
+
* Copied from @autorest/system-requirements
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
const execute = (
|
|
9
|
+
command: string,
|
|
10
|
+
cmdlineargs: Array<string>,
|
|
11
|
+
options: MoreOptions = {},
|
|
12
|
+
): Promise<ExecResult> => {
|
|
13
|
+
return new Promise((resolve, reject) => {
|
|
14
|
+
const cp = spawn(command, cmdlineargs, { ...options, stdio: "pipe", shell: true });
|
|
15
|
+
if (options.onCreate) {
|
|
16
|
+
options.onCreate(cp);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
options.onStdOutData && cp.stdout.on("data", options.onStdOutData);
|
|
20
|
+
options.onStdErrData && cp.stderr.on("data", options.onStdErrData);
|
|
21
|
+
|
|
22
|
+
let err = "";
|
|
23
|
+
let out = "";
|
|
24
|
+
let all = "";
|
|
25
|
+
cp.stderr.on("data", (chunk) => {
|
|
26
|
+
err += chunk;
|
|
27
|
+
all += chunk;
|
|
28
|
+
});
|
|
29
|
+
cp.stdout.on("data", (chunk) => {
|
|
30
|
+
out += chunk;
|
|
31
|
+
all += chunk;
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
cp.on("error", (err) => {
|
|
35
|
+
reject(err);
|
|
36
|
+
});
|
|
37
|
+
cp.on("close", (code, signal) =>
|
|
38
|
+
resolve({
|
|
39
|
+
stdout: out,
|
|
40
|
+
stderr: err,
|
|
41
|
+
log: all,
|
|
42
|
+
error: code ? new Error("Process Failed.") : null,
|
|
43
|
+
code,
|
|
44
|
+
}),
|
|
45
|
+
);
|
|
46
|
+
});
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
const versionIsSatisfied = (version: string, requirement: string): boolean => {
|
|
50
|
+
const cleanedVersion = coerce(version);
|
|
51
|
+
if (!cleanedVersion) {
|
|
52
|
+
throw new Error(`Invalid version ${version}.`);
|
|
53
|
+
}
|
|
54
|
+
return satisfies(cleanedVersion, requirement, true);
|
|
55
|
+
};
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* Validate the provided system requirement resolution is satisfying the version requirement if applicable.
|
|
59
|
+
* @param resolution Command resolution.
|
|
60
|
+
* @param actualVersion Version for that resolution.
|
|
61
|
+
* @param requirement Requirement.
|
|
62
|
+
* @returns the resolution if it is valid or an @see SystemRequirementError if not.
|
|
63
|
+
*/
|
|
64
|
+
const validateVersionRequirement = (
|
|
65
|
+
resolution: SystemRequirementResolution,
|
|
66
|
+
actualVersion: string,
|
|
67
|
+
requirement: SystemRequirement,
|
|
68
|
+
): SystemRequirementResolution | SystemRequirementError => {
|
|
69
|
+
if (!requirement.version) {
|
|
70
|
+
return resolution; // No version requirement.
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
try {
|
|
74
|
+
if (versionIsSatisfied(actualVersion, requirement.version)) {
|
|
75
|
+
return resolution;
|
|
76
|
+
}
|
|
77
|
+
return {
|
|
78
|
+
...resolution,
|
|
79
|
+
error: true,
|
|
80
|
+
message: `'${resolution.command}' version is '${actualVersion}' but doesn't satisfy requirement '${requirement.version}'. Please update.`,
|
|
81
|
+
actualVersion: actualVersion,
|
|
82
|
+
neededVersion: requirement.version,
|
|
83
|
+
};
|
|
84
|
+
} catch {
|
|
85
|
+
return {
|
|
86
|
+
...resolution,
|
|
87
|
+
error: true,
|
|
88
|
+
message: `Couldn't parse the version ${actualVersion}. This is not a valid semver version.`,
|
|
89
|
+
actualVersion: actualVersion,
|
|
90
|
+
neededVersion: requirement.version,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
|
|
95
|
+
const tryPython = async (
|
|
96
|
+
requirement: SystemRequirement,
|
|
97
|
+
command: string,
|
|
98
|
+
additionalArgs: string[] = [],
|
|
99
|
+
): Promise<SystemRequirementResolution | SystemRequirementError> => {
|
|
100
|
+
const resolution: SystemRequirementResolution = {
|
|
101
|
+
name: PythonRequirement,
|
|
102
|
+
command,
|
|
103
|
+
additionalArgs: additionalArgs.length > 0 ? additionalArgs : undefined,
|
|
104
|
+
};
|
|
105
|
+
|
|
106
|
+
try {
|
|
107
|
+
const result = await execute(command, [
|
|
108
|
+
...additionalArgs,
|
|
109
|
+
"-c",
|
|
110
|
+
`"${PRINT_PYTHON_VERSION_SCRIPT}"`,
|
|
111
|
+
]);
|
|
112
|
+
return validateVersionRequirement(resolution, result.stdout.trim(), requirement);
|
|
113
|
+
} catch (e) {
|
|
114
|
+
return {
|
|
115
|
+
error: true,
|
|
116
|
+
...resolution,
|
|
117
|
+
message: `'${command}' command line is not found in the path. Make sure to have it installed.`,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
};
|
|
121
|
+
|
|
122
|
+
/**
|
|
123
|
+
* Returns the path to the executable as asked in the requirement.
|
|
124
|
+
* @param requirement System requirement definition.
|
|
125
|
+
* @returns If the requirement provide an environment variable for the path returns the value of that environment variable. undefined otherwise.
|
|
126
|
+
*/
|
|
127
|
+
const getExecutablePath = (requirement: SystemRequirement): string | undefined =>
|
|
128
|
+
requirement.environmentVariable && process.env[requirement.environmentVariable];
|
|
129
|
+
|
|
130
|
+
const createPythonErrorMessage = (
|
|
131
|
+
requirement: SystemRequirement,
|
|
132
|
+
errors: SystemRequirementError[],
|
|
133
|
+
): SystemRequirementError => {
|
|
134
|
+
const versionReq = requirement.version ?? "*";
|
|
135
|
+
const lines = [
|
|
136
|
+
`Couldn't find a valid python interpreter satisfying the requirement (version: ${versionReq}). Tried:`,
|
|
137
|
+
...errors.map((x) => ` - ${x.command} (${x.message})`),
|
|
138
|
+
];
|
|
139
|
+
|
|
140
|
+
return {
|
|
141
|
+
error: true,
|
|
142
|
+
name: "python",
|
|
143
|
+
command: "python",
|
|
144
|
+
message: lines.join("\n"),
|
|
145
|
+
};
|
|
146
|
+
};
|
|
147
|
+
|
|
148
|
+
const resolvePythonRequirement = async (
|
|
149
|
+
requirement: SystemRequirement,
|
|
150
|
+
): Promise<SystemRequirementResolution | SystemRequirementError> => {
|
|
151
|
+
// Hardcoding AUTOREST_PYTHON_EXE is for backward compatibility
|
|
152
|
+
const path = getExecutablePath(requirement) ?? process.env["AUTOREST_PYTHON_EXE"];
|
|
153
|
+
if (path) {
|
|
154
|
+
return await tryPython(requirement, path);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
const errors: SystemRequirementError[] = [];
|
|
158
|
+
// On windows try `py` executable with `-3` flag.
|
|
159
|
+
if (process.platform === "win32") {
|
|
160
|
+
const pyResult = await tryPython(requirement, "py", ["-3"]);
|
|
161
|
+
if ("error" in pyResult) {
|
|
162
|
+
errors.push(pyResult);
|
|
163
|
+
} else {
|
|
164
|
+
return pyResult;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
const python3Result = await tryPython(requirement, "python3");
|
|
169
|
+
if ("error" in python3Result) {
|
|
170
|
+
errors.push(python3Result);
|
|
171
|
+
} else {
|
|
172
|
+
return python3Result;
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
const pythonResult = await tryPython(requirement, "python");
|
|
176
|
+
if ("error" in pythonResult) {
|
|
177
|
+
errors.push(pythonResult);
|
|
178
|
+
} else {
|
|
179
|
+
return pythonResult;
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
return createPythonErrorMessage(requirement, errors);
|
|
183
|
+
};
|
|
184
|
+
|
|
185
|
+
/**
|
|
186
|
+
* @param command list of the command and arguments. First item in array must be a python exe @see KnownPythonExe. (e.g. ["python", "my_python_file.py"]
|
|
187
|
+
* @param requirement
|
|
188
|
+
*/
|
|
189
|
+
export const patchPythonPath = async (
|
|
190
|
+
command: PythonCommandLine,
|
|
191
|
+
requirement: SystemRequirement,
|
|
192
|
+
): Promise<string[]> => {
|
|
193
|
+
const [_, ...args] = command;
|
|
194
|
+
const resolution = await resolvePythonRequirement(requirement);
|
|
195
|
+
if ("error" in resolution) {
|
|
196
|
+
throw new Error(`Failed to find compatible python version. ${resolution.message}`);
|
|
197
|
+
}
|
|
198
|
+
return [resolution.command, ...(resolution.additionalArgs ?? []), ...args];
|
|
199
|
+
};
|
|
200
|
+
|
|
201
|
+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
202
|
+
// TYPES
|
|
203
|
+
const PythonRequirement = "python";
|
|
204
|
+
const PRINT_PYTHON_VERSION_SCRIPT = "import sys; print('.'.join(map(str, sys.version_info[:3])))";
|
|
205
|
+
|
|
206
|
+
type KnownPythonExe = "python.exe" | "python3.exe" | "python" | "python3";
|
|
207
|
+
type PythonCommandLine = [KnownPythonExe, ...string[]];
|
|
208
|
+
|
|
209
|
+
interface MoreOptions extends SpawnOptions {
|
|
210
|
+
onCreate?(cp: ChildProcess): void;
|
|
211
|
+
onStdOutData?(chunk: any): void;
|
|
212
|
+
onStdErrData?(chunk: any): void;
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
interface SystemRequirement {
|
|
216
|
+
version?: string;
|
|
217
|
+
/**
|
|
218
|
+
* Name of an environment variable where the user could provide the path to the exe.
|
|
219
|
+
* @example "AUTOREST_PYTHON_PATH"
|
|
220
|
+
*/
|
|
221
|
+
environmentVariable?: string;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
interface SystemRequirementResolution {
|
|
225
|
+
/**
|
|
226
|
+
* Name of the requirement.
|
|
227
|
+
* @example python, java, etc.
|
|
228
|
+
*/
|
|
229
|
+
name: string;
|
|
230
|
+
|
|
231
|
+
/**
|
|
232
|
+
* Name of the command
|
|
233
|
+
* @example python3, /home/my_user/python39/python, java, etc.
|
|
234
|
+
*/
|
|
235
|
+
command: string;
|
|
236
|
+
|
|
237
|
+
/**
|
|
238
|
+
* List of additional arguments to pass to this command.
|
|
239
|
+
* @example '-3' for 'py' to specify to use python 3
|
|
240
|
+
*/
|
|
241
|
+
additionalArgs?: string[];
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
interface ExecResult {
|
|
245
|
+
stdout: string;
|
|
246
|
+
stderr: string;
|
|
247
|
+
|
|
248
|
+
/**
|
|
249
|
+
* Union of stdout and stderr.
|
|
250
|
+
*/
|
|
251
|
+
log: string;
|
|
252
|
+
error: Error | null;
|
|
253
|
+
code: number | null;
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
interface SystemRequirementError extends SystemRequirementResolution {
|
|
257
|
+
error: true;
|
|
258
|
+
message: string;
|
|
259
|
+
neededVersion?: string;
|
|
260
|
+
actualVersion?: string;
|
|
261
|
+
}
|