Update app.py

app.py

@@ -68,23 +68,39 @@ def get_device_ip_address():
         print(result)
         return result
 
-def get_location(ip_addr):
-    ip=ip_addr
-    # ip=str(request.remote_addr)
-    req_data={
-        "ip":ip,
-        "token":"pkml123"
-    }
-    url = "https://demos.pragnakalp.com/get-ip-location"
+# def get_location(ip_addr):
+#     ip=ip_addr
+#     # ip=str(request.remote_addr)
+#     req_data={
+#         "ip":ip,
+#         "token":"pkml123"
+#     }
+#     url = "https://demos.pragnakalp.com/get-ip-location"
+
+#     # req_data=json.dumps(req_data)
+#     # print("req_data",req_data)
+#     headers = {'Content-Type': 'application/json'}
 
-    # req_data=json.dumps(req_data)
-    # print("req_data",req_data)
-    headers = {'Content-Type': 'application/json'}
+#     response = requests.request("POST", url, headers=headers, data=json.dumps(req_data))
+#     response = response.json()
+#     print("response======>>",response)
+#     return response
+        
+def get_ip():
+    response = requests.get('https://api64.ipify.org?format=json').json()
+    return response["ip"]
 
-    response = requests.request("POST", url, headers=headers, data=json.dumps(req_data))
-    response = response.json()
-    print("response======>>",response)
-    return response
+
+def get_location():
+    ip_address = get_ip()
+    response = requests.get(f'https://ipapi.co/{ip_address}/json/').json()
+    location_data = {
+        "ip": ip_address,
+        "city": response.get("city"),
+        "region": response.get("region"),
+        "country": response.get("country_name")
+    }
+    return location_data
     
 def generate_emotion(article):
     text = "Input sentence: "
@@ -130,7 +146,7 @@ def save_data_and_sendmail(article,output):
         # # url = 'http://pragnakalpdev33.pythonanywhere.com/HF_space_question_generator'
         # myobj = {'article': article,'total_que': num_que,'gen_que':result,'ip_addr':hostname.get("ip_addr",""),'host':hostname.get("host","")}
         # x = requests.post(url, json = myobj) 
-        location = get_location(ip_address)
+        location = get_location()
         print(location)
         url = 'https://pragnakalpdev33.pythonanywhere.com/HF_space_bert_base_ner'
         myobj = {'article': article,'gen_text':output,'ip_addr':ip_address}