Update parser.py

parser.py

@@ -44,49 +44,59 @@ def create_vector(category, level, location, total_lines, parent_path):
                         for i, parent in enumerate(parent_path)) / max(1, len(category_map))
     return [category_id, level, center_pos, span, parent_depth, parent_weight]
 
-def parse_node(node, lines, prev_end, level=0, total_lines=None, parent_path=None, counters=None):
+def parse_node(node, lines, prev_end, level=0, total_lines=None, parent_path=None, counters=None, processed_lines=None):
     if total_lines is None:
         total_lines = len(lines)
     if parent_path is None:
         parent_path = []
     if counters is None:
         counters = {cat: 0 for cat in ['import', 'assignment', 'function', 'async_function', 'class', 'if', 'while', 'for', 'try', 'return', 'expression', 'other', 'spacer', 'elif', 'else', 'except', 'finally']}
+    if processed_lines is None:
+        processed_lines = set()
 
     parts = []
     start_line = getattr(node, 'lineno', prev_end + 1)
     end_line = getattr(node, 'end_lineno', start_line)
-    category = get_category(node)
 
+    # Skip if any lines are already processed
+    if any(line in processed_lines for line in range(start_line, end_line + 1)):
+        return parts
+
+    category = get_category(node)
     counters[category] += 1
     node_id = f"{category.capitalize()}[{counters[category]}]"
 
     # Spacer before node
     if start_line > prev_end + 1:
         spacer_lines = lines[prev_end:start_line - 1]
-        counters['spacer'] += 1
-        spacer_node_id = f"Spacer[{counters['spacer']}]"
+        spacer_lines_set = set(range(prev_end + 1, start_line))
+        if not spacer_lines_set.issubset(processed_lines):
+            counters['spacer'] += 1
+            spacer_node_id = f"Spacer[{counters['spacer']}]"
+            parts.append({
+                'category': 'spacer',
+                'source': ''.join(spacer_lines),
+                'location': (prev_end + 1, start_line - 1),
+                'level': level,
+                'vector': create_vector('spacer', level, (prev_end + 1, start_line - 1), total_lines, parent_path),
+                'parent_path': ' -> '.join(parent_path) if parent_path else 'Top-Level',
+                'node_id': spacer_node_id
+            })
+            processed_lines.update(spacer_lines_set)
+
+    # Current node's header (e.g., 'def', 'if')
+    current_path = parent_path + [node_id]
+    if start_line not in processed_lines:
         parts.append({
-            'category': 'spacer',
-            'source': ''.join(spacer_lines),
-            'location': (prev_end + 1, start_line - 1),
+            'category': category,
+            'source': lines[start_line - 1],
+            'location': (start_line, start_line),
             'level': level,
-            'vector': create_vector('spacer', level, (prev_end + 1, start_line - 1), total_lines, parent_path),
+            'vector': create_vector(category, level, (start_line, start_line), total_lines, current_path),
             'parent_path': ' -> '.join(parent_path) if parent_path else 'Top-Level',
-            'node_id': spacer_node_id
+            'node_id': node_id
         })
-
-    # Current node's header (e.g., 'def', 'if')
-    current_path = parent_path + [node_id]
-    node_lines = lines[start_line - 1:end_line]
-    parts.append({
-        'category': category,
-        'source': node_lines[0],  # Only the header line
-        'location': (start_line, start_line),
-        'level': level,
-        'vector': create_vector(category, level, (start_line, start_line), total_lines, current_path),
-        'parent_path': ' -> '.join(parent_path) if parent_path else 'Top-Level',
-        'node_id': node_id
-    })
+        processed_lines.add(start_line)
 
     # Process nested bodies
     nested_prev_end = start_line
@@ -95,66 +105,74 @@ def parse_node(node, lines, prev_end, level=0, total_lines=None, parent_path=Non
             for child in getattr(node, attr):
                 if attr == 'orelse' and isinstance(node, ast.If) and child.lineno != start_line:
                     sub_category = 'elif' if 'elif' in lines[child.lineno - 1] else 'else'
-                    counters[sub_category] += 1
-                    sub_node_id = f"{sub_category.capitalize()}[{counters[sub_category]}]"
                     sub_start = child.lineno
                     sub_end = getattr(child, 'end_lineno', sub_start)
-                    parts.append({
-                        'category': sub_category,
-                        'source': lines[sub_start - 1],
-                        'location': (sub_start, sub_start),
-                        'level': level,
-                        'vector': create_vector(sub_category, level, (sub_start, sub_start), total_lines, current_path),
-                        'parent_path': ' -> '.join(parent_path) if parent_path else 'Top-Level',
-                        'node_id': sub_node_id
-                    })
-                    child_parts = parse_node(child, lines, sub_start, level + 1, total_lines, current_path, counters)
-                    parts.extend(child_parts)
-                    nested_prev_end = max(nested_prev_end, child_parts[-1]['location'][1] if child_parts else sub_start)
+                    if not any(line in processed_lines for line in range(sub_start, sub_end + 1)):
+                        counters[sub_category] += 1
+                        sub_node_id = f"{sub_category.capitalize()}[{counters[sub_category]}]"
+                        parts.append({
+                            'category': sub_category,
+                            'source': lines[sub_start - 1],
+                            'location': (sub_start, sub_start),
+                            'level': level,
+                            'vector': create_vector(sub_category, level, (sub_start, sub_start), total_lines, current_path),
+                            'parent_path': ' -> '.join(parent_path) if parent_path else 'Top-Level',
+                            'node_id': sub_node_id
+                        })
+                        processed_lines.add(sub_start)
+                        child_parts = parse_node(child, lines, sub_start, level + 1, total_lines, current_path, counters, processed_lines)
+                        parts.extend(child_parts)
+                        nested_prev_end = max(nested_prev_end, child_parts[-1]['location'][1] if child_parts else sub_start)
                 elif attr == 'handlers' and isinstance(child, ast.ExceptHandler):
-                    counters['except'] += 1
-                    sub_node_id = f"Except[{counters['except']}]"
                     sub_start = child.lineno
                     sub_end = getattr(child, 'end_lineno', sub_start)
-                    parts.append({
-                        'category': 'except',
-                        'source': lines[sub_start - 1],
-                        'location': (sub_start, sub_start),
-                        'level': level,
-                        'vector': create_vector('except', level, (sub_start, sub_start), total_lines, current_path),
-                        'parent_path': ' -> '.join(parent_path) if parent_path else 'Top-Level',
-                        'node_id': sub_node_id
-                    })
-                    child_parts = parse_node(child, lines, sub_start, level + 1, total_lines, current_path, counters)
-                    parts.extend(child_parts)
-                    nested_prev_end = max(nested_prev_end, child_parts[-1]['location'][1] if child_parts else sub_start)
+                    if not any(line in processed_lines for line in range(sub_start, sub_end + 1)):
+                        counters['except'] += 1
+                        sub_node_id = f"Except[{counters['except']}]"
+                        parts.append({
+                            'category': 'except',
+                            'source': lines[sub_start - 1],
+                            'location': (sub_start, sub_start),
+                            'level': level,
+                            'vector': create_vector('except', level, (sub_start, sub_start), total_lines, current_path),
+                            'parent_path': ' -> '.join(parent_path) if parent_path else 'Top-Level',
+                            'node_id': sub_node_id
+                        })
+                        processed_lines.add(sub_start)
+                        child_parts = parse_node(child, lines, sub_start, level + 1, total_lines, current_path, counters, processed_lines)
+                        parts.extend(child_parts)
+                        nested_prev_end = max(nested_prev_end, child_parts[-1]['location'][1] if child_parts else sub_start)
                 elif attr == 'finalbody':
-                    counters['finally'] += 1
-                    sub_node_id = f"Finally[{counters['finally']}]"
                     sub_start = child.lineno
                     sub_end = getattr(child, 'end_lineno', sub_start)
-                    parts.append({
-                        'category': 'finally',
-                        'source': lines[sub_start - 1],
-                        'location': (sub_start, sub_start),
-                        'level': level,
-                        'vector': create_vector('finally', level, (sub_start, sub_start), total_lines, current_path),
-                        'parent_path': ' -> '.join(parent_path) if parent_path else 'Top-Level',
-                        'node_id': sub_node_id
-                    })
-                    child_parts = parse_node(child, lines, sub_start, level + 1, total_lines, current_path, counters)
-                    parts.extend(child_parts)
-                    nested_prev_end = max(nested_prev_end, child_parts[-1]['location'][1] if child_parts else sub_start)
+                    if not any(line in processed_lines for line in range(sub_start, sub_end + 1)):
+                        counters['finally'] += 1
+                        sub_node_id = f"Finally[{counters['finally']}]"
+                        parts.append({
+                            'category': 'finally',
+                            'source': lines[sub_start - 1],
+                            'location': (sub_start, sub_start),
+                            'level': level,
+                            'vector': create_vector('finally', level, (sub_start, sub_start), total_lines, current_path),
+                            'parent_path': ' -> '.join(parent_path) if parent_path else 'Top-Level',
+                            'node_id': sub_node_id
+                        })
+                        processed_lines.add(sub_start)
+                        child_parts = parse_node(child, lines, sub_start, level + 1, total_lines, current_path, counters, processed_lines)
+                        parts.extend(child_parts)
+                        nested_prev_end = max(nested_prev_end, child_parts[-1]['location'][1] if child_parts else sub_start)
                 else:
-                    child_parts = parse_node(child, lines, nested_prev_end, level + 1, total_lines, current_path, counters)
+                    child_parts = parse_node(child, lines, nested_prev_end, level + 1, total_lines, current_path, counters, processed_lines)
                     parts.extend(child_parts)
                     nested_prev_end = child_parts[-1]['location'][1] if child_parts else nested_prev_end
 
-    # Update end_line of the parent node to reflect its full scope
-    if nested_prev_end > start_line:
-        parts[-1]['location'] = (start_line, nested_prev_end)
-        parts[-1]['source'] = ''.join(lines[start_line - 1:nested_prev_end])
-        parts[-1]['vector'] = create_vector(category, level, (start_line, nested_prev_end), total_lines, current_path)
+    # Update end_line and source of the parent node if its body extends it
+    if nested_prev_end > start_line and start_line not in processed_lines:
+        final_end = nested_prev_end
+        parts[-1]['location'] = (start_line, final_end)
+        parts[-1]['source'] = ''.join(lines[start_line - 1:final_end])
+        parts[-1]['vector'] = create_vector(category, level, (start_line, final_end), total_lines, current_path)
+        processed_lines.update(range(start_line, final_end + 1))
 
     return parts
 
@@ -168,25 +186,29 @@ def parse_python_code(code):
 
     parts = []
     prev_end = 0
+    processed_lines = set()
 
     for stmt in tree.body:
-        stmt_parts = parse_node(stmt, lines, prev_end, total_lines=total_lines)
+        stmt_parts = parse_node(stmt, lines, prev_end, total_lines=total_lines, processed_lines=processed_lines)
         parts.extend(stmt_parts)
-        prev_end = stmt_parts[-1]['location'][1]
+        prev_end = stmt_parts[-1]['location'][1] if stmt_parts else prev_end
 
     if prev_end < total_lines:
         remaining_lines = lines[prev_end:]
-        counters = {'spacer': 0}
-        counters['spacer'] += 1
-        spacer_node_id = f"Spacer[{counters['spacer']}]"
-        parts.append({
-            'category': 'spacer',
-            'source': ''.join(remaining_lines),
-            'location': (prev_end + 1, total_lines + 1),
-            'level': 0,
-            'vector': create_vector('spacer', 0, (prev_end + 1, total_lines + 1), total_lines, []),
-            'parent_path': 'Top-Level',
-            'node_id': spacer_node_id
-        })
+        remaining_lines_set = set(range(prev_end + 1, total_lines + 1))
+        if not remaining_lines_set.issubset(processed_lines):
+            counters = {'spacer': 0}
+            counters['spacer'] += 1
+            spacer_node_id = f"Spacer[{counters['spacer']}]"
+            parts.append({
+                'category': 'spacer',
+                'source': ''.join(remaining_lines),
+                'location': (prev_end + 1, total_lines + 1),
+                'level': 0,
+                'vector': create_vector('spacer', 0, (prev_end + 1, total_lines + 1), total_lines, []),
+                'parent_path': 'Top-Level',
+                'node_id': spacer_node_id
+            })
+            processed_lines.update(remaining_lines_set)
 
     return parts