Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: refine normalization output parser #96

Merged
merged 1 commit into from
Nov 15, 2024
Merged

chore: refine normalization output parser #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/tablegpt/agent/file_reading/data_normalizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def __init__(self, text: str, expected_type: str):

class ListListOutputParser(BaseTransformOutputParser[list[list[Any]]]):
# TODO: this regex has lot of bugs.
pattern: Pattern = re.compile(r"\[\s*(?:\[\s*(.*?)\s*\]\s*)*\,?\]")
pattern: Pattern = re.compile(r"\[\s*(?:\[\s*(.*?)\s*\]\s*)*\,?\]", re.DOTALL)
"""Explanation of the regex:
- \\[ and \\]: Match the outer square brackets of the list.
- \\s*: Matches zero or more whitespace characters (spaces, tabs, etc.) between and around the elements.
Expand All @@ -102,6 +102,7 @@ class ListListOutputParser(BaseTransformOutputParser[list[list[Any]]]):
- (.*?): Non-greedy match for the elements inside the inner lists, capturing the contents lazily.
- \\s*: Matches optional spaces around the elements within the inner list.
- ,?: Optionally matches a comma after the inner lists, which could exist in some cases (like when lists are separated by commas).
- re.DOTALL : This flag makes the dot `.` match newlines as well, so the regex can match multi-line text.
"""

def parse(self, text: str) -> list[list[Any]]:
Expand All @@ -120,7 +121,7 @@ def parse(self, text: str) -> list[list[Any]]:

class ListTupleOutputParser(BaseTransformOutputParser[list[list[Any]]]):
# TODO: this regex has lot of bugs.
pattern: Pattern = re.compile(r"\[\s*(?:\(\s*(.*?)\s*\)\s*)*\,?\]")
pattern: Pattern = re.compile(r"\[\s*(?:\(\s*(.*?)\s*\)\s*)*\,?\]", re.DOTALL)
"""Explanation of the regex:
- \\[ and \\]: Match the outer square brackets of the list.
- \\s*: Matches zero or more whitespace characters (spaces, tabs, etc.) between and around the elements.
Expand All @@ -129,6 +130,7 @@ class ListTupleOutputParser(BaseTransformOutputParser[list[list[Any]]]):
- (.*?): Non-greedy match for the elements inside the tuple, capturing the contents lazily.
- \\s*: Matches optional spaces around the elements within the tuple.
- ,?: Optionally matches a comma after the inner lists, which could exist in some cases (like when lists are separated by commas).
- re.DOTALL : This flag makes the dot `.` match newlines as well, so the regex can match multi-line text.
"""

def parse(self, text: str) -> list[list[Any]]:
Expand Down