@typespec/http-client-python 0.7.0 → 0.8.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/code-model.js +6 -6
- package/dist/emitter/code-model.js.map +1 -1
- package/dist/emitter/emitter.d.ts.map +1 -1
- package/dist/emitter/emitter.js +97 -59
- package/dist/emitter/emitter.js.map +1 -1
- package/dist/emitter/external-process.js +3 -3
- package/dist/emitter/external-process.js.map +1 -1
- package/dist/emitter/http.d.ts.map +1 -1
- package/dist/emitter/http.js +81 -23
- package/dist/emitter/http.js.map +1 -1
- package/dist/emitter/lib.d.ts +37 -1
- package/dist/emitter/lib.d.ts.map +1 -1
- package/dist/emitter/lib.js +24 -0
- package/dist/emitter/lib.js.map +1 -1
- package/dist/emitter/types.d.ts.map +1 -1
- package/dist/emitter/types.js +6 -4
- package/dist/emitter/types.js.map +1 -1
- package/dist/emitter/utils.d.ts +5 -2
- package/dist/emitter/utils.d.ts.map +1 -1
- package/dist/emitter/utils.js +99 -2
- package/dist/emitter/utils.js.map +1 -1
- package/emitter/src/code-model.ts +8 -8
- package/emitter/src/emitter.ts +101 -58
- package/emitter/src/external-process.ts +3 -3
- package/emitter/src/http.ts +113 -26
- package/emitter/src/lib.ts +24 -0
- package/emitter/src/types.ts +7 -4
- package/emitter/src/utils.ts +118 -1
- package/emitter/temp/tsconfig.tsbuildinfo +1 -1
- package/emitter/test/utils.test.ts +6 -1
- package/eng/scripts/setup/__pycache__/venvtools.cpython-38.pyc +0 -0
- package/eng/scripts/setup/run_tsp.py +4 -5
- package/generator/build/lib/pygen/__init__.py +3 -3
- package/generator/build/lib/pygen/black.py +2 -2
- package/generator/build/lib/pygen/codegen/__init__.py +5 -5
- package/generator/build/lib/pygen/codegen/models/paging_operation.py +11 -2
- package/generator/build/lib/pygen/codegen/models/parameter.py +2 -1
- package/generator/build/lib/pygen/codegen/models/request_builder_parameter.py +2 -0
- package/generator/build/lib/pygen/codegen/models/response.py +1 -1
- package/generator/build/lib/pygen/codegen/serializers/builder_serializer.py +47 -25
- package/generator/build/lib/pygen/preprocess/__init__.py +10 -12
- package/generator/build/lib/pygen/preprocess/python_mappings.py +1 -1
- package/generator/build/lib/pygen/utils.py +5 -5
- package/generator/component-detection-pip-report.json +7 -6
- package/generator/dist/pygen-0.1.0-py3-none-any.whl +0 -0
- package/generator/pygen/__init__.py +3 -3
- package/generator/pygen/black.py +2 -2
- package/generator/pygen/codegen/__init__.py +5 -5
- package/generator/pygen/codegen/models/paging_operation.py +11 -2
- package/generator/pygen/codegen/models/parameter.py +2 -1
- package/generator/pygen/codegen/models/request_builder_parameter.py +2 -0
- package/generator/pygen/codegen/models/response.py +1 -1
- package/generator/pygen/codegen/serializers/builder_serializer.py +47 -25
- package/generator/pygen/preprocess/__init__.py +10 -12
- package/generator/pygen/preprocess/python_mappings.py +1 -1
- package/generator/pygen/utils.py +5 -5
- package/generator/pygen.egg-info/PKG-INFO +0 -1
- package/generator/pygen.egg-info/SOURCES.txt +0 -1
- package/generator/pygen.egg-info/requires.txt +0 -1
- package/generator/setup.py +0 -1
- package/generator/test/generic_mock_api_tests/asynctests/test_payload_pageable_async.py +75 -0
- package/generator/test/generic_mock_api_tests/test_payload_pageable.py +54 -0
- package/package.json +2 -1
- package/generator/build/lib/pygen/m2r.py +0 -65
- package/generator/pygen/m2r.py +0 -65
- package/generator/test/generic_mock_api_tests/unittests/test_m2r.py +0 -10
- package/generator/test/unbranded/mock_api_tests/cadl-ranch-config.yaml +0 -27
package/emitter/src/utils.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
+
InitializedByFlags,
|
|
2
3
|
SdkHeaderParameter,
|
|
3
4
|
SdkHttpParameter,
|
|
4
5
|
SdkMethod,
|
|
@@ -7,9 +8,11 @@ import {
|
|
|
7
8
|
SdkQueryParameter,
|
|
8
9
|
SdkServiceMethod,
|
|
9
10
|
SdkServiceOperation,
|
|
11
|
+
SdkServiceResponseHeader,
|
|
10
12
|
SdkType,
|
|
11
13
|
} from "@azure-tools/typespec-client-generator-core";
|
|
12
14
|
import { getNamespaceFullName } from "@typespec/compiler";
|
|
15
|
+
import { marked, Token } from "marked";
|
|
13
16
|
import { PythonSdkContext } from "./lib.js";
|
|
14
17
|
import { getSimpleTypeResult, getType } from "./types.js";
|
|
15
18
|
|
|
@@ -149,6 +152,7 @@ type ParamBase = {
|
|
|
149
152
|
inOverload: boolean;
|
|
150
153
|
isApiVersion: boolean;
|
|
151
154
|
type: Record<string, any>;
|
|
155
|
+
isContinuationToken: boolean;
|
|
152
156
|
};
|
|
153
157
|
|
|
154
158
|
export function getAddedOn<TServiceOperation extends SdkServiceOperation>(
|
|
@@ -159,15 +163,46 @@ export function getAddedOn<TServiceOperation extends SdkServiceOperation>(
|
|
|
159
163
|
// if type is added in the first version of the client, we do not need to add the versioning info
|
|
160
164
|
if (
|
|
161
165
|
type.apiVersions[0] ===
|
|
162
|
-
context.sdkPackage.clients.find(
|
|
166
|
+
context.sdkPackage.clients.find(
|
|
167
|
+
(c) => c.clientInitialization.initializedBy | InitializedByFlags.Individually,
|
|
168
|
+
)?.apiVersions[0]
|
|
163
169
|
)
|
|
164
170
|
return undefined;
|
|
165
171
|
return type.apiVersions[0];
|
|
166
172
|
}
|
|
167
173
|
|
|
174
|
+
export function isContinuationToken<TServiceOperation extends SdkServiceOperation>(
|
|
175
|
+
parameter: SdkParameter | SdkHttpParameter | SdkServiceResponseHeader,
|
|
176
|
+
method?: SdkServiceMethod<TServiceOperation>,
|
|
177
|
+
input: boolean = true,
|
|
178
|
+
): boolean {
|
|
179
|
+
const parameterSegments =
|
|
180
|
+
method && method.kind === "paging"
|
|
181
|
+
? method.pagingMetadata.continuationTokenParameterSegments
|
|
182
|
+
: undefined;
|
|
183
|
+
const responseSegments =
|
|
184
|
+
method && method.kind === "paging"
|
|
185
|
+
? method.pagingMetadata.continuationTokenResponseSegments
|
|
186
|
+
: undefined;
|
|
187
|
+
if (!parameterSegments || !responseSegments) return false;
|
|
188
|
+
if (input) {
|
|
189
|
+
return Boolean(
|
|
190
|
+
parameterSegments &&
|
|
191
|
+
parameterSegments.length > 0 &&
|
|
192
|
+
(parameter.kind === "header" || parameter.kind === "query" || parameter.kind === "body") &&
|
|
193
|
+
parameterSegments.at(-1) === parameter.correspondingMethodParams.at(-1),
|
|
194
|
+
);
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
return Boolean(
|
|
198
|
+
responseSegments && responseSegments.length > 0 && responseSegments.at(-1) === parameter,
|
|
199
|
+
);
|
|
200
|
+
}
|
|
201
|
+
|
|
168
202
|
export function emitParamBase<TServiceOperation extends SdkServiceOperation>(
|
|
169
203
|
context: PythonSdkContext<TServiceOperation>,
|
|
170
204
|
parameter: SdkParameter | SdkHttpParameter,
|
|
205
|
+
method?: SdkServiceMethod<TServiceOperation>,
|
|
171
206
|
): ParamBase {
|
|
172
207
|
let type = getType(context, parameter.type);
|
|
173
208
|
if (parameter.isApiVersionParam) {
|
|
@@ -186,6 +221,7 @@ export function emitParamBase<TServiceOperation extends SdkServiceOperation>(
|
|
|
186
221
|
clientName: camelToSnakeCase(parameter.name),
|
|
187
222
|
inOverload: false,
|
|
188
223
|
isApiVersion: parameter.isApiVersionParam,
|
|
224
|
+
isContinuationToken: isContinuationToken(parameter, method),
|
|
189
225
|
type,
|
|
190
226
|
};
|
|
191
227
|
}
|
|
@@ -232,3 +268,84 @@ export function getClientNamespace<TServiceOperation extends SdkServiceOperation
|
|
|
232
268
|
? rootNamespace
|
|
233
269
|
: removeUnderscoresFromNamespace(clientNamespace).toLowerCase();
|
|
234
270
|
}
|
|
271
|
+
|
|
272
|
+
function parseToken(token: Token): string {
|
|
273
|
+
let parsed = "";
|
|
274
|
+
switch (token.type) {
|
|
275
|
+
case "heading":
|
|
276
|
+
parsed += `${"=".repeat(token.text.length)}\n${token.text}\n${"=".repeat(
|
|
277
|
+
token.text.length,
|
|
278
|
+
)}\n\n`;
|
|
279
|
+
break;
|
|
280
|
+
case "paragraph":
|
|
281
|
+
parsed += `${token.text}\n\n`;
|
|
282
|
+
break;
|
|
283
|
+
case "strong":
|
|
284
|
+
parsed += `**${token.text}**`;
|
|
285
|
+
break;
|
|
286
|
+
case "em":
|
|
287
|
+
parsed += `*${token.text}*`;
|
|
288
|
+
break;
|
|
289
|
+
case "codespan":
|
|
290
|
+
parsed += `\`\`${token.text}\`\``;
|
|
291
|
+
break;
|
|
292
|
+
case "code":
|
|
293
|
+
let codeBlockStyle = token.codeBlockStyle;
|
|
294
|
+
if (codeBlockStyle === undefined) {
|
|
295
|
+
codeBlockStyle = token.raw.split("\n")[0].replace("```", "").trim();
|
|
296
|
+
}
|
|
297
|
+
parsed += `\n\n.. code-block:: ${codeBlockStyle ?? ""}\n\n ${token.text.split("\n").join("\n ")}`;
|
|
298
|
+
break;
|
|
299
|
+
case "link":
|
|
300
|
+
if (token.href !== undefined) {
|
|
301
|
+
parsed += `\`${token.text} <${token.href}>\`_`;
|
|
302
|
+
break;
|
|
303
|
+
}
|
|
304
|
+
parsed += `${token.text}`;
|
|
305
|
+
break;
|
|
306
|
+
case "list":
|
|
307
|
+
if (!token.ordered) {
|
|
308
|
+
parsed += `\n\n${token.items.map((item: any) => `* ${item.text}`).join("\n")}`;
|
|
309
|
+
break;
|
|
310
|
+
}
|
|
311
|
+
parsed += `\n\n${token.items.map((item: any, index: number) => `${index + 1}. ${item.text}`).join("\n")}`;
|
|
312
|
+
break;
|
|
313
|
+
default:
|
|
314
|
+
parsed += token.raw;
|
|
315
|
+
}
|
|
316
|
+
return parsed;
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
export function md2Rst(text?: string): string | undefined {
|
|
320
|
+
try {
|
|
321
|
+
if (!text || text === "") return text;
|
|
322
|
+
const tokens = marked.lexer(text);
|
|
323
|
+
let rst = "";
|
|
324
|
+
|
|
325
|
+
tokens.forEach((token: Token) => {
|
|
326
|
+
if (token.type === "heading") {
|
|
327
|
+
// Heading tokens are block level, so we should check if there are additional tokens inside
|
|
328
|
+
const parsedHeadingText = md2Rst(token.text);
|
|
329
|
+
rst += `${"=".repeat(
|
|
330
|
+
parsedHeadingText!.length,
|
|
331
|
+
)}\n${parsedHeadingText}\n${"=".repeat(parsedHeadingText!.length)}\n\n`;
|
|
332
|
+
} else if ("tokens" in token && token.tokens !== undefined && token.tokens.length > 0) {
|
|
333
|
+
token.tokens.forEach((element: any) => {
|
|
334
|
+
rst += parseToken(element);
|
|
335
|
+
});
|
|
336
|
+
} else {
|
|
337
|
+
rst += parseToken(token);
|
|
338
|
+
}
|
|
339
|
+
});
|
|
340
|
+
|
|
341
|
+
// Trim trailing whitespace or tabs
|
|
342
|
+
return rst.replace(/[ \t]+$/, "");
|
|
343
|
+
} catch (e) {
|
|
344
|
+
if (e instanceof RangeError) {
|
|
345
|
+
// The error is thrown by the tokenizer when the markdown is too long
|
|
346
|
+
// We can ignore it and return the original text
|
|
347
|
+
return text;
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
return text;
|
|
351
|
+
}
|