Add code filtering option to MarkdownTextFilter

This commit is contained in:
Mark Backman
2024-10-11 10:23:34 -04:00
parent 66a76af341
commit 84705427c5
3 changed files with 91 additions and 0 deletions

View File

@@ -294,6 +294,8 @@ class TTSService(AIService):
async def _handle_interruption(self, frame: StartInterruptionFrame, direction: FrameDirection):
self._current_sentence = ""
if self._text_filter:
self._text_filter.handle_interruption()
await self.push_frame(frame, direction)
async def _process_text_frame(self, frame: TextFrame):
@@ -318,6 +320,7 @@ class TTSService(AIService):
await self.start_processing_metrics()
if self._text_filter:
self._text_filter.reset_interruption()
text = self._text_filter.filter(text)
await self.process_generator(self.run_tts(text))
await self.stop_processing_metrics()

View File

@@ -16,3 +16,11 @@ class BaseTextFilter(ABC):
@abstractmethod
def filter(self, text: str) -> str:
pass
@abstractmethod
def handle_interruption(self):
pass
@abstractmethod
def reset_interruption(self):
pass

View File

@@ -23,10 +23,13 @@ class MarkdownTextFilter(BaseTextFilter):
class InputParams(BaseModel):
enable_text_filter: bool = True
filter_code: bool = False
def __init__(self, params: InputParams = InputParams(), **kwargs):
super().__init__(**kwargs)
self._settings = params
self._in_code_block = False
self._interrupted = False
def update_settings(self, settings: Mapping[str, Any]):
for key, value in settings.items():
@@ -38,6 +41,9 @@ class MarkdownTextFilter(BaseTextFilter):
# Replace newlines with spaces only when there's no text before or after
text = re.sub(r"^\s*\n", " ", text, flags=re.MULTILINE)
# Remove backticks from inline code, but not from code blocks
text = re.sub(r"(?<!`)`([^`\n]+)`(?!`)", r"\1", text)
# Remove repeated sequences of 5 or more characters
text = re.sub(r"(\S)(\1{4,})", "", text)
@@ -73,6 +79,10 @@ class MarkdownTextFilter(BaseTextFilter):
filtered_text = re.sub(r"\|", "", filtered_text)
filtered_text = re.sub(r"^\s*[-:]+\s*$", "", filtered_text, flags=re.MULTILINE)
# Remove code blocks
if self._settings.filter_code:
filtered_text = self.remove_code_blocks(filtered_text)
# Restore numbered list items
filtered_text = filtered_text.replace("§NUM§", "")
@@ -82,3 +92,73 @@ class MarkdownTextFilter(BaseTextFilter):
return filtered_text
else:
return text
def handle_interruption(self):
self._interrupted = True
self._in_code_block = False
def reset_interruption(self):
self._interrupted = False
def remove_code_blocks(self, text: str) -> str:
"""
Main method to remove code blocks from the input text.
Handles interruptions and delegates to specific methods based on the current state.
"""
if self._interrupted:
self._in_code_block = False
return text
# Pattern to match three consecutive backticks (code block delimiter)
code_block_pattern = r"```"
match = re.search(code_block_pattern, text)
if self._in_code_block:
return self._handle_in_code_block(match, text)
return self._handle_not_in_code_block(match, text, code_block_pattern)
def _handle_in_code_block(self, match, text):
"""
Handle text when we're currently inside a code block.
If we find the end of the block, return text after it. Otherwise, skip the content.
"""
if match:
self._in_code_block = False
end_index = match.end()
return text[end_index:].strip()
return " " # Skip content inside code block
def _handle_not_in_code_block(self, match, text, code_block_pattern):
"""
Handle text when we're not currently inside a code block.
Delegate to specific methods based on whether we find a code block delimiter.
"""
if not match:
return text # No code block found, return original text
start_index = match.start()
if start_index == 0 or text[:start_index].isspace():
return self._handle_start_of_code_block(text, start_index)
return self._handle_code_block_within_text(text, code_block_pattern)
def _handle_start_of_code_block(self, text, start_index):
"""
Handle the case where we find the start of a code block.
Return any text before the code block and set the state to inside a code block.
"""
self._in_code_block = True
return text[:start_index].strip()
def _handle_code_block_within_text(self, text, code_block_pattern):
"""
Handle the case where we find a code block within the text.
If it's a complete code block, remove it and return surrounding text.
If it's the start of a code block, return text before it and set state.
"""
parts = re.split(code_block_pattern, text)
if len(parts) > 2:
return (parts[0] + " " + parts[-1]).strip()
self._in_code_block = True
return parts[0].strip()