http-content-parser 0.0.14__tar.gz → 0.0.16__tar.gz

{http_content_parser-0.0.14 → http_content_parser-0.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: http_content_parser
-Version: 0.0.14
+Version: 0.0.16
 Summary: parse http's payload and response
 Author-email: max su <suleiabc@gmail.com>
 License-File: LICENSE

{http_content_parser-0.0.14 → http_content_parser-0.0.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "http_content_parser"
-version = "0.0.14"
+version = "0.0.16"
 authors = [
   { name="max su", email="suleiabc@gmail.com" },
 ]

{http_content_parser-0.0.14 → http_content_parser-0.0.16}/src/http_content_parser/generate_api_file.py

@@ -1,4 +1,5 @@
 # -*- coding: UTF-8 -*-
+import copy
 import json
 import re
 
@@ -40,11 +41,23 @@ class GenerateApiFile:
         payload_list = self.convert_curl_data_to_model(
             curl_file_path=curl_file, curl_filter=curl_filter
         )
+        # handle duplicate key
+        new_payload_list = self.handle_duplicate_yaml_key(payload_list)
         # write to yaml
-        for payload in payload_list:
+        for payload in new_payload_list:
             self.write_api_content_to_yaml(yaml_file, payload)
-        # remove duplicate key
-        self.remove_duplicate_key_for_yaml(yaml_file)
+
+    def handle_duplicate_yaml_key(self, payload_list: list[ReqData]) -> list[ReqData]:
+        key_filter = {}
+        new_payload_list = copy.deepcopy(payload_list)
+        for payload, p_copy in zip(payload_list, new_payload_list):
+            k = payload.temp_api_label
+            if k in key_filter.keys():
+                p_copy.temp_api_label = k + "_" + str(key_filter[k])
+                key_filter[k] += 1
+            else:
+                key_filter[k] = 1
+        return new_payload_list
 
     def convert_curl_data_to_model(
         self, curl_file_path, curl_filter=None

{http_content_parser-0.0.14 → http_content_parser-0.0.16}/tests/test_curl.py

@@ -13,14 +13,10 @@ class TestCases:
         # with open("./postman.json", "r") as f:
         #     json_dict = json.load(f)
         # gaf.produce_api_yaml_for_postman(json_dict, "./test.yaml")
-        curl_file = '/Users/lei.susl/Desktop/test1/iac-dispatcher/tmp2'
-        res = gaf.convert_curl_data_to_model(curl_file_path=curl_file)
-        for r in res:
-            print('body is: \n')
-            print(r.body)
-            print('header is: \n')
-            print(r.header)
-
+        curl_file = ""
+        res = gaf.produce_api_yaml_for_curl(
+            curl_file=curl_file, yaml_file="api.yaml"
+        )
 
     def test_for(self):
         # c = 1
@@ -34,4 +30,4 @@ class TestCases:
         temp = '{    "job_id":{{job_id}},    "product_id": 4,    "local_user_id": 0}'
         temp = json.dumps(data)
         temp = json.loads(temp)
-        print(temp)
+        print(temp)