fix merge

app.py

@@ -1,12 +1,12 @@
 import gradio as gr
-from easyocr import Reader
-from PIL import Image
-import io
+from deprem_ocr.ocr import DepremOCR
 import json
 import csv
 import openai
 import ast
 import os
+import cv2
+import numpy as np
 from deta import Deta
 
 
@@ -18,38 +18,39 @@ import os
 import openai
 
 
-
 class OpenAI_API:
     def __init__(self):
-        self.openai_api_key = ''
-        
+        self.openai_api_key = ""
+
     def single_request(self, address_text):
-        
+
         openai.api_type = "azure"
         openai.api_base = "https://damlaopenai.openai.azure.com/"
         openai.api_version = "2022-12-01"
         openai.api_key = os.getenv("API_KEY")
-        
+
         response = openai.Completion.create(
-          engine="Davinci-003",
-          prompt=address_text,
-          temperature=0.9,
-          max_tokens=256,
-          top_p=1.0,
-          n=1,
-          logprobs=0,
-          echo=False,
-          stop=None,
-          frequency_penalty=0,
-          presence_penalty=0,
-          best_of=1)
+            engine="Davinci-003",
+            prompt=address_text,
+            temperature=0.9,
+            max_tokens=256,
+            top_p=1.0,
+            n=1,
+            logprobs=0,
+            echo=False,
+            stop=None,
+            frequency_penalty=0,
+            presence_penalty=0,
+            best_of=1,
+        )
 
         return response
 
+
 ########################
 
-openai.api_key = os.getenv('API_KEY')
-reader = Reader(["tr"])
+openai.api_key = os.getenv("API_KEY")
+depremOCR = DepremOCR()
 
 
 def get_parsed_address(input_img):
@@ -65,7 +66,8 @@ def preprocess_img(inp_image):
 
 
 def get_text(input_img):
-    result = reader.readtext(input_img, detail=0)
+    result = depremOCR.apply_ocr(np.array(input_img))
+    print(result)
     return " ".join(result)
 
 
@@ -83,9 +85,10 @@ def get_json(mahalle, il, sokak, apartman):
     dump = json.dumps(adres, indent=4, ensure_ascii=False)
     return dump
 
+
 def write_db(data_dict):
     # 2) initialize with a project key
-    deta_key = os.getenv('DETA_KEY')
+    deta_key = os.getenv("DETA_KEY")
     deta = Deta(deta_key)
 
     # 3) create and use as many DBs as you want!
@@ -98,16 +101,17 @@ def text_dict(input):
     write_db(eval_result)
 
     return (
-        str(eval_result['city']),
-        str(eval_result['distinct']),
-        str(eval_result['neighbourhood']),
-        str(eval_result['street']),
-        str(eval_result['address']),
-        str(eval_result['tel']),
-        str(eval_result['name_surname']),
-        str(eval_result['no']),
+        str(eval_result["city"]),
+        str(eval_result["distinct"]),
+        str(eval_result["neighbourhood"]),
+        str(eval_result["street"]),
+        str(eval_result["address"]),
+        str(eval_result["tel"]),
+        str(eval_result["name_surname"]),
+        str(eval_result["no"]),
     )
-        
+
+
 def openai_response(ocr_input):
     prompt = f"""Tabular Data Extraction You are a highly intelligent and accurate tabular data extractor from 
             plain text input and especially from emergency text that carries address information, your inputs can be text 
@@ -128,28 +132,31 @@ def openai_response(ocr_input):
     resp = eval(resp.replace("'{", "{").replace("}'", "}"))
     resp["input"] = ocr_input
     dict_keys = [
-    'city',
-    'distinct',
-    'neighbourhood',
-    'street',
-    'no',
-    'tel',
-    'name_surname',
-    'address',
-    'input',
+        "city",
+        "distinct",
+        "neighbourhood",
+        "street",
+        "no",
+        "tel",
+        "name_surname",
+        "address",
+        "input",
     ]
     for key in dict_keys:
         if key not in resp.keys():
-            resp[key] = ''
+            resp[key] = ""
     return resp
 
 
 with gr.Blocks() as demo:
     gr.Markdown(
-    """
+        """
     # Enkaz Bildirme Uygulaması
-    """)
-    gr.Markdown("Bu uygulamada ekran görüntüsü sürükleyip bırakarak AFAD'a enkaz bildirimi yapabilirsiniz. Mesajı metin olarak da girebilirsiniz, tam adresi ayrıştırıp döndürür. API olarak kullanmak isterseniz sayfanın en altında use via api'ya tıklayın.")
+    """
+    )
+    gr.Markdown(
+        "Bu uygulamada ekran görüntüsü sürükleyip bırakarak AFAD'a enkaz bildirimi yapabilirsiniz. Mesajı metin olarak da girebilirsiniz, tam adresi ayrıştırıp döndürür. API olarak kullanmak isterseniz sayfanın en altında use via api'ya tıklayın."
+    )
     with gr.Row():
         img_area = gr.Image(label="Ekran Görüntüsü yükleyin 👇")
         ocr_result = gr.Textbox(label="Metin yükleyin 👇 ")
@@ -170,13 +177,23 @@ with gr.Blocks() as demo:
         with gr.Row():
             no = gr.Textbox(label="Kapı No")
 
+    submit_button.click(
+        get_parsed_address,
+        inputs=img_area,
+        outputs=open_api_text,
+        api_name="upload_image",
+    )
 
-    submit_button.click(get_parsed_address, inputs = img_area, outputs = open_api_text, api_name="upload_image")
-
-    ocr_result.change(openai_response, ocr_result, open_api_text, api_name="upload-text")
+    ocr_result.change(
+        openai_response, ocr_result, open_api_text, api_name="upload-text"
+    )
 
-    open_api_text.change(text_dict, open_api_text, [city, distinct, neighbourhood, street, address, tel, name_surname, no])
+    open_api_text.change(
+        text_dict,
+        open_api_text,
+        [city, distinct, neighbourhood, street, address, tel, name_surname, no],
+    )
 
 
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch()

requirements.txt

@@ -1,5 +1,14 @@
+paddlepaddle
+opencv-python
+Pillow
+numpy==1.23.3
+pandas
+imutils
+Cython
+imgaug
+pyclipper
+deprem_ocr
 openai
 Pillow
-easyocr
 gradio
-deta
+deta