Update model & codegen

This commit is contained in:
Ashita Prasad
2024-01-07 14:36:30 +05:30
parent 3823b94531
commit 4cf36b6450
10 changed files with 71 additions and 98 deletions

View File

@ -1,11 +1,10 @@
import 'dart:io';
import 'dart:convert';
import 'package:apidash/utils/extensions/request_model_extension.dart';
import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart'
show getNewUuid, getValidRequestUri, padMultilineString, rowsToFormDataMap;
import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
show getNewUuid, getValidRequestUri, padMultilineString;
import 'package:apidash/models/models.dart' show RequestModel;
import 'package:apidash/consts.dart';
class PythonHttpClientCodeGen {
final String kTemplateStart = """import http.client
@ -91,7 +90,6 @@ body = b'\r\n'.join(dataList)
RequestModel requestModel,
String defaultUriScheme,
) {
List<FormDataModel> formDataList = requestModel.formDataList ?? [];
String uuid = getNewUuid();
try {
@ -154,7 +152,8 @@ body = b'\r\n'.join(dataList)
if (headers.isNotEmpty || hasBody) {
hasHeaders = true;
bool hasContentTypeHeader = headers.keys.any((k) => k.toLowerCase() == HttpHeaders.contentTypeHeader);
bool hasContentTypeHeader = headers.keys
.any((k) => k.toLowerCase() == HttpHeaders.contentTypeHeader);
if (hasBody && !hasContentTypeHeader) {
headers[HttpHeaders.contentTypeHeader] =
@ -170,7 +169,7 @@ body = b'\r\n'.join(dataList)
var formDataBodyData = jj.Template(kStringFormDataBody);
result += formDataBodyData.render(
{
"fields_list": json.encode(rowsToFormDataMap(formDataList)),
"fields_list": json.encode(requestModel.formDataMapList),
"boundary": uuid,
},
);

View File

@ -1,16 +1,10 @@
import 'dart:io';
import 'dart:convert';
import 'package:apidash/utils/extensions/request_model_extension.dart';
import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart'
show
getNewUuid,
getValidRequestUri,
padMultilineString,
rowsToFormDataMap,
stripUriParams;
import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
show getNewUuid, getValidRequestUri, padMultilineString, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel;
class PythonRequestsCodeGen {
final String kTemplateStart = """import requests
@ -107,7 +101,6 @@ print('Response Body:', response.text)
bool hasHeaders = false;
bool hasBody = false;
bool hasJsonBody = false;
List<FormDataModel> formDataList = requestModel.formDataList ?? [];
String uuid = getNewUuid();
String url = requestModel.url;
@ -181,7 +174,7 @@ print('Response Body:', response.text)
var formDataBodyData = jj.Template(kStringFormDataBody);
result += formDataBodyData.render(
{
"fields_list": json.encode(rowsToFormDataMap(formDataList)),
"fields_list": json.encode(requestModel.formDataMapList),
"boundary": uuid,
},
);