Update app.py

app.py

@@ -606,6 +606,9 @@ class InputData(BaseModel):
     tarif_pkb: float = 0.015
     tarif_bbnkb: float = 0.1
 
+# class InputGetData(BaseModel):
+#     nopol: message
+
 @app.post("/pred")
 async def greet_json(body: InputData):
     global codes_emb
@@ -745,17 +748,6 @@ async def greet_json(body: InputData):
 
 @app.get("/get_data")
 def get_data(nopol: str):
-    # print(nopol)
-    # options = webdriver.ChromeOptions()
-    # options.add_argument("--headless")
-    # options.add_argument("--disable-gpu")
-    # options.add_argument("--no-sandbox")
-    # options.add_argument('--disable-dev-shm-usage')
-    # options.binary_location = "/usr/bin/chromium"
-    # # driver = webdriver.Chrome(options=options)
-    # # driver = webdriver.Chrome(ChromeDriverManager().install(), options=options)
-    # driver = webdriver.Chrome(executable_path="/usr/lib/chromium/chromedriver", options=options)
-    
     data_kendaraan, total_tagihan, rincians_pkb, rincians_swd = get_vehicle_info_bs4(nopol)
     data_kendaraan["no_polisi"] = nopol
     return {
@@ -763,4 +755,55 @@ def get_data(nopol: str):
         "rincian_total_tagihan":total_tagihan,
         "rincian_pkb":[x for x in rincians_pkb if any(x.values())],
         "rincian_swdkllj":[x for x in rincians_swd if any(x.values())]
-    }
+    }
+
+
+@app.post("/get_data")
+async def get_data_json(body: InputData):
+    message = body.message
+
+    data_kendaraan, total_tagihan, rincians_pkb, rincians_swd = get_vehicle_info_bs4(message)
+    data_kendaraan["no_polisi"] = nopol
+
+    string = "*DATA KENDARAAN:*\n"
+    string += "\n".join([f"{k.replace("_", " ").upper()} \t\t\t: {v}" for k,v in data_kendaraan.items()])
+    string += "\n\n---"
+
+    string += "*RINCIAN:*\n"
+    string += "".join([f"{x['jenis']}:\nPokok: Rp{x['pokok']}\nDenda: Rp{x['denda']}\nTotal: Rp{x['total']}\n---" for x in total_tagihan])
+
+    string += "\n*Rincian PKB:*\n"
+    string+= "".join(
+        [
+            f"{x['jenis']}:\nPokok: Rp{x['pokok']}\nDenda: Rp{x['denda']}\nTotal: Rp{x['total']}\n---" 
+            for x in rincians_pkb 
+            if str(x.get("total", 0)) != "0"
+        ]
+    )
+
+    string += "\n*Rincian SWDKLLJ:*\n"
+    string+= "".join(
+        [
+            f"{x['jenis']}:\nPokok: Rp{x['pokok']}\nDenda: Rp{x['denda']}\nTotal: Rp{x['total']}\n---" 
+            for x in rincians_swd 
+            if str(x.get("total", 0)) != "0"
+        ]
+    )
+
+    return {
+        "code":200,
+        "success":True,
+        "message":"Request was successful",
+        "data":{"results":{"text":string}},
+    }
+
+    
+    
+    # return {
+    #     "data_kendaraan":data_kendaraan,
+    #     "rincian_total_tagihan":total_tagihan,
+    #     "rincian_pkb":[x for x in rincians_pkb if str(x.get("total", 0)) != "0"],
+    #     "rincian_swdkllj":[x for x in rincians_swd if str(x.get("total", 0)) != "0"]
+    # }
+
+