jonathanjordan21 commited on
Commit
ef30530
·
verified ·
1 Parent(s): dee5397

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +39 -26
app.py CHANGED
@@ -762,33 +762,46 @@ def get_data(nopol: str):
762
  async def get_data_json(body: InputData):
763
  message = body.message
764
 
765
- data_kendaraan, total_tagihan, rincians_pkb, rincians_swd = get_vehicle_info_bs4(message)
766
- data_kendaraan["no_polisi"] = nopol
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
767
 
768
- string = "*DATA KENDARAAN:*\n"
769
- string += "\n".join([f"{k.replace("_", " ").upper()} \t\t\t: {v}" for k,v in data_kendaraan.items()])
770
- string += "\n\n---"
771
-
772
- string += "*RINCIAN:*\n"
773
- string += "".join([f"{x['jenis']}:\nPokok: Rp{x['pokok']}\nDenda: Rp{x['denda']}\nTotal: Rp{x['total']}\n---" for x in total_tagihan])
774
-
775
- string += "\n*Rincian PKB:*\n"
776
- string+= "".join(
777
- [
778
- f"{x['jenis']}:\nPokok: Rp{x['pokok']}\nDenda: Rp{x['denda']}\nTotal: Rp{x['total']}\n---"
779
- for x in rincians_pkb
780
- if str(x.get("total", 0)) != "0"
781
- ]
782
- )
783
-
784
- string += "\n*Rincian SWDKLLJ:*\n"
785
- string+= "".join(
786
- [
787
- f"{x['jenis']}:\nPokok: Rp{x['pokok']}\nDenda: Rp{x['denda']}\nTotal: Rp{x['total']}\n---"
788
- for x in rincians_swd
789
- if str(x.get("total", 0)) != "0"
790
- ]
791
- )
792
 
793
  return {
794
  "code":200,
 
762
  async def get_data_json(body: InputData):
763
  message = body.message
764
 
765
+ if len(message) > 15:
766
+ pattern = r'\b([A-Za-z]{1,2})\s?(\d{2,4})\s?([A-Za-z]{1,3})\b'
767
+ matches = re.findall(pattern, message)
768
+ message = [" ".join(x).upper() for i,x in enumerate(matches)]
769
+ else:
770
+ message = [message]
771
+
772
+ string = ""
773
+
774
+ for m in message:
775
+
776
+ data_kendaraan, total_tagihan, rincians_pkb, rincians_swd = get_vehicle_info_bs4(m)
777
+ data_kendaraan["no_polisi"] = nopol
778
+
779
+ string += "\n---*DATA KENDARAAN:*\n"
780
+ string += "\n".join([f"{k.replace('_', ' ')} \t\t\t: {v}" for k,v in data_kendaraan.items()])
781
+ string += "\n\n---"
782
+
783
+ string += "*RINCIAN:*\n"
784
+ string += "".join([f"{x['jenis']}:\nPokok: Rp{x['pokok']}\nDenda: Rp{x['denda']}\nTotal: Rp{x['total']}\n---" for x in total_tagihan])
785
+
786
+ string += "\n*Rincian PKB:*\n"
787
+ string+= "".join(
788
+ [
789
+ f"{x['jenis']}:\nPokok: Rp{x['pokok']}\nDenda: Rp{x['denda']}\nTotal: Rp{x['total']}\n---"
790
+ for x in rincians_pkb
791
+ if str(x.get("total", 0)) != "0"
792
+ ]
793
+ )
794
+
795
+ string += "\n*Rincian SWDKLLJ:*\n"
796
+ string += "".join(
797
+ [
798
+ f"{x['jenis']}:\nPokok: Rp{x['pokok']}\nDenda: Rp{x['denda']}\nTotal: Rp{x['total']}\n---"
799
+ for x in rincians_swd
800
+ if str(x.get("total", 0)) != "0"
801
+ ]
802
+ )
803
 
804
+ string += "\n\n"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
805
 
806
  return {
807
  "code":200,