Update app.py

app.py

@@ -48,59 +48,59 @@ bert_ner_model = os.path.join(cwd)
 Entities_Found =[]
 Entity_Types = []
 k = 0
-def get_device_ip_address():
+# def get_device_ip_address():
     
-    if os.name == "nt":
-        result = "Running on Windows"
-        hostname = socket.gethostname()
-        ip_address = socket.gethostbyname(hostname)
-        return ip_address
-    elif os.name == "posix":
-        gw = os.popen("ip -4 route show default").read().split()
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        s.connect((gw[2], 0))
-        ip_address = s.getsockname()[0]
-        gateway = gw[2]
-        host = socket.gethostname()
-        return ip_address
-    else:
-        result['id'] = os.name + " not supported yet."
-        print(result)
-        return result
+#     if os.name == "nt":
+#         result = "Running on Windows"
+#         hostname = socket.gethostname()
+#         ip_address = socket.gethostbyname(hostname)
+#         return ip_address
+#     elif os.name == "posix":
+#         gw = os.popen("ip -4 route show default").read().split()
+#         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+#         s.connect((gw[2], 0))
+#         ip_address = s.getsockname()[0]
+#         gateway = gw[2]
+#         host = socket.gethostname()
+#         return ip_address
+#     else:
+#         result['id'] = os.name + " not supported yet."
+#         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
+    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"]
 
 
-def get_location(ip_addr):
-    ip_address = ip_addr
-    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 get_location(ip_addr):
+#     ip_address = ip_addr
+#     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,8 +130,10 @@ def generate_emotion(article):
 def save_data_and_sendmail(article,output):
     try:
         print("welcome")
-        ip_address = ''
-        ip_address = get_device_ip_address()
+        # ip_address = ''
+        # ip_address = get_device_ip_address()
+        ip_address=str(request.remote_addr)
+        location = get_location(ip_address)
         # location = get_location(ip_address)
         print(ip_address)
         add_csv = [article,output,ip_address]
@@ -146,7 +148,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_addr)
+        # 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}