Update app.py

app.py

@@ -198,22 +198,39 @@ def get_calculation(request_code, plate_number):
     calc = detail_perhitungan.get(request_code)
     vehicle = vehicle_tax_info.get(plate_number)
     
-    if vehicle == None or calc == None:
+    if vehicle != None and calc != None:
+        harga_jual = vehicle.get("harga_jual")
+        formula = calc.get("formula")
+        result = formula(harga_jual)
+        description = inspect.getsource(formula).split(":", 2)[-1].strip()
+        result_detail = request_code + " - " + calc.get("name")
+        return result, str(description), result_detail
+
+    elif vehicle == None:
+        formula = calc.get("formula")
+        description = inspect.getsource(formula).split(":", 2)[-1].strip()
+        result_detail = request_code + " - " + calc.get("name")
+        return None, str(description), result_detail
+
+    else:
         return None, None, None
-        
-    harga_jual = vehicle.get("harga_jual")
-    formula = calc.get("formula")
-    result = formula(harga_jual)
-    description = inspect.getsource(formula).split(":", 2)[-1].strip()
-    result_detail = request_code + " - " + calc.get("name")
-
-    # out = "=============================================="
-    # out += "\n\nWajib Pajak ingin melakukan proses berikut:\n"
-    # out = ""
-    
-    return result, str(description), result_detail
 
 
+def build_output_formula(descriptions, result_details):
+    out = "----------------------------------------------------\n\n"
+    out = "Daftar Kode Permohonan:\n"
+    for i, (res,desc,detail) in enumerate(zip(results, descriptions, result_details)):
+        harga_jual = str(vehicle.get("harga_jual"))
+        out += f"{i+1}. {detail}\nRumus: {desc}\n"
+    return out
+
+
+def build_output_vehicle(vehicle):
+    out = "----------------------------------------------------\n\n"
+    out = "Nomor Polisi: " + plate_number + "\n"
+    out += "\n".join([k + " : " + str(v) if k != "no_rangka" else k + " : " + censor_middle(v) for  k,v in vehicle.items()])
+    return out
+
 def build_output(result, description, result_detail, plate_number):
     return build_outputs([result], [description], [result_detail], plate_number)
 
@@ -221,19 +238,20 @@ def build_output(result, description, result_detail, plate_number):
 def build_outputs(results, descriptions, result_details, plate_number):
     vehicle = vehicle_tax_info.get(plate_number)
 
-    out = "--------------------------------------------------"
-    out = "\n\nNomor Polisi: " + plate_number + "\n"
+    out = "----------------------------------------------------\n\n"
+    out = "Nomor Polisi: " + plate_number + "\n"
     out += "\n".join([k + " : " + str(v) if k != "no_rangka" else k + " : " + censor_middle(v) for  k,v in vehicle.items()])
     # out += "\n----------------------------------------------"
     
-    out += f"\nWajib Pajak dengan NoPol {plate_number} ingin melakukan proses berikut:\n"
+    # out += f"\nWajib Pajak dengan NoPol {plate_number} ingin melakukan proses berikut:\n"
+    out += "\n\nDaftar Kode Permohonan:\n"
 
     for i, (res,desc,detail) in enumerate(zip(results, descriptions, result_details)):
         harga_jual = str(vehicle.get("harga_jual"))
         out += f"{i+1}. {detail}\nRumus: {desc}\nDetail perhitungan: {desc.replace('harga_jual', harga_jual)} = {res}\n"
 
     # out += "----------------------------\nEstimasi biaya: "
-    out += "\n\n---------------------------\n\nEstimasi Biaya:"
+    out += "\n\n\nEstimasi Biaya:"
 
     if len(results) > 1:
         out += " + ".join([f"Rp{x}" for x in results])
@@ -304,8 +322,7 @@ def respond(
         #         formula = kode_mohon.get("formula")
         #         description = inspect.getsource(formula).split(":", 2)[-1].strip()
         
-        # out = "Request code number:\n" + request_numbers + "\n\nRequest detail:\n" + request_details + f"\n\nConfidence score:\n{request_scores}" + "\n\nPlate numbers: " + plate_numbers
-
+        out = ""
         for plate in plates:
             results, descriptions, result_details = [], [], []
             for code in request_numbers_copy:
@@ -320,6 +337,14 @@ def respond(
 
             if results:
                 out += "\n\n" + build_outputs(results, descriptions, result_details, plate)
+            elif descriptions:
+                out += "\n\n" + build_output_formula(descriptions, result_details)
+            elif vehicle_tax_info.get(plate):
+                out += "\n\n" + build_output_vehicle(vehicle_tax_info.get(plate))
+            else:
+                # + request_details + f"\n\nConfidence score:\n{request_scores}"
+                out += "Request code number:\n" + request_numbers + "\n\nRequest detail:\n" + "\n\nPlate numbers: " + plate_numbers
+
 
         return out
 
@@ -336,17 +361,25 @@ def respond(
         request_code = codes[scores.argmax()]
         # "{:.2f}".format(a)
 
-    out = "Request code number: " + request_code[:3] + "\nRequest detail: " + request_code[6:] + f"\nConfidence score: {round(scores[s_max].tolist(),3)}" + "\nPlate numbers: " + plate_numbers
+    # out = "Request code number: " + request_code[:3] + "\nRequest detail: " + request_code[6:] + f"\nConfidence score: {round(scores[s_max].tolist(),3)}" + "\nPlate numbers: " + plate_numbers
 
+    out = ""
     for plate in plates:
         results, descriptions, result_details = [], [], []
         result, description, result_detail = get_calculation(request_code[:3], plate)
 
         if result != None:
             results.append(result)
+            out += "\n\n" + build_outputs(results, descriptions, result_details, plate)
+        elif description != None:
             descriptions.append(description)
             result_details.append(result_detail)
-            out += "\n\n" + build_outputs(results, descriptions, result_details, plate)
+            out += "\n\n" + build_output_formula(descriptions, result_details)
+        elif vehicle_tax_info.get(plate):
+            out += "\n\n" + build_output_vehicle(vehicle_tax_info.get(plate))
+        else:
+            # + request_code[6:] + f"\nConfidence score: {round(scores[s_max].tolist(),3)}"
+            out += "Request code number: " + request_code[:3] + "\nRequest detail: " + "\nPlate numbers: " + plate_numbers
 
     return out