willisapi-client 1.4__tar.gz → 1.5__tar.gz

{willisapi_client-1.4 → willisapi_client-1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: willisapi_client
-Version: 1.4
+Version: 1.5
 Summary: A Python client for willisapi
 Home-page: https://github.com/bklynhlth/willsiapi_client
 Author: bklynhlth

{willisapi_client-1.4 → willisapi_client-1.5}/tests/test_auth.py

@@ -1,5 +1,4 @@
 from willisapi_client.services.auth.login_manager import login
-from willisapi_client.services.auth.user_manager import create_user
 from willisapi_client.services.auth.user_group_manager import create_account
 from unittest.mock import patch
 from datetime import timedelta, datetime
@@ -107,7 +106,7 @@ class TestLoginFunction:
             self.client_name,
         )
         print(result)
-        assert result == None
+        assert result == "Python error"
 
     @patch("willisapi_client.services.auth.user_group_manager.AuthUtils.create_account")
     def test_create_account_failed_401_status(self, mocked_create_account):
@@ -121,7 +120,7 @@ class TestLoginFunction:
             self.client_name,
         )
         print(result)
-        assert result == None
+        assert result == "Not an Admin User"
 
     @patch("willisapi_client.services.auth.user_group_manager.AuthUtils.create_account")
     def test_create_account_failed_409_status(self, mocked_create_account):
@@ -135,7 +134,7 @@ class TestLoginFunction:
             self.client_name,
         )
         print(result)
-        assert result == None
+        assert result == "User already exists or already in some group"
 
     @patch("willisapi_client.services.auth.user_group_manager.AuthUtils.create_account")
     def test_create_account_failed_404_status(self, mocked_create_account):
@@ -149,99 +148,4 @@ class TestLoginFunction:
             self.client_name,
         )
         print(result)
-        assert result == None
-
-
-class TestSignupFunction:
-    def setup_method(self):
-        self.username = "dummy"
-        self.password = "password"
-        self.admin_key = "admin_key"
-        self.non_admin_key = "non_admin_key"
-        self.client_email = "client@email.com"
-        self.client_name = "client"
-        self.first_name = "First"
-        self.last_name = "Last"
-
-    @patch("willisapi_client.services.auth.login_manager.AuthUtils.signup")
-    def test_signup_failed(self, mocked_signup):
-        mocked_signup.return_value = {
-            "status_code": 200,
-            "message": "Not an admin user",
-        }
-        message = create_user(
-            self.non_admin_key,
-            self.client_email,
-            self.client_name,
-            self.first_name,
-            self.last_name,
-        )
-        assert message == "Not an admin user"
-
-    @patch("willisapi_client.services.auth.login_manager.AuthUtils.signup")
-    def test_signup_success(self, mocked_signup):
-        mocked_signup.return_value = {"status_code": 200, "message": "User created"}
-        message = create_user(
-            self.admin_key,
-            self.client_email,
-            self.client_name,
-            self.first_name,
-            self.last_name,
-        )
-        assert message == "User created"
-
-    @patch("willisapi_client.services.auth.login_manager.AuthUtils.signup")
-    def test_signup_failed_400_status(self, mocked_signup):
-        mocked_signup.return_value = {
-            "status_code": 400,
-        }
-        message = create_user(
-            self.admin_key,
-            self.client_email,
-            self.client_name,
-            self.first_name,
-            self.last_name,
-        )
-        assert message == None
-
-    @patch("willisapi_client.services.auth.login_manager.AuthUtils.signup")
-    def test_signup_failed_500_status(self, mocked_signup):
-        mocked_signup.return_value = {
-            "status_code": 500,
-        }
-        message = create_user(
-            self.admin_key,
-            self.client_email,
-            self.client_name,
-            self.first_name,
-            self.last_name,
-        )
-        assert message == None
-
-    @patch("willisapi_client.services.auth.login_manager.AuthUtils.signup")
-    def test_signup_failed_401_status(self, mocked_signup):
-        mocked_signup.return_value = {
-            "status_code": 401,
-        }
-        message = create_user(
-            self.admin_key,
-            self.client_email,
-            self.client_name,
-            self.first_name,
-            self.last_name,
-        )
-        assert message == None
-
-    @patch("willisapi_client.services.auth.login_manager.AuthUtils.signup")
-    def test_signup_failed_403_status(self, mocked_signup):
-        mocked_signup.return_value = {
-            "status_code": 403,
-        }
-        message = create_user(
-            self.admin_key,
-            self.client_email,
-            self.client_name,
-            self.first_name,
-            self.last_name,
-        )
-        assert message == None
+        assert result == "User not found"

{willisapi_client-1.4 → willisapi_client-1.5}/willisapi_client/__init__.py

@@ -3,10 +3,9 @@
 # import the required packages
 from willisapi_client.services.api import (
     login,
-    create_user,
     upload,
     download,
     create_account,
 )
 
-__all__ = ["login", "create_user", "upload", "download", "create_account"]
+__all__ = ["login", "upload", "download", "create_account"]

{willisapi_client-1.4 → willisapi_client-1.5}/willisapi_client/__version__.py

@@ -1,7 +1,7 @@
 """Version details for willisapi_client
 """
 __client__ = "willisapi_client"
-__latestVersion__ = "1.4"
+__latestVersion__ = "1.5"
 __url__ = "https://github.com/bklynhlth/willsiapi_client"
 __short_description__ = "A Python client for willisapi"
 __content_type__ = "text/markdown"

{willisapi_client-1.4 → willisapi_client-1.5}/willisapi_client/services/api.py

@@ -1,6 +1,6 @@
 # website:   https://www.brooklyn.health
 
 # import the required packages
-from willisapi_client.services.auth import login, create_user, create_account
+from willisapi_client.services.auth import login, create_account
 from willisapi_client.services.upload import upload
 from willisapi_client.services.download import download

{willisapi_client-1.4 → willisapi_client-1.5}/willisapi_client/services/auth/__init__.py

@@ -2,10 +2,6 @@
 from willisapi_client.services.auth.login_manager import (
     login,
 )
-from willisapi_client.services.auth.user_manager import (
-    create_user,
-)
-
 from willisapi_client.services.auth.user_group_manager import create_account
 
-__all__ = ["login", "create_user", "create_account"]
+__all__ = ["login", "create_account"]

{willisapi_client-1.4 → willisapi_client-1.5}/willisapi_client/services/auth/auth_utils.py

@@ -50,46 +50,6 @@ class AuthUtils:
         else:
             return res_json
 
-    @staticmethod
-    def signup(url, data, headers, try_number):
-        """
-        ------------------------------------------------------------------------------------------------------
-        Class: AuthUtils
-
-        Function: signup
-
-        Description: This is an internal signup function which makes a POST API call to the brooklyn.health API server.
-
-        Parameters:
-        ----------
-        url: The URL of the API endpoint.
-        data: The data to be sent in the request body.
-        headers: The headers to be sent in the request.
-        try_number: The number of times the function has been tried.
-
-        Returns:
-        ----------
-        json: The JSON response from the API server.
-
-        Raises:
-        ----------
-        UnableToOnboardClientError: If the function fails to signup after 3 tries.
-        ------------------------------------------------------------------------------------------------------
-        """
-        try:
-            response = requests.post(url, json=data, headers=headers)
-            res_json = response.json()
-        except (
-            requests.exceptions.ConnectionError,
-            json.decoder.JSONDecodeError,
-        ) as ex:
-            if try_number == 3:
-                raise UnableToOnboardClientError
-            time.sleep(random.random() * 2)
-            return AuthUtils.signup(url, data, headers, try_number=try_number + 1)
-        else:
-            return res_json
-
     @staticmethod
     def create_account(url, data, headers, try_number):
         """

{willisapi_client-1.4 → willisapi_client-1.5}/willisapi_client/services/auth/user_group_manager.py

@@ -61,7 +61,7 @@ def create_account(
             logger.info(
                 f'{datetime.now().strftime("%H:%M:%S")}: User already present in the group'
             )
-            return response["message"]
+        return response["message"]
     else:
         logger.error(f"Login Failed")
         return None

{willisapi_client-1.4 → willisapi_client-1.5}/willisapi_client/services/download/download_utils.py

@@ -5,12 +5,9 @@ import random
 import pandas as pd
 from typing import Tuple
 
-emotional_expressivity_summary = "emotional_expressivity_summary"
-facial_expressivity_summary = "facial_expressivity_summary"
 vocal_acoustic_summary = "vocal_acoustics_summary"
 speech_characteristics_summary = "speech_characteristics_summary"
 rater_qa_summary = "rater_qa_summary"
-eye_blinks_summary = "eye_blink_rate_summary"
 
 
 class DownloadUtils:
@@ -164,22 +161,17 @@ class DownloadUtils:
         measures_dict = response["items"]["project"]["participant"][pt]["results"][rec][
             "measures"
         ]
-        if workflow_tag in measures_dict:
-            if measures_dict[workflow_tag]:
-                if workflow_tag in [
-                    emotional_expressivity_summary,
-                    facial_expressivity_summary,
-                ]:
-                    return pd.read_json(
-                        json.dumps(measures_dict[workflow_tag][0])
-                    ).head(1)
-                if workflow_tag in [
-                    vocal_acoustic_summary,
-                    speech_characteristics_summary,
-                    rater_qa_summary,
-                    eye_blinks_summary,
-                ]:
-                    return pd.read_json(json.dumps(measures_dict[workflow_tag][0]))
+        if (
+            workflow_tag in measures_dict
+            and measures_dict[workflow_tag]
+            and workflow_tag
+            in [
+                vocal_acoustic_summary,
+                speech_characteristics_summary,
+                rater_qa_summary,
+            ]
+        ):
+            return pd.read_json(json.dumps(measures_dict[workflow_tag][0]))
         return pd.DataFrame()
 
     def generate_response_df(response) -> Tuple[pd.DataFrame, str]:
@@ -221,16 +213,6 @@ class DownloadUtils:
                         columns=DownloadUtils._get_defined_columns(),
                     )
 
-                    emotional_expressivity_summary_df = (
-                        DownloadUtils._get_summary_df_from_json(
-                            response, pt, rec, emotional_expressivity_summary
-                        )
-                    )
-                    facial_expressivity_summary_df = (
-                        DownloadUtils._get_summary_df_from_json(
-                            response, pt, rec, facial_expressivity_summary
-                        )
-                    )
                     vocal_acoustics_summary_df = (
                         DownloadUtils._get_summary_df_from_json(
                             response, pt, rec, vocal_acoustic_summary
@@ -241,21 +223,14 @@ class DownloadUtils:
                             response, pt, rec, speech_characteristics_summary
                         )
                     )
-
-                    eye_blinks_summary_df = DownloadUtils._get_summary_df_from_json(
-                        response, pt, rec, eye_blinks_summary
-                    )
                     rater_qa_summary_df = DownloadUtils._get_summary_df_from_json(
                         response, pt, rec, rater_qa_summary
                     )
                     df = pd.concat(
                         [
                             main_df,
-                            emotional_expressivity_summary_df,
-                            facial_expressivity_summary_df,
                             vocal_acoustics_summary_df,
                             speech_characteristics_summary_df,
-                            eye_blinks_summary_df,
                             rater_qa_summary_df,
                         ],
                         axis=1,

{willisapi_client-1.4 → willisapi_client-1.5}/willisapi_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: willisapi-client
-Version: 1.4
+Version: 1.5
 Summary: A Python client for willisapi
 Home-page: https://github.com/bklynhlth/willsiapi_client
 Author: bklynhlth

{willisapi_client-1.4 → willisapi_client-1.5}/willisapi_client.egg-info/SOURCES.txt

@@ -27,7 +27,6 @@ willisapi_client/services/auth/__init__.py
 willisapi_client/services/auth/auth_utils.py
 willisapi_client/services/auth/login_manager.py
 willisapi_client/services/auth/user_group_manager.py
-willisapi_client/services/auth/user_manager.py
 willisapi_client/services/download/__init__.py
 willisapi_client/services/download/download_handler.py
 willisapi_client/services/download/download_utils.py

willisapi_client-1.4/willisapi_client/services/auth/user_manager.py

@@ -1,59 +0,0 @@
-# website:   https://www.brooklyn.health
-from http import HTTPStatus
-
-from willisapi_client.willisapi_client import WillisapiClient
-from willisapi_client.services.auth.auth_utils import AuthUtils
-from willisapi_client.logging_setup import logger as logger
-
-
-def create_user(
-    key: str,
-    client_email: str,
-    client_name: str,
-    first_name: str,
-    last_name: str,
-    **kwargs,
-) -> str:
-    """
-    ---------------------------------------------------------------------------------------------------
-    Function: create_user
-
-    Description: This is the signup function to access willisAPI signup API
-
-    Parameters:
-    ----------
-    key: Admin access token
-    client_email: string representation of client email id
-    client_name: stringbrepresentation of expected client name without empty spaces
-    first_name: User's first name
-    last_name: User's last_name
-
-    Returns:
-    ----------
-    status : Onboard succes/fail message (str/None)
-    ---------------------------------------------------------------------------------------------------
-    """
-
-    wc = WillisapiClient(env=kwargs.get("env"))
-    url = wc.get_signup_url()
-    headers = wc.get_headers()
-    headers["Authorization"] = key
-    data = dict(
-        client_email=client_email,
-        client_name=client_name,
-        first_name=first_name,
-        last_name=last_name,
-    )
-    response = AuthUtils.signup(url, data, headers, try_number=1)
-    if (
-        response
-        and "status_code" in response
-        and response["status_code"] == HTTPStatus.OK
-    ):
-        logger.info(
-            f"Signup Successful for client: {client_name}, client_email: {client_email}"
-        )
-        return response["message"]
-    else:
-        logger.error(f"Signup Failed")
-        return None