http-content-parser 0.0.20__tar.gz → 0.0.21__tar.gz

{http_content_parser-0.0.20 → http_content_parser-0.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: http_content_parser
-Version: 0.0.20
+Version: 0.0.21
 Summary: parse http's payload and response
 Author-email: leo <suleiabc@gmail.com>
 License-File: LICENSE

{http_content_parser-0.0.20 → http_content_parser-0.0.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "http_content_parser"
-version = "0.0.20"
+version = "0.0.21"
 authors = [{ name = "leo", email = "suleiabc@gmail.com" }]
 description = "parse http's payload and response"
 readme = "README.md"

{http_content_parser-0.0.20 → http_content_parser-0.0.21}/src/http_content_parser/api_parser.py

@@ -19,6 +19,15 @@ class ApiModelParser:
         new_payload_list = self.__handle_duplicate_api_label(payload_list)
         return new_payload_list
 
+    def get_api_list_for_curl(self, curl_file, curl_filter=None) -> list[dict]:
+        # convert curl
+        payload_list = self.convert_curl_data_to_list(
+            curl_file_path=curl_file, url_filter=curl_filter
+        )
+        # handle duplicate key
+        new_payload_list = self.__handle_duplicate_api_label_for_dict(payload_list)
+        return new_payload_list
+
     def get_api_model_for_postman(self, json_dict: dict) -> list[ReqData]:
         payload_list = self.convert_postman_to_model(postman_dict=json_dict)
         # handle duplicate key
@@ -37,6 +46,34 @@ class ApiModelParser:
         new_payload_list = self.__handle_duplicate_api_label(payload_list)
         return new_payload_list
 
+    def convert_curl_data_to_list(
+        self, curl_file_path: str, url_filter=None
+    ) -> list[dict]:
+        curl_parser = CurlParser()
+        payload_list = []
+        with open(curl_file_path, "rt") as f:
+            lines = f.readlines()
+            line_num_array = curl_parser.get_curl_line_num_scope(lines=lines)
+            for r in line_num_array:
+                res_dict = curl_parser.split_curl_to_struct(
+                    lines, r[0], r[1], url_filter
+                )
+                req_list = res_dict
+                url_content = curl_parser.parse_url(req_list["original_url"])
+                req_list["temp_api_label"] = (
+                    self.__replace_api_label_chars(url_content["path"][1:])
+                    + "_"
+                    + req_list["method"]
+                )
+                # req_list["header"] = json.dumps(req_list["header"])
+                if url_content["query_params"]:
+                    req_list["query_param"] = json.dumps(url_content["query_params"])
+                else:
+                    req_list["query_param"] = {}
+                req_list["path"] = url_content["path"][1:]
+                payload_list.append(req_list)
+        return payload_list
+
     def convert_curl_data_to_model(
         self, curl_file_path: str, url_filter=None
     ) -> list[ReqData]:
@@ -166,3 +203,17 @@ class ApiModelParser:
             else:
                 key_filter[k] = 2
         return new_payload_list
+
+    def __handle_duplicate_api_label_for_dict(
+        self, payload_list: list[dict]
+    ) -> list[list]:
+        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] = 2
+        return new_payload_list

{http_content_parser-0.0.20 → http_content_parser-0.0.21}/tests/test_api_model_parser.py

@@ -6,5 +6,5 @@ api_parser = ApiModelParser()
 
 def test_curl_parser():
     curl_file = "./tmp"
-    api_info = api_parser.get_api_model_for_curl(curl_file=curl_file)
+    api_info = api_parser.get_api_list_for_curl(curl_file=curl_file)
     print(api_info)