@azure-tools/typespec-python 0.26.0 → 0.27.1
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/emitter.js +3 -3
- package/dist/src/emitter.js.map +1 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js +11 -19
- package/dist/src/types.js.map +1 -1
- package/dist/src/utils.js +1 -1
- 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/models/model_type.py +5 -1
- package/generator/pygen/codegen/models/operation.py +3 -1
- package/generator/pygen/codegen/models/operation_group.py +1 -1
- package/generator/pygen/codegen/serializers/builder_serializer.py +39 -3
- package/generator/pygen/codegen/serializers/general_serializer.py +6 -5
- package/generator/pygen/codegen/templates/model_base.py.jinja2 +1 -0
- package/generator/pygen/codegen/templates/model_dpg.py.jinja2 +3 -2
- package/package.json +7 -7
- package/scripts/__pycache__/venvtools.cpython-310.pyc +0 -0
- package/scripts/__pycache__/venvtools.cpython-38.pyc +0 -0
package/dist/src/emitter.js
CHANGED
|
@@ -43,15 +43,15 @@ function addDefaultOptions(sdkContext) {
|
|
|
43
43
|
options.flavor = "azure";
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
-
function createPythonSdkContext(context) {
|
|
46
|
+
async function createPythonSdkContext(context) {
|
|
47
47
|
return {
|
|
48
|
-
...createSdkContext(context, "@azure-tools/typespec-python"),
|
|
48
|
+
...(await createSdkContext(context, "@azure-tools/typespec-python")),
|
|
49
49
|
__endpointPathParameters: [],
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
export async function $onEmit(context) {
|
|
53
53
|
const program = context.program;
|
|
54
|
-
const sdkContext = createPythonSdkContext(context);
|
|
54
|
+
const sdkContext = await createPythonSdkContext(context);
|
|
55
55
|
const root = path.join(dirname(fileURLToPath(import.meta.url)), "..", "..");
|
|
56
56
|
const outputDir = context.emitterOutputDir;
|
|
57
57
|
const yamlMap = emitCodeModel(sdkContext);
|
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,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,CACpD,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KACzB;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,EAAE;QAC5B,yEAAyE;QACzE,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;KAC9B;IACD,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,WAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC9E,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC;KAC5B;AACL,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAc,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAEH,OAAO,EAYP,mBAAmB,EACtB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,eAAO,MAAM,QAAQ,mCAA0C,CAAC;AAChE,eAAO,MAAM,cAAc,yCAAgD,CAAC;AAE5E,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,cAAc,EAAE,CAAC;CAC3B;AAcD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CASpF;AAED,wBAAgB,OAAO,CAAC,iBAAiB,SAAS,mBAAmB,EACjE,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,IAAI,EAAE,cAAc,GAAG,mBAAmB,GAAG,IAAI,GAAG,OAAO,EAC3D,QAAQ,UAAQ,GACjB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAc,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAEH,OAAO,EAYP,mBAAmB,EACtB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,eAAO,MAAM,QAAQ,mCAA0C,CAAC;AAChE,eAAO,MAAM,cAAc,yCAAgD,CAAC;AAE5E,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,cAAc,EAAE,CAAC;CAC3B;AAcD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CASpF;AAED,wBAAgB,OAAO,CAAC,iBAAiB,SAAS,mBAAmB,EACjE,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,IAAI,EAAE,cAAc,GAAG,mBAAmB,GAAG,IAAI,GAAG,OAAO,EAC3D,QAAQ,UAAQ,GACjB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAmDrB;AA0RD,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAcvE;AAED,eAAO,MAAM,UAAU;;;;;;;;;;CAItB,CAAC"}
|
package/dist/src/types.js
CHANGED
|
@@ -65,15 +65,7 @@ export function getType(context, type, fromBody = false) {
|
|
|
65
65
|
case "decimal":
|
|
66
66
|
case "decimal128":
|
|
67
67
|
case "string":
|
|
68
|
-
case "password":
|
|
69
|
-
case "guid":
|
|
70
68
|
case "url":
|
|
71
|
-
case "uri":
|
|
72
|
-
case "uuid":
|
|
73
|
-
case "eTag":
|
|
74
|
-
case "armId":
|
|
75
|
-
case "ipAddress":
|
|
76
|
-
case "azureLocation":
|
|
77
69
|
return emitBuiltInType(type);
|
|
78
70
|
case "any":
|
|
79
71
|
return KnownTypes.any;
|
|
@@ -146,18 +138,18 @@ function visibilityMapping(visibility) {
|
|
|
146
138
|
}
|
|
147
139
|
return result;
|
|
148
140
|
}
|
|
149
|
-
function emitProperty(context,
|
|
141
|
+
function emitProperty(context, property) {
|
|
150
142
|
return {
|
|
151
|
-
clientName: camelToSnakeCase(
|
|
152
|
-
wireName:
|
|
153
|
-
type: getType(context,
|
|
154
|
-
optional:
|
|
155
|
-
description:
|
|
156
|
-
addedOn: getAddedOn(context,
|
|
157
|
-
visibility: visibilityMapping(
|
|
158
|
-
isDiscriminator:
|
|
159
|
-
flatten:
|
|
160
|
-
isMultipartFileInput:
|
|
143
|
+
clientName: camelToSnakeCase(property.name),
|
|
144
|
+
wireName: property.serializedName,
|
|
145
|
+
type: getType(context, property.type),
|
|
146
|
+
optional: property.optional,
|
|
147
|
+
description: property.description,
|
|
148
|
+
addedOn: getAddedOn(context, property),
|
|
149
|
+
visibility: visibilityMapping(property.visibility),
|
|
150
|
+
isDiscriminator: property.discriminator,
|
|
151
|
+
flatten: property.flatten,
|
|
152
|
+
isMultipartFileInput: property.isMultipartFileInput,
|
|
161
153
|
};
|
|
162
154
|
}
|
|
163
155
|
function emitModel(context, type, fromBody) {
|
package/dist/src/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.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")
|
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
|
)
|
|
@@ -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]:
|
|
@@ -495,7 +495,9 @@ class Operation(OperationBase[Response]):
|
|
|
495
495
|
relative_path = "..." if async_mode else ".."
|
|
496
496
|
if self.code_model.options["models_mode"] == "dpg":
|
|
497
497
|
if self.parameters.has_body:
|
|
498
|
-
if
|
|
498
|
+
if self.has_form_data_body:
|
|
499
|
+
file_import.add_submodule_import(relative_path, "_model_base", ImportType.LOCAL)
|
|
500
|
+
else:
|
|
499
501
|
file_import.add_submodule_import(
|
|
500
502
|
f"{relative_path}_model_base",
|
|
501
503
|
"SdkJSONEncoder",
|
|
@@ -114,7 +114,7 @@ class OperationGroup(BaseModel):
|
|
|
114
114
|
and not self.is_mixin
|
|
115
115
|
):
|
|
116
116
|
file_import.add_submodule_import(relative_path, "models", ImportType.LOCAL, alias="_models")
|
|
117
|
-
if self.
|
|
117
|
+
if self.is_mixin:
|
|
118
118
|
file_import.add_submodule_import(".._vendor", f"{self.client.name}MixinABC", ImportType.LOCAL)
|
|
119
119
|
if self.has_abstract_operations:
|
|
120
120
|
file_import.add_submodule_import(".._vendor", "raise_if_not_implemented", ImportType.LOCAL)
|
|
@@ -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
|
|
|
@@ -905,6 +909,9 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]): # pylint: di
|
|
|
905
909
|
builder: OperationType,
|
|
906
910
|
response: Response,
|
|
907
911
|
) -> List[str]:
|
|
912
|
+
return self.response_headers(response) + self.response_deserialization(builder, response)
|
|
913
|
+
|
|
914
|
+
def response_headers(self, response: Response) -> List[str]:
|
|
908
915
|
retval: List[str] = [
|
|
909
916
|
(
|
|
910
917
|
f"response_headers['{response_header.wire_name}']=self._deserialize("
|
|
@@ -914,6 +921,14 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]): # pylint: di
|
|
|
914
921
|
]
|
|
915
922
|
if response.headers:
|
|
916
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] = []
|
|
917
932
|
deserialize_code: List[str] = []
|
|
918
933
|
stream_logic = True
|
|
919
934
|
if builder.has_stream_response:
|
|
@@ -1018,13 +1033,34 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]): # pylint: di
|
|
|
1018
1033
|
retval.append("response_headers = {}")
|
|
1019
1034
|
if builder.has_response_body or builder.any_response_has_headers:
|
|
1020
1035
|
if len(builder.responses) > 1:
|
|
1036
|
+
status_codes, res_headers, res_deserialization = [], [], []
|
|
1021
1037
|
for status_code in builder.success_status_codes:
|
|
1022
1038
|
response = builder.get_response_from_status(status_code)
|
|
1023
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):
|
|
1024
1061
|
retval.append(f"if response.status_code == {status_code}:")
|
|
1025
|
-
retval.extend(
|
|
1026
|
-
|
|
1027
|
-
)
|
|
1062
|
+
retval.extend([f" {line}" for line in headers])
|
|
1063
|
+
retval.extend([f" {line}" for line in deserialization])
|
|
1028
1064
|
retval.append("")
|
|
1029
1065
|
else:
|
|
1030
1066
|
retval.extend(self.response_headers_and_deserialization(builder, builder.responses[0]))
|
|
@@ -105,11 +105,12 @@ class GeneralSerializer(BaseSerializer):
|
|
|
105
105
|
typing_section=TypingSection.TYPING,
|
|
106
106
|
)
|
|
107
107
|
for client in clients:
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
108
|
+
if client.has_mixin:
|
|
109
|
+
file_import.add_submodule_import(
|
|
110
|
+
"._configuration",
|
|
111
|
+
f"{client.name}Configuration",
|
|
112
|
+
ImportType.LOCAL,
|
|
113
|
+
)
|
|
113
114
|
if self.code_model.has_etag:
|
|
114
115
|
file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB)
|
|
115
116
|
file_import.add_submodule_import(
|
|
@@ -45,7 +45,8 @@
|
|
|
45
45
|
__flattened_items = ["{{ model.flattened_items|join('\", \"') }}"]
|
|
46
46
|
{% endif %}
|
|
47
47
|
|
|
48
|
-
{%
|
|
48
|
+
{% set need_init = (not model.internal) and (serializer.init_line(model) or model.discriminator)%}
|
|
49
|
+
{% if need_init %}
|
|
49
50
|
@overload
|
|
50
51
|
def __init__(
|
|
51
52
|
self,
|
|
@@ -64,7 +65,7 @@
|
|
|
64
65
|
|
|
65
66
|
{% endif %}
|
|
66
67
|
{% set initialize_properties = serializer.initialize_properties(model) %}
|
|
67
|
-
{% if
|
|
68
|
+
{% if need_init or initialize_properties %}
|
|
68
69
|
def __init__(self, *args: Any, **kwargs: Any) -> None:{{ '# pylint: disable=useless-super-delegation' if not initialize_properties else '' }}
|
|
69
70
|
{% for line in serializer.super_call(model) %}
|
|
70
71
|
{{ line }}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@azure-tools/typespec-python",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.27.1",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec emitter for Python SDKs",
|
|
6
6
|
"homepage": "https://github.com/Azure/autorest.python",
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
"peerDependencies": {
|
|
36
36
|
"@azure-tools/typespec-azure-core": ">=0.44.0 <1.0.0",
|
|
37
37
|
"@azure-tools/typespec-azure-resource-manager": ">=0.44.0 <1.0.0",
|
|
38
|
-
"@azure-tools/typespec-autorest": ">=0.44.
|
|
39
|
-
"@azure-tools/typespec-client-generator-core": ">=0.44.
|
|
38
|
+
"@azure-tools/typespec-autorest": ">=0.44.1 <1.0.0",
|
|
39
|
+
"@azure-tools/typespec-client-generator-core": ">=0.44.3 <1.0.0",
|
|
40
40
|
"@azure-tools/typespec-azure-rulesets": ">=0.44.0 <3.0.0",
|
|
41
|
-
"@typespec/compiler": ">=0.58.
|
|
41
|
+
"@typespec/compiler": ">=0.58.1 <1.0.0",
|
|
42
42
|
"@typespec/http": ">=0.58.0 <1.0.0",
|
|
43
43
|
"@typespec/rest": ">=0.58.0 <1.0.0",
|
|
44
44
|
"@typespec/versioning": ">=0.58.0 <1.0.0",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
60
|
"@azure-tools/typespec-azure-resource-manager": "~0.44.0",
|
|
61
|
-
"@azure-tools/typespec-autorest": "~0.44.
|
|
61
|
+
"@azure-tools/typespec-autorest": "~0.44.1",
|
|
62
62
|
"@azure-tools/cadl-ranch-expect": "~0.14.1",
|
|
63
63
|
"@azure-tools/cadl-ranch-specs": "~0.34.5",
|
|
64
64
|
"@types/js-yaml": "~4.0.5",
|
|
@@ -72,8 +72,8 @@
|
|
|
72
72
|
"rimraf": "~5.0.0",
|
|
73
73
|
"typescript": "~5.1.3",
|
|
74
74
|
"@azure-tools/typespec-azure-core": "~0.44.0",
|
|
75
|
-
"@azure-tools/typespec-client-generator-core": "~0.44.
|
|
76
|
-
"@typespec/compiler": "~0.58.
|
|
75
|
+
"@azure-tools/typespec-client-generator-core": "~0.44.3",
|
|
76
|
+
"@typespec/compiler": "~0.58.1",
|
|
77
77
|
"@typespec/http": "~0.58.0",
|
|
78
78
|
"@typespec/rest": "~0.58.0",
|
|
79
79
|
"@typespec/versioning": "~0.58.0",
|
|
Binary file
|
|
Binary file
|