From bed6cd86dc791b043549c5a33edb52c440cb521b Mon Sep 17 00:00:00 2001 From: ogabrielluiz Date: Thu, 6 Jun 2024 09:05:49 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20(parse.py):=20Update=20parse=5Fc?= =?UTF-8?q?ontext=20function=20to=20use=20the=20new=20ParsedArgs=20namedtu?= =?UTF-8?q?ple=20for=20better=20code=20organization=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/base/langflow/base/curl/parse.py | 100 +++++++++++++++++-- 1 file changed, 90 insertions(+), 10 deletions(-) diff --git a/src/backend/base/langflow/base/curl/parse.py b/src/backend/base/langflow/base/curl/parse.py index c86638306..892abdde2 100644 --- a/src/backend/base/langflow/base/curl/parse.py +++ b/src/backend/base/langflow/base/curl/parse.py @@ -15,10 +15,25 @@ import shlex from collections import OrderedDict, namedtuple from http.cookies import SimpleCookie -from uncurl.api import parser # type: ignore - -parser.add_argument("-x", "--proxy", default={}) -parser.add_argument("-U", "--proxy-user", default="") +ParsedArgs = namedtuple( + "ParsedContext", + [ + "command", + "url", + "data", + "data_binary", + "method", + "headers", + "compressed", + "insecure", + "user", + "include", + "silent", + "proxy", + "proxy_user", + "cookies", + ], +) ParsedContext = namedtuple("ParsedContext", ["method", "url", "data", "headers", "cookies", "verify", "auth", "proxy"]) @@ -27,24 +42,89 @@ def normalize_newlines(multiline_text): return multiline_text.replace(" \\\n", " ") +def parse_curl_command(curl_command): + tokens = shlex.split(normalize_newlines(curl_command)) + tokens = [token for token in tokens if token and token != " "] + if "curl" not in tokens[0]: + raise ValueError("Invalid curl command") + args_template = { + "command": None, + "url": None, + "data": None, + "data_binary": None, + "method": "get", + "headers": [], + "compressed": False, + "insecure": False, + "user": (), + "include": False, + "silent": False, + "proxy": None, + "proxy_user": None, + "cookies": {}, + } + args = args_template.copy() + + i = 0 + while i < len(tokens): + token = tokens[i] + if token == "-X": + i += 1 + args["method"] = tokens[i].lower() + elif token in ("-d", "--data"): + i += 1 + args["data"] = tokens[i] + args["method"] = "post" + elif token in ("-b", "--data-binary", "--data-raw"): + i += 1 + args["data_binary"] = tokens[i] + args["method"] = "post" + elif token in ("-H", "--header"): + i += 1 + args["headers"].append(tokens[i]) + elif token == "--compressed": + args["compressed"] = True + elif token in ("-k", "--insecure"): + args["insecure"] = True + elif token in ("-u", "--user"): + i += 1 + args["user"] = tuple(tokens[i].split(":")) + elif token in ("-I", "--include"): + args["include"] = True + elif token in ("-s", "--silent"): + args["silent"] = True + elif token in ("-x", "--proxy"): + i += 1 + args["proxy"] = tokens[i] + elif token in ("-U", "--proxy-user"): + i += 1 + args["proxy_user"] = tokens[i] + elif not token.startswith("-"): + if args["command"] is None: + args["command"] = token + else: + args["url"] = token + i += 1 + + return ParsedArgs(**args) + + def parse_context(curl_command): method = "get" - tokens = shlex.split(normalize_newlines(curl_command)) - tokens = [token for token in tokens if token and token != " "] - parsed_args = parser.parse_args(tokens) + parsed_args: ParsedArgs = parse_curl_command(curl_command) post_data = parsed_args.data or parsed_args.data_binary if post_data: method = "post" - if parsed_args.X: - method = parsed_args.X.lower() + if parsed_args.method: + method = parsed_args.method.lower() cookie_dict = OrderedDict() quoted_headers = OrderedDict() - for curl_header in parsed_args.header: + for curl_header in parsed_args.headers: if curl_header.startswith(":"): occurrence = [m.start() for m in re.finditer(":", curl_header)] header_key, header_value = curl_header[: occurrence[1]], curl_header[occurrence[1] + 1 :]