Update app.py

app.py

@@ -1,10 +1,8 @@
 from flask import Flask, request, jsonify, send_file
-import cv2
-import pytesseract
-from PIL import Image, ImageDraw, ImageFont
-import numpy as np
 import io
 import traceback
+from android import AndroidEditor
+import base64
 
 app = Flask(__name__)
 
@@ -23,307 +21,21 @@ def process_android_image():
 
     try:
         file_bytes = image_file.read()
-        image_array = np.frombuffer(file_bytes, np.uint8)
-        image = cv2.imdecode(image_array, cv2.IMREAD_COLOR)
-        extracted_data = pytesseract.image_to_data(image, output_type=pytesseract.Output.DICT)
-        text_list = extracted_data['text']
-
-        group_position = None
-        split_position = None
-        member_position = None
-        member_count_position = None
-        second_member_position = None
-        second_member_count_position = None
-        lang = ''
-
-        for i, text in enumerate(text_list):
-            if "Grup" in text or "Group" in text:
-                lang = 'id' if "Grup" in text else 'en'
-                group_position = {
-                    "left": extracted_data['left'][i],
-                    "top": extracted_data['top'][i],
-                    "width": extracted_data['width'][i],
-                    "height": extracted_data['height'][i],
-                }
-
-                split_position = {
-                    "left": extracted_data['left'][i + 1],
-                    "top": extracted_data['top'][i + 1],
-                    "width": extracted_data['width'][i + 1],
-                    "height": extracted_data['height'][i + 1],
-                }
-
-                member_position = {
-                    "left": extracted_data['left'][i + 3],
-                    "top": extracted_data['top'][i + 3],
-                    "width": extracted_data['width'][i + 3],
-                    "height": extracted_data['height'][i + 3],
-                }
-
-                if i + 2 < len(text_list):
-                    member_count_position = {
-                        "left": extracted_data['left'][i + 2],
-                        "top": extracted_data['top'][i + 2],
-                        "width": extracted_data['width'][i + 2],
-                        "height": extracted_data['height'][i + 2],
-                    }
-
-                for j in range(i + 4, len(text_list)):  
-                    if "Anggota" in text_list[j]:
-                        second_member_position = {
-                            "left": extracted_data['left'][j],
-                            "top": extracted_data['top'][j],
-                            "width": extracted_data['width'][j],
-                            "height": extracted_data['height'][j],
-                        }
-                        if j + 2 < len(text_list): 
-                            second_member_count_position = {
-                                "left": extracted_data['left'][j - 1],
-                                "top": extracted_data['top'][j - 1],
-                                "width": extracted_data['width'][j - 1],
-                                "height": extracted_data['height'][j - 1],
-                            }
-                        break
-                break
-
-        x = member_position['left'] + member_position['width'] + 100
-        y = member_position['top'] + member_position['height'] - 100
-        bg_color = image[y, x]
-        rgb = (int(bg_color[0]), int(bg_color[1]), int(bg_color[2]))
-
-    
-        if group_position:
-            cv2.rectangle(
-                image,
-                (group_position['left'] - 5, group_position['top'] - 5),
-                (group_position['left'] + group_position['width'], group_position['top'] + group_position['height']),
-                rgb,
-                -1,
-            )
-
-        if split_position:
-            cv2.rectangle(
-                image,
-                (split_position['left'] - 5, split_position['top'] - 5),
-                (split_position['left'] + split_position['width'], split_position['top'] + split_position['height']),
-                rgb,
-                -1,
-            )
-
-        if member_position:
-            cv2.rectangle(
-                image,
-                (member_position['left'] - 5, member_position['top'] - 5),
-                (member_position['left'] + member_position['width'], member_position['top'] + member_position['height']),
-                rgb,
-                -1,
-            )
-
-        if member_count_position:
-            cv2.rectangle(
-                image,
-                (member_count_position['left'] - 5, member_count_position['top'] - 5),
-                (member_count_position['left'] + member_count_position['width'], member_count_position['top'] + member_count_position['height']),
-                rgb,
-                -1,
-            )
-
-            updated_member_count = {
-                'id': f"Grup · {anggota} anggota",
-                'en': f"Group · {anggota} members"
-            }.get(lang)
- 
-
-            font_path = "Roboto-Regular.ttf"
-            font_size = max(member_count_position['width'], member_count_position['height']) - 2
-            font = ImageFont.truetype(font_path, font_size)
-
-            image_pil = Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB))
-            draw = ImageDraw.Draw(image_pil)
-            text_x = group_position['left']
-            text_y = member_count_position['top'] - 4
-            draw.text((text_x, text_y), updated_member_count, font=font, fill=(90, 94, 95, 255)) 
-            image = cv2.cvtColor(np.array(image_pil), cv2.COLOR_RGB2BGR)
-
-        if second_member_position:
-            cv2.rectangle(
-                image,
-                (second_member_position['left'] - 5, second_member_position['top'] - 5),
-                (second_member_position['left'] + second_member_position['width'], second_member_position['top'] + second_member_position['height']),
-                rgb,
-                -1,
-            )
-
-        if second_member_count_position:
-            cv2.rectangle(
-                image,
-                (second_member_count_position['left'] - 5, second_member_count_position['top'] - 5),
-                (second_member_count_position['left'] + second_member_count_position['width'], second_member_count_position['top'] + second_member_count_position['height']),
-                rgb,
-                -1,
-            )
-            updated_second_member_count = {
-                'id': f"{anggota} Anggota",
-                'en': f"{anggota} Members"
-            }.get(lang)
-
-            font_path = "Roboto-Regular.ttf"
-            font_size = max(second_member_count_position['width'], second_member_count_position['height']) - 1
-            font = ImageFont.truetype(font_path, font_size)
-
-            image_pil = Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB))
-            draw = ImageDraw.Draw(image_pil)
-            text_x = second_member_count_position['left']
-            text_y = second_member_count_position['top'] - 4
-            draw.text((text_x, text_y), updated_second_member_count, font=font, fill=(90, 94, 95, 255)) 
-            image = cv2.cvtColor(np.array(image_pil), cv2.COLOR_RGB2BGR)
-
-    
-        _, img_encoded = cv2.imencode('.jpg', image)
-        return send_file(io.BytesIO(img_encoded.tobytes()), mimetype='image/jpeg')
-
+        editor = AndroidEditor()
+        img_b64, theme = editor.process_image_bytes(file_bytes, anggota)
+        if img_b64 is None:
+            return jsonify({'status': 'failed', 'message': 'Gagal memproses gambar'}), 500
+        return jsonify({'status': 'success', 'theme': theme, 'image': img_b64})
     except Exception as e:
         error_message = str(e)
-    
         error_traceback = traceback.format_exc()
         print("Error occurred:", error_traceback) 
         return jsonify({'status': 'failed', 'message': error_message, 'traceback': error_traceback}), 500
 
-
 @app.route('/iphone', methods=['POST'])
 def process_iphone_image():
-    app.logger.info('Menerima permintaan POST untuk memproses gambar iPhone')
-    anggota = request.form.get('anggota')
-    image_file = request.files.get('file')
-    
-    if not anggota or not image_file:
-        return jsonify({'status': 'failed', 'message': 'Parameter anggota dan file diperlukan'}), 400
-
-    try:
-        # Read and process the uploaded image
-        file_bytes = image_file.read()
-        image_array = np.frombuffer(file_bytes, np.uint8)
-        image = cv2.imdecode(image_array, cv2.IMREAD_COLOR)
-        
-        if image is None:
-            raise ValueError("Gagal membaca gambar. File mungkin rusak atau format tidak didukung.")
-
-        extracted_data = pytesseract.image_to_data(image, output_type=pytesseract.Output.DICT)
-        text_list = extracted_data['text']
-        
-        group_position = None
-        split_position = None
-        member_position = None
-        member_count_position = None
-        lang = ''
-
-        # Find the second occurrence of "Grup" or "Group"
-        group_indices = []
-        for i, text in enumerate(text_list):
-            if text in ["Grup", "Group"]:
-                group_indices.append(i)
-
-        if len(group_indices) >= 2:
-            i = group_indices[1]
-            
-            if (i + 3 < len(text_list) and (text_list[i+1] == "-") and text_list[i+3] in ["anggota", "member"]):
-                lang = 'id' if text_list[i] == "Grup" else 'en'
-                
-                group_position = {
-                    "left": extracted_data['left'][i],
-                    "top": extracted_data['top'][i],
-                    "width": extracted_data['width'][i],
-                    "height": extracted_data['height'][i],
-                }
-
-                split_position = {
-                    "left": extracted_data['left'][i + 1],
-                    "top": extracted_data['top'][i + 1],
-                    "width": extracted_data['width'][i + 1],
-                    "height": extracted_data['height'][i + 1],
-                }
-
-                member_position = {
-                    "left": extracted_data['left'][i + 3],
-                    "top": extracted_data['top'][i + 3],
-                    "width": extracted_data['width'][i + 3],
-                    "height": extracted_data['height'][i + 3],
-                }
-
-                if i + 2 < len(text_list):
-                    member_count_position = {
-                        "left": extracted_data['left'][i + 2],
-                        "top": extracted_data['top'][i + 2],
-                        "width": extracted_data['width'][i + 2],
-                        "height": extracted_data['height'][i + 2],
-                    }
-        else:
-            return jsonify({'status': 'failed', 'message': 'Pola grup tidak ditemukan pada gambar'}), 400
-
-        # Get background color for masking
-        x = member_position['left'] + member_position['width'] + 100
-        y = member_position['top'] + member_position['height'] - 100
-        bg_color = image[y, x]
-        rgb = (int(bg_color[0]), int(bg_color[1]), int(bg_color[2]))
-
-        # Mask the original text areas
-        if group_position:
-            cv2.rectangle(
-                image,
-                (group_position['left'], group_position['top']),
-                (group_position['left'] + group_position['width'], group_position['top'] + group_position['height']),
-                rgb,
-                -1,
-            )
-
-        if split_position:
-            cv2.rectangle(
-                image,
-                (split_position['left'], split_position['top']),
-                (split_position['left'] + split_position['width'], split_position['top'] + split_position['height']),
-                rgb,
-                -1,
-            )
-
-        if member_position:
-            cv2.rectangle(
-                image,
-                (member_position['left'], member_position['top']),
-                (member_position['left'] + member_position['width'], member_position['top'] + member_position['height']),
-                rgb,
-                -1,
-            )
-
-        if member_count_position:
-            cv2.rectangle(
-                image,
-                (member_count_position['left'], member_count_position['top']),
-                (member_count_position['left'] + member_count_position['width'], member_count_position['top'] + member_count_position['height']),
-                rgb,
-                -1,
-            )
-
-            # Add new member count text
-            updated_member_count = {
-                'id': f"Grup · {anggota} anggota",
-                'en': f"Group · {anggota} member"
-            }.get(lang)
-
-            font_path = "SFNSText-Regular.otf"
-            font_size = max(member_count_position['width'], member_count_position['height']) + 5.5
-            font = ImageFont.truetype(font_path, int(font_size))
-
-            image_pil = Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB))
-            draw = ImageDraw.Draw(image_pil)
-            text_x = group_position['left']
-            text_y = member_count_position['top'] - 4
-            draw.text((text_x, text_y), updated_member_count, font=font, fill=(90, 94, 95, 255)) 
-            image = cv2.cvtColor(np.array(image_pil), cv2.COLOR_RGB2BGR)
-
-        # Encode and return the processed image
-        _, img_encoded = cv2.imencode('.jpg', image)
-        return send_file(io.BytesIO(img_encoded.tobytes()), mimetype='image/jpeg')
-
+    try :
+        return jsonify({'status': 'failed', 'message': 'Fitur ini sedang dikembangkan'}), 500
     except Exception as e:
         error_traceback = traceback.format_exc()
         print(f"Error occurred: {error_traceback}")
@@ -332,6 +44,149 @@ def process_iphone_image():
             'message': str(e),
             'traceback': error_traceback
         }), 500
+    # app.logger.info('Menerima permintaan POST untuk memproses gambar iPhone')
+    # anggota = request.form.get('anggota')
+    # image_file = request.files.get('file')
+    
+    # if not anggota or not image_file:
+    #     return jsonify({'status': 'failed', 'message': 'Parameter anggota dan file diperlukan'}), 400
+
+    # try:
+    #     # Read and process the uploaded image
+    #     file_bytes = image_file.read()
+    #     image_array = np.frombuffer(file_bytes, np.uint8)
+    #     image = cv2.imdecode(image_array, cv2.IMREAD_COLOR)
+        
+    #     if image is None:
+    #         raise ValueError("Gagal membaca gambar. File mungkin rusak atau format tidak didukung.")
+
+    #     extracted_data = pytesseract.image_to_data(image, output_type=pytesseract.Output.DICT)
+    #     text_list = extracted_data['text']
+        
+    #     group_position = None
+    #     split_position = None
+    #     member_position = None
+    #     member_count_position = None
+    #     lang = ''
+
+    #     # Find the second occurrence of "Grup" or "Group"
+    #     group_indices = []
+    #     for i, text in enumerate(text_list):
+    #         if text in ["Grup", "Group"]:
+    #             group_indices.append(i)
+
+    #     if len(group_indices) >= 2:
+    #         i = group_indices[1]
+            
+    #         if (i + 3 < len(text_list) and (text_list[i+1] == "-") and text_list[i+3] in ["anggota", "member"]):
+    #             lang = 'id' if text_list[i] == "Grup" else 'en'
+                
+    #             group_position = {
+    #                 "left": extracted_data['left'][i],
+    #                 "top": extracted_data['top'][i],
+    #                 "width": extracted_data['width'][i],
+    #                 "height": extracted_data['height'][i],
+    #             }
+
+    #             split_position = {
+    #                 "left": extracted_data['left'][i + 1],
+    #                 "top": extracted_data['top'][i + 1],
+    #                 "width": extracted_data['width'][i + 1],
+    #                 "height": extracted_data['height'][i + 1],
+    #             }
+
+    #             member_position = {
+    #                 "left": extracted_data['left'][i + 3],
+    #                 "top": extracted_data['top'][i + 3],
+    #                 "width": extracted_data['width'][i + 3],
+    #                 "height": extracted_data['height'][i + 3],
+    #             }
+
+    #             if i + 2 < len(text_list):
+    #                 member_count_position = {
+    #                     "left": extracted_data['left'][i + 2],
+    #                     "top": extracted_data['top'][i + 2],
+    #                     "width": extracted_data['width'][i + 2],
+    #                     "height": extracted_data['height'][i + 2],
+    #                 }
+    #     else:
+    #         return jsonify({'status': 'failed', 'message': 'Pola grup tidak ditemukan pada gambar'}), 400
+
+    #     if member_position is None:
+    #         return jsonify({'status': 'failed', 'message': 'Pola anggota tidak ditemukan pada gambar'}), 400
+
+    #     # Get background color for masking
+    #     x = member_position['left'] + member_position['width'] + 100
+    #     y = member_position['top'] + member_position['height'] - 100
+    #     bg_color = image[y, x]
+    #     rgb = (int(bg_color[0]), int(bg_color[1]), int(bg_color[2]))
+
+    #     # Mask the original text areas
+    #     if group_position:
+    #         cv2.rectangle(
+    #             image,
+    #             (group_position['left'], group_position['top']),
+    #             (group_position['left'] + group_position['width'], group_position['top'] + group_position['height']),
+    #             rgb,
+    #             -1,
+    #         )
+
+    #     if split_position:
+    #         cv2.rectangle(
+    #             image,
+    #             (split_position['left'], split_position['top']),
+    #             (split_position['left'] + split_position['width'], split_position['top'] + split_position['height']),
+    #             rgb,
+    #             -1,
+    #         )
+
+    #     if member_position:
+    #         cv2.rectangle(
+    #             image,
+    #             (member_position['left'], member_position['top']),
+    #             (member_position['left'] + member_position['width'], member_position['top'] + member_position['height']),
+    #             rgb,
+    #             -1,
+    #         )
+
+    #     if member_count_position:
+    #         cv2.rectangle(
+    #             image,
+    #             (member_count_position['left'], member_count_position['top']),
+    #             (member_count_position['left'] + member_count_position['width'], member_count_position['top'] + member_count_position['height']),
+    #             rgb,
+    #             -1,
+    #         )
+
+    #         # Add new member count text
+    #         updated_member_count = {
+    #             'id': f"Grup · {anggota} anggota",
+    #             'en': f"Group · {anggota} member"
+    #         }.get(lang)
+
+    #         font_path = "SFNSText-Regular.otf"
+    #         font_size = max(member_count_position['width'], member_count_position['height']) + 5.5
+    #         font = ImageFont.truetype(font_path, int(font_size))
+
+    #         image_pil = Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB))
+    #         draw = ImageDraw.Draw(image_pil)
+    #         text_x = group_position['left']
+    #         text_y = member_count_position['top'] - 4
+    #         draw.text((text_x, text_y), updated_member_count, font=font, fill=(90, 94, 95, 255)) 
+    #         image = cv2.cvtColor(np.array(image_pil), cv2.COLOR_RGB2BGR)
+
+        # Encode and return the processed image
+        # _, img_encoded = cv2.imencode('.jpg', image)
+        # return jsonify(io.BytesIO(img_encoded.tobytes()), mimetype='image/jpeg')
+
+    # except Exception as e:
+    #     error_traceback = traceback.format_exc()
+    #     print(f"Error occurred: {error_traceback}")
+    #     return jsonify({
+    #         'status': 'failed',
+    #         'message': str(e),
+    #         'traceback': error_traceback
+    #     }), 500
 
 if __name__ == '__main__':
-    app.run(port=7860, host='0.0.0.0') 
+    app.run(port=7860, debug=True, host='0.0.0.0')