medicafe 0.250819.1__py3-none-any.whl → 0.250819.2__py3-none-any.whl

MediBot/__init__.py

@@ -19,7 +19,7 @@ Smart Import Integration:
         medibot_main = get_components('medibot_main')
 """
 
-__version__ = "0.250819.1"
+__version__ = "0.250819.2"
 __author__ = "Daniel Vidaud"
 __email__ = "daniel@personalizedtransformation.com"
 

MediCafe/__init__.py

@@ -27,7 +27,7 @@ Smart Import System:
         api_suite = get_api_access()
 """
 
-__version__ = "0.250819.1"
+__version__ = "0.250819.2"
 __author__ = "Daniel Vidaud"
 __email__ = "daniel@personalizedtransformation.com"
 

MediLink/MediLink_837p_encoder_library.py

@@ -201,8 +201,8 @@ def create_nm1_billing_provider_segment(config, endpoint):
     # Resolve required values with TestMode-aware enforcement
     billing_provider_lastname = legacy_require_config_value(
         [config, endpoint_config],
-        'billing_provider_lastname',
-        config.get('default_billing_provider_name', 'DEFAULT NAME'),
+        ['billing_provider_lastname', 'default_billing_provider_name'],
+        'DEFAULT NAME',
         '2010AA Billing Provider Last Name',
         config,
         endpoint
@@ -210,12 +210,12 @@ def create_nm1_billing_provider_segment(config, endpoint):
     billing_provider_firstname = config.get('billing_provider_firstname', '')
     billing_provider_npi = legacy_require_config_value(
         [endpoint_config, config],
-        'billing_provider_npi',
-        config.get('default_billing_provider_npi', 'DEFAULT NPI'),
+        ['billing_provider_npi', 'default_billing_provider_npi'],
+        'DEFAULT NPI',
         '2010AA Billing Provider NPI',
         config,
         endpoint
-    )
+    ) # BUG This is stupid. The NPI is the same. Maybe the first and last name registration might vary by endpoint, but the NPI wont.
     
     # Determine billing_entity_type_qualifier based on the presence of billing_provider_firstname
     billing_entity_type_qualifier = '1' if billing_provider_firstname else '2' 
@@ -1528,20 +1528,27 @@ DEFAULT_PLACEHOLDER_VALUES = set([
     'NO STATE', 'NO ZIP', 'NO TAX ID', 'NONE'
 ])
 
-def _get_value_from_sources(source_dicts, key):
-    for d in source_dicts:
-        try:
-            if isinstance(d, dict) and key in d:
-                val = d.get(key)
-                if val not in [None, '']:
-                    return val
-        except Exception:
-            pass
+string_types = (str,)
+
+def _get_value_from_sources(source_dicts, keys):
+    # Accept a single key or an ordered list/tuple of keys; scan in priority order
+    if not isinstance(keys, (list, tuple)):
+        keys = [keys]
+    for key in keys:
+        for d in source_dicts:
+            try:
+                if isinstance(d, dict) and key in d:
+                    val = d.get(key)
+                    if val not in [None, '']:
+                        return val
+            except Exception:
+                pass
     return None
 
 def legacy_require_config_value(source_dicts, key, default_value, context_label, config, endpoint=None, allow_default_in_test=True):
     """
     Fetch a configuration value from one or more dicts.
+    - `key` may be a string or a list/tuple of keys to try in order (primary, secondary, ...).
     - If found and equals a known placeholder, allow only in TestMode.
     - If missing, allow default only in TestMode (when allow_default_in_test is True).
     - Otherwise raise ValueError to prevent generating malformed 837p.
@@ -1549,18 +1556,19 @@ def legacy_require_config_value(source_dicts, key, default_value, context_label,
     TODO Eventually we should get this functionality into configloader in MediCafe so that we can use it in other places.
     """
     value = _get_value_from_sources(source_dicts, key)
+    key_label = key if isinstance(key, string_types) else "/".join([k for k in key if isinstance(k, string_types)])
     # Found a value
     if value not in [None, '']:
         if isinstance(value, str) and value in DEFAULT_PLACEHOLDER_VALUES:
             if _is_test_mode(config):
                 try:
-                    MediLink_ConfigLoader.log("TEST MODE: Placeholder used for {} -> {}".format(key, value), level="WARNING")
+                    MediLink_ConfigLoader.log("TEST MODE: Placeholder used for {} -> {}".format(key_label, value), level="WARNING")
                 except Exception:
                     pass
-                print("TEST MODE: Using placeholder '{}' for {} ({})".format(value, key, context_label))
+                print("TEST MODE: Using placeholder '{}' for {} ({})".format(value, key_label, context_label))
                 return value
             else:
-                msg = "Missing real value for '{}' in {}. Found placeholder '{}'. Endpoint: {}".format(key, context_label, value, (endpoint or ''))
+                msg = "Missing real value for '{}' in {}. Found placeholder '{}'. Endpoint: {}".format(key_label, context_label, value, (endpoint or ''))
                 try:
                     MediLink_ConfigLoader.log(msg, level="CRITICAL")
                 except Exception:
@@ -1570,12 +1578,12 @@ def legacy_require_config_value(source_dicts, key, default_value, context_label,
     # Missing value entirely
     if allow_default_in_test and _is_test_mode(config):
         try:
-            MediLink_ConfigLoader.log("TEST MODE: Default used for {} -> {}".format(key, default_value), level="WARNING")
+            MediLink_ConfigLoader.log("TEST MODE: Default used for {} -> {}".format(key_label, default_value), level="WARNING")
         except Exception:
             pass
-        print("TEST MODE: Using default '{}' for {} ({})".format(default_value, key, context_label))
+        print("TEST MODE: Using default '{}' for {} ({})".format(default_value, key_label, context_label))
         return default_value
-    msg = "Required configuration '{}' missing for {}. Endpoint: {}".format(key, context_label, (endpoint or ''))
+    msg = "Required configuration '{}' missing for {}. Endpoint: {}".format(key_label, context_label, (endpoint or ''))
     try:
         MediLink_ConfigLoader.log(msg, level="CRITICAL")
     except Exception:

MediLink/__init__.py

@@ -22,7 +22,7 @@ Smart Import Integration:
         datamgmt = get_components('medilink_datamgmt')
 """
 
-__version__ = "0.250819.1"
+__version__ = "0.250819.2"
 __author__ = "Daniel Vidaud"
 __email__ = "daniel@personalizedtransformation.com"
 

{medicafe-0.250819.1.dist-info → medicafe-0.250819.2.dist-info}/METADATA

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

{medicafe-0.250819.1.dist-info → medicafe-0.250819.2.dist-info}/RECORD

@@ -10,12 +10,12 @@ MediBot/MediBot_UI.py,sha256=iG8UK71aHYBmB0lkjwl-C6L9DbsOyLaq-wt9kChV0jo,23781
 MediBot/MediBot_dataformat_library.py,sha256=D46fdPtxcgfWTzaLBtSvjtozzZBNqNiODgu4vKMZrBg,10746
 MediBot/MediBot_docx_decoder.py,sha256=gn7I7Ng5khVIzU0HTTOqi31YSSn1yW8Pyk-i_P9r1oA,32472
 MediBot/MediBot_smart_import.py,sha256=Emvz7NwemHGCHvG5kZcUyXMcCheidbGKaPfOTg-YCEs,6684
-MediBot/__init__.py,sha256=I2JcvQjmAgvDibwv9qIqTmwm8aIx3wLvNrwx25U2ijU,3192
+MediBot/__init__.py,sha256=BsN88plf2Df_DwQcH5u984m_cB1fSH3t_0wGsv_FRjM,3192
 MediBot/get_medicafe_version.py,sha256=uyL_UIE42MyFuJ3SRYxJp8sZx8xjTqlYZ3FdQuxLduY,728
 MediBot/update_json.py,sha256=vvUF4mKCuaVly8MmoadDO59M231fCIInc0KI1EtDtPA,3704
 MediBot/update_medicafe.py,sha256=09asEEgnGEOq4HH4dmnF18hZdzggqn8zDutQqymdVws,8550
 MediCafe/MediLink_ConfigLoader.py,sha256=fNBFnPbh1YRVCs9WvZp6tPsKTUFzK3f38ePeUQ00QrQ,10161
-MediCafe/__init__.py,sha256=S7mJnzX4mN7T1iNsjNpdbVQC86cxlifqDv5d-UAEjbE,5721
+MediCafe/__init__.py,sha256=xGUWBKk7QuOBa-SnzrqJb-SQIDKuaBRN1wHfp0yKiCg,5721
 MediCafe/__main__.py,sha256=mRNyk3D9Ilnu2XhgVI_rut7r5Ro7UIKtwV871giAHI8,12992
 MediCafe/api_core.py,sha256=IZaBXnP4E7eHzxVbCk2HtxywiVBuhaUyHeaqss8llgY,66378
 MediCafe/api_core_backup.py,sha256=Oy_Fqt0SEvGkQN1Oqw5iUPVFxPEokyju5CuPEb9k0OY,18686
@@ -31,7 +31,7 @@ MediCafe/submission_index.py,sha256=35gz8Anx1dIqG1I14GvuLY0nTO4dSBr2YsZwof9aIQg,
 MediLink/InsuranceTypeService.py,sha256=FKWC1nRfKV_OtCDUtZustauXNhmCYDFiY9jsAGHPPUM,2178
 MediLink/MediLink_837p_cob_library.py,sha256=glc7SJBDx0taCGmwmCs81GFJJcvA_D7nycIkTfmIuwE,30650
 MediLink/MediLink_837p_encoder.py,sha256=lJnly96LsSBnzEgF8Ne-nQTL7cmRhoFL2fJajtpvOcU,32209
-MediLink/MediLink_837p_encoder_library.py,sha256=4rjzKmDcC2f6p2ja5o7cwl2cEXsLkH_0QbqcTT0MoQI,87185
+MediLink/MediLink_837p_encoder_library.py,sha256=VzOpzbYF3i133vdqqxYB6JVMd9N5QzfKaWNVeQKIRZM,87774
 MediLink/MediLink_837p_utilities.py,sha256=AJ0F22LoF8du20zPBH4TZXgsdXCD-1qYKBnHJM-mXl0,16260
 MediLink/MediLink_API_Generator.py,sha256=VZBL9W8yFTMJ4ikSwbUI8ANtaJCLnUyqoF8xQEJQn_E,11176
 MediLink/MediLink_Azure.py,sha256=Ow70jctiHFIylskBExN7WUoRgrKOvBR6jNTnQMk6lJA,210
@@ -54,7 +54,7 @@ MediLink/MediLink_insurance_utils.py,sha256=g741Fj2K26cMy0JX5d_XavMw9LgkK6hjaUJY
 MediLink/MediLink_main.py,sha256=5llRZ065vhUq5cWePb7Zz7QJUIAmua33BeNe3LjTVuE,21892
 MediLink/MediLink_smart_import.py,sha256=B5SfBn_4bYEWJJDolXbjnwKx_-MaqGZ76LyXQwWDV80,9838
 MediLink/Soumit_api.py,sha256=5JfOecK98ZC6NpZklZW2AkOzkjvrbYxpJpZNH3rFxDw,497
-MediLink/__init__.py,sha256=cmVSGALQVlQ5LSCgzd5e2vnlM4q5_P5Kb8iALK1Yw9k,3888
+MediLink/__init__.py,sha256=_XkngMf4aoHnU0OdY2xvg9NTRqwdRKRLA00iLFlBKfU,3888
 MediLink/gmail_http_utils.py,sha256=gtqCCrzJC7e8JFQzMNrf7EbK8na2h4sfTu-NMaZ_UHc,4006
 MediLink/gmail_oauth_utils.py,sha256=Ugr-DEqs4_RddRMSCJ_dbgA3TVeaxpbAor-dktcTIgY,3713
 MediLink/insurance_type_integration_test.py,sha256=pz2OCXitAznqDciYn6OL9M326m9CYU7YiK-ynssdQ5g,15172
@@ -64,9 +64,9 @@ MediLink/test_cob_library.py,sha256=wUMv0-Y6fNsKcAs8Z9LwfmEBRO7oBzBAfWmmzwoNd1g,
 MediLink/test_timing.py,sha256=yH2b8QPLDlp1Zy5AhgtjzjnDHNGhAD16ZtXtZzzESZw,2042
 MediLink/test_validation.py,sha256=FJrfdUFK--xRScIzrHCg1JeGdm0uJEoRnq6CgkP2lwM,4154
 MediLink/webapp.html,sha256=JPKT559aFVBi1r42Hz7C77Jj0teZZRumPhBev8eSOLk,19806
-medicafe-0.250819.1.dist-info/LICENSE,sha256=65lb-vVujdQK7uMH3RRJSMwUW-WMrMEsc5sOaUn2xUk,1096
-medicafe-0.250819.1.dist-info/METADATA,sha256=VXbIzbDxX-2vHAXuT2jHQnujywhvBmAXjE0NLAGulOA,3384
-medicafe-0.250819.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-medicafe-0.250819.1.dist-info/entry_points.txt,sha256=m3RBUBjr-xRwEkKJ5W4a7NlqHZP_1rllGtjZnrRqKe8,52
-medicafe-0.250819.1.dist-info/top_level.txt,sha256=U6-WBJ9RCEjyIs0BlzbQq_PwedCp_IV9n1616NNV5zA,26
-medicafe-0.250819.1.dist-info/RECORD,,
+medicafe-0.250819.2.dist-info/LICENSE,sha256=65lb-vVujdQK7uMH3RRJSMwUW-WMrMEsc5sOaUn2xUk,1096
+medicafe-0.250819.2.dist-info/METADATA,sha256=eAsPHqAEy5kI7cWEeBeBU5jpYILTcKd3R_3cUtnRrAg,3384
+medicafe-0.250819.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+medicafe-0.250819.2.dist-info/entry_points.txt,sha256=m3RBUBjr-xRwEkKJ5W4a7NlqHZP_1rllGtjZnrRqKe8,52
+medicafe-0.250819.2.dist-info/top_level.txt,sha256=U6-WBJ9RCEjyIs0BlzbQq_PwedCp_IV9n1616NNV5zA,26
+medicafe-0.250819.2.dist-info/RECORD,,