medicafe 0.250122.7__tar.gz → 0.250305.0__tar.gz

{medicafe-0.250122.7 → medicafe-0.250305.0}/MediBot/update_medicafe.py

@@ -148,6 +148,9 @@ def ensure_dependencies(requirements_file='requirements.txt'):
                 if not upgrade_package(package_name):  # Attempt to upgrade/downgrade to the required version
                     print("Warning: Failed to upgrade/downgrade {} to version {}.".format(package_name, version))
                     time.sleep(2)  # Pause for 2 seconds after failure message
+            elif version and installed_version == version:  # Check if installed version matches required version
+                print("All versions match for {}. No changes needed.".format(package_name))
+                time.sleep(1)  # Pause for 2 seconds to allow user to read the output
             elif not version:  # If no specific version is required, check for the latest version
                 latest_version = get_latest_version(package_name)
                 if latest_version and installed_version != latest_version:

{medicafe-0.250122.7 → medicafe-0.250305.0}/MediLink/MediLink_837p_encoder_library.py

@@ -60,7 +60,7 @@ def create_nm1_billing_provider_segment(config, endpoint):
     billing_provider_npi = endpoint_config.get('billing_provider_npi', config.get('default_billing_provider_npi', 'DEFAULT NPI'))
     
     # Determine billing_entity_type_qualifier based on the presence of billing_provider_firstname
-    billing_entity_type_qualifier = '1' if billing_provider_firstname else '2'
+    billing_entity_type_qualifier = '1' if billing_provider_firstname else '2' 
     
     # Construct NM1 segment for the billing provider
     nm1_segment = "NM1*{}*{}*{}*{}****{}*{}~".format(
@@ -152,10 +152,10 @@ def create_1000A_submitter_name_segment(patient_data, config, endpoint):
     # Submitter contact details
     contact_name = config.get('submitter_name', 'NONE')
     contact_telephone_number = config.get('submitter_tel', 'NONE')
-    entity_type_qualifier = '2' # if contact_name else '1'  BUG - 1 if submitter_first_name is not empty.
+    entity_type_qualifier = '2' # if contact_name else '1'  BUG - 1 if submitter_first_name is not empty. Reference: billing_entity_type_qualifier = '1' if billing_provider_firstname else '2' 
     
     # Construct NM1 segment for the submitter
-    nm1_segment = "NM1*41*{}*{}*****{}*{}~".format(entity_type_qualifier, submitter_name, submitter_id_qualifier, submitter_id)
+    nm1_segment = "NM1*41*{}*{}*****{}*{}~".format(entity_type_qualifier, submitter_name, submitter_id_qualifier, submitter_id) # BUG - need to check submitter_name because this is written as fixed ****** which implies a single entry and not a first and last name. This is weird.
     
     # Construct PER segment for the submitter's contact information
     per_segment = "PER*IC*{}*TE*{}~".format(contact_name, contact_telephone_number)

medicafe-0.250305.0/MediLink/MediLink_Azure.py

@@ -0,0 +1,13 @@
+#MediLink_Azure.py
+
+import requests
+import json
+import os
+
+# Define the Azure AD tenant ID and client ID
+TENANT_ID = 'your-tenant-id'
+CLIENT_ID = 'your-client-id'
+
+# Define the Azure AD endpoint
+
+

{medicafe-0.250122.7 → medicafe-0.250305.0}/MediLink/MediLink_DataMgmt.py

@@ -327,11 +327,13 @@ def build_command(winscp_path, winscp_log_path, endpoint_config, remote_director
 
     session_name = endpoint_config.get('session_name', '')
 
-    # Initial command structure
+    # Initial command structure with options to disable timestamp preservation and permission setting (should now be compatible with Availity, hopefully this doesn't break everything else)
     command = [
         winscp_path,
         '/log=' + winscp_log_path,
         '/loglevel=1',
+        '/nopreservetime',  # Disable timestamp preservation
+        '/nopermissions',   # Disable permission setting
         '/command',
         'open {}'.format(session_name),
         'cd /',

{medicafe-0.250122.7 → medicafe-0.250305.0}/MediLink/MediLink_Up.py

@@ -140,6 +140,7 @@ def handle_transmission_result(transmission_result, config, operation_type, meth
         # Define the log filename based on the operation type
         log_filename = "winscp_{}.log".format(operation_type)
         # BUG local_claims_path is where the uploads are only. this needs to have a switch. Check where WinSCP actually logs though.
+        # At some point we're going to want to make some aux function that cleans the winscp logs every once in a while (once a day?).
         log_path = os.path.join(config['MediLink_Config']['local_claims_path'], log_filename)
         
         try:
@@ -153,10 +154,11 @@ def handle_transmission_result(transmission_result, config, operation_type, meth
                 success_dict = {file_path: (False, "Log file empty") for file_path in transmission_result}
             else:
                 # Process the last few lines of the log file for transfer status
-                last_lines = log_contents[-15:]
+                last_lines = log_contents[-35:]
                 for file_path in transmission_result:
                     success_message = "Transfer done: '{}'".format(file_path)
-                    success = any(success_message in line for line in last_lines)
+                    additional_success_message = "Upload of file '{}' was successful, but error occurred while setting the permissions and/or timestamp.".format(file_path)
+                    success = any(success_message in line or additional_success_message in line for line in last_lines)
                     message = "Success" if success else "Transfer incomplete or error occurred"
                     success_dict[file_path] = (success, message)
 

{medicafe-0.250122.7/medicafe.egg-info → medicafe-0.250305.0}/PKG-INFO

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

{medicafe-0.250122.7 → medicafe-0.250305.0/medicafe.egg-info}/PKG-INFO

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

{medicafe-0.250122.7 → medicafe-0.250305.0}/medicafe.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ MediLink/MediLink_API_Generator.py
 MediLink/MediLink_API_v2.py
 MediLink/MediLink_API_v3.py
 MediLink/MediLink_APIs.py
+MediLink/MediLink_Azure.py
 MediLink/MediLink_ClaimStatus.py
 MediLink/MediLink_ConfigLoader.py
 MediLink/MediLink_DataMgmt.py

{medicafe-0.250122.7 → medicafe-0.250305.0}/medicafe.egg-info/requires.txt

@@ -7,3 +7,4 @@ lxml==4.2.0
 python-docx==0.8.11
 PyYAML==5.2
 chardet==3.0.4
+msal==1.26.0

{medicafe-0.250122.7 → medicafe-0.250305.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='medicafe',
-    version="0.250122.7",
+    version="0.250305.0",
     description='MediCafe',
     long_description="""
     # Project Overview: MediCafe
@@ -61,7 +61,8 @@ setup(
         'lxml==4.2.0',
         'python-docx==0.8.11',
         'PyYAML==5.2',
-        'chardet==3.0.4'
+        'chardet==3.0.4',
+        'msal==1.26.0'
     ],
     zip_safe=False
 )