wip: updated http and requests header handle

lib/codegen/python/http_client.dart

@@ -1,11 +1,10 @@
 import 'dart:io';
 import 'dart:convert';
-import 'package:apidash/utils/convert_utils.dart';
 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 getValidRequestUri, padMultilineString;
+    show getNewUuid, getValidRequestUri, padMultilineString, rowsToFormDataMap;
 import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
 
 class PythonHttpClientCodeGen {
@@ -13,11 +12,8 @@ class PythonHttpClientCodeGen {
 {% if isFormDataRequest %}
 import mimetypes
 from codecs import encode
-import uuid
-
-headers = {}
-boundary = str(uuid.uuid4())
 {% endif %}
+
 """;
 
   String kTemplateParams = """
@@ -40,6 +36,8 @@ body = r'''{{body}}'''
 headers = {{headers}}
 
 """;
+  String kTemplateFormHeaderContentType = '''
+multipart/form-data; boundary={{boundary}}''';
 
   int kHeadersPadding = 10;
 
@@ -51,10 +49,6 @@ conn = http.client.HTTP{{isHttps}}Connection("{{authority}}")""";
 
 conn.request("{{method}}", "{{path}}"{{queryParamsStr}}""";
 
-  String kTemplateFormDataRequest = """
-conn.request("{{method}}", "{{path}}"{{queryParamsStr}},body=payload, headers=headers
-""";
-
   String kStringRequestBody = """,
               body= body""";
 
@@ -76,8 +70,7 @@ def build_data_list(fields):
         name = field.get('name', '')
         value = field.get('value', '')
         type_ = field.get('type', 'text')
-
+        dataList.append(encode('--{{boundary}}'))
-        dataList.append(encode(f'--{boundary}'))
         if type_ == 'text':
             dataList.append(encode(f'Content-Disposition: form-data; name="{name}"'))
             dataList.append(encode('Content-Type: text/plain'))
@@ -88,23 +81,18 @@ def build_data_list(fields):
             dataList.append(encode(f'Content-Type: {mimetypes.guess_type(value)[0] or "application/octet-stream"}'))
             dataList.append(encode(''))
             dataList.append(open(value, 'rb').read())
-
+    dataList.append(encode(f'--{{boundary}}--'))
-    dataList.append(encode(f'--{boundary}--'))
     dataList.append(encode(''))
     return dataList
 dataList = build_data_list({{fields_list}})
 body = b'\r\n'.join(dataList)
 ''';
-
-  String kFormDataHeaders = '''
-headers['Content-type'] = f'multipart/form-data; boundary={boundary}';
-''';
-
   String? getCode(
     RequestModel requestModel,
     String defaultUriScheme,
   ) {
     List<FormDataModel> formDataList = requestModel.formDataList ?? [];
+    String uuid = getNewUuid();
 
     try {
       String result = "";
@@ -116,6 +104,7 @@ headers['Content-type'] = f'multipart/form-data; boundary={boundary}';
       if (!url.contains("://") && url.isNotEmpty) {
         url = "$defaultUriScheme://$url";
       }
+
       var templateStartUrl = jj.Template(kTemplateStart);
       result += templateStartUrl.render(
         {
@@ -151,6 +140,13 @@ headers['Content-type'] = f'multipart/form-data; boundary={boundary}';
         var headersList = requestModel.requestHeaders;
         if (headersList != null || hasBody) {
           var headers = requestModel.headersMap;
+          if (requestModel.isFormDataRequest) {
+            var formHeaderTemplate =
+                jj.Template(kTemplateFormHeaderContentType);
+            headers[HttpHeaders.contentTypeHeader] = formHeaderTemplate.render({
+              "boundary": uuid,
+            });
+          }
           if (headers.isNotEmpty || hasBody) {
             hasHeaders = true;
             if (hasBody) {
@@ -164,11 +160,11 @@ headers['Content-type'] = f'multipart/form-data; boundary={boundary}';
           }
         }
         if (requestModel.isFormDataRequest) {
-          result += kFormDataHeaders;
           var formDataBodyData = jj.Template(kStringFormDataBody);
           result += formDataBodyData.render(
             {
               "fields_list": json.encode(rowsToFormDataMap(formDataList)),
+              "boundary": uuid,
             },
           );
         }
@@ -177,6 +173,7 @@ headers['Content-type'] = f'multipart/form-data; boundary={boundary}';
           "isHttps": uri.scheme == "https" ? "S" : "",
           "authority": uri.authority
         });
+
         var templateRequest = jj.Template(kTemplateRequest);
         result += templateRequest.render({
           "method": method.name.toUpperCase(),
@@ -196,7 +193,6 @@ headers['Content-type'] = f'multipart/form-data; boundary={boundary}';
       }
       return result;
     } catch (e) {
-      print(e);
       return null;
     }
   }

lib/codegen/python/requests.dart

@@ -1,11 +1,15 @@
 import 'dart:io';
 import 'dart:convert';
-import 'package:apidash/utils/convert_utils.dart';
 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 getValidRequestUri, padMultilineString, stripUriParams;
+    show
+        getNewUuid,
+        getValidRequestUri,
+        padMultilineString,
+        rowsToFormDataMap,
+        stripUriParams;
 import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
 
 class PythonRequestsCodeGen {
@@ -13,23 +17,9 @@ class PythonRequestsCodeGen {
 {% if isFormDataRequest %}
 import mimetypes
 from codecs import encode
-import uuid
-
-headers = {}
-boundary = str(uuid.uuid4())
 {% endif %}
 url = '{{url}}'
 
-""";
-
-  final String kTemplateFormDataImports = """
-import mimetypes
-from codecs import encode
-import uuid
-
-headers = {}
-boundary = str(uuid.uuid4())
-
 """;
 
   String kTemplateParams = """
@@ -56,6 +46,8 @@ payload = {{body}}
 headers = {{headers}}
 
 """;
+  String kTemplateFormHeaderContentType = '''
+multipart/form-data; boundary={{boundary}}''';
 
   int kHeadersPadding = 10;
 
@@ -72,7 +64,7 @@ def build_data_list(fields):
         value = field.get('value', '')
         type_ = field.get('type', 'text')
 
-        dataList.append(encode(f'--{boundary}'))
+        dataList.append(encode('--{{boundary}}'))
         if type_ == 'text':
             dataList.append(encode(f'Content-Disposition: form-data; name="{name}"'))
             dataList.append(encode('Content-Type: text/plain'))
@@ -84,12 +76,13 @@ def build_data_list(fields):
             dataList.append(encode(''))
             dataList.append(open(value, 'rb').read())
 
-    dataList.append(encode(f'--{boundary}--'))
+    dataList.append(encode('--{{boundary}}--'))
     dataList.append(encode(''))
     return dataList
 dataList = build_data_list({{fields_list}})
 payload = b'\r\n'.join(dataList)
 ''';
+
   String kStringRequestParams = """, params=params""";
 
   String kStringRequestBody = """, data=payload""";
@@ -97,9 +90,6 @@ payload = b'\r\n'.join(dataList)
   String kStringRequestJson = """, json=payload""";
 
   String kStringRequestHeaders = """, headers=headers""";
-  String kFormDataHeaders = '''
-headers['Content-type'] = f'multipart/form-data; boundary={boundary}';
-''';
 
   final String kStringRequestEnd = """)
 
@@ -118,6 +108,7 @@ print('Response Body:', response.text)
       bool hasBody = false;
       bool hasJsonBody = false;
       List<FormDataModel> formDataList = requestModel.formDataList ?? [];
+      String uuid = getNewUuid();
 
       String url = requestModel.url;
       if (!url.contains("://") && url.isNotEmpty) {
@@ -164,6 +155,13 @@ print('Response Body:', response.text)
         var headersList = requestModel.requestHeaders;
         if (headersList != null || hasBody) {
           var headers = requestModel.headersMap;
+          if (requestModel.isFormDataRequest) {
+            var formHeaderTemplate =
+                jj.Template(kTemplateFormHeaderContentType);
+            headers[HttpHeaders.contentTypeHeader] = formHeaderTemplate.render({
+              "boundary": uuid,
+            });
+          }
           if (headers.isNotEmpty || hasBody) {
             hasHeaders = true;
             if (hasBody) {
@@ -177,11 +175,11 @@ print('Response Body:', response.text)
           }
         }
         if (requestModel.isFormDataRequest) {
-          result += kFormDataHeaders;
           var formDataBodyData = jj.Template(kStringFormDataBody);
           result += formDataBodyData.render(
             {
               "fields_list": json.encode(rowsToFormDataMap(formDataList)),
+              "boundary": uuid,
             },
           );
         }