Added reporting for CLI token commands (#2297)

Author: istranic

deeplake/cli/auth.py

@@ -10,6 +10,7 @@
     save_reporting_config,
     get_reporting_config,
     deeplake_reporter,
+    set_username,
 )
 from deeplake.util.exceptions import AuthenticationException, LoginException
 
@@ -33,6 +34,7 @@ def login(username: str, password: str, token: str):
                 )
                 username = click.prompt("Username")
                 password = click.prompt("Password", hide_input=True)
+                # username_reporting = username
             if not password:
                 password = click.prompt(
                     f"Please enter password for user {username}", hide_input=True
@@ -52,10 +54,12 @@ def login(username: str, password: str, token: str):
                         "Invalid API token. Please make sure the token is correct and try again."
                     )
                 write_token(token)
+                username = client.get_user_profile()["name"]
             click.echo("Successfully logged in to Activeloop.")
             reporting_config = get_reporting_config()
             if reporting_config.get("username") != username:
                 save_reporting_config(True, username=username)
+                set_username(deeplake_reporter, username)
             break
         except AuthenticationException:
             chances -= 1

deeplake/client/client.py

@@ -50,7 +50,15 @@ class DeepLakeBackendClient:
     """Communicates with Activeloop Backend"""
 
     def __init__(self, token: Optional[str] = None):
+        from deeplake.util.bugout_reporter import (
+            save_reporting_config,
+            get_reporting_config,
+            deeplake_reporter,
+            set_username,
+        )
+
         self.version = deeplake.__version__
+        self._token_from_env = False
         self.auth_header = None
         self.token = token or self.get_token()
         self.auth_header = f"Bearer {self.token}"
@@ -62,13 +70,22 @@ def __init__(self, token: Optional[str] = None):
             remove_token()
             self.token = token or self.get_token()
             self.auth_header = f"Bearer {self.token}"
+        if self._token_from_env:
+            username = self.get_user_profile()["name"]
+            if get_reporting_config().get("username") != username:
+                save_reporting_config(True, username=username)
+                set_username(deeplake_reporter, username)
 
     def get_token(self):
         """Returns a token"""
-        token = read_token()
+        self._token_from_env = False
+        token = read_token(from_env=False)
         if token is None:
-            token = self.request_auth_token(username="public", password="")
-
+            token = read_token(from_env=True)
+            if token is None:
+                token = self.request_auth_token(username="public", password="")
+            else:
+                self._token_from_env = True
         return token
 
     def request(

deeplake/client/utils.py

@@ -35,15 +35,14 @@ def write_token(token: str):
         f.write(token)
 
 
-def read_token():
+def read_token(from_env=True):
     """Returns the token. Searches for the token first in token file and then in enviroment variables."""
     token = None
     if os.path.exists(TOKEN_FILE_PATH):
         with open(TOKEN_FILE_PATH) as f:
             token = f.read()
-    else:
+    elif from_env:
         token = os.environ.get(DEEPLAKE_AUTH_TOKEN)
-
     return token
 
 

deeplake/util/bugout_reporter.py

@@ -119,6 +119,17 @@ def blacklist_token_parameters_fn(params: Dict[str, Any]) -> Dict[str, Any]:
     tags=[],
 )
 
+
+def set_username(reporter: HumbugReporter, username: str) -> None:
+    index, current_username = find_current_username(reporter)
+
+    if current_username is None:
+        reporter.tags.append(f"username:{username}")
+    else:
+        if f"username:{username}" != current_username:
+            reporter.tags[index] = f"username:{username}"
+
+
 hub_user = bugout_reporting_config.get("username")
 if hub_user is not None:
     deeplake_reporter.tags.append(f"username:{hub_user}")
@@ -145,22 +156,16 @@ def feature_report_path(
         client = DeepLakeBackendClient(token=token)
         username = client.get_user_profile()["name"]
 
-        index, current_username = find_current_username()
-
-        if current_username is None:
-            deeplake_reporter.tags.append(f"username:{username}")
-        else:
-            if f"username:{username}" != current_username:
-                deeplake_reporter.tags[index] = f"username:{username}"
+        set_username(deeplake_reporter, username)
 
     deeplake_reporter.feature_report(
         feature_name=feature_name,
         parameters=parameters,
     )
 
 
-def find_current_username():
-    for index, tag in enumerate(deeplake_reporter.tags):
+def find_current_username(reporter: HumbugReporter):
+    for index, tag in enumerate(reporter.tags):
         if "username" in tag:
             return index, tag
     return None, None