From f3a7620188a644fd965ae6edc73c1fe2fc1c7d9d Mon Sep 17 00:00:00 2001
From: firestarsdog <229254897+firestarsdog@users.noreply.github.com>
Date: Tue, 19 May 2026 10:57:20 -0400
Subject: [PATCH] StarPilot Tools Auth Cleanup

---
 tools/lib/api.py  | 12 ++++++++++--
 tools/lib/auth.py | 13 ++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/tools/lib/api.py b/tools/lib/api.py
index 50fe296e0..285854c68 100644
--- a/tools/lib/api.py
+++ b/tools/lib/api.py
@@ -1,9 +1,17 @@
 import os
 import requests
 
-from openpilot.starpilot.common.starpilot_utilities import use_konik_server
+from openpilot.common.params import Params
 
-API_HOST = os.getenv('API_HOST', f"https://api.{'konik.ai' if use_konik_server() else 'commadotai.com'}")
+
+def _use_konik_server():
+  try:
+    return Params().get_bool("UseKonikServer")
+  except Exception:
+    return False
+
+
+API_HOST = os.getenv('API_HOST', f"https://api.{'konik.ai' if _use_konik_server() else 'commadotai.com'}")
 
 # TODO: this should be merged into common.api
 
diff --git a/tools/lib/auth.py b/tools/lib/auth.py
index cabdb84e9..d84b41c12 100755
--- a/tools/lib/auth.py
+++ b/tools/lib/auth.py
@@ -23,19 +23,26 @@ Examples::
 
 import argparse
 import os
-import sys
 import pprint
+import sys
 import webbrowser
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from typing import Any
 from urllib.parse import parse_qs, urlencode
 
+from openpilot.common.params import Params
 from openpilot.tools.lib.api import APIError, CommaApi, UnauthorizedError
 from openpilot.tools.lib.auth_config import set_token, get_token
 
-from openpilot.starpilot.common.starpilot_utilities import use_konik_server
 
-API_HOST = os.getenv('API_HOST', f"https://api.{'konik' if use_konik_server() else 'comma'}.ai")
+def _use_konik_server():
+  try:
+    return Params().get_bool("UseKonikServer")
+  except Exception:
+    return False
+
+
+API_HOST = os.getenv('API_HOST', f"https://api.{'konik.ai' if _use_konik_server() else 'comma.ai'}")
 PORT = 3000