refactor(app): update task handling and Base64 conversion functions

app.py

@@ -7,12 +7,18 @@ import plotly.graph_objects as go
 import matplotlib.pyplot as plt
 from PIL import Image
 from io import BytesIO
-import plotly.io as pio
 
-pio.renderers.default = "browser"
+# import logging
+
+# import plotly.io as pio
+
+# pio.renderers.default = "browser"
+
+# logger = logging.getLogger(__name__)
+# logger.setLevel(logging.INFO)
 
 df = pd.read_csv("herbologist_almanac_checklist_data.csv")
-columns_with_tasks = [
+TASKS = [
     "task1",
     "task2",
     "task3",
@@ -28,7 +34,7 @@ PLANTS = list(df["plant"].unique())
 
 
 def bin_ls2base64(ls):
-    # 将二进制列表转换为二进制列表
+    # 将二进制列表转换为base64字符串
     binary_str = "".join(str(n) for n in ls)
 
     # decimal_int = int(bin_str, 2)
@@ -38,59 +44,58 @@ def bin_ls2base64(ls):
 
 
 def base64_to_binary(base64_str):
-    # 将base64字符串转换为二进制字符串
     if isinstance(base64_str, str):
+        # 将base64字符串转换为二进制列表
         byte_str = base64.b64decode(base64_str)
         binary_str = bin(int.from_bytes(byte_str, byteorder="big"))[2:].zfill(
-            len(columns_with_tasks) * len(PLANTS)
+            len(TASKS) * len(PLANTS)
         )
         # ls = [int(n) for n in binary_str]
         return binary_str
 
+    else:
+        raise TypeError(
+            "Invalid input type. Expected str, got {}".format(type(base64_str))
+        )
+
 
 def parse_token(token):
-    try:
-        if not token:  # 处理空字符串的情况
-            token = "\x00"
-
-        if len(token) > 0:
-            payload = base64_to_binary(token)
-            almanac_data: list = [int(n) for n in payload]
-            # print(len(almanac_data))
-            parsed_dict = {}
-            for _, row in df.iterrows():
-                parsed_dict[row["plant"]] = [
-                    almanac_data.pop() for _ in range(len(columns_with_tasks))
-                ]
 
+    if not token:  # 处理空字符串的情况
+        token = "\x00"
+
+    if len(token) > 0:
+        payload = base64_to_binary(token)
+        almanac_data: list = [int(n) for n in payload]
+        # print(len(almanac_data))
+        parsed_dict = {}
+        for _, row in df.iterrows():
+            parsed_dict[row["plant"]] = [almanac_data.pop() for _ in range(len(TASKS))]
         return parsed_dict
-    except Exception as e:
-        print(e)
+    else:
+        return parse_token("\x00")
 
 
-# 定义一个简单的函数，接收DataFrame数据
+# 定义一个简单的函数，模拟接收DataFrame数据
 def process_data(*args):
     plot_library = args[-1]
     almanac_dict = dict(zip(PLANTS, args[:-1]))
 
-    almanac_df = df.filter(items=["plant", "name"] + columns_with_tasks)
+    almanac_df = df.filter(items=["plant", "name"] + TASKS)
     almanac_bin_ls = []
     for pl in PLANTS:
-        # TODO refactor by using len
-        almanac_inp = almanac_dict[pl]
-
-        almanac_bin = [0 for _ in range(len(columns_with_tasks))]
-
-        for n in almanac_inp:
-            almanac_bin[n] = 1
+        plant_tasks = almanac_dict[pl]
+        plant_tasks_done = [0 for _ in range(len(TASKS))]
 
-        almanac_bin_ls += almanac_bin
+        for n, i in enumerate(plant_tasks):
+            plant_tasks_done[n] = 1
+            almanac_df.loc[almanac_df["plant"] == pl, TASKS[i]] = "✔"
 
-        for _, i in enumerate(almanac_inp):
-            almanac_df.loc[almanac_df["plant"] == pl, columns_with_tasks[i]] = "✔"
+        almanac_bin_ls += plant_tasks_done
 
     almanac_reverse_64 = bin_ls2base64(reversed(almanac_bin_ls))
 
+    # logger.info("Generating image!")
     return (
         (
             generate_img_by_plotly(almanac_df.drop(columns=df.columns[0]))
@@ -107,7 +112,7 @@ def show_checkbox_groups(token):
     for index, row in df.iterrows():
         tasks = [
             row[col][0].upper() + row[col][1:]
-            for col in columns_with_tasks
+            for col in TASKS
             if df.notnull().at[index, col]
         ]
         with gr.Row():
@@ -117,12 +122,13 @@ def show_checkbox_groups(token):
                 value=[
                     tasks[i]
                     for i, v in enumerate(parsed_dict[row["plant"]])
-                    if v == 1 and df.notnull().at[index, columns_with_tasks[i]]
+                    if v == 1 and df.notnull().at[index, TASKS[i]]
                 ],
                 type="index",
             )
             checklist_inputs.append(checkbox)
 
+    # logger.info("Rerendering checklist!")
     return checklist_inputs
 
 
@@ -170,9 +176,8 @@ def generate_img_by_matplotlib(df):
         if cell.get_text().get_text() == "nan":
             cell.set_text_props(text="", ha="center")
         if row == 0:
-            text = cell.get_text().get_text()
             cell.set_text_props(
-                text=text, weight="bold", ha="center"
+                weight="bold", ha="center"
             )  # Bold and center-align header text
         if col == 0:
             text = cell.get_text().get_text()
@@ -204,6 +209,7 @@ def generate_img_by_matplotlib(df):
     buffer.seek(0)
     image = Image.open(buffer)
 
+    # logger.info("Image generated by matplotlib successfully!")
     return image
 
 
@@ -326,6 +332,7 @@ def generate_img_by_plotly(df):
     buffer.seek(0)
     image = Image.open(buffer)
 
+    # logger.info("Image generated by plotly successfully!")
     return image
 
 
@@ -365,7 +372,7 @@ with gr.Blocks() as app:
     plot_library = gr.Radio(
         ["plotly", "matplotlib"],
         label="Plot Library",
-        value=""plotly",
+        value="plotly",
         info="Choose your plot library",
     )
 
@@ -382,6 +389,7 @@ with gr.Blocks() as app:
         - 2024/09/03: Fix a mistake in the tasks of mimbulus
         - 2024/09/04: Correct Radiant count for water hyacinth
         - 2024/09/05: Support image generated by plotly
+        - 2024/09/13: Update Water Lily tasks and color options
     """
     )
 
@@ -397,6 +405,12 @@ with gr.Blocks() as app:
         outputs=checklist_inputs,
     )
 
+    # generate_button.click(
+    #     generate_img,
+    #     inputs=[df_out],
+    #     outputs=[generated_img],
+    # )
+
 
 app.queue()
 app.launch()