Update api.py

api.py

@@ -1,111 +1,102 @@
 from flask import Flask, request, jsonify
-import traceback
-from android import AndroidEditor
-from iphone import IPhoneEditor
-from all import UnifiedEditor
+from ocr import OcrPriceExtractor
+import io
+from gevent.pywsgi import WSGIServer
+from gevent import monkey
+import multiprocessing
+from concurrent.futures import ThreadPoolExecutor
+import logging
+import os
+
+# Patch all for gevent
+monkey.patch_all()
+
+# Setup logging
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
 
 app = Flask(__name__)
 
-ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif'}
-
-def allowed_file(filename):
-    return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
-
-@app.route('/')
-def index():
-    """
-    Endpoint utama yang menampilkan pesan selamat datang
-    """
-    return "Kelas Kink"
-
-@app.route('/unified', methods=['POST'])
-def process_unified_image():
-    """
-    Endpoint untuk memproses gambar dari Unified
-    """
-    app.logger.info('Menerima permintaan POST untuk memproses gambar')
-    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
-        
+# Thread pool untuk OCR processing
+ocr_pool = ThreadPoolExecutor(max_workers=multiprocessing.cpu_count())
+ocr = OcrPriceExtractor()
+
+# ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'bmp'}
+
+# def allowed_file(filename):
+#     return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
+
+def process_ocr_task(bytes_io):
+    """Process OCR in a separate thread"""
     try:
-        file_bytes = image_file.read()
-        editor = UnifiedEditor()
-        img_b64, theme, platform = 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, 'mode': platform, 'image': img_b64})
+        text, prices = ocr.extract_text(bytes_io)
+        return text, prices
     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('/android', methods=['POST'])
-def process_android_image():
-    """
-    Endpoint untuk memproses gambar dari Android
-    
-    Parameters:
-    - anggota: Nama anggota (form data)
-    - file: File gambar (form data)
-    
-    Returns:
-    - JSON response dengan status, theme, dan gambar yang diproses
-    """
-    app.logger.info('Menerima permintaan POST untuk memproses gambar')
-    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
-        
+        logger.error(f"OCR processing error: {str(e)}")
+        return None, None
+
+@app.route('/ocr', methods=['POST'])
+def process_image():
     try:
-        file_bytes = image_file.read()
-        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():
-    """
-    Endpoint untuk memproses gambar dari iPhone
-    
-    Parameters:
-    - anggota: Nama anggota (form data)
-    - file: File gambar (form data)
-    
-    Returns:
-    - JSON response dengan status, theme, dan gambar yang diproses
-    """
-    app.logger.info('Menerima permintaan POST untuk memproses gambar')
-    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
+        if 'image' not in request.files:
+            return jsonify({
+                'success': False,
+                'error': 'No image file provided'
+            }), 400
+
+        file = request.files['image']
         
-    try:
-        file_bytes = image_file.read()
-        editor = IPhoneEditor()
-        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})
+        if file.filename == '':
+            return jsonify({
+                'success': False,
+                'error': 'No selected file'
+            }), 400
+
+        # Read file to BytesIO
+        bytes_io = io.BytesIO(file.read())
+        
+        # Submit OCR task to thread pool
+        future = ocr_pool.submit(process_ocr_task, bytes_io)
+        text, prices = future.result(timeout=30)  # 30 seconds timeout
+
+        if text is None:
+            return jsonify({
+                'success': False,
+                'error': 'Failed to process image'
+            }), 500
+
+        response = {
+            'success': True,
+            'data': {
+                'text': text,
+                'prices': prices
+            }
+        }
+
+        return jsonify(response)
+
     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
+        logger.error(f"API error: {str(e)}")
+        return jsonify({
+            'success': False,
+            'error': str(e)
+        }), 500
+
+@app.route('/health', methods=['GET'])
+def health_check():
+    return jsonify({
+        'status': 'healthy',
+        'service': 'ocr-api',
+        'workers': ocr_pool._max_workers,
+        'active_threads': len(ocr_pool._threads)
+    })
 
 if __name__ == '__main__':
-    app.run(port=7860, debug=True, host='0.0.0.0') 
+    # Development mode
+    if os.environ.get('FLASK_ENV') == 'development':
+        app.run(host='0.0.0.0', port=5000, debug=True)
+    else:
+        # Production mode with gevent
+        logger.info(f"Starting server with {ocr_pool._max_workers} workers")
+        http_server = WSGIServer(('0.0.0.0', 5000), app)
+        http_server.serve_forever()