Upload app.py

app.py

@@ -4,14 +4,10 @@ from app_vars import *
 from nltk import edit_distance
 import gradio as g
 
-global name, url, correct, wrong, previous_correctness, skipped, prevurl, coft, qnum
-name, url = get_rock_name_url()
-prevurl = ""
-correct = 0
-wrong = 0
-skipped = 0
-coft = 0
-qnum = 0
+state = g.State(
+    {a: b for a, b in (zip(["name", "url"], get_rock_name_url()))}
+    | dict(correct=0, wrong=0, skipped=0, prevurl="", coft=0, qnum=1)
+)
 
 
 def check_2_strings(a: str, b: str):
@@ -26,78 +22,103 @@ def get_name(
     ans: str,
     feedback: str,
 ):
-    global name, url, correct, wrong, skipped, prevurl, coft, qnum
+    # global state.value["name"], state.value["url"], state.value["correct"], state.value["wrong"], state.value["skipped"], state.value["prevurl"], state.value["coft"], state.value["qnum"]
     out = ""
     fb = ""
     stats = ""
-    qnum += 1
+    state.value["qnum"] += 1
     if len(ans) >= 1:
         ans = ans.strip()
-        deviance = check_2_strings(ans, name)
+        deviance = check_2_strings(ans, state.value["name"])
         if ans in ["s", "/", "skip", "n", "r"]:
-            fb += "# The answer is: " + name
-            skipped += 1
-            prevurl = url
+            fb += "The answer is: " + state.value["name"]
+            state.value["skipped"] += 1
+            state.value["prevurl"] = state.value["url"]
         elif deviance <= 26:
-            fb += "## Correct! - The answer is: " + name
+            fb += f"""Correct! - The answer is: {state.value["name"]}"""
 
-            # print("Before:", url, prevurl, url == prevurl)
-            if prevurl != url:
-                coft += 1
-            # print("after:", url, prevurl, url == prevurl)
-            name, url = get_rock_name_url()
-            correct += 1
-            # print("after2:", url, prevurl, url == prevurl, "\n\n\n")
+            # print("Before:", state.value["url"], state.value["prevurl"], state.value["url"] == state.value["prevurl"])
+            if state.value["prevurl"] != state.value["url"]:
+                state.value["coft"] += 1
+            # print("after:", state.value["url"], state.value["prevurl"], state.value["url"] == state.value["prevurl"])
+            state.value["name"], state.value["url"] = get_rock_name_url()
+            state.value["correct"] += 1
+            # print("after2:", state.value["url"], state.value["prevurl"], state.value["url"] == state.value["prevurl"], "\n\n\n")
         else:
-            wrong += 1
-            fb += f"## Wrong! The answer isn't '{ans}'.\n # Press s, r, or n to see the answer."
-            prevurl = url
+            state.value["wrong"] += 1
+            fb += f"\n### Wrong! The answer isn't {ans}. \n ### Press s, r, or n to see the answer."
+            state.value["prevurl"] = state.value["url"]
 
-        stats = f" ### Question {qnum}: \n {fb} \n ## Correct: {correct} | Wrong: {wrong} | Correct on first try : {coft} | Skipped: {skipped} | Total: {correct + wrong + skipped} \n Your current deviance from the correct answer is: {deviance}"
+        stats = f"""
+Statistic | Value
+---: | :---
+Correct | {state.value["correct"]}
+Wrong | {state.value["wrong"]} 
+Correct on first try | {state.value["coft"]}
+Skipped | {state.value["skipped"]}
+Total | {state.value["correct"] + state.value["wrong"] + state.value["skipped"]}
+          """
         out = ""
     else:
         out = ans
         stats = feedback
     return (
-        url,
+        state.value["url"],
         out,
+        f"""## Question {state.value["qnum"]}:\n ### {fb}""",
         stats,
-        f"""### [Click here to research the rock](https://www.mindat.org/search.php?search='{name}')""",
+        rf"""### [Click here to research the rock](https://www.mindat.org/search.php?search={state.value["name"].strip().replace(" ", "%20")})""",
     )
 
 
 with g.Blocks() as A:
     title = g.Markdown("# Practice Rocks and Minerals. By Aashray")
+    with g.Row():
+        inp = g.Textbox(
+            placeholder="""Enter the rock/mineral's name here. Press s, r, or n to skip the question.""",
+            show_label=False,
+            max_lines=1,
+            autofocus=True,
+            autoscroll=True,
+        )
     with g.Row() as row:
-        with g.Column(min_width = 1000, scale = 5):
-            img = g.Image(
-                url,
+        with g.Column(
+            scale=7,
+            min_width=1000,
+        ):
+            img = g.ImageEditor(
+                state.value["url"],
                 type="filepath",
-                tool="select"
+                sources=[],
             )
         with g.Column(variant="panel"):
-            with g.Group():
-                inp = g.Textbox(
-                    placeholder="Enter the rock name",
-                    show_label=False,
-                    max_lines=1,
-                )
             feedback = g.Markdown(
-                "### Type in the name of the rock and press enter to get started."
+                f"""### Question {state.value["qnum"]}: Type in the name of the rock/mineral to get started!"""
+            )
+            stats = g.Markdown(
+                f"""
+                Statistic | Value
+                ---: | :---
+                Correct | {state.value["correct"]}
+                Wrong | {state.value["wrong"]} 
+                Correct on first try | {state.value["coft"]}
+                Skipped | {state.value["skipped"]}
+                Total | {state.value["correct"] + state.value["wrong"] + state.value["skipped"]}
+                """
             )
-            l = g.Markdown(
-                f"""\n## [**Click here to research the rock**](https://www.mindat.org/search.php?search='{name}')"""
+            link = g.Markdown(
+                f"""### [Click here to research the rock](https://www.mindat.org/search.php?search={state.value["name"].strip().replace(" ", "%20")})"""
             )
     inp.submit(
         fn=get_name,
-        inputs=[inp, feedback],
+        inputs=[inp, stats],
         outputs=[
             img,
             inp,
             feedback,
-            l,
+            stats,
+            link,
         ],
-        scroll_to_output=True,
     )
 
 A.launch(