feat(all): reject state, major cleanup

app.py

@@ -1,8 +1,8 @@
 # Import libraries and modules
-# Run pip install gradio and wonderwords in terminal
+# Run pip install gradio and essential_generators in terminal
 import gradio as gr
 import pandas as pd
-from wonderwords import RandomSentence
+from essential_generators import DocumentGenerator
 from main import generate_dfa
 
 # DataFrame
@@ -21,23 +21,30 @@ with open("words.txt") as file:
 dfa = generate_dfa(words)
 
 
-# Generate examples || RandomSentence is not the best way to generate examples || Should be replaced with self-generated examples
+# Generate examples
 def generateExamples():
-    s = RandomSentence()
+    gen = DocumentGenerator()
     examples = []
     for i in range(3):
-        examples.append(s.sentence())
+        examples.append(gen.paragraph())
     return examples
 
 
 # Color match function
-def color_match(text):
+def color_match(text: gr.Textbox):
     colored_text = []
     pointer = 0
 
     # Get the result of the DFA check on the input text
     match_dict = dfa.check(text)
 
+    if not match_dict:
+        return (
+            '<div style="background-color: #dc2626; color: #fff; text-align: center; width: 100%; padding: 10px; font-weight:800; font-size:1.5rem">Rejected</div>',
+            None,
+            None,
+        )
+
     # Flatten the match_dict into a list of tuples and sort by the start index
     matches = sorted(
         (start, end, word)
@@ -47,67 +54,31 @@ def color_match(text):
 
     for start, end, word in matches:
         colored_text.append(text[pointer:start])
-        # print(f"Start: {start}, End: {end}, Word: {word}")
         # End need to be incremented by 1 to include the last character
-        colored_text.append(f'<span style="color:red;">{text[start:end + 1]}</span>')
-        # print(f"Colored Text: {colored_text}")
+        colored_text.append(f"<span style='color:#4ade80'>{text[start:end + 1]}</span>")
         # Move the pointer to the end of the match
         pointer = end + 1
 
     # Add remaining text
     colored_text.append(text[pointer:])
-    # print(f"Text before merge: {colored_text}")
     # Combine the strings
     colored_text = "".join(colored_text)
-    # print(f"Colored Text after merging: {colored_text}")
-
-    # Call getOccurrences function and get the DataFrame
-    occurrences_df = getOccurrences(text)
-    # print(f"Occurences_df: {occurrences_df}")
 
     # Call getPositions function and get the DataFrame
     positions_df = getPositions(text)
-    # print(f"Positions_df: {positions_df}")
-
-    return colored_text, occurrences_df, positions_df
-
 
-# Get occurrences function
-def getOccurrences(text):
-    match_dict = dfa.check(text)
-    wordCount = {}
-    for word, positions in match_dict.items():
-        # print(f"Word: {word}, Positions: {positions}")
-        # print(f"Length of positions: {len(positions)}")
-        # Store the word and the number of occurrences in the wordCount dictionary
-        wordCount[word] = len(positions)
-    # print(f"Word Count: {wordCount}")
-
-    # Convert the wordCount dictionary to a DataFrame
-    occurrences_df = pd.DataFrame(
-        list(wordCount.items()), columns=["Words", "Occurrences"]
-    )
-    # print(occurences_df)
-    return occurrences_df
+    return colored_text, positions_df
 
 
 # Get positions function
 def getPositions(text):
     match_dict = dfa.check(text)
-    wordPositions = {}
+    positions_df = pd.DataFrame(columns=["Words", "Positions", "Occurences"])
     for word, positions in match_dict.items():
         # Convert the list of tuples to a string
         positions_str = ", ".join(map(str, positions))
-        print(f"Word: {word}, Positions: {positions_str}")
         # Store the word and the positions string in the wordPositions dictionary
-        wordPositions[word] = positions_str
-        print(f"Word Positions: {wordPositions}")
-
-    # Convert the wordPositions dictionary to a DataFrame
-    positions_df = pd.DataFrame(
-        list(wordPositions.items()), columns=["Words", "Positions"]
-    )
-    print(f"Positions_df: {positions_df}")
+        positions_df.loc[len(positions_df)] = [word, positions_str, len(positions)]
 
     return positions_df
 
@@ -116,10 +87,27 @@ def getPositions(text):
 def search_and_display(search_query):
     # Filter the DataFrame based on the search query
     filtered_df = df[df["Words"].str.contains(search_query)]
-    # print(f"Filtered text: {filtered_df}")
     return filtered_df
 
 
+def text_change_search(text: gr.Textbox):
+    if text == "":
+        return gr.update(interactive=False)
+    else:
+        return gr.update(interactive=True)
+
+
+def text_change_test(text: gr.Textbox):
+    if text == "":
+        return gr.update(interactive=False), gr.update(interactive=False)
+    else:
+        return gr.update(interactive=True), gr.update(interactive=True)
+
+
+def remove_output(result, position):
+    return None, None
+
+
 # CSS styling
 # css = """
 # warning {background-color: #FFCCCB}
@@ -133,41 +121,47 @@ def search_and_display(search_query):
 
 # Gradio UI
 with gr.Blocks() as demo:
-
     # Title block
     # Apply CSS styling to the title
     title = gr.HTML(
-        "<h1 style='color: gold; margin-bottom: 0px font-weight:bold'>English Conjuction Finder</h1>"
+        "<h1 style='color: #2563eb; font-weight:bold'>English Conjunctions/Adverb/Adjectives Finder</h1>"
     )
-    description = gr.HTML(
-        "<p style='color: #fef9c3;'>Enter a text and see the words that are accepted by the DFA highlighted in red.</p>"
-    )
-
-    # Search block
-    search = gr.Textbox(
-        label="Search",
-        placeholder="Search accepted words here",
-        lines=1,
-        info="List of accpetable words in DFA",
-    )
-    search_btn = gr.Button(value="Search")
-    resultSearch = gr.Dataframe(df, height=300)
-
-    search_btn.click(
-        search_and_display, inputs=[search], outputs=[resultSearch], api_name=False
-    )
-
-    # Adding a line break
-    line_break = gr.HTML("<br>")
+    with gr.Accordion("Accepted Words", open=False):
+        # Search block
+        search = gr.Textbox(
+            label="Search",
+            placeholder="Search accepted words here",
+            lines=1,
+            info="List of accpetable words in DFA",
+            show_copy_button=True,
+        )
+        with gr.Row():
+            cancel_btn = gr.ClearButton(search, variant="stop", interactive=False)
+            search_btn = gr.Button(value="Search", variant="primary")
+        resultSearch = gr.Dataframe(df, height=300, col_count=1, headers=["Words"])
+
+        search.change(
+            text_change_search,
+            inputs=[search],
+            outputs=[cancel_btn],
+        )
+
+        search_btn.click(
+            search_and_display, inputs=[search], outputs=[resultSearch], api_name=False
+        )
 
     # Text block for DFA and color match
-    textTitle = gr.HTML("<h2>Try it here!</h2>")
+    textTitle = gr.HTML("<h2 style='color: #2563eb;'>Try it here!</h2>")
+    description = gr.HTML(
+        "<p style='color: #a78bfa;'>Enter a text and see the words that are accepted by the DFA highlighted in <span style='color:#4ade80'>green</span>.</p>"
+    )
     text = gr.Textbox(
+        autofocus=True,
         label="Text",
         placeholder="Enter text here",
         info="Enter text to check for DFA match",
+        show_copy_button=True,
     )
-    submit_btn = gr.Button(value="Submit")
 
     # Examples block
     examples_data = generateExamples()
@@ -175,27 +169,37 @@ with gr.Blocks() as demo:
         examples=examples_data,
         inputs=[text],
     )
+    with gr.Row():
+        cancel_btn = gr.ClearButton([text], variant="stop", interactive=False)
+        submit_btn = gr.Button(value="Submit", variant="primary", interactive=False)
+
+    text.change(
+        text_change_test,
+        inputs=[text],
+        outputs=[cancel_btn, submit_btn],
+    )
 
     # Result block
-    resultTitle = gr.HTML("<h2 style='color: gold; margin-bottom: 5px'>Result</h2>")
+    resultTitle = gr.HTML("<h2 style='color: #2563eb;'>Result</h2>")
     result = gr.HTML("<p></p>")
 
-    # Occurrences block
-    occurrencesTitle = gr.HTML(
-        "<h2 style='color: gold; margin-bottom: 5px'>Occurrences</h2>"
-    )
-    occurrences = gr.Dataframe()
-
     # Position block
-    positionTitle = gr.HTML("<h2 style='color: gold;'>Position</h2>")
-    position = gr.Dataframe()
+    # positionTitle = gr.HTML("<h2 style='color: gold;'>Position</h2>")
+    position = gr.Dataframe(
+        show_label=True, col_count=3, headers=["Words", "Positions", "Occurences"]
+    )
 
     submit_btn.click(
         color_match,
         inputs=[text],
-        outputs=[result, occurrences, position],
+        outputs=[result, position],
         api_name=False,
     )
+    cancel_btn.click(
+        remove_output,
+        inputs=[result, position],
+        outputs=[result, position],
+    )
 
 # Launch the app
 demo.launch()