willisapi-client 1.7__tar.gz → 1.9__tar.gz

{willisapi_client-1.7 → willisapi_client-1.9}/PKG-INFO

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

{willisapi_client-1.7 → willisapi_client-1.9}/tests/test_auth.py

@@ -1,12 +1,12 @@
 from willisapi_client.services.auth.login_manager import login
 
 from unittest.mock import patch
-from datetime import timedelta, datetime
+from datetime import timedelta, datetime, timezone
 
 
 class TestLoginFunction:
     def setup_method(self):
-        self.dt = datetime.now()
+        self.dt = datetime.now(timezone.utc)
         self.username = "dummy"
         self.password = "password"
         self.id_token = "dummy_token"

willisapi_client-1.9/tests/test_diarize.py

@@ -0,0 +1,64 @@
+from unittest.mock import patch
+
+from willisapi_client.services.diarize.willisdiarize import (
+    willis_diarize,
+)
+from willisapi_client.logging_setup import logger as logger
+import logging
+
+
+class TestDiarizeFunction:
+    def setup(self):
+        self.key = "dummy"
+        self.file_path = "file.json"
+
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.decode_response"
+    )
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.request_diarize"
+    )
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.read_json_file"
+    )
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.is_valid_file_path"
+    )
+    def test_willis_diarize_function_success(
+        self, mock_file_path, mock_json, mock_api_res, mock_decoded_res, caplog
+    ):
+        mock_file_path.return_value = True
+        mock_json.return_value = {"Correct Transcription"}
+        mock_api_res.return_value = {
+            "status_code": 200,
+            "data": "Encoded Response",
+        }
+        mock_decoded_res.return_value = {"Correct Transcription"}
+        with caplog.at_level(logging.INFO):
+            res = willis_diarize(self.key, self.file_path)
+
+        assert res == {"Correct Transcription"}
+
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.request_diarize"
+    )
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.read_json_file"
+    )
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.is_valid_file_path"
+    )
+    def test_willis_diarize_function_invalid_json(
+        self, mock_file_path, mock_json, mock_api_res, caplog
+    ):
+        mock_file_path.return_value = False
+        mock_json.return_value = {}
+        mock_api_res.return_value = {
+            "status_code": 200,
+            "data": "Encoded Response",
+        }
+
+        with caplog.at_level(logging.INFO):
+            res = willis_diarize(self.key, self.file_path)
+
+        assert "Input file type is incorrect. We only accept JSON files" in caplog.text

willisapi_client-1.9/tests/test_diarize_call_remaining.py

@@ -0,0 +1,42 @@
+from unittest.mock import patch
+
+from willisapi_client.services.diarize.willisdiarize_call_remaining import (
+    willis_diarize_call_remaining,
+)
+from willisapi_client.logging_setup import logger as logger
+import logging
+
+
+class TestDiarizeCallsFunction:
+    def setup(self):
+        self.key = "dummy"
+
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.request_call_remaining"
+    )
+    def test_willisdiarize_remaining_calls_failed(self, mocked_data, caplog):
+        mocked_data.return_value = {}
+        with caplog.at_level(logging.INFO):
+            willis_diarize_call_remaining(self.key)
+        assert "" in caplog.text
+
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.request_call_remaining"
+    )
+    def test_willisdiarize_remaining_calls_missing_auth(self, mocked_data, caplog):
+        mocked_data.return_value = {"status_code": 401, "message": "message"}
+        with caplog.at_level(logging.INFO):
+            willis_diarize_call_remaining(self.key)
+        assert "message" in caplog.text
+
+    @patch(
+        "willisapi_client.services.diarize.diarize_utils.DiarizeUtils.request_call_remaining"
+    )
+    def test_willisdiarize_remaining_calls_success(self, mocked_data, caplog):
+        mocked_data.return_value = {
+            "status_code": 401,
+            "message": "Your account has 10 WillisDiarize API calls remaining.",
+        }
+        with caplog.at_level(logging.INFO):
+            willis_diarize_call_remaining(self.key)
+        assert "Your account has 10 WillisDiarize API calls remaining." in caplog.text

{willisapi_client-1.7 → willisapi_client-1.9}/tests/test_upload.py

@@ -95,7 +95,7 @@ class TestUpload:
         mocked_df.return_value = pd.DataFrame([self.df_row], columns=self.df_cols)
         mock_row_validation.return_value = True, None
         mocked_upload.return_value = True, None
-        df = upload(self.key, self.metadata, reupload="force")
+        df = upload(self.key, self.metadata, force_upload="true")
         num = len(df[df["upload_status"] == "success"])
         assert num == 1
         assert list(df.columns) == self.response_df_cols

willisapi_client-1.9/willisapi_client/__init__.py

@@ -0,0 +1,18 @@
+# website:   https://www.brooklyn.health
+
+# import the required packages
+from willisapi_client.services.api import (
+    login,
+    upload,
+    download,
+    willis_diarize_call_remaining,
+    willis_diarize,
+)
+
+__all__ = [
+    "login",
+    "upload",
+    "download",
+    "willis_diarize_call_remaining",
+    "willis_diarize",
+]

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client/__version__.py

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

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client/services/api.py

@@ -4,3 +4,7 @@
 from willisapi_client.services.auth import login
 from willisapi_client.services.upload import upload
 from willisapi_client.services.download import download
+from willisapi_client.services.diarize import (
+    willis_diarize_call_remaining,
+    willis_diarize,
+)

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client/services/auth/login_manager.py

@@ -3,7 +3,7 @@ from typing import Tuple
 from http import HTTPStatus
 
 # import datetime
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 from willisapi_client.willisapi_client import WillisapiClient
 from willisapi_client.services.auth.auth_utils import AuthUtils
@@ -41,10 +41,10 @@ def login(username: str, password: str, **kwargs) -> Tuple[str, int]:
     ):
         logger.info("Login Successful; Key acquired")
         logger.info(
-            f"Key expiration: {datetime.now() + timedelta(seconds=response['result']['expires_in'])}"
+            f"Key expiration: {datetime.now(timezone.utc) + timedelta(seconds=response['result']['expires_in'])}"
         )
         required_format = (
-            f"{datetime.now() + timedelta(seconds=response['result']['expires_in'])}"
+            f"{datetime.now(timezone.utc) + timedelta(seconds=response['result']['expires_in'])}"
         )
         return (response["result"]["id_token"], required_format)
     else:

willisapi_client-1.9/willisapi_client/services/diarize/__init__.py

@@ -0,0 +1,7 @@
+# website:   https://www.brooklyn.health
+from willisapi_client.services.diarize.willisdiarize_call_remaining import (
+    willis_diarize_call_remaining,
+)
+from willisapi_client.services.diarize.willisdiarize import willis_diarize
+
+__all__ = ["willis_diarize_call_remaining", "willis_diarize"]

willisapi_client-1.9/willisapi_client/services/diarize/diarize_utils.py

@@ -0,0 +1,99 @@
+import requests
+import json
+import time
+import random
+import os
+import gzip
+import base64
+from willisapi_client.logging_setup import logger as logger
+
+
+class DiarizeUtils:
+    def is_valid_file_path(file_path: str):
+        return file_path.endswith(".json") and os.path.exists(file_path)
+
+    def read_json_file(file_path: str):
+        data = None
+        try:
+            with open(file_path) as f:
+                json_data = json.load(f)
+            data = dict(json_data=json_data)
+        except json.decoder.JSONDecodeError:
+            logger.info("No data found in the file or JSON is invalid.")
+            logger.info("Failed!")
+        return data
+
+    def decode_response(encoded_response):
+        return json.loads(gzip.decompress(base64.b64decode(encoded_response)))
+
+    def request_diarize(url, data, headers, try_number):
+        """
+        ------------------------------------------------------------------------------------------------------
+        Class: DiarizeUtils
+
+        Function: request_diarize
+
+        Description: This is an internal diarize function which makes a GET API call to brooklyn.health API server
+
+        Parameters:
+        ----------
+        url: The URL of the API endpoint.
+        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.
+        ------------------------------------------------------------------------------------------------------
+        """
+        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
+            time.sleep(random.random() * 2)
+            return DiarizeUtils.request_diarize(
+                url, data, headers, try_number=try_number + 1
+            )
+        else:
+            return res_json
+
+    def request_call_remaining(url, headers, try_number):
+        """
+        ------------------------------------------------------------------------------------------------------
+        Class: DiarizeUtils
+
+        Function: request_call_remaining
+
+        Description: This is an internal diarize function which makes a GET API call to brooklyn.health API server
+
+        Parameters:
+        ----------
+        url: The URL of the API endpoint.
+        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.
+        ------------------------------------------------------------------------------------------------------
+        """
+        try:
+            response = requests.get(url, headers=headers)
+            res_json = response.json()
+        except (
+            requests.exceptions.ConnectionError,
+            json.decoder.JSONDecodeError,
+        ) as ex:
+            if try_number == 3:
+                raise
+            time.sleep(random.random() * 2)
+            return DiarizeUtils.request_call_remaining(
+                url, headers, try_number=try_number + 1
+            )
+        else:
+            return res_json

willisapi_client-1.9/willisapi_client/services/diarize/willisdiarize.py

@@ -0,0 +1,52 @@
+from http import HTTPStatus
+
+from willisapi_client.willisapi_client import WillisapiClient
+from willisapi_client.logging_setup import logger as logger
+from willisapi_client.services.diarize.diarize_utils import DiarizeUtils
+
+
+def willis_diarize(key: str, file_path: str, **kwargs):
+    """
+    ---------------------------------------------------------------------------------------------------
+    Function: willis_diarize
+
+    Description: This function makes call to WillisDiarize Model
+
+    Parameters:
+    ----------
+    key: AWS access id token (str)
+    file_path: String
+
+    Returns:
+    ----------
+    json: JSON
+    ---------------------------------------------------------------------------------------------------
+    """
+
+    logger.info("Passing through WillisDiarize...")
+    wc = WillisapiClient(env=kwargs.get("env"))
+    url = wc.get_diarize()
+    headers = wc.get_headers()
+    headers["Authorization"] = key
+    corrected_transcript = None
+
+    if not DiarizeUtils.is_valid_file_path(file_path):
+        logger.info("Input file type is incorrect. We only accept JSON files.")
+        logger.info("Failed!")
+        return corrected_transcript
+
+    data = DiarizeUtils.read_json_file(file_path)
+
+    if not data:
+        return corrected_transcript
+
+    response = DiarizeUtils.request_diarize(url, data, headers, try_number=1)
+    if response["status_code"] != HTTPStatus.OK:
+        logger.info(response["message"])
+        logger.info("Failed!")
+    else:
+        logger.info("Returning processed JSON...")
+        encoded_response = response["data"]
+        corrected_transcript = DiarizeUtils.decode_response(encoded_response)
+        logger.info("Done!")
+    return corrected_transcript

willisapi_client-1.9/willisapi_client/services/diarize/willisdiarize_call_remaining.py

@@ -0,0 +1,28 @@
+from http import HTTPStatus
+
+from willisapi_client.willisapi_client import WillisapiClient
+from willisapi_client.logging_setup import logger as logger
+from willisapi_client.services.diarize.diarize_utils import DiarizeUtils
+
+
+def willis_diarize_call_remaining(key: str, **kwargs):
+    """
+    ---------------------------------------------------------------------------------------------------
+    Function: willis_diarize_call_remaining
+
+    Description: This function returns the number of remaining calls for willisdiarize
+
+    Parameters:
+    ----------
+    key: AWS access id token (str)
+    ---------------------------------------------------------------------------------------------------
+    """
+
+    wc = WillisapiClient(env=kwargs.get("env"))
+    url = wc.get_diarize_remaining_calls_url()
+    headers = wc.get_headers()
+    headers["Authorization"] = key
+
+    response = DiarizeUtils.request_call_remaining(url, headers, try_number=1)
+    if response:
+        logger.info(response["message"])

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client/services/download/download_utils.py

@@ -7,7 +7,7 @@ from typing import Tuple
 from http import HTTPStatus
 
 
-vocal_acoustic_summary = "vocal_acoustics_summary"
+vocal_acoustics_simple_summary = "vocal_acoustics_simple_summary"
 speech_characteristics_summary = "speech_characteristics_summary"
 rater_qa_summary = "rater_qa_summary"
 
@@ -164,7 +164,7 @@ class DownloadUtils:
             and measures_dict[workflow_tag]
             and workflow_tag
             in [
-                vocal_acoustic_summary,
+                vocal_acoustics_simple_summary,
                 speech_characteristics_summary,
                 rater_qa_summary,
             ]
@@ -239,9 +239,9 @@ class DownloadUtils:
                         columns=DownloadUtils._get_defined_columns(),
                     )
 
-                    vocal_acoustics_summary_df = (
+                    vocal_acoustics_simple_summary_df = (
                         DownloadUtils._get_summary_df_from_json(
-                            data, pt, rec, vocal_acoustic_summary
+                            data, pt, rec, vocal_acoustics_simple_summary
                         )
                     )
                     speech_characteristics_summary_df = (
@@ -255,7 +255,7 @@ class DownloadUtils:
                     df = pd.concat(
                         [
                             main_df,
-                            vocal_acoustics_summary_df,
+                            vocal_acoustics_simple_summary_df,
                             speech_characteristics_summary_df,
                             rater_qa_summary_df,
                         ],

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client/services/upload/csv_validation.py

@@ -53,7 +53,7 @@ class CSVValidation:
         }
         self.gender_field = ["M", "F"]
         self.workflow_tags = [
-            "vocal_acoustics",
+            "vocal_acoustics_simple",
             "speech_characteristics",
             "speech_transcription_aws",
             "voice_and_speech",
@@ -71,6 +71,8 @@ class CSVValidation:
             "scale_",
             "speech_characteristics_",
             "rater_qa_",
+            "scale_wd_",
+            "rater_qa_wd_",
         ]
         self.collect_time_format = r"^\d{4}-\d{2}-\d{2}$"
         self.df = None

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client/services/upload/multipart_upload_handler.py

@@ -33,7 +33,7 @@ def upload(key, data, **kwargs):
         logger.info(f'{datetime.now().strftime("%H:%M:%S")}: csv check passed')
         dataframe = csv.get_dataframe()
         wc = WillisapiClient(env=kwargs.get("env"))
-        reupload = "true" if kwargs.get("reupload") == "force" else "false"
+        force_upload = "true" if kwargs.get("force_upload") == True else False
         url = wc.get_upload_url()
         headers = wc.get_headers()
         headers["Authorization"] = key
@@ -43,7 +43,7 @@ def upload(key, data, **kwargs):
             (is_valid_row, error) = csv.validate_row(row)
             if is_valid_row:
                 (uploaded, error) = UploadUtils.upload(
-                    index, row, url, headers, reupload
+                    index, row, url, headers, force_upload
                 )
                 if uploaded:
                     summary.append([row.file_path, "success", None])

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client/services/upload/upload_utils.py

@@ -102,7 +102,7 @@ class UploadUtils:
         return number_of_parts
 
     def initiate_multi_part_upload(
-        index: int, row, url: str, headers: dict, reupload: str
+        index: int, row, url: str, headers: dict, force_upload: str
     ) -> Tuple[str, str]:
         """
         ------------------------------------------------------------------------------------------------------
@@ -146,7 +146,7 @@ class UploadUtils:
 
         try:
             response = requests.post(
-                f"{url}?type=initiate&reupload={reupload}", json=data, headers=headers
+                f"{url}?type=initiate&force_upload={force_upload}", json=data, headers=headers
             )
             res_json = response.json()
         except Exception as ex:
@@ -171,6 +171,7 @@ class UploadUtils:
 
             else:
                 if "message" in res_json and res_json["message"] == "Unauthorized":
+                    error = res_json["message"]
                     logger.error(
                         "Your Key is expired. Login again to generate a new key"
                     )
@@ -279,7 +280,7 @@ class UploadUtils:
         return SORTED_PARTS
 
     @staticmethod
-    def upload(index, row, url, headers, reupload) -> Tuple[bool, str]:
+    def upload(index, row, url, headers, force_upload) -> Tuple[bool, str]:
         """
         ------------------------------------------------------------------------------------------------------
         Class: UploadUtils
@@ -302,8 +303,9 @@ class UploadUtils:
         ------------------------------------------------------------------------------------------------------
         """
         (upload_id, record_id, error) = UploadUtils.initiate_multi_part_upload(
-            index, row, url, headers, reupload
+            index, row, url, headers, force_upload
         )
+        filename = os.path.basename(row.file_path)
         uploaded = False
         if upload_id and record_id:
             presigned_urls, number_of_parts = UploadUtils.fetch_pre_signed_part_urls(
@@ -313,7 +315,7 @@ class UploadUtils:
                 if len(presigned_urls) != number_of_parts:
                     parts = json.dumps([])
                     res = requests.post(
-                        f"{url}?type=complete&record_id={record_id}&upload_id={upload_id}&number_of_parts={number_of_parts}",
+                        f"{url}?type=complete&record_id={record_id}&upload_id={upload_id}&number_of_parts={number_of_parts}&filename={filename}",
                         json=parts,
                         headers=headers,
                     )
@@ -323,7 +325,7 @@ class UploadUtils:
                     UploadUtils.close_file(file)
                     parts = json.dumps(parts)
                     res = requests.post(
-                        f"{url}?type=complete&record_id={record_id}&upload_id={upload_id}&number_of_parts={number_of_parts}",
+                        f"{url}?type=complete&record_id={record_id}&upload_id={upload_id}&number_of_parts={number_of_parts}&filename={filename}",
                         json=parts,
                         headers=headers,
                     )

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client/willisapi_client.py

@@ -25,14 +25,17 @@ class WillisapiClient:
     def get_login_url(self):
         return self.get_base_url() + "login"
 
-    def get_signup_url(self):
-        return self.get_base_url() + "signup"
-
     def get_upload_url(self):
         return self.get_base_url() + "upload"
 
     def get_download_url(self):
         return self.get_base_url() + "download"
 
+    def get_diarize_remaining_calls_url(self):
+        return self.get_base_url() + "willis-diarize-call-remaining"
+
+    def get_diarize(self):
+        return self.get_base_url() + "diarize"
+
     def get_headers(self):
         return {"Content-Type": "application/json", "Accept": "application/json"}

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client.egg-info/PKG-INFO

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

{willisapi_client-1.7 → willisapi_client-1.9}/willisapi_client.egg-info/SOURCES.txt

@@ -7,6 +7,8 @@ setup.cfg
 setup.py
 tests/test_auth.py
 tests/test_csv_validation.py
+tests/test_diarize.py
+tests/test_diarize_call_remaining.py
 tests/test_download.py
 tests/test_upload.py
 willisapi_client/__init__.py
@@ -26,6 +28,10 @@ willisapi_client/services/exceptions.py
 willisapi_client/services/auth/__init__.py
 willisapi_client/services/auth/auth_utils.py
 willisapi_client/services/auth/login_manager.py
+willisapi_client/services/diarize/__init__.py
+willisapi_client/services/diarize/diarize_utils.py
+willisapi_client/services/diarize/willisdiarize.py
+willisapi_client/services/diarize/willisdiarize_call_remaining.py
 willisapi_client/services/download/__init__.py
 willisapi_client/services/download/download_handler.py
 willisapi_client/services/download/download_utils.py

willisapi_client-1.7/willisapi_client/__init__.py

@@ -1,10 +0,0 @@
-# website:   https://www.brooklyn.health
-
-# import the required packages
-from willisapi_client.services.api import (
-    login,
-    upload,
-    download,
-)
-
-__all__ = ["login", "upload", "download"]