feedback fixes

Author: NawreCode

dataikuapi/dss/admin.py

@@ -380,7 +380,7 @@ def save(self):
 
 class DSSUserActivity(object):
     """
-    Settings for a DSS user.
+    Activity for a DSS user.
     Do not call this directly, use :meth:`DSSUser.get_activity` or :meth:`DSSClient.list_users_activity`
     """
 
@@ -398,13 +398,13 @@ def get_raw(self):
         """
         return self.activity
 
-    def get_last_successful_login_attempt(self, as_date=False):
+    def get_last_successful_login(self, as_date=False):
         """
-        Get the last successful login attempt of the user as a timestamp or as a :class:`datetime.datetime`
+        Get the last successful login of the user as a timestamp or as a :class:`datetime.datetime`
         
-        Returns None if there is no logged attempt.
+        Returns None if there were no successful login for this user.
 
-        :return: the last successful login attempt
+        :return: the last successful login
         :rtype: int or :class:`datetime.datetime` or None
         """
         timestamp = self.activity["lastSuccessfulLogin"]
@@ -415,13 +415,13 @@ def get_last_successful_login_attempt(self, as_date=False):
         else:
             return timestamp
 
-    def get_last_failed_login_attempt(self, as_date=False):
+    def get_last_failed_login(self, as_date=False):
         """
-        Get the last failed login attempt of the user as a timestamp or as a :class:`datetime.datetime`
+        Get the last failed login of the user as a timestamp or as a :class:`datetime.datetime`
 
-        Returns None if there is no logged attempt.
+        Returns None if there were no failed login for this user.
 
-        :return: the last failed login attempt
+        :return: the last failed login
         :rtype: int or :class:`datetime.datetime` or None
         """
         timestamp = self.activity["lastFailedLogin"]
@@ -437,12 +437,12 @@ def get_last_session_activity(self, as_date=False):
         Get the last session activity of the user as a timestamp or as a :class:`datetime.datetime`, i.e. the last time
         he opened a new DSS tab or refreshed his session.
 
-        Returns None if there is no logged attempt.
+        Returns None if there is no session activity yet.
 
-        :return: the last session loading
+        :return: the last session activity
         :rtype: int or :class:`datetime.datetime` or None
         """
-        timestamp = self.activity["lastLoaded"]
+        timestamp = self.activity["lastSessionActivity"]
         if timestamp == 0:
             return None
         elif as_date:

dataikuapi/dssclient.py

@@ -386,7 +386,7 @@ def create_user(self, login, password, display_name='', source_type='LOCAL', gro
     def get_own_user(self):
         return DSSOwnUser(self)
 
-    def list_users_activity(self, as_objects=False):
+    def list_users_activity(self, as_objects=False, enabledUsersOnly=False):
         """
         List all users activity
 
@@ -395,7 +395,10 @@ def list_users_activity(self, as_objects=False):
         :return: A list of user activity logs, as a list of :class:`dataikuapi.dss.admin.DSSUserActivity` if as_objects is True, else as a list of dict
         :rtype: list of :class:`dataikuapi.dss.admin.DSSUserActivity` or a list of dict
         """
-        all_activity = self._perform_json("GET", "/admin/users/activity")
+        params = {
+            "enabledUsersOnly": enabledUsersOnly
+        }
+        all_activity = self._perform_json("GET", "/admin/users/activity", params=params)
 
         if as_objects:
             return [DSSUserActivity(self, user_activity["login"], user_activity) for user_activity in all_activity]