update banner

Author: ptpt

mapillary_tools/authenticate.py

@@ -168,7 +168,7 @@ def _verify_user_auth(user_items: types.UserItem) -> types.UserItem:
     """
     Verify that the user access token is valid
     """
-    if constants._DISABLE_AUTH_VERIFICATION:
+    if constants._AUTH_VERIFICATION_DISABLED:
         return user_items
 
     try:
@@ -351,11 +351,12 @@ def _welcome():
     _echo(
         """
 ================================================================================
-                            Welcome to Mapillary!
+                             Welcome to Mapillary!
 ================================================================================
-If you haven't registered yet, please visit the following link to sign up first:
-https://www.mapillary.com/signup
-After the registration, proceed here to sign in.
+  If you haven't registered yet, please visit https://www.mapillary.com/signup
+  to create your account first.
+
+  Once registered, proceed here to sign in.
 ================================================================================
-    """.strip()
+    """
     )

mapillary_tools/constants.py

@@ -5,6 +5,15 @@
 
 _ENV_PREFIX = "MAPILLARY_TOOLS_"
 
+
+def _yes_or_no(val: str) -> bool:
+    return val.strip().upper() in [
+        "1",
+        "TRUE",
+        "YES",
+    ]
+
+
 # In meters
 CUTOFF_DISTANCE = float(os.getenv(_ENV_PREFIX + "CUTOFF_DISTANCE", 600))
 # In seconds
@@ -56,16 +65,8 @@
 # Max number of pixels per sequence (sum of image pixels in the sequence)
 MAX_SEQUENCE_PIXELS: str = os.getenv(_ENV_PREFIX + "MAX_SEQUENCE_PIXELS", "6G")
 
-PROMPT_DISABLED: bool = os.getenv(_ENV_PREFIX + "PROMPT_DISABLED", "NO").upper() in [
-    "1",
-    "TRUE",
-    "YES",
-]
+PROMPT_DISABLED: bool = _yes_or_no(os.getenv(_ENV_PREFIX + "PROMPT_DISABLED", "NO"))
 
-_DISABLE_AUTH_VERIFICATION = os.getenv(
-    _ENV_PREFIX + "_DISABLE_AUTH_VERIFICATION", "NO"
-).upper() in [
-    "1",
-    "TRUE",
-    "YES",
-]
+_AUTH_VERIFICATION_DISABLED: bool = _yes_or_no(
+    os.getenv(_ENV_PREFIX + "_AUTH_VERIFICATION_DISABLED", "NO")
+)

tests/integration/fixtures.py

@@ -28,7 +28,8 @@
 def setup_config(tmpdir: py.path.local):
     config_path = tmpdir.mkdir("configs").join("CLIENT_ID")
     os.environ["MAPILLARY_CONFIG_PATH"] = str(config_path)
-    os.environ["MAPILLARY_TOOLS__DISABLE_AUTH_VERIFICATION"] = "YES"
+    os.environ["MAPILLARY_TOOLS_PROMPT_DISABLED"] = "YES"
+    os.environ["MAPILLARY_TOOLS__AUTH_VERIFICATION_DISABLED"] = "YES"
     x = subprocess.run(
         f"{EXECUTABLE} authenticate --user_name {USERNAME} --jwt test_user_token",
         shell=True,
@@ -38,7 +39,8 @@ def setup_config(tmpdir: py.path.local):
     if tmpdir.check():
         tmpdir.remove(ignore_errors=True)
     os.environ.pop("MAPILLARY_CONFIG_PATH", None)
-    os.environ.pop("MAPILLARY_TOOLS__DISABLE_AUTH_VERIFICATION", None)
+    os.environ.pop("MAPILLARY_TOOLS_PROMPT_DISABLED", None)
+    os.environ.pop("MAPILLARY_TOOLS__AUTH_VERIFICATION_DISABLED", None)
 
 
 @pytest.fixture
@@ -55,7 +57,8 @@ def setup_data(tmpdir: py.path.local):
 def setup_upload(tmpdir: py.path.local):
     upload_dir = tmpdir.mkdir("mapillary_public_uploads")
     os.environ["MAPILLARY_UPLOAD_PATH"] = str(upload_dir)
-    os.environ["MAPILLARY_TOOLS__DISABLE_AUTH_VERIFICATION"] = "YES"
+    os.environ["MAPILLARY_TOOLS__AUTH_VERIFICATION_DISABLED"] = "YES"
+    os.environ["MAPILLARY_TOOLS_PROMPT_DISABLED"] = "YES"
     os.environ["MAPILLARY__ENABLE_UPLOAD_HISTORY_FOR_DRY_RUN"] = "YES"
     history_path = tmpdir.join("history")
     os.environ["MAPILLARY_UPLOAD_HISTORY_PATH"] = str(history_path)
@@ -64,7 +67,8 @@ def setup_upload(tmpdir: py.path.local):
         tmpdir.remove(ignore_errors=True)
     os.environ.pop("MAPILLARY_UPLOAD_PATH", None)
     os.environ.pop("MAPILLARY_UPLOAD_HISTORY_PATH", None)
-    os.environ.pop("MAPILLARY_TOOLS__DISABLE_AUTH_VERIFICATION", None)
+    os.environ.pop("MAPILLARY_TOOLS__AUTH_VERIFICATION_DISABLED", None)
+    os.environ.pop("MAPILLARY_TOOLS_PROMPT_DISABLED", None)
     os.environ.pop("MAPILLARY__ENABLE_UPLOAD_HISTORY_FOR_DRY_RUN", None)