Update app.py

app.py

@@ -42,27 +42,61 @@ tokenizer = AutoTokenizer.from_pretrained("mrm8488/t5-base-finetuned-emotion")
 model_base = AutoModelWithLMHead.from_pretrained(model_path)
 
 """
-get ip address
+get ip address and location
 """
-def get_device_ip_address():
-    if os.name == "nt":
-        result = "Running on Windows"
-        hostname = socket.gethostname()
-        ip_address = socket.gethostbyname(hostname)
-        print(ip_address)
-        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()
+# def get_device_ip_address():
+#     if os.name == "nt":
+#         result = "Running on Windows"
+#         hostname = socket.gethostname()
+#         ip_address = socket.gethostbyname(hostname)
+#         print(ip_address)
+#         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 getIP():
+    ip_address = ''
+    try:
+    	d = str(urlopen('http://checkip.dyndns.com/')
+    			.read())
+    
+    	return r.compile(r'Address: (\d+\.\d+\.\d+\.\d+)').search(d).group(1)
+    except Exception as e:
+        print("Error while getting IP address -->",e)
         return ip_address
-    else:
-        result['id'] = os.name + " not supported yet."
-        print(result)
-        return result
+
+def get_location(ip_addr):
+    location = {}
+    try:
+        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
+    except Exception as e:
+        print("Error while getting location -->",e)
+        return location
 
 """
 generate emotions of the sentences
@@ -103,8 +137,6 @@ def generate_emotion(article):
             
     result = {'Input':sen_list_temp, 'Detected Emotion':results}
     gc.collect()
-    print("sen_list@@@@@@@@@     ",sen_list)
-    print("results_dict@@@@@@@@  ",results_dict)
     save_data_and_sendmail(article,results_dict,sen_list, results)
     return pd.DataFrame(result)
     
@@ -113,13 +145,13 @@ Save generated details
 """
 def save_data_and_sendmail(article,results_dict,sen_list,results):
     try:
-        print("????????????????????????????????")
-        print("sen_list^^^^^     ",sen_list)
-        print("results^^^^^^ ",results)
-        ip_address = ''
-        ip_address = get_device_ip_address()
+     
+        ip_address= getIP()
+        print(ip_address)
+        location = get_location(ip_address)
+        print(location)
         
-        add_csv = [article,results_dict,ip_address]
+        add_csv = [article,results_dict,ip_address,location]
         with open(DATA_FILE, "a") as f:
             writer = csv.writer(f)
             # write the data
@@ -129,9 +161,8 @@ def save_data_and_sendmail(article,results_dict,sen_list,results):
     
         url = 'https://pragnakalpdev33.pythonanywhere.com/emotion_detection_demo'
         # url = 'https://pragnakalpdev35.pythonanywhere.com/HF_space_emotion_detection'
-        # url = 'http://pragnakalpdev33.pythonanywhere.com/HF_space_question_generator'
         
-        myobj = {"sentences":sen_list,"gen_results":results,"ip_addr":ip_address}
+        myobj = {"sentences":sen_list,"gen_results":results,"ip_addr":ip_address,'loc':location}
         print("myobj######    ",myobj)
         response = requests.post(url, json = myobj)
         print("response=-----=",response.status_code)
@@ -146,7 +177,7 @@ def save_data_and_sendmail(article,results_dict,sen_list,results):
 UI design for demo using gradio app
 """
 inputs = gr.Textbox(value=SENTENCES_VALUE,lines=3, label="Sentences",elem_id="inp_div")
-outputs = [gr.Dataframe(row_count = (2, "dynamic"), col_count=(2, "fixed"), label="Here is the Result", headers=["Input","Detected Emotion"])]
+outputs = [gr.Dataframe(row_count = (3, "dynamic"), col_count=(2, "fixed"), label="Here is the Result", headers=["Input","Detected Emotion"])]
 
 demo = gr.Interface(
     generate_emotion,