Update app.py

app.py

@@ -7,16 +7,17 @@ import requests
 import datetime
 import zipfile
 import matplotlib.font_manager
-import matplotlib.colors as mcolors
 from huggingface_hub import HfApi, HfFolder
+from matplotlib.colors import to_rgba
 
 # Hugging Face repo and token
 HF_REPO = "ArrcttacsrjksX/Texttoimage"
 HF_ENGINE_URL = "https://huggingface.co/ArrcttacsrjksX/Texttoimage/resolve/main/engine"
-HF_TOKEN = os.getenv("HF_TOKEN")
+HF_TOKEN = os.getenv("HF_TOKEN")  # Lấy token từ biến môi trường
 ENGINE_EXECUTABLE = "./engine"
 
 def download_engine():
+    """Download engine from Hugging Face if not available."""
     if not os.path.exists(ENGINE_EXECUTABLE):
         headers = {"Authorization": f"Bearer {HF_TOKEN}"}
         response = requests.get(HF_ENGINE_URL, headers=headers, stream=True)
@@ -32,10 +33,6 @@ def ensure_executable(file_path):
     if not os.access(file_path, os.X_OK):
         os.chmod(file_path, os.stat(file_path).st_mode | stat.S_IXUSR)
 
-def hex_to_rgb_float(hex_color):
-    """Convert hex color (#RRGGBB) to (r, g, b) float values."""
-    return mcolors.hex2color(hex_color)
-
 def extract_and_load_fonts(directory="fontfile", extract_to="extracted_fonts"):
     if not os.path.exists(extract_to):
         os.makedirs(extract_to)
@@ -64,6 +61,7 @@ def get_available_fonts():
     return sorted(set(system_fonts + extracted_fonts))
 
 def upload_to_huggingface(file_path, text_content, timestamp_folder):
+    """Upload image and text to Hugging Face repo."""
     api = HfApi()
     HfFolder.save_token(HF_TOKEN)
     repo_path = f"{HF_REPO}/{timestamp_folder}"
@@ -73,27 +71,19 @@ def upload_to_huggingface(file_path, text_content, timestamp_folder):
     api.upload_file(path_or_fileobj="temp_text.txt", path_in_repo=f"{repo_path}/text.txt", repo_id=HF_REPO)
     os.remove("temp_text.txt")
 
-def read_file_content(file):
-    """Read text from uploaded file."""
-    try:
-        if isinstance(file, bytes):
-            return file.decode("utf-8")
-        elif hasattr(file, "read"):
-            return file.read().decode("utf-8")
-        return str(file, "utf-8")
-    except Exception as e:
-        return f"Error reading file: {e}"
-
 def call_engine(file_input, input_text, font_size, width, height, bg_color, text_color, mode, font_name, align, line_spacing, image_format):
     download_engine()
     ensure_executable(ENGINE_EXECUTABLE)
     if file_input:
         input_text = read_file_content(file_input)
     
-    # Convert colors from hex to (r, g, b) float tuples
-    text_color = hex_to_rgb_float(text_color)
-    bg_color = hex_to_rgb_float(bg_color)
-
+    # Chuyển đổi màu sắc sang dạng hợp lệ
+    try:
+        bg_color = to_rgba(bg_color)
+        text_color = to_rgba(text_color)
+    except ValueError:
+        raise Exception("Invalid color format. Please use a valid color code or tuple.")
+    
     input_data = {
         "input_text": input_text,
         "font_size": font_size,
@@ -107,16 +97,21 @@ def call_engine(file_input, input_text, font_size, width, height, bg_color, text
         "line_spacing": line_spacing,
         "image_format": image_format
     }
-
     result = subprocess.run([ENGINE_EXECUTABLE, json.dumps(input_data)], capture_output=True, text=True)
     if result.returncode != 0:
         raise Exception(f"Engine error: {result.stderr}")
-
     output_path = result.stdout.strip()
     timestamp_folder = datetime.datetime.now().strftime("%d-%m-%Y %H-%M-%S")
     upload_to_huggingface(output_path, input_text, timestamp_folder)
     return output_path
 
+def read_file_content(file):
+    """Read text from uploaded file."""
+    try:
+        return file.decode("utf-8") if isinstance(file, bytes) else file.read().decode("utf-8")
+    except Exception as e:
+        return f"Error reading file: {e}"
+
 with gr.Blocks() as demo:
     gr.Markdown("# 🖼️ Text to Image Converter")
     available_fonts = get_available_fonts()