medicafe 0.250305.1__tar.gz → 0.250401.0__tar.gz

{medicafe-0.250305.1 → medicafe-0.250401.0}/MediBot/MediBot_Crosswalk_Library.py

@@ -543,14 +543,24 @@ def update_crosswalk_with_new_payer_id(client, insurance_name, payer_id, config,
             else:
                 selected_endpoint = current_endpoint  # Use the existing valid endpoint
 
-        # Add the insurance ID to the payer ID entry
-        crosswalk['payer_id'][payer_id]['medisoft_id'].add(str(medisoft_id_str))  # Ensure IDs are strings
-        MediLink_ConfigLoader.log(
-            "Added new insurance ID {} to payer ID {}.".format(medisoft_id_str, payer_id),
-            config,
-            level="INFO"
-        )
-
+        # Add the insurance ID to the payer ID entry - with error handling for the .add() operation
+        try:
+            if not isinstance(crosswalk['payer_id'][payer_id]['medisoft_id'], set):
+                # Convert to set if it's not already one
+                crosswalk['payer_id'][payer_id]['medisoft_id'] = set(crosswalk['payer_id'][payer_id]['medisoft_id'])
+                MediLink_ConfigLoader.log("Converted medisoft_id to set for payer ID {}.".format(payer_id), config, level="DEBUG")
+            
+            crosswalk['payer_id'][payer_id]['medisoft_id'].add(str(medisoft_id_str)) # Ensure IDs are strings
+            MediLink_ConfigLoader.log(
+                "Added new insurance ID {} to payer ID {}.".format(medisoft_id_str, payer_id),
+                config,
+                level="INFO"
+            )
+        except AttributeError as e:
+            MediLink_ConfigLoader.log("AttributeError while adding medisoft_id: {}".format(e), config, level="ERROR")
+            print("Error adding medisoft_id for payer ID {}: {}".format(payer_id, e))
+            return False
+        
         # Fetch and store the payer name for the new payer ID
         if fetch_and_store_payer_name(client, payer_id, crosswalk, config):
             MediLink_ConfigLoader.log("Successfully fetched and stored payer name for new payer ID {}.".format(payer_id), config, level="INFO")

{medicafe-0.250305.1 → medicafe-0.250401.0}/MediLink/MediLink_API_v3.py

@@ -160,21 +160,35 @@ class APIClient(BaseAPIClient):
         url = base_url + url_extension
 
         try:
-            # Make the API call based on call_type
-            if call_type == 'GET':
-                response = requests.get(url, headers=headers, params=params)
-            elif call_type == 'POST':
-                headers['Content-Type'] = 'application/json'
-                response = requests.post(url, headers=headers, json=data)
-            elif call_type == 'DELETE':
-                response = requests.delete(url, headers=headers)
-            else:
-                raise ValueError("Unsupported call type: {}".format(call_type))
-
             masked_headers = headers.copy()
             if 'Authorization' in masked_headers:
                 masked_headers['Authorization'] = 'Bearer ***'
 
+            def make_request():
+                if call_type == 'GET':
+                    return requests.get(url, headers=headers, params=params)
+                elif call_type == 'POST':
+                    headers['Content-Type'] = 'application/json'
+                    return requests.post(url, headers=headers, json=data)
+                elif call_type == 'DELETE':
+                    return requests.delete(url, headers=headers)
+                else:
+                    raise ValueError("Unsupported call type: {}".format(call_type))
+
+            # Make initial request
+            response = make_request()
+
+            # If we get a 5xx error, wait and retry once
+            if 500 <= response.status_code < 600:
+                MediLink_ConfigLoader.log(
+                    "Received {} error from server for {} request to {}. Waiting 1 second before retry...".format(
+                        response.status_code, call_type, url
+                    ),
+                    level="WARNING"
+                )
+                time.sleep(1)
+                response = make_request()
+
             # Raise an HTTPError if the response was unsuccessful
             response.raise_for_status()
 
@@ -305,6 +319,17 @@ def fetch_payer_name_from_api(client, payer_id, config, primary_endpoint='AVAILI
         endpoints = config['MediLink_Config']['endpoints']  # Re-attempt to access endpoints
         MediLink_ConfigLoader.log("Re-loaded configuration successfully.", level="INFO")
     
+    # Sanitize and validate payer_id
+    if not isinstance(payer_id, str):
+        payer_id = str(payer_id)
+    
+    payer_id = ''.join(char for char in payer_id if char.isalnum())
+    
+    if not payer_id:
+        error_message = "Invalid payer_id in API v3: {}. Must contain a string of alphanumeric characters.".format(payer_id)
+        MediLink_ConfigLoader.log(error_message, level="ERROR")
+        print(error_message)
+    
     # Define endpoint rotation logic
     endpoint_order = ([primary_endpoint] + 
                       [endpoint for endpoint in endpoints if endpoint != primary_endpoint]

{medicafe-0.250305.1/medicafe.egg-info → medicafe-0.250401.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250305.1
+Version: 0.250401.0
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250305.1 → medicafe-0.250401.0/medicafe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250305.1
+Version: 0.250401.0
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250305.1 → medicafe-0.250401.0}/medicafe.egg-info/requires.txt

@@ -4,6 +4,7 @@ tqdm==4.14.0
 python-docx==0.8.11
 PyYAML==5.2
 chardet==3.0.4
+cffi==1.8.2
 msal==1.26.0
 
 [:platform_python_implementation != "CPython" or sys_platform != "win32" or python_version > "3.5"]

{medicafe-0.250305.1 → medicafe-0.250401.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='medicafe',
-    version="0.250305.1",
+    version="0.250401.0",
     description='MediCafe',
     long_description="""
     # Project Overview: MediCafe
@@ -65,6 +65,7 @@ setup(
         'python-docx==0.8.11',
         'PyYAML==5.2',
         'chardet==3.0.4',
+        'cffi==1.8.2', # msal needs this and then pip install will fail because 1.15.X won't work on XP.
         'msal==1.26.0'
     ],
     zip_safe=False