@azure-tools/typespec-python 0.25.0 → 0.27.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/src/code-model.js +2 -2
- package/dist/src/code-model.js.map +1 -1
- package/dist/src/emitter.js +1 -1
- package/dist/src/emitter.js.map +1 -1
- package/dist/src/http.d.ts.map +1 -1
- package/dist/src/http.js +2 -1
- package/dist/src/http.js.map +1 -1
- package/dist/src/utils.js +2 -2
- package/dist/src/utils.js.map +1 -1
- package/generator/pygen/__init__.py +1 -1
- package/generator/pygen/black.py +7 -8
- package/generator/pygen/codegen/__init__.py +4 -0
- package/generator/pygen/codegen/models/client.py +2 -1
- package/generator/pygen/codegen/models/model_type.py +5 -1
- package/generator/pygen/codegen/models/operation.py +2 -0
- package/generator/pygen/codegen/serializers/__init__.py +4 -0
- package/generator/pygen/codegen/serializers/builder_serializer.py +75 -20
- package/generator/pygen/codegen/serializers/parameter_serializer.py +1 -1
- package/generator/pygen/codegen/templates/model_base.py.jinja2 +1 -0
- package/generator/pygen/codegen/templates/request_builder.py.jinja2 +2 -2
- package/generator/pygen/preprocess/__init__.py +10 -4
- package/generator/pygen/preprocess/python_mappings.py +5 -3
- package/generator/pygen/utils.py +4 -0
- package/package.json +24 -22
- package/scripts/__pycache__/venvtools.cpython-310.pyc +0 -0
- package/scripts/__pycache__/venvtools.cpython-38.pyc +0 -0
package/dist/src/code-model.js
CHANGED
|
@@ -166,14 +166,14 @@ function emitClient(context, client) {
|
|
|
166
166
|
}
|
|
167
167
|
export function emitCodeModel(sdkContext) {
|
|
168
168
|
// Get types
|
|
169
|
-
const sdkPackage = sdkContext.
|
|
169
|
+
const sdkPackage = sdkContext.sdkPackage;
|
|
170
170
|
const codeModel = {
|
|
171
171
|
namespace: removeUnderscoresFromNamespace(sdkPackage.rootNamespace).toLowerCase(),
|
|
172
172
|
clients: [],
|
|
173
173
|
subnamespaceToClients: {},
|
|
174
174
|
};
|
|
175
175
|
for (const model of sdkPackage.models) {
|
|
176
|
-
if (model.name === "") {
|
|
176
|
+
if (model.name === "" || (model.usage & UsageFlags.Spread) > 0) {
|
|
177
177
|
continue;
|
|
178
178
|
}
|
|
179
179
|
getType(sdkContext, model);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-model.js","sourceRoot":"","sources":["../../src/code-model.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"code-model.js","sourceRoot":"","sources":["../../src/code-model.ts"],"names":[],"mappings":"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"}
|
package/dist/src/emitter.js
CHANGED
|
@@ -33,7 +33,7 @@ function addDefaultOptions(sdkContext) {
|
|
|
33
33
|
options["package-mode"] = sdkContext.arm ? "azure-mgmt" : "azure-dataplane";
|
|
34
34
|
}
|
|
35
35
|
if (!options["package-name"]) {
|
|
36
|
-
options["package-name"] = removeUnderscoresFromNamespace(sdkContext.
|
|
36
|
+
options["package-name"] = removeUnderscoresFromNamespace(sdkContext.sdkPackage.rootNamespace.toLowerCase()).replace(/\./g, "-");
|
|
37
37
|
}
|
|
38
38
|
if (options.flavor !== "azure") {
|
|
39
39
|
// if they pass in a flavor other than azure, we want to ignore the value
|
package/dist/src/emitter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AACA,OAAO,EACH,gBAAgB,GAInB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,UAAU,aAAa,CAAC,OAAmB;IAC7C,MAAM,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACvE,IAAI,mBAAmB,EAAE;QACrB,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACnC,IAAI,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;YAC1C,OAAO,mBAAmB,CAAC;SAC9B;QACD,MAAM,IAAI,KAAK,CAAC,0DAA0D,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACtG;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAsB;IAC7C,MAAM,cAAc,GAAG;QACnB,iBAAiB,EAAE,SAAS;QAC5B,0BAA0B,EAAE,IAAI;QAChC,QAAQ,EAAE,SAAS;KACtB,CAAC;IACF,UAAU,CAAC,WAAW,CAAC,OAAO,GAAG;QAC7B,GAAG,cAAc;QACjB,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO;KACpC,CAAC;IACF,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC;IAC/C,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;IACnD,IAAI,OAAO,CAAC,0BAA0B,CAAC,EAAE;QACrC,OAAO,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC;KAC/E;IACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QAC1B,OAAO,CAAC,cAAc,CAAC,GAAG,8BAA8B,CACpD,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"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"}
|
package/dist/src/http.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,qBAAqB,EAErB,aAAa,EAEb,gBAAgB,EAEhB,yBAAyB,EACzB,mBAAmB,EACnB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,qBAAqB,EAErB,aAAa,EAEb,gBAAgB,EAEhB,yBAAyB,EACzB,mBAAmB,EACnB,sBAAsB,EAMzB,MAAM,6CAA6C,CAAC;AAYrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAO5C,wBAAgB,mBAAmB,CAC/B,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAC3C,UAAU,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,EAC/C,kBAAkB,EAAE,MAAM,GAC3B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAWvB;AAiED,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAC3C,UAAU,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAC7C,kBAAkB,EAAE,MAAM,GAC3B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAGvB;AAED,wBAAgB,oBAAoB,CAChC,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAC3C,UAAU,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EAAE,sBAAsB,CAAC,gBAAgB,CAAC,EAChD,kBAAkB,EAAE,MAAM,GAC3B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAGvB;AAED,wBAAgB,uBAAuB,CACnC,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAC3C,UAAU,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EAAE,yBAAyB,CAAC,gBAAgB,CAAC,EACnD,kBAAkB,EAAE,MAAM,GAC3B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAIvB"}
|
package/dist/src/http.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { UsageFlags, } from "@azure-tools/typespec-client-generator-core";
|
|
1
2
|
import { camelToSnakeCase, emitParamBase, getAddedOn, getDelimeterAndExplode, getDescriptionAndSummary, getImplementation, isAbstract, isAzureCoreModel, } from "./utils.js";
|
|
2
3
|
import { KnownTypes, getType } from "./types.js";
|
|
3
4
|
function isContentTypeParameter(parameter) {
|
|
@@ -102,7 +103,7 @@ function emitHttpOperation(context, rootClient, operationGroupName, operation, m
|
|
|
102
103
|
};
|
|
103
104
|
if (result.bodyParameter &&
|
|
104
105
|
((_a = operation.bodyParam) === null || _a === void 0 ? void 0 : _a.type.kind) === "model" &&
|
|
105
|
-
((_b = operation.bodyParam) === null || _b === void 0 ? void 0 : _b.type.
|
|
106
|
+
(((_b = operation.bodyParam) === null || _b === void 0 ? void 0 : _b.type.usage) & UsageFlags.Spread) > 0) {
|
|
106
107
|
result.bodyParameter["propertyToParameterName"] = {};
|
|
107
108
|
result.bodyParameter["defaultToUnsetSentinel"] = true;
|
|
108
109
|
result.bodyParameter.type.base = "json";
|
package/dist/src/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils.js
CHANGED
|
@@ -20,7 +20,7 @@ export function getImplementation(context, parameter) {
|
|
|
20
20
|
}
|
|
21
21
|
export function isAbstract(method) {
|
|
22
22
|
var _a, _b;
|
|
23
|
-
return ((_b = (_a = method.operation.bodyParam) === null || _a === void 0 ? void 0 : _a.contentTypes.length) !== null && _b !== void 0 ? _b : 0) > 1;
|
|
23
|
+
return ((_b = (_a = method.operation.bodyParam) === null || _a === void 0 ? void 0 : _a.contentTypes.length) !== null && _b !== void 0 ? _b : 0) > 1 && method.access !== "internal";
|
|
24
24
|
}
|
|
25
25
|
export function getDelimeterAndExplode(parameter) {
|
|
26
26
|
if (parameter.type.kind !== "array")
|
|
@@ -49,7 +49,7 @@ export function getAddedOn(context, type) {
|
|
|
49
49
|
// since we do not support multi-service for now, we can just check the root client's api version
|
|
50
50
|
// if type is added in the first version of the client, we do not need to add the versioning info
|
|
51
51
|
if (type.apiVersions[0] ===
|
|
52
|
-
((_a = context.
|
|
52
|
+
((_a = context.sdkPackage.clients.find((c) => c.initialization.access === "public")) === null || _a === void 0 ? void 0 : _a.apiVersions[0]))
|
|
53
53
|
return undefined;
|
|
54
54
|
return type.apiVersions[0];
|
|
55
55
|
}
|
package/dist/src/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAG1D,MAAM,UAAU,gBAAgB,CAAC,IAAY;IACzC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAE,EAAE,CACvC,GAAG;SACE,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC;SAC7B,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;SACzD,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE7B,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,IAAa;IACxD,sCAAsC;IACtC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC7B,OAA4C,EAC5C,SAA0C;IAE1C,IAAI,SAAS,CAAC,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACxC,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,UAAU,CACtB,MAA2C;;IAE3C,OAAO,CAAC,MAAA,MAAA,MAAM,CAAC,SAAS,CAAC,SAAS,0CAAE,YAAY,CAAC,MAAM,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ class ReaderAndWriter:
|
|
|
54
54
|
fd.write(file_content)
|
|
55
55
|
|
|
56
56
|
def list_file(self) -> List[str]:
|
|
57
|
-
return [str(f) for f in self.output_folder.glob("**/*") if f.is_file()]
|
|
57
|
+
return [str(f.relative_to(self.output_folder)) for f in self.output_folder.glob("**/*") if f.is_file()]
|
|
58
58
|
|
|
59
59
|
|
|
60
60
|
class Plugin(ReaderAndWriter, ABC):
|
package/generator/pygen/black.py
CHANGED
|
@@ -37,15 +37,14 @@ class BlackScriptPlugin(Plugin): # pylint: disable=abstract-method
|
|
|
37
37
|
[
|
|
38
38
|
Path(f)
|
|
39
39
|
for f in self.list_file()
|
|
40
|
-
if
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
".mypy_cache",
|
|
47
|
-
)
|
|
40
|
+
if Path(f).parts[0]
|
|
41
|
+
not in (
|
|
42
|
+
"__pycache__",
|
|
43
|
+
"node_modules",
|
|
44
|
+
"venv",
|
|
45
|
+
"env",
|
|
48
46
|
)
|
|
47
|
+
and not Path(f).parts[0].startswith(".")
|
|
49
48
|
and Path(f).suffix == ".py"
|
|
50
49
|
],
|
|
51
50
|
)
|
|
@@ -164,6 +164,10 @@ class OptionsRetriever:
|
|
|
164
164
|
except AttributeError:
|
|
165
165
|
return packaging_files_config
|
|
166
166
|
|
|
167
|
+
@property
|
|
168
|
+
def package_version(self) -> Optional[str]:
|
|
169
|
+
return str(self.options.get("package-version", ""))
|
|
170
|
+
|
|
167
171
|
|
|
168
172
|
class CodeGenerator(Plugin):
|
|
169
173
|
def __init__(self, *args, **kwargs: Any) -> None:
|
|
@@ -18,6 +18,7 @@ from .request_builder import (
|
|
|
18
18
|
from .parameter import Parameter, ParameterMethodLocation
|
|
19
19
|
from .lro_operation import LROOperation
|
|
20
20
|
from .lro_paging_operation import LROPagingOperation
|
|
21
|
+
from ...utils import extract_original_name
|
|
21
22
|
|
|
22
23
|
ParameterListType = TypeVar(
|
|
23
24
|
"ParameterListType",
|
|
@@ -92,7 +93,7 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
|
|
|
92
93
|
if operation_yaml.get("isLroInitialOperation"):
|
|
93
94
|
# we want to change the name
|
|
94
95
|
request_builder.name = request_builder.get_name(
|
|
95
|
-
request_builder.yaml_data["name"]
|
|
96
|
+
extract_original_name(request_builder.yaml_data["name"]),
|
|
96
97
|
request_builder.yaml_data,
|
|
97
98
|
request_builder.code_model,
|
|
98
99
|
request_builder.client,
|
|
@@ -32,6 +32,10 @@ class UsageFlags(Enum):
|
|
|
32
32
|
ApiVersionEnum = 8
|
|
33
33
|
JsonMergePatch = 16
|
|
34
34
|
MultipartFormData = 32
|
|
35
|
+
Spread = 64
|
|
36
|
+
Error = 128
|
|
37
|
+
Json = 256
|
|
38
|
+
Xml = 512
|
|
35
39
|
|
|
36
40
|
|
|
37
41
|
def _get_properties(type: "ModelType", properties: List[Property]) -> List[Property]:
|
|
@@ -86,7 +90,7 @@ class ModelType( # pylint: disable=abstract-method
|
|
|
86
90
|
|
|
87
91
|
@property
|
|
88
92
|
def is_usage_output(self) -> bool:
|
|
89
|
-
return self.usage
|
|
93
|
+
return self.usage & UsageFlags.Output.value
|
|
90
94
|
|
|
91
95
|
@property
|
|
92
96
|
def flattened_property(self) -> Optional[Property]:
|
|
@@ -343,6 +343,8 @@ class OperationBase( # pylint: disable=too-many-public-methods,too-many-instanc
|
|
|
343
343
|
"ResourceExistsError",
|
|
344
344
|
"ResourceNotModifiedError",
|
|
345
345
|
]
|
|
346
|
+
if self.stream_value:
|
|
347
|
+
errors.extend(["StreamConsumedError", "StreamClosedError"])
|
|
346
348
|
for error in errors:
|
|
347
349
|
file_import.add_submodule_import("exceptions", error, ImportType.SDKCORE)
|
|
348
350
|
if self.code_model.options["azure_arm"]:
|
|
@@ -555,6 +555,10 @@ class JinjaSerializer(ReaderAndWriter): # pylint: disable=abstract-method
|
|
|
555
555
|
|
|
556
556
|
for client in self.code_model.clients:
|
|
557
557
|
for og in client.operation_groups:
|
|
558
|
+
if self.code_model.options["multiapi"] and any(
|
|
559
|
+
o.api_versions[0] != self.code_model.options["default_api_version"] for o in og.operations
|
|
560
|
+
):
|
|
561
|
+
continue
|
|
558
562
|
test_serializer = TestSerializer(self.code_model, env, client=client, operation_group=og)
|
|
559
563
|
for is_async in (True, False):
|
|
560
564
|
try:
|
|
@@ -58,6 +58,10 @@ OperationType = TypeVar(
|
|
|
58
58
|
)
|
|
59
59
|
|
|
60
60
|
|
|
61
|
+
def _all_same(data: List[List[str]]) -> bool:
|
|
62
|
+
return len(data) > 1 and all(sorted(data[0]) == sorted(data[i]) for i in range(1, len(data)))
|
|
63
|
+
|
|
64
|
+
|
|
61
65
|
def _json_serializable(content_type: str) -> bool:
|
|
62
66
|
return bool(JSON_REGEXP.match(content_type.split(";")[0].strip().lower()))
|
|
63
67
|
|
|
@@ -410,14 +414,19 @@ class RequestBuilderSerializer(_BuilderBaseSerializer[RequestBuilderType]): # p
|
|
|
410
414
|
return "response.json()"
|
|
411
415
|
|
|
412
416
|
@staticmethod
|
|
413
|
-
def
|
|
417
|
+
def declare_non_inputtable_headers_queries(builder: RequestBuilderType) -> List[str]:
|
|
414
418
|
def _get_value(param):
|
|
419
|
+
declaration = param.get_declaration() if param.constant else None
|
|
415
420
|
if param.location in [ParameterLocation.HEADER, ParameterLocation.QUERY]:
|
|
416
421
|
kwarg_dict = "headers" if param.location == ParameterLocation.HEADER else "params"
|
|
417
|
-
return f"_{kwarg_dict}.pop('{param.wire_name}', {
|
|
418
|
-
return
|
|
422
|
+
return f"_{kwarg_dict}.pop('{param.wire_name}', {declaration})"
|
|
423
|
+
return declaration
|
|
419
424
|
|
|
420
|
-
return [
|
|
425
|
+
return [
|
|
426
|
+
f"{p.client_name} = {_get_value(p)}"
|
|
427
|
+
for p in (builder.parameters.headers + builder.parameters.query)
|
|
428
|
+
if not p.in_method_signature
|
|
429
|
+
]
|
|
421
430
|
|
|
422
431
|
@property
|
|
423
432
|
def _function_def(self) -> str:
|
|
@@ -561,16 +570,22 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]): # pylint: di
|
|
|
561
570
|
return retval
|
|
562
571
|
|
|
563
572
|
def make_pipeline_call(self, builder: OperationType) -> List[str]:
|
|
573
|
+
retval = []
|
|
564
574
|
type_ignore = self.async_mode and builder.group_name == "" # is in a mixin
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
575
|
+
if builder.stream_value is True and not self.code_model.options["version_tolerant"]:
|
|
576
|
+
retval.append("_decompress = kwargs.pop('decompress', True)")
|
|
577
|
+
retval.extend(
|
|
578
|
+
[
|
|
579
|
+
f"_stream = {builder.stream_value}",
|
|
580
|
+
f"pipeline_response: PipelineResponse = {self._call_method}self._client.{self.pipeline_name}.run( "
|
|
581
|
+
+ f"{'# type: ignore' if type_ignore else ''} # pylint: disable=protected-access",
|
|
582
|
+
" _request,",
|
|
583
|
+
" stream=_stream,",
|
|
584
|
+
" **kwargs",
|
|
585
|
+
")",
|
|
586
|
+
]
|
|
587
|
+
)
|
|
588
|
+
return retval
|
|
574
589
|
|
|
575
590
|
@property
|
|
576
591
|
def _function_def(self) -> str:
|
|
@@ -894,6 +909,9 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]): # pylint: di
|
|
|
894
909
|
builder: OperationType,
|
|
895
910
|
response: Response,
|
|
896
911
|
) -> List[str]:
|
|
912
|
+
return self.response_headers(response) + self.response_deserialization(builder, response)
|
|
913
|
+
|
|
914
|
+
def response_headers(self, response: Response) -> List[str]:
|
|
897
915
|
retval: List[str] = [
|
|
898
916
|
(
|
|
899
917
|
f"response_headers['{response_header.wire_name}']=self._deserialize("
|
|
@@ -903,6 +921,14 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]): # pylint: di
|
|
|
903
921
|
]
|
|
904
922
|
if response.headers:
|
|
905
923
|
retval.append("")
|
|
924
|
+
return retval
|
|
925
|
+
|
|
926
|
+
def response_deserialization(
|
|
927
|
+
self,
|
|
928
|
+
builder: OperationType,
|
|
929
|
+
response: Response,
|
|
930
|
+
) -> List[str]:
|
|
931
|
+
retval: List[str] = []
|
|
906
932
|
deserialize_code: List[str] = []
|
|
907
933
|
stream_logic = True
|
|
908
934
|
if builder.has_stream_response:
|
|
@@ -913,7 +939,9 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]): # pylint: di
|
|
|
913
939
|
if self.code_model.options["version_tolerant"]:
|
|
914
940
|
deserialized = "response.iter_bytes()"
|
|
915
941
|
else:
|
|
916
|
-
deserialized =
|
|
942
|
+
deserialized = (
|
|
943
|
+
f"response.stream_download(self._client.{self.pipeline_name}, decompress=_decompress)"
|
|
944
|
+
)
|
|
917
945
|
deserialize_code.append(f"deserialized = {deserialized}")
|
|
918
946
|
elif response.type:
|
|
919
947
|
pylint_disable = ""
|
|
@@ -961,11 +989,17 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]): # pylint: di
|
|
|
961
989
|
def handle_error_response(self, builder: OperationType) -> List[str]:
|
|
962
990
|
async_await = "await " if self.async_mode else ""
|
|
963
991
|
retval = [f"if response.status_code not in {str(builder.success_status_codes)}:"]
|
|
964
|
-
response_read =
|
|
992
|
+
response_read = [
|
|
993
|
+
" try:",
|
|
994
|
+
f" {async_await}response.read() # Load the body in memory and close the socket",
|
|
995
|
+
" except (StreamConsumedError, StreamClosedError):",
|
|
996
|
+
" pass",
|
|
997
|
+
]
|
|
965
998
|
if builder.stream_value is True: # _stream is True so no need to judge it
|
|
966
|
-
retval.
|
|
999
|
+
retval.extend(response_read)
|
|
967
1000
|
elif isinstance(builder.stream_value, str): # _stream is not sure, so we need to judge it
|
|
968
|
-
retval.
|
|
1001
|
+
retval.append(" if _stream:")
|
|
1002
|
+
retval.extend([f" {l}" for l in response_read])
|
|
969
1003
|
type_ignore = " # type: ignore" if _need_type_ignore(builder) else ""
|
|
970
1004
|
retval.append(
|
|
971
1005
|
f" map_error(status_code=response.status_code, response=response, error_map=error_map){type_ignore}"
|
|
@@ -999,13 +1033,34 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]): # pylint: di
|
|
|
999
1033
|
retval.append("response_headers = {}")
|
|
1000
1034
|
if builder.has_response_body or builder.any_response_has_headers:
|
|
1001
1035
|
if len(builder.responses) > 1:
|
|
1036
|
+
status_codes, res_headers, res_deserialization = [], [], []
|
|
1002
1037
|
for status_code in builder.success_status_codes:
|
|
1003
1038
|
response = builder.get_response_from_status(status_code)
|
|
1004
1039
|
if response.headers or response.type:
|
|
1040
|
+
status_codes.append(status_code)
|
|
1041
|
+
res_headers.append(self.response_headers(response))
|
|
1042
|
+
res_deserialization.append(self.response_deserialization(builder, response))
|
|
1043
|
+
|
|
1044
|
+
is_headers_same = _all_same(res_headers)
|
|
1045
|
+
is_deserialization_same = _all_same(res_deserialization)
|
|
1046
|
+
if is_deserialization_same:
|
|
1047
|
+
if is_headers_same:
|
|
1048
|
+
retval.extend(res_headers[0])
|
|
1049
|
+
retval.extend(res_deserialization[0])
|
|
1050
|
+
retval.append("")
|
|
1051
|
+
else:
|
|
1052
|
+
for status_code, headers in zip(status_codes, res_headers):
|
|
1053
|
+
if headers:
|
|
1054
|
+
retval.append(f"if response.status_code == {status_code}:")
|
|
1055
|
+
retval.extend([f" {line}" for line in headers])
|
|
1056
|
+
retval.append("")
|
|
1057
|
+
retval.extend(res_deserialization[0])
|
|
1058
|
+
retval.append("")
|
|
1059
|
+
else:
|
|
1060
|
+
for status_code, headers, deserialization in zip(status_codes, res_headers, res_deserialization):
|
|
1005
1061
|
retval.append(f"if response.status_code == {status_code}:")
|
|
1006
|
-
retval.extend(
|
|
1007
|
-
|
|
1008
|
-
)
|
|
1062
|
+
retval.extend([f" {line}" for line in headers])
|
|
1063
|
+
retval.extend([f" {line}" for line in deserialization])
|
|
1009
1064
|
retval.append("")
|
|
1010
1065
|
else:
|
|
1011
1066
|
retval.extend(self.response_headers_and_deserialization(builder, builder.responses[0]))
|
|
@@ -148,7 +148,7 @@ class ParameterSerializer:
|
|
|
148
148
|
param.wire_name,
|
|
149
149
|
ParameterSerializer.serialize_parameter(param, serializer_name),
|
|
150
150
|
)
|
|
151
|
-
if not param.optional:
|
|
151
|
+
if not param.optional and (param.in_method_signature or param.constant):
|
|
152
152
|
retval = [set_parameter]
|
|
153
153
|
else:
|
|
154
154
|
retval = [
|
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
{% if request_builder_serializer.pop_kwargs_from_signature(request_builder) %}
|
|
9
9
|
{{ op_tools.serialize(request_builder_serializer.pop_kwargs_from_signature(request_builder)) | indent }}
|
|
10
10
|
{%- endif -%}
|
|
11
|
-
{% if request_builder_serializer.
|
|
12
|
-
{{ op_tools.serialize(request_builder_serializer.
|
|
11
|
+
{% if request_builder_serializer.declare_non_inputtable_headers_queries(request_builder) %}
|
|
12
|
+
{{ op_tools.serialize(request_builder_serializer.declare_non_inputtable_headers_queries(request_builder)) | indent }}
|
|
13
13
|
{% endif %}
|
|
14
14
|
# Construct URL
|
|
15
15
|
{{ request_builder_serializer.construct_url(request_builder) }}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
import copy
|
|
9
9
|
from typing import Callable, Dict, Any, List, Optional
|
|
10
10
|
|
|
11
|
-
from ..utils import to_snake_case
|
|
11
|
+
from ..utils import to_snake_case, extract_original_name
|
|
12
12
|
from .helpers import (
|
|
13
13
|
add_redefined_builtin_info,
|
|
14
14
|
pad_builtin_namespaces,
|
|
@@ -235,7 +235,8 @@ class PreProcessPlugin(YamlUpdatePlugin): # pylint: disable=abstract-method
|
|
|
235
235
|
property["clientName"] = self.pad_reserved_words(property["clientName"].lower(), PadType.PROPERTY)
|
|
236
236
|
add_redefined_builtin_info(property["clientName"], property)
|
|
237
237
|
if type.get("name"):
|
|
238
|
-
|
|
238
|
+
pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS
|
|
239
|
+
name = self.pad_reserved_words(type["name"], pad_type)
|
|
239
240
|
type["name"] = name[0].upper() + name[1:]
|
|
240
241
|
type["description"] = update_description(type.get("description", ""), type["name"])
|
|
241
242
|
type["snakeCaseName"] = to_snake_case(type["name"])
|
|
@@ -243,7 +244,7 @@ class PreProcessPlugin(YamlUpdatePlugin): # pylint: disable=abstract-method
|
|
|
243
244
|
# we're enums
|
|
244
245
|
values_to_add = []
|
|
245
246
|
for value in type["values"]:
|
|
246
|
-
padded_name = self.pad_reserved_words(value["name"].lower(), PadType.
|
|
247
|
+
padded_name = self.pad_reserved_words(value["name"].lower(), PadType.ENUM_VALUE).upper()
|
|
247
248
|
if self.version_tolerant:
|
|
248
249
|
if padded_name[0] in "0123456789":
|
|
249
250
|
padded_name = "ENUM_" + padded_name
|
|
@@ -362,7 +363,12 @@ class PreProcessPlugin(YamlUpdatePlugin): # pylint: disable=abstract-method
|
|
|
362
363
|
yaml_data["groupName"] = self.pad_reserved_words(yaml_data["groupName"], PadType.OPERATION_GROUP)
|
|
363
364
|
yaml_data["groupName"] = to_snake_case(yaml_data["groupName"])
|
|
364
365
|
yaml_data["name"] = yaml_data["name"].lower()
|
|
365
|
-
yaml_data
|
|
366
|
+
if yaml_data.get("isLroInitialOperation") is True:
|
|
367
|
+
yaml_data["name"] = (
|
|
368
|
+
"_" + self.pad_reserved_words(extract_original_name(yaml_data["name"]), PadType.METHOD) + "_initial"
|
|
369
|
+
)
|
|
370
|
+
else:
|
|
371
|
+
yaml_data["name"] = self.pad_reserved_words(yaml_data["name"], PadType.METHOD)
|
|
366
372
|
yaml_data["description"] = update_description(yaml_data["description"], yaml_data["name"])
|
|
367
373
|
yaml_data["summary"] = update_description(yaml_data.get("summary", ""))
|
|
368
374
|
body_parameter = yaml_data.get("bodyParameter")
|
|
@@ -53,9 +53,10 @@ basic_latin_chars = {
|
|
|
53
53
|
|
|
54
54
|
class PadType(str, Enum):
|
|
55
55
|
MODEL = "Model"
|
|
56
|
+
ENUM_CLASS = "Enum"
|
|
56
57
|
METHOD = "_method"
|
|
57
58
|
PARAMETER = "_parameter"
|
|
58
|
-
|
|
59
|
+
ENUM_VALUE = "_enum"
|
|
59
60
|
PROPERTY = "_property"
|
|
60
61
|
OPERATION_GROUP = "Operations"
|
|
61
62
|
|
|
@@ -175,9 +176,10 @@ RESERVED_WORDS = {
|
|
|
175
176
|
"retry_on_status_codes",
|
|
176
177
|
*_always_reserved,
|
|
177
178
|
],
|
|
178
|
-
PadType.MODEL: [*_always_reserved],
|
|
179
|
+
PadType.MODEL: ["enum", *_always_reserved],
|
|
179
180
|
PadType.PROPERTY: ["self", *_always_reserved],
|
|
180
|
-
PadType.
|
|
181
|
+
PadType.ENUM_CLASS: ["enum", *_always_reserved],
|
|
182
|
+
PadType.ENUM_VALUE: ["mro", *_always_reserved],
|
|
181
183
|
PadType.OPERATION_GROUP: [*_always_reserved],
|
|
182
184
|
}
|
|
183
185
|
|
package/generator/pygen/utils.py
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@azure-tools/typespec-python",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.27.0",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec emitter for Python SDKs",
|
|
6
6
|
"homepage": "https://github.com/Azure/autorest.python",
|
|
@@ -33,15 +33,16 @@
|
|
|
33
33
|
"scripts/**"
|
|
34
34
|
],
|
|
35
35
|
"peerDependencies": {
|
|
36
|
-
"@azure-tools/typespec-azure-core": ">=0.
|
|
37
|
-
"@azure-tools/typespec-azure-resource-manager": ">=0.
|
|
38
|
-
"@azure-tools/typespec-autorest": ">=0.
|
|
39
|
-
"@azure-tools/typespec-client-generator-core": ">=0.
|
|
40
|
-
"@typespec
|
|
41
|
-
"@typespec/
|
|
42
|
-
"@typespec/
|
|
43
|
-
"@typespec/
|
|
44
|
-
"@typespec/
|
|
36
|
+
"@azure-tools/typespec-azure-core": ">=0.44.0 <1.0.0",
|
|
37
|
+
"@azure-tools/typespec-azure-resource-manager": ">=0.44.0 <1.0.0",
|
|
38
|
+
"@azure-tools/typespec-autorest": ">=0.44.0 <1.0.0",
|
|
39
|
+
"@azure-tools/typespec-client-generator-core": ">=0.44.1 <1.0.0",
|
|
40
|
+
"@azure-tools/typespec-azure-rulesets": ">=0.44.0 <3.0.0",
|
|
41
|
+
"@typespec/compiler": ">=0.58.0 <1.0.0",
|
|
42
|
+
"@typespec/http": ">=0.58.0 <1.0.0",
|
|
43
|
+
"@typespec/rest": ">=0.58.0 <1.0.0",
|
|
44
|
+
"@typespec/versioning": ">=0.58.0 <1.0.0",
|
|
45
|
+
"@typespec/openapi": ">=0.58.0 <1.0.0"
|
|
45
46
|
},
|
|
46
47
|
"dependenciesMeta": {
|
|
47
48
|
"@azure-tools/typespec-client-generator-core": {
|
|
@@ -50,32 +51,33 @@
|
|
|
50
51
|
},
|
|
51
52
|
"dependencies": {
|
|
52
53
|
"js-yaml": "~4.1.0",
|
|
53
|
-
"@typespec/openapi3": "~0.
|
|
54
|
+
"@typespec/openapi3": "~0.58.0",
|
|
54
55
|
"@autorest/system-requirements": "~1.0.2",
|
|
55
56
|
"fs-extra": "~11.2.0",
|
|
56
57
|
"semver": "~7.6.2"
|
|
57
58
|
},
|
|
58
59
|
"devDependencies": {
|
|
59
|
-
"@azure-tools/typespec-azure-resource-manager": "~0.
|
|
60
|
-
"@azure-tools/typespec-autorest": "~0.
|
|
61
|
-
"@azure-tools/cadl-ranch-expect": "~0.14.
|
|
62
|
-
"@azure-tools/cadl-ranch-specs": "~0.34.
|
|
60
|
+
"@azure-tools/typespec-azure-resource-manager": "~0.44.0",
|
|
61
|
+
"@azure-tools/typespec-autorest": "~0.44.0",
|
|
62
|
+
"@azure-tools/cadl-ranch-expect": "~0.14.1",
|
|
63
|
+
"@azure-tools/cadl-ranch-specs": "~0.34.5",
|
|
63
64
|
"@types/js-yaml": "~4.0.5",
|
|
64
65
|
"@types/mocha": "~10.0.1",
|
|
65
66
|
"@types/node": "^18.16.3",
|
|
66
67
|
"@typespec/eslint-config-typespec": "~0.55.0",
|
|
67
|
-
"@typespec/openapi": "~0.
|
|
68
|
+
"@typespec/openapi": "~0.58.0",
|
|
68
69
|
"c8": "~7.13.0",
|
|
69
70
|
"eslint": "^8.57.0",
|
|
70
71
|
"mocha": "~10.2.0",
|
|
71
72
|
"rimraf": "~5.0.0",
|
|
72
73
|
"typescript": "~5.1.3",
|
|
73
|
-
"@azure-tools/typespec-azure-core": "~0.
|
|
74
|
-
"@azure-tools/typespec-client-generator-core": "~0.
|
|
75
|
-
"@typespec/compiler": "~0.
|
|
76
|
-
"@typespec/http": "~0.
|
|
77
|
-
"@typespec/rest": "~0.
|
|
78
|
-
"@typespec/versioning": "~0.
|
|
74
|
+
"@azure-tools/typespec-azure-core": "~0.44.0",
|
|
75
|
+
"@azure-tools/typespec-client-generator-core": "~0.44.1",
|
|
76
|
+
"@typespec/compiler": "~0.58.0",
|
|
77
|
+
"@typespec/http": "~0.58.0",
|
|
78
|
+
"@typespec/rest": "~0.58.0",
|
|
79
|
+
"@typespec/versioning": "~0.58.0",
|
|
80
|
+
"@azure-tools/typespec-azure-rulesets": "0.44.0"
|
|
79
81
|
},
|
|
80
82
|
"scripts": {
|
|
81
83
|
"clean": "rimraf ./dist ./temp",
|
|
Binary file
|
|
Binary file
|