Update app.py

app.py

@@ -69,23 +69,23 @@ k = 0
 #         print(result)
 #         return result
 
-def get_location(ip_address):
-    ip=ip_address
-    # ip=str(request.remote_addr)
-    req_data={
-        "ip":ip,
-        "token":"pkml123"
-    }
-    url = "https://demos.pragnakalp.com/get-ip-location"
+# def get_location(ip_address):
+#     ip=ip_address
+#     # 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
+#     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()
@@ -102,6 +102,31 @@ def get_location(ip_address):
 #         "country": response.get("country_name")
 #     }
 #     return location_data
+
+
+def getIP():
+	d = str(urlopen('http://checkip.dyndns.com/')
+			.read())
+
+	return r.compile(r'Address: (\d+\.\d+\.\d+\.\d+)').search(d).group(1)
+
+def get_location(ip_addr):
+    ip=ip_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'}
+
+    response = requests.request("POST", url, headers=headers, data=json.dumps(req_data))
+    response = response.json()
+    print("response======>>",response)
+    return response
     
 def generate_emotion(article):
     text = "Input sentence: "
@@ -131,14 +156,19 @@ def generate_emotion(article):
 def save_data_and_sendmail(article,output):
     try:
         print("welcome")
-        # ip_address = ''
+        ip_address = ''
         # ip_address = get_device_ip_address()
-        ip_address=str(request.remote_addr)
-        print(ip_address)
-        location = get_location(ip_address)
+        # ip_address=str(request.remote_addr)
+        # print(ip_address)
+        # location = get_location(ip_address)
         # location = get_location(ip_address)
         # print(ip_address)
-        add_csv = [article,output,ip_address]
+
+        ip_address= getIP()
+        print(ip_address)
+        location = get_location(ip_address)
+        print(location)
+        add_csv = [article,output,ip_address,location]
         with open(DATA_FILE, "a") as f:
             writer = csv.writer(f)
             # write the data
@@ -150,10 +180,9 @@ 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_addr)
-        print(location)
+        
         url = 'https://pragnakalpdev33.pythonanywhere.com/HF_space_bert_base_ner'
-        myobj = {'article': article,'gen_text':output,'ip_addr':ip_address}
+        myobj = {'article': article,'gen_text':output,'ip_addr':ip_address,"location":location}
         x = requests.post(url, json = myobj) 
         
         return "Successfully save data"