Logging levels (#62)

* Print device code request.

* Catch failed token silent-get when writeback.

* Invoke logging level in call.

* Increment version.

Author: perolavsvendsen

setup.py

@@ -13,7 +13,7 @@
         "Natural Language :: English",
         "Programming Language :: Python :: 3.7" "Programming Language :: Python :: 3.8",
     ],
-    version="0.1.5",
+    version="0.1.6",
     author="Equinor ASA",
     install_requires=["requests", "msal", "PyYAML", "setuptools"],
     python_requires=">=3.4",

src/sumo/wrapper/_auth.py

@@ -12,8 +12,7 @@
     datefmt="%Y-%m-%d %H:%M:%S",
 )
 
-logger = logging.getLogger(__name__)
-logger.setLevel(level="DEBUG")
+logger = logging.getLogger("sumo.wrapper")
 
 TENANT = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0"
 
@@ -30,6 +29,7 @@ def __init__(
         authority=AUTHORITY_URI,
         client_credentials=None,
         writeback=False,
+        verbosity="CRITICAL",
     ):
 
         logger.debug("Initialize Auth")
@@ -62,13 +62,22 @@ def __init__(
         if self._cache_available():
             if not self.accounts:
                 logger.debug("Token cache found but have no accounts")
-                raise RuntimeError(
-                    "The locally stored token has no accounts. "
-                    "Please check your access or run 'sumo_login' to re-create your token."
-                )
+                if self.writeback:
+                    logger.debug("Writeback is True, running device_code")
+                    self._oauth_device_code()
+                else:
+                    raise RuntimeError(
+                        "The locally stored token has no accounts. "
+                        "Please check your access or run 'sumo_login' to re-create your token."
+                    )
             else:
                 logger.debug("There are accounts. Calling _oauth_get_token_silent()")
-                self._oauth_get_token_silent()
+                if not self._oauth_get_token_silent():
+                    logger.debug("self._oauth_get_token_silent returned False")
+                    if self.writeback:
+                        logger.debug("self.writeback is True, calling device_code")
+                        self._oauth_device_code()
+
         else:
             logger.debug("No token cache found, reauthenticate")
             self._oauth_device_code()
@@ -117,8 +126,10 @@ def _oauth_get_token_silent(self):
         elif "error" in self.result:
             logger.info("Error getting access token")
             logger.debug(self.result["error"])
+            return False
         else:
             logger.info("Failed getting access token")
+            return False
 
         self._set_expiring_date(int(self.result["expires_in"]))
 
@@ -127,6 +138,8 @@ def _oauth_get_token_silent(self):
 
         logger.debug("_oauth_get_token_silent() has finished")
 
+        return True
+
     def _set_expiring_date(self, time_left, threshold=60):
         """
         Defines the access token expiring date. Sets a threshold to update the token before it expires
@@ -163,7 +176,7 @@ def _oauth_device_code(self):
                 "Fail to create device flow. Err: %s" % json.dumps(flow, indent=4)
             )
         else:
-            logger.debug("flow[message] is %s", flow["message"])
+            print(flow["message"])
 
         self.result = self.app.acquire_token_by_device_flow(flow)
         try:

src/sumo/wrapper/_call_azure_api.py

@@ -4,8 +4,7 @@
 from ._auth import Auth
 from ._request_error import AuthenticationError, TransientError, PermanentError
 
-logger = logging.getLogger(__name__)
-logger.setLevel(level="DEBUG")
+logger = logging.getLogger("sumo.wrapper")
 
 
 def _raise_request_error_exception(code, message):
@@ -34,7 +33,17 @@ class CallAzureApi:
                 Need to be an Azure resourceId
     """
 
-    def __init__(self, resource_id, client_id, outside_token=False, writeback=False):
+    def __init__(
+        self,
+        resource_id,
+        client_id,
+        outside_token=False,
+        writeback=False,
+        verbosity="CRITICAL",
+    ):
+
+        logger.setLevel(level=verbosity)
+
         self.resource_id = resource_id
         self.client_id = client_id
         self.writeback = writeback

src/sumo/wrapper/_call_sumo_api.py

@@ -1,6 +1,10 @@
+import logging
+
 from .config import APP_REGISTRATION
 from ._call_azure_api import CallAzureApi
 
+logger = logging.getLogger("sumo.wrapper")
+
 
 class CallSumoApi:
     """
@@ -14,8 +18,12 @@ def __init__(
         client_id=None,
         outside_token=False,
         writeback=False,
+        verbosity="CRITICAL",
     ):
         """Initialize the wrapper. Chooses among multiple environments."""
+
+        logger.setLevel(level=verbosity)
+
         if env == "exp":
             self.base_url = (
                 "https://main-sumo-experiment-dev.playground.radix.equinor.com/api/v1"

src/sumo/wrapper/login.py

@@ -1,8 +1,13 @@
 import os
 import sys
+import logging
+
 from argparse import ArgumentParser
 from sumo.wrapper import CallSumoApi
 
+logger = logging.getLogger("sumo.wrapper")
+logger.setLevel(level="CRITICAL")
+
 
 def get_parser() -> ArgumentParser:
     parser = ArgumentParser(description="Login to Sumo on azure")
@@ -13,17 +18,24 @@ def get_parser() -> ArgumentParser:
         default="prod",
         help="Environment to log into",
     )
+    parser.add_argument(
+        "--verbosity",
+        dest="verbosity",
+        default="CRITICAL",
+        help="Set the verbosity level",
+    )
     return parser
 
 
 def main():
     args = get_parser().parse_args()
-
+    logger.setLevel(level=args.verbosity)
     env = args.env
+    logger.debug("env is %s", env)
 
     print("Login to Sumo environment: " + env)
 
-    CallSumoApi(env=env, writeback=True)
+    CallSumoApi(env=env, writeback=True, verbosity=args.verbosity)
 
 
 if __name__ == "__main__":