Update app.py

app.py

@@ -533,7 +533,7 @@ def send_email(job_info):
 
             for key, value in job_info.items():
                 if key.endswith("time") and value:
-                    job_info[key] = datetime.fromtimestamp(value).strftime("%Y-%m-%d %H:%M:%S")
+                    job_info[key] = ts_to_str(value, get_timezone_by_ip(job_info['ip']))
 
             server = smtplib.SMTP(email_serv, int(email_port))
             # server.starttls()
@@ -603,19 +603,21 @@ def check_user_running_job(email, request):
 
 def get_timezone_by_ip(ip):
     try:
-        data = session.get(f'http://ip-api.com/json/{ip}').json()
+        data = session.get(f'https://worldtimeapi.org/api/ip/{ip}').json()
         return data['timezone']
     except Exception:
         return 'UTC'
 
 
-def ts_to_str(ts, timezone_str):
-    if isinstance(ts, str):
-        return ts
-    local_tz = pytz.timezone(timezone_str)
-    dt = datetime.fromtimestamp(ts)
-    dt = dt.replace(tzinfo=pytz.utc)  # Set the datetime object to UTC
-    localized_dt = dt.astimezone(local_tz)  # Convert the datetime object to the desired timezone
+def ts_to_str(timestamp, timezone):
+    # Create a timezone-aware datetime object from the UNIX timestamp
+    dt = datetime.fromtimestamp(timestamp, pytz.utc)
+
+    # Convert the timezone-aware datetime object to the target timezone
+    target_timezone = pytz.timezone(timezone)
+    localized_dt = dt.astimezone(target_timezone)
+
+    # Format the datetime object to the specified string format
     return localized_dt.strftime('%Y-%m-%d %H:%M:%S (%Z)')
 
 
@@ -2000,7 +2002,7 @@ QALAHAYFAQYHDPDDEPVADPYDQSFESRDLLIDEWKSLTYDEVISFVPPPLDQEEMES
                     'task': task,
                     'status': 'RUNNING',
                     'email': email,
-                    'ip': str(request.client.host),
+                    'ip': request.headers.get('x-forwarded-for', request.client.host),
                     'cookies': dict(request.cookies),
                     'start_time': time(),
                     'end_time': None,