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

{http_content_parser-0.0.18 → http_content_parser-0.0.20}/.gitignore

@@ -158,4 +158,7 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
-.vscode/
+.vscode/
+
+# 
+tmp

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

@@ -1,8 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: http_content_parser
-Version: 0.0.18
+Version: 0.0.20
 Summary: parse http's payload and response
-Author-email: max su <suleiabc@gmail.com>
+Author-email: leo <suleiabc@gmail.com>
 License-File: LICENSE
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -24,5 +24,5 @@ python3 -m build
 
 ```bash
 rm -f dist/*
- python3 -m twine upload dist/*
+python3 -m twine upload dist/*
 ```

{http_content_parser-0.0.18 → http_content_parser-0.0.20}/README.md

@@ -12,5 +12,5 @@ python3 -m build
 
 ```bash
 rm -f dist/*
- python3 -m twine upload dist/*
+python3 -m twine upload dist/*
 ```

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

@@ -4,8 +4,8 @@ build-backend = "hatchling.build"
 
 [project]
 name = "http_content_parser"
-version = "0.0.18"
-authors = [{ name = "max su", email = "suleiabc@gmail.com" }]
+version = "0.0.20"
+authors = [{ name = "leo", email = "suleiabc@gmail.com" }]
 description = "parse http's payload and response"
 readme = "README.md"
 requires-python = ">=3.8"

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

@@ -57,7 +57,10 @@ class ApiModelParser:
                     + req_model.method
                 )
                 req_model.header = json.dumps(req_model.header)
-                req_model.query_param = json.dumps(url_content["query_params"])
+                if url_content["query_params"]:
+                    req_model.query_param = json.dumps(url_content["query_params"])
+                else:
+                    req_model.query_param = {}
                 req_model.path = url_content["path"][1:]
                 payload_list.append(req_model)
         return payload_list

{http_content_parser-0.0.18 → http_content_parser-0.0.20}/src/http_content_parser/curl_parser.py

@@ -5,6 +5,8 @@ from urllib.parse import urlparse, parse_qs
 
 class CurlParser(object):
     def parse_url(self, url: str) -> dict:
+        if "://" not in url:
+            url = "http://" + url
         # 解析 URL
         parsed_url = urlparse(url)
         # 获取各个组成部分

{http_content_parser-0.0.18 → http_content_parser-0.0.20}/src/http_content_parser/generate_api_file.py

@@ -11,6 +11,7 @@ from http_content_parser.openapi_parser import OpenApiParser
 from http_content_parser.postman_parser import parse_postman
 
 
+# TODO 不直接生成yaml文件,只生成dict,方便后续扩展
 class GenerateApiFile:
     def __init__(self) -> None:
         pass
@@ -79,36 +80,14 @@ class GenerateApiFile:
                     + req_model.method
                 )
                 req_model.header = json.dumps(req_model.header)
-                req_model.query_param = json.dumps(url_content["query_params"])
+                if url_content["query_params"]:
+                    req_model.query_param = json.dumps(url_content["query_params"])
+                else:
+                    req_model.query_param = {}
                 req_model.path = url_content["path"][1:]
                 payload_list.append(req_model)
         return payload_list
 
-    def convert_curl_data_to_model_old(
-        self, curl_file_path, url_filter=None
-    ) -> list[ReqData]:
-        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
-                )
-                template = ReqData(dd=res_dict)
-                split_url = curl_parser.split_url(template.original_url, "_")
-                template.temp_api_label = (
-                    self.replace_api_label_chars(split_url["url_path"])
-                    + template.method
-                )
-                template.header = json.dumps(template.header)
-                template.query_param = json.dumps(split_url["url_params"])
-                split_url_origin = curl_parser.split_url(template.original_url, "/")
-                template.path = split_url_origin["url_path"][:-1]
-                payload_list.append(template)
-        return payload_list
-
     def produce_api_yaml_for_swagger2(self, swagger2_dict, yaml_file):
         swagger_parser = Swagger2Parser(swagger2_dict)
         api_dict = swagger_parser.get_swagger_api_info()

{http_content_parser-0.0.18 → http_content_parser-0.0.20}/src/http_content_parser/req_data.py

@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 
 """
-__author__ = maxsulei
+__author__ = leo
 """
 
 

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

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

{http_content_parser-0.0.18 → http_content_parser-0.0.20}/tests/test_curl.py

@@ -9,7 +9,7 @@ def test_curl():
     #     json_dict = json.load(f)
     # gaf.produce_api_yaml_for_postman(json_dict, "./test.yaml")
     curl_file = (
-        "/Users/lei.susl/vs_workspace/company/apiTest/testcase/iac/tocex_master/temp"
+        "./tmp"
     )
     gaf.produce_api_yaml_for_curl(curl_file=curl_file, yaml_file="api.yaml")
 

http_content_parser-0.0.18/tests/curl

@@ -1,6 +0,0 @@
-curl --location 'http://tocex-master-sg7-live.cluster.shopeemobile.com/apis/tocex/v1/machineset/node_provision/get' \
---header 'Authorization: ApiToken eyJpZCI6IjNjNzk2MzFkLWJiZmYtNGE0NS1iMTVjLWY5MTFmMWNlZDE4NiIsImFjY291bnQiOiJlY3AuYm90QHNob3BlZS5jb20iLCJncm91cCI6IiIsInVzZXJfcm9sZSI6InJvb3QiLCJjcmVhdGVkX2F0IjoxNjQ2MDI1NTcxLCJleHBpcmVzX2F0IjoxOTU1NjI1NTcxLCJjb21tZW50IjoiKGxpdmUpIGVjcCBib3QgdG9rZW4iLCJzZXJ2aWNlcyI6W119.ffniWLZOLxvieccUbBuJus6lDsm6QzAf1OAf3EfRb3jRfhQ5XItVsWJEZ/cPulHSfn3gxdL7n/hPKYIBdubJpxK2jxFcUcplcHWiCKw93eWfZFj/+JtBKWmFBlxuXF+3tsXPwMIlUzgJRUr5dxqM6nKrB8aYRMmLkmSvUOu/O4lx5JgfMGqU1AqzYgtZy5RYtTcfV61pOE//kEJCsDVFHPVCTTkJYyDunCXR0pVd1BHIt7fd+bsaozdU2Ry9a1FAOFFxI+mQAG1gpg2bc+FqqC+YyMpQZiATI/B6dCkjoA2xLUm5eMmHIBO0QdOVVwAQpDNHbQyzLrqlbkiabERulw==' \
---header 'Content-Type: application/json' \
---data '{
-    "host_ip": "10.214.82.96"
-}'