medicafe 0.250819.1__tar.gz → 0.250819.2__tar.gz

{medicafe-0.250819.1 → medicafe-0.250819.2}/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-0.250819.1 → medicafe-0.250819.2}/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"
 

{medicafe-0.250819.1 → medicafe-0.250819.2}/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:

{medicafe-0.250819.1 → medicafe-0.250819.2}/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 → medicafe-0.250819.2}/PKG-INFO

@@ -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 → medicafe-0.250819.2}/medicafe.egg-info/PKG-INFO

@@ -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 → medicafe-0.250819.2}/setup.py

@@ -54,7 +54,7 @@ if long_description_text is None:
 
 setup(
     name='medicafe',
-    version="0.250819.1",
+    version="0.250819.2",
     description='MediCafe',
     long_description=long_description_text,
     long_description_content_type='text/markdown',