Update app.py

app.py

@@ -111,17 +111,48 @@ def extract_result(lst):
     name=lst[x][1][1]
     country=lst[x][1][2]
     nationality=lst[x][1][3]
+
     try:
       birth_date=datetime.strptime(lst[x][1][4], '%y%m%d').strftime('%d/%m/%Y')
       expiry_date=datetime.strptime(lst[x][1][5], '%y%m%d').strftime('%d/%m/%Y')
+      year=datetime.strptime(lst[x][1][5], '%y%m%d').year
+      month=datetime.strptime(lst[x][1][5], '%y%m%d').month
+      day=datetime.strptime(lst[x][1][5], '%y%m%d').day
+      if nationality=='TWN':
+          year-=5
+      else:
+          year-=10
+ 
+      if nationality=='IND' or nationality=='CHN' or nationality=='BRA':
+          
+          if str(day)=="31":
+              day=1
+              month+=1
+          else:
+              day+=1
+
+      str_day=day
+      str_month=month
+      if len(str(day))==1:
+          str_day="0"+str(day)
+          
+      if len(str(month))==1:
+          str_month="0"+str(month)
+        
+          
+      issue_date=str(str_day)+"/"+str(str_month)+"/"+str(year)
     except:
       
       birth_date=lst[x][1][4]#datetime.strptime(lst[x][1][4], '%y%m%d').strftime('%d/%m/%Y')
       expiry_date=lst[x][1][5]#datetime.strptime(lst[x][1][5], '%y%m%d').strftime('%d/%m/%Y')
-      
+  
+
+        
+      issue_date=expiry_date
+ 
     document_type=lst[x][1][7]
     document_number=lst[x][1][8]
-    temp_lst.append([surname,name,country,birth_date,expiry_date,document_number])
+    temp_lst.append([surname,name,country,birth_date,expiry_date,document_number,issue_date])
     
     #temp_lst.append([surname,name,country,nationality,birth_date,expiry_date,document_type,document_number])
     final_lst.append(temp_lst)
@@ -133,17 +164,52 @@ def extract_result(lst):
     country=lst[x][2]
     nationality=lst[x][3]
     try:
+
       birth_date=datetime.strptime(lst[x][4], '%y%m%d').strftime('%d/%m/%Y')
       expiry_date=datetime.strptime(lst[x][5], '%y%m%d').strftime('%d/%m/%Y')
+      year=datetime.strptime(lst[x][5], '%y%m%d').year
+      month=datetime.strptime(lst[x][5], '%y%m%d').month
+      day=datetime.strptime(lst[x][5], '%y%m%d').day
+
+      if nationality=='TWN':
+          year-=5
+      else:
+          year-=10
+
+
+      if country=='IND' or nationality=='CHN' or nationality=='BRA':
+          
+          if str(day)=="31":
+              day=1
+              month+=1
+          else:
+              day+=1
+      str_day=day
+      str_month=month
+
+
+      if len(str(day))==1:
+          str_day="0"+str(day)
+          
+      if len(str(month))==1:
+          str_month="0"+str(month)
+        
+          
+      issue_date=str(str_day)+"/"+str(str_month)+"/"+str(year)
+
+    
+      
     except:
        birth_date=lst[x][4]#datetime.strptime(lst[x][4], '%y%m%d').strftime('%d/%m/%Y')
        expiry_date=lst[x][5]#datetime.strptime(lst[x][5], '%y%m%d').strftime('%d/%m/%Y')
+       issue_date=expiry_date
+
     
     document_type=lst[x][7]
     document_number=lst[x][8]
 
     if document_type=="P" or document_type=="p":# or document_type=="PM" or document_type=="PO":
-        temp_lst.append([surname,name,country,birth_date,expiry_date,document_number])
+        temp_lst.append([surname,name,country,birth_date,expiry_date,document_number,issue_date])
     else:
         print(lst)
         temp_lst.append("The attached document is not a Passport")
@@ -162,7 +228,7 @@ def return_df(final_lst):
   if final_lst[0]=="The attached document is not a Passport":
       return "The attached document is not a Passport"
   else:
-      columns = ['family_name','given_name','country','date_of_birth','expiration','passport_number']
+      columns = ['family_name','given_name','country','date_of_birth','expiration','passport_number','issue_date']
       #columns = ['family_name','given_name','country','nationality','date_of_birth','expiration','document_type','passport_number']
     
       res = {columns[i]: final_lst[0][i] for i in range(len(columns))}
@@ -287,5 +353,3 @@ uvicorn.run(app, host="0.0.0.0", port=7860)
 #app.mount(CUSTOM_PATH, gradio_app)
 #io.launch()
 
-
-