January 28th, 2025 Update

selfdrive/frogpilot/fleetmanager/fleet_manager.py

@@ -171,56 +171,53 @@ def open_error_log(file_name):
 @app.route("/addr_input", methods=['GET', 'POST'])
 def addr_input():
   preload = fleet.preload_favs()
-  SearchInput = fleet.get_SearchInput()
+  search_input = fleet.get_search_input()
   token = fleet.get_public_token()
-  s_token = fleet.get_app_token()
-  gmap_key = fleet.get_gmap_key()
-  lon = float(0.0)
-  lat = float(0.0)
+
+  lon = 0.0
+  lat = 0.0
+
   if request.method == 'POST':
-    valid_addr = False
     postvars = request.form.to_dict()
+    valid_addr = False
     addr, lon, lat, valid_addr, token = fleet.parse_addr(postvars, lon, lat, valid_addr, token)
+
     if not valid_addr:
-      # If address is not found, try searching
-      postvars = request.form.to_dict()
       addr = request.form.get('addr_val')
       addr, lon, lat, valid_addr, token = fleet.search_addr(postvars, lon, lat, valid_addr, token)
+
     if valid_addr:
-      # If a valid address is found, redirect to nav_confirmation
       return redirect(url_for('nav_confirmation', addr=addr, lon=lon, lat=lat))
-    else:
-      return render_template("error.html")
-  elif has_prime():
+    return render_template("error.html")
+
+  if has_prime():
     return render_template("prime.html")
-  # amap stuff
-  elif SearchInput == 1:
-    amap_key, amap_key_2 = fleet.get_amap_key()
-    if amap_key == "" or amap_key is None or amap_key_2 == "" or amap_key_2 is None:
-      return redirect(url_for('amap_key_input'))
-    elif token == "" or token is None:
+
+  if search_input == 0:
+    if fleet.get_public_token() is None:
       return redirect(url_for('public_token_input'))
-    elif s_token == "" or s_token is None:
+
+    if fleet.get_secret_token() is None:
       return redirect(url_for('app_token_input'))
-    else:
-      return redirect(url_for('amap_addr_input'))
-  elif fleet.get_nav_active():
-    if SearchInput == 2:
-      return render_template("nonprime.html", gmap_key=gmap_key, lon=lon, lat=lat, home=preload[0], work=preload[1], fav1=preload[2], fav2=preload[3], fav3=preload[4])
-    else:
-      return render_template("nonprime.html", gmap_key=None, lon=None, lat=None, home=preload[0], work=preload[1], fav1=preload[2], fav2=preload[3], fav3=preload[4])
-  elif token == "" or token is None:
-    return redirect(url_for('public_token_input'))
-  elif s_token == "" or s_token is None:
-    return redirect(url_for('app_token_input'))
-  elif SearchInput == 2:
+
+  if search_input == 1:
+    amap_key, amap_key_2 = fleet.get_amap_key()
+    if not amap_key or not amap_key_2:
+      return redirect(url_for('amap_key_input'))
+    return redirect(url_for('amap_addr_input'))
+
+  if search_input == 2:
+    gmap_key = fleet.get_gmap_key()
     lon, lat = fleet.get_last_lon_lat()
-    if gmap_key == "" or gmap_key is None:
+
+    if not gmap_key:
       return redirect(url_for('gmap_key_input'))
-    else:
-      return render_template("addr.html", gmap_key=gmap_key, lon=lon, lat=lat, home=preload[0], work=preload[1], fav1=preload[2], fav2=preload[3], fav3=preload[4])
-  else:
-      return render_template("addr.html", gmap_key=None, lon=None, lat=None, home=preload[0], work=preload[1], fav1=preload[2], fav2=preload[3], fav3=preload[4])
+    return render_template("addr.html", gmap_key=gmap_key, lon=lon, lat=lat, home=preload[0], work=preload[1], fav1=preload[2], fav2=preload[3], fav3=preload[4])
+
+  if fleet.get_nav_active():
+    return render_template("nonprime.html", gmap_key=None, lon=None, lat=None, home=preload[0], work=preload[1], fav1=preload[2], fav2=preload[3], fav3=preload[4])
+
+  return render_template("addr.html", gmap_key=None, lon=None, lat=None, home=preload[0], work=preload[1], fav1=preload[2], fav2=preload[3], fav3=preload[4])
 
 @app.route("/nav_confirmation", methods=['GET', 'POST'])
 def nav_confirmation():

selfdrive/frogpilot/fleetmanager/helpers.py

@@ -227,23 +227,24 @@ def get_nav_active():
     return False
 
 def get_amap_key():
-  return (
-    token.strip() if (token := params.get("AMapKey1", encoding='utf8')) != "0" else None,
-    token2.strip() if (token2 := params.get("AMapKey2", encoding='utf8')) != "0" else None
-  )
+  token = params.get("AMapKey1", encoding='utf8')
+  token2 = params.get("AMapKey2", encoding='utf8')
+  return (token.strip() if token else None, token2.strip() if token2 else None)
 
 def get_gmap_key():
-  return token.strip() if (token := params.get("GMapKey", encoding='utf8')) != "0" else None
+  token = params.get("GMapKey", encoding='utf8')
+  return token.strip() if token else None
 
 def get_public_token():
-  return token.strip() if (token := params.get("MapboxPublicKey", encoding='utf8')).startswith("pk") else None
+  token = params.get("MapboxPublicKey", encoding='utf8')
+  return token.strip() if token and token.startswith("pk") else None
 
-def get_app_token():
-  return token.strip() if (token := params.get("MapboxSecretKey", encoding='utf8')).startswith("sk") else None
+def get_secret_token():
+  token = params.get("MapboxSecretKey", encoding='utf8')
+  return token.strip() if token and token.startswith("sk") else None
 
-def get_SearchInput():
-  SearchInput = params.get_int("SearchInput")
-  return SearchInput
+def get_search_input():
+  return params.get_int("SearchInput")
 
 def get_last_lon_lat():
   last_pos = params.get("LastGPSPosition")

system/sentry.py

@@ -94,7 +94,7 @@ def capture_fingerprint(frogpilot_toggles, params, params_tracking):
 
     fingerprint = [params.get("DongleId", encoding="utf-8"), frogpilot_toggles.car_model]
     scope.fingerprint = fingerprint
-    sentry_sdk.capture_message(f"Logged user fingerprint: {fingerprint}", level="info")
+    sentry_sdk.capture_message(f"Logged user: {fingerprint}", level="info")
     sentry_sdk.flush()
 
     params.put_bool("FingerprintLogged", True)