rsnarsna commited on
Commit ·
627bc6c
1
Parent(s): 098002c
fix(codegen): remove redundant then_var assignments and generate clean Python identifiers
Browse files- lambdas/codegen_handler.py +26 -22
lambdas/codegen_handler.py
CHANGED
|
@@ -313,7 +313,16 @@ def generate_code_logic(
|
|
| 313 |
}
|
| 314 |
|
| 315 |
label = str(data.get("label") or node.get("label") or raw_type or node_id)
|
| 316 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 317 |
incoming = incoming_edges_map.get(node_id, [])
|
| 318 |
|
| 319 |
# Schema inspection from registry
|
|
@@ -463,7 +472,6 @@ def generate_code_logic(
|
|
| 463 |
code_body_lines.append(f" {node_var} = requests.request('{method}', {url_expr}, json={payload_expr}, headers={headers_expr}, timeout={timeout_val})")
|
| 464 |
code_body_lines.append(f" {status_var} = {node_var}.status_code")
|
| 465 |
code_body_lines.append(f" {headers_res_var} = dict({node_var}.headers)")
|
| 466 |
-
code_body_lines.append(f" {then_var} = True")
|
| 467 |
output_var_map[f"{node_id}:response"] = node_var
|
| 468 |
output_var_map[f"{node_id}:text"] = f"{node_var}.text"
|
| 469 |
output_var_map[f"{node_id}:data"] = f"{node_var}.json()"
|
|
@@ -471,7 +479,7 @@ def generate_code_logic(
|
|
| 471 |
output_var_map[f"{node_id}:out"] = f"{node_var}.json()"
|
| 472 |
output_var_map[f"{node_id}:status_code"] = status_var
|
| 473 |
output_var_map[f"{node_id}:headers"] = headers_res_var
|
| 474 |
-
output_var_map[f"{node_id}:then"] =
|
| 475 |
output_var_map[node_id] = node_var
|
| 476 |
|
| 477 |
# 1. Primitives & Constants
|
|
@@ -641,27 +649,29 @@ def generate_code_logic(
|
|
| 641 |
val_expr = resolve_input(["value", "val", "in", "x"], params.get("value", ""))
|
| 642 |
prefix = params.get("prefix", "")
|
| 643 |
node_var = val_expr
|
| 644 |
-
then_var = f"then_{safe_id}"
|
| 645 |
if prefix:
|
| 646 |
code_body_lines.append(f' print(f"{prefix}{{{val_expr}}}")')
|
| 647 |
else:
|
| 648 |
code_body_lines.append(f" print({val_expr})")
|
| 649 |
-
code_body_lines.append(f" {then_var} = True")
|
| 650 |
output_var_map[f"{node_id}:out"] = node_var
|
| 651 |
-
output_var_map[f"{node_id}:then"] =
|
| 652 |
output_var_map[node_id] = node_var
|
| 653 |
|
| 654 |
# 10. IO Input
|
| 655 |
elif raw_type in ("io.input", "input"):
|
| 656 |
prompt = params.get("prompt", "")
|
| 657 |
-
|
| 658 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 659 |
code_body_lines.append(f' {node_var} = input("{prompt}")')
|
| 660 |
-
code_body_lines.append(f" {then_var} = True")
|
| 661 |
output_var_map[f"{node_id}:value"] = node_var
|
| 662 |
output_var_map[f"{node_id}:out"] = node_var
|
| 663 |
output_var_map[f"{node_id}:output"] = node_var
|
| 664 |
-
output_var_map[f"{node_id}:then"] =
|
| 665 |
output_var_map[node_id] = node_var
|
| 666 |
|
| 667 |
# 10B. Sandboxed File Read Node
|
|
@@ -690,11 +700,10 @@ def generate_code_logic(
|
|
| 690 |
code_body_lines.append(f" {node_var} = _f_{safe_id}.read()")
|
| 691 |
code_body_lines.append(f" {bytes_var} = len({node_var})")
|
| 692 |
code_body_lines.append(f" {success_var} = True")
|
| 693 |
-
code_body_lines.append(f" {then_var} = True")
|
| 694 |
output_var_map[f"{node_id}:content"] = node_var
|
| 695 |
output_var_map[f"{node_id}:byte_count"] = bytes_var
|
| 696 |
output_var_map[f"{node_id}:success"] = success_var
|
| 697 |
-
output_var_map[f"{node_id}:then"] =
|
| 698 |
output_var_map[f"{node_id}:out"] = node_var
|
| 699 |
output_var_map[node_id] = node_var
|
| 700 |
|
|
@@ -721,11 +730,10 @@ def generate_code_logic(
|
|
| 721 |
code_body_lines.append(f" {bytes_var} = len(str({content_expr}).encode('{encoding_val}'))")
|
| 722 |
code_body_lines.append(f" {path_res_var} = {path_expr}")
|
| 723 |
code_body_lines.append(f" {success_var} = True")
|
| 724 |
-
code_body_lines.append(f" {then_var} = True")
|
| 725 |
output_var_map[f"{node_id}:bytes_written"] = bytes_var
|
| 726 |
output_var_map[f"{node_id}:file_path"] = path_res_var
|
| 727 |
output_var_map[f"{node_id}:success"] = success_var
|
| 728 |
-
output_var_map[f"{node_id}:then"] =
|
| 729 |
output_var_map[node_id] = bytes_var
|
| 730 |
|
| 731 |
# 10D. JSON Parse Node
|
|
@@ -752,11 +760,10 @@ def generate_code_logic(
|
|
| 752 |
code_body_lines.append(f" {data_var} = json.loads({safe_text_expr}, strict={strict})")
|
| 753 |
code_body_lines.append(f" {valid_var} = True")
|
| 754 |
code_body_lines.append(f" {err_var} = None")
|
| 755 |
-
code_body_lines.append(f" {then_var} = True")
|
| 756 |
output_var_map[f"{node_id}:data"] = data_var
|
| 757 |
output_var_map[f"{node_id}:is_valid"] = valid_var
|
| 758 |
output_var_map[f"{node_id}:error"] = err_var
|
| 759 |
-
output_var_map[f"{node_id}:then"] =
|
| 760 |
output_var_map[f"{node_id}:out"] = data_var
|
| 761 |
output_var_map[node_id] = data_var
|
| 762 |
|
|
@@ -775,11 +782,10 @@ def generate_code_logic(
|
|
| 775 |
code_body_lines.append(f" {text_var} = json.dumps({data_expr}, indent={indent_arg}, sort_keys={sort_keys}, ensure_ascii={ensure_ascii}, default=str)")
|
| 776 |
code_body_lines.append(f" {bytes_var} = len({text_var}.encode('utf-8'))")
|
| 777 |
code_body_lines.append(f" {success_var} = True")
|
| 778 |
-
code_body_lines.append(f" {then_var} = True")
|
| 779 |
output_var_map[f"{node_id}:text"] = text_var
|
| 780 |
output_var_map[f"{node_id}:byte_size"] = bytes_var
|
| 781 |
output_var_map[f"{node_id}:success"] = success_var
|
| 782 |
-
output_var_map[f"{node_id}:then"] =
|
| 783 |
output_var_map[f"{node_id}:out"] = text_var
|
| 784 |
output_var_map[node_id] = text_var
|
| 785 |
|
|
@@ -817,12 +823,11 @@ def generate_code_logic(
|
|
| 817 |
code_body_lines.append(f" {rows_var} = [list(r) for r in {reader_var} if r and any(str(x).strip() for x in r)]")
|
| 818 |
code_body_lines.append(f" {count_var} = len({rows_var})")
|
| 819 |
code_body_lines.append(f" {success_var} = True")
|
| 820 |
-
code_body_lines.append(f" {then_var} = True")
|
| 821 |
output_var_map[f"{node_id}:rows"] = rows_var
|
| 822 |
output_var_map[f"{node_id}:headers"] = headers_var
|
| 823 |
output_var_map[f"{node_id}:row_count"] = count_var
|
| 824 |
output_var_map[f"{node_id}:success"] = success_var
|
| 825 |
-
output_var_map[f"{node_id}:then"] =
|
| 826 |
output_var_map[f"{node_id}:out"] = rows_var
|
| 827 |
output_var_map[node_id] = rows_var
|
| 828 |
|
|
@@ -869,12 +874,11 @@ def generate_code_logic(
|
|
| 869 |
code_body_lines.append(f" {count_var} = len(_rows_{safe_id})")
|
| 870 |
code_body_lines.append(f" {bytes_var} = len({text_var}.encode('utf-8'))")
|
| 871 |
code_body_lines.append(f" {success_var} = True")
|
| 872 |
-
code_body_lines.append(f" {then_var} = True")
|
| 873 |
output_var_map[f"{node_id}:text"] = text_var
|
| 874 |
output_var_map[f"{node_id}:row_count"] = count_var
|
| 875 |
output_var_map[f"{node_id}:byte_size"] = bytes_var
|
| 876 |
output_var_map[f"{node_id}:success"] = success_var
|
| 877 |
-
output_var_map[f"{node_id}:then"] =
|
| 878 |
output_var_map[f"{node_id}:out"] = text_var
|
| 879 |
output_var_map[node_id] = text_var
|
| 880 |
|
|
|
|
| 313 |
}
|
| 314 |
|
| 315 |
label = str(data.get("label") or node.get("label") or raw_type or node_id)
|
| 316 |
+
# Clean, human-readable safe_id (avoids ugly raw UI UUIDs like alli_primitive_input_mvumq1nh_kvh9c)
|
| 317 |
+
clean_lbl = re.sub(r"[^a-zA-Z0-9_]", "_", label.lower()).strip("_")
|
| 318 |
+
clean_lbl = re.sub(r"_+", "_", clean_lbl)
|
| 319 |
+
if str(node_id).startswith("alli_primitive_") or len(str(node_id)) > 20:
|
| 320 |
+
if clean_lbl and not clean_lbl[0].isdigit() and len(clean_lbl) <= 24:
|
| 321 |
+
safe_id = f"{clean_lbl}_{step_counter}"
|
| 322 |
+
else:
|
| 323 |
+
safe_id = f"step_{step_counter}"
|
| 324 |
+
else:
|
| 325 |
+
safe_id = sanitize_identifier(node_id.replace("-", "_"), f"node_{step_counter}")
|
| 326 |
incoming = incoming_edges_map.get(node_id, [])
|
| 327 |
|
| 328 |
# Schema inspection from registry
|
|
|
|
| 472 |
code_body_lines.append(f" {node_var} = requests.request('{method}', {url_expr}, json={payload_expr}, headers={headers_expr}, timeout={timeout_val})")
|
| 473 |
code_body_lines.append(f" {status_var} = {node_var}.status_code")
|
| 474 |
code_body_lines.append(f" {headers_res_var} = dict({node_var}.headers)")
|
|
|
|
| 475 |
output_var_map[f"{node_id}:response"] = node_var
|
| 476 |
output_var_map[f"{node_id}:text"] = f"{node_var}.text"
|
| 477 |
output_var_map[f"{node_id}:data"] = f"{node_var}.json()"
|
|
|
|
| 479 |
output_var_map[f"{node_id}:out"] = f"{node_var}.json()"
|
| 480 |
output_var_map[f"{node_id}:status_code"] = status_var
|
| 481 |
output_var_map[f"{node_id}:headers"] = headers_res_var
|
| 482 |
+
output_var_map[f"{node_id}:then"] = "True"
|
| 483 |
output_var_map[node_id] = node_var
|
| 484 |
|
| 485 |
# 1. Primitives & Constants
|
|
|
|
| 649 |
val_expr = resolve_input(["value", "val", "in", "x"], params.get("value", ""))
|
| 650 |
prefix = params.get("prefix", "")
|
| 651 |
node_var = val_expr
|
|
|
|
| 652 |
if prefix:
|
| 653 |
code_body_lines.append(f' print(f"{prefix}{{{val_expr}}}")')
|
| 654 |
else:
|
| 655 |
code_body_lines.append(f" print({val_expr})")
|
|
|
|
| 656 |
output_var_map[f"{node_id}:out"] = node_var
|
| 657 |
+
output_var_map[f"{node_id}:then"] = "True"
|
| 658 |
output_var_map[node_id] = node_var
|
| 659 |
|
| 660 |
# 10. IO Input
|
| 661 |
elif raw_type in ("io.input", "input"):
|
| 662 |
prompt = params.get("prompt", "")
|
| 663 |
+
user_var = params.get("var_name") or params.get("alias")
|
| 664 |
+
if user_var:
|
| 665 |
+
node_var = sanitize_identifier(user_var, "user_input")
|
| 666 |
+
elif clean_lbl and not clean_lbl[0].isdigit() and len(clean_lbl) <= 24:
|
| 667 |
+
node_var = clean_lbl if step_counter == 1 else f"{clean_lbl}_{step_counter}"
|
| 668 |
+
else:
|
| 669 |
+
node_var = "user_input" if step_counter == 1 else f"user_input_{step_counter}"
|
| 670 |
code_body_lines.append(f' {node_var} = input("{prompt}")')
|
|
|
|
| 671 |
output_var_map[f"{node_id}:value"] = node_var
|
| 672 |
output_var_map[f"{node_id}:out"] = node_var
|
| 673 |
output_var_map[f"{node_id}:output"] = node_var
|
| 674 |
+
output_var_map[f"{node_id}:then"] = "True"
|
| 675 |
output_var_map[node_id] = node_var
|
| 676 |
|
| 677 |
# 10B. Sandboxed File Read Node
|
|
|
|
| 700 |
code_body_lines.append(f" {node_var} = _f_{safe_id}.read()")
|
| 701 |
code_body_lines.append(f" {bytes_var} = len({node_var})")
|
| 702 |
code_body_lines.append(f" {success_var} = True")
|
|
|
|
| 703 |
output_var_map[f"{node_id}:content"] = node_var
|
| 704 |
output_var_map[f"{node_id}:byte_count"] = bytes_var
|
| 705 |
output_var_map[f"{node_id}:success"] = success_var
|
| 706 |
+
output_var_map[f"{node_id}:then"] = "True"
|
| 707 |
output_var_map[f"{node_id}:out"] = node_var
|
| 708 |
output_var_map[node_id] = node_var
|
| 709 |
|
|
|
|
| 730 |
code_body_lines.append(f" {bytes_var} = len(str({content_expr}).encode('{encoding_val}'))")
|
| 731 |
code_body_lines.append(f" {path_res_var} = {path_expr}")
|
| 732 |
code_body_lines.append(f" {success_var} = True")
|
|
|
|
| 733 |
output_var_map[f"{node_id}:bytes_written"] = bytes_var
|
| 734 |
output_var_map[f"{node_id}:file_path"] = path_res_var
|
| 735 |
output_var_map[f"{node_id}:success"] = success_var
|
| 736 |
+
output_var_map[f"{node_id}:then"] = "True"
|
| 737 |
output_var_map[node_id] = bytes_var
|
| 738 |
|
| 739 |
# 10D. JSON Parse Node
|
|
|
|
| 760 |
code_body_lines.append(f" {data_var} = json.loads({safe_text_expr}, strict={strict})")
|
| 761 |
code_body_lines.append(f" {valid_var} = True")
|
| 762 |
code_body_lines.append(f" {err_var} = None")
|
|
|
|
| 763 |
output_var_map[f"{node_id}:data"] = data_var
|
| 764 |
output_var_map[f"{node_id}:is_valid"] = valid_var
|
| 765 |
output_var_map[f"{node_id}:error"] = err_var
|
| 766 |
+
output_var_map[f"{node_id}:then"] = "True"
|
| 767 |
output_var_map[f"{node_id}:out"] = data_var
|
| 768 |
output_var_map[node_id] = data_var
|
| 769 |
|
|
|
|
| 782 |
code_body_lines.append(f" {text_var} = json.dumps({data_expr}, indent={indent_arg}, sort_keys={sort_keys}, ensure_ascii={ensure_ascii}, default=str)")
|
| 783 |
code_body_lines.append(f" {bytes_var} = len({text_var}.encode('utf-8'))")
|
| 784 |
code_body_lines.append(f" {success_var} = True")
|
|
|
|
| 785 |
output_var_map[f"{node_id}:text"] = text_var
|
| 786 |
output_var_map[f"{node_id}:byte_size"] = bytes_var
|
| 787 |
output_var_map[f"{node_id}:success"] = success_var
|
| 788 |
+
output_var_map[f"{node_id}:then"] = "True"
|
| 789 |
output_var_map[f"{node_id}:out"] = text_var
|
| 790 |
output_var_map[node_id] = text_var
|
| 791 |
|
|
|
|
| 823 |
code_body_lines.append(f" {rows_var} = [list(r) for r in {reader_var} if r and any(str(x).strip() for x in r)]")
|
| 824 |
code_body_lines.append(f" {count_var} = len({rows_var})")
|
| 825 |
code_body_lines.append(f" {success_var} = True")
|
|
|
|
| 826 |
output_var_map[f"{node_id}:rows"] = rows_var
|
| 827 |
output_var_map[f"{node_id}:headers"] = headers_var
|
| 828 |
output_var_map[f"{node_id}:row_count"] = count_var
|
| 829 |
output_var_map[f"{node_id}:success"] = success_var
|
| 830 |
+
output_var_map[f"{node_id}:then"] = "True"
|
| 831 |
output_var_map[f"{node_id}:out"] = rows_var
|
| 832 |
output_var_map[node_id] = rows_var
|
| 833 |
|
|
|
|
| 874 |
code_body_lines.append(f" {count_var} = len(_rows_{safe_id})")
|
| 875 |
code_body_lines.append(f" {bytes_var} = len({text_var}.encode('utf-8'))")
|
| 876 |
code_body_lines.append(f" {success_var} = True")
|
|
|
|
| 877 |
output_var_map[f"{node_id}:text"] = text_var
|
| 878 |
output_var_map[f"{node_id}:row_count"] = count_var
|
| 879 |
output_var_map[f"{node_id}:byte_size"] = bytes_var
|
| 880 |
output_var_map[f"{node_id}:success"] = success_var
|
| 881 |
+
output_var_map[f"{node_id}:then"] = "True"
|
| 882 |
output_var_map[f"{node_id}:out"] = text_var
|
| 883 |
output_var_map[node_id] = text_var
|
| 884 |
|