medicafe 0.251026.0__tar.gz → 0.251027.1__tar.gz

{medicafe-0.251026.0 → medicafe-0.251027.1}/MediBot/__init__.py

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

{medicafe-0.251026.0 → medicafe-0.251027.1}/MediCafe/MediLink_ConfigLoader.py

@@ -43,8 +43,7 @@ def get_default_config():
                     'enabled': False,
                     'to': '',
                     'subject_prefix': 'MediCafe Error Report',
-                    'max_bundle_bytes': 1572864,
-                    'transport': 'gmail_api'
+                    'max_bundle_bytes': 1572864
                 }
             },
             # STRATEGIC NOTE (COB Configuration): COB library is fully implemented and ready
@@ -158,16 +157,43 @@ def load_configuration(config_path=os.path.join(os.path.dirname(__file__), '..',
             print("Using default configurations due to missing files")
             
     except ValueError as e:
+        # LOUD NOTIFICATION for malformed JSON files
+        print("\n" + "="*80)
+        print("*** CRITICAL ERROR: MALFORMED JSON CONFIGURATION FILES ***")
+        print("="*80)
         if isinstance(e, UnicodeDecodeError):
-            print("Error decoding file: {}".format(e))
+            print("ERROR: Cannot decode configuration file - invalid character encoding")
+            print("DETAILS: {}".format(e))
         else:
-            print("Error parsing file: {}".format(e))
-        print("Falling back to default configurations...")
+            print("ERROR: Configuration files contain invalid JSON syntax")
+            print("DETAILS: {}".format(e))
+        print("\nAFFECTED FILES:")
+        print("- Config file: {}".format(config_path))
+        print("- Crosswalk file: {}".format(crosswalk_path))
+        print("\nACTION REQUIRED:")
+        print("1. Check JSON syntax in both files")
+        print("2. Validate JSON using an online validator")
+        print("3. Fix syntax errors and restart the application")
+        print("\nFALLBACK: Using default configurations (may cause issues)")
+        print("="*80 + "\n")
+        
         config = get_default_config()
         crosswalk = get_default_crosswalk()
     except KeyError as e:
-        print("Critical configuration is missing: {}".format(e))
-        print("Falling back to default configurations...")
+        # LOUD NOTIFICATION for missing required configuration keys
+        print("\n" + "="*80)
+        print("*** CRITICAL ERROR: MISSING REQUIRED CONFIGURATION ***")
+        print("="*80)
+        print("ERROR: Required configuration key is missing")
+        print("DETAILS: {}".format(e))
+        print("\nAFFECTED FILE: {}".format(config_path))
+        print("\nACTION REQUIRED:")
+        print("1. Ensure 'MediLink_Config' section exists in config.json")
+        print("2. Check that all required configuration keys are present")
+        print("3. Verify JSON structure matches expected format")
+        print("\nFALLBACK: Using default configurations (may cause issues)")
+        print("="*80 + "\n")
+        
         config = get_default_config()
         crosswalk = get_default_crosswalk()
     except Exception as e:

{medicafe-0.251026.0 → medicafe-0.251027.1}/MediCafe/__init__.py

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

{medicafe-0.251026.0 → medicafe-0.251027.1}/MediCafe/error_reporter.py

@@ -16,11 +16,6 @@ from email.mime.text import MIMEText
 from MediCafe.MediLink_ConfigLoader import load_configuration, log as mc_log
 from MediLink.MediLink_Gmail import get_access_token
 
-ASCII_SAFE_REPLACEMENTS = [
-	('"', '"'),
-	("'", "'"),
-]
-
 
 def _safe_ascii(text):
 	try:
@@ -66,21 +61,33 @@ def _get_latest_log_path(local_storage_path):
 
 
 def _redact(text):
-	# Best-effort ASCII redaction: mask obvious numeric IDs and bearer tokens
-	try:
-		text = _safe_ascii(text)
-		import re
-		patterns = [
-			(r'\b(\d{3}-?\d{2}-?\d{4})\b', '***-**-****'),
-			(r'\b(\d{9,11})\b', '*********'),
-			(r'Bearer\s+[A-Za-z0-9\-._~+/]+=*', 'Bearer ***'),
-			(r'Authorization:\s*[^\n\r]+', 'Authorization: ***'),
-		]
-		for pat, rep in patterns:
-			text = re.sub(pat, rep, text)
-		return text
-	except Exception:
-		return text
+    # Best-effort ASCII redaction: mask common secrets in logs and JSON
+    try:
+        text = _safe_ascii(text)
+        import re
+        patterns = [
+            # SSN-like
+            (r'\b(\d{3}-?\d{2}-?\d{4})\b', '***-**-****'),
+            # 9-11 digit numeric IDs
+            (r'\b(\d{9,11})\b', '*********'),
+            # Authorization headers
+            (r'Authorization:\s*Bearer\s+[A-Za-z0-9\-._~+/]+=*', 'Authorization: Bearer ***'),
+            (r'Authorization:\s*[^\n\r]+', 'Authorization: ***'),
+            # JSON token fields
+            (r'("access_token"\s*:\s*")([^"]+)(")', r'\1***\3'),
+            (r'("refresh_token"\s*:\s*")([^"]+)(")', r'\1***\3'),
+            (r'("id_token"\s*:\s*")([^"]+)(")', r'\1***\3'),
+            (r'("X-Auth-Token"\s*:\s*")([^"]+)(")', r'\1***\3'),
+            # URL query params: token=..., access_token=..., auth=...
+            (r'(token|access_token|auth|authorization)=([^&\s]+)', r'\1=***'),
+            # Bearer fragments in JSON or text
+            (r'Bearer\s+[A-Za-z0-9\-._~+/]+=*', 'Bearer ***'),
+        ]
+        for pat, rep in patterns:
+            text = re.sub(pat, rep, text)
+        return text
+    except Exception:
+        return text
 
 
 def _ensure_dir(path):
@@ -92,15 +99,7 @@ def _ensure_dir(path):
 		return False
 
 
-def _compute_report_id(zip_path):
-	try:
-		h = hashlib.sha256()
-		with open(zip_path, 'rb') as f:
-			chunk = f.read(256 * 1024)
-			h.update(chunk)
-		return 'mc-{}-{}'.format(int(time.time()), h.hexdigest()[:12])
-	except Exception:
-		return 'mc-{}-{}'.format(int(time.time()), '000000000000')
+# _compute_report_id removed (unused)
 
 
 def collect_support_bundle(include_traceback=True, max_log_lines=500):
@@ -128,7 +127,7 @@ def collect_support_bundle(include_traceback=True, max_log_lines=500):
 		except Exception:
 			traceback_txt = ''
 
-	meta = {
+meta = {
 		'app_version': _safe_ascii(_get_version()),
 		'python_version': _safe_ascii(sys.version.split(' ')[0]),
 		'platform': _safe_ascii(platform.platform()),
@@ -164,11 +163,7 @@ def collect_support_bundle(include_traceback=True, max_log_lines=500):
 		mc_log('Error creating support bundle: {}'.format(e), level='ERROR')
 		return None
 
-	bundle_size = os.path.getsize(zip_path)
-	if bundle_size > 1572864:
-		os.remove(zip_path)
-		mc_log('Bundle too large ({} bytes) - discarded'.format(bundle_size), level='WARNING')
-		return None
+	# Do not delete oversize bundles here; sender will enforce size based on config
 	return zip_path
 
 
@@ -202,9 +197,12 @@ def capture_unhandled_traceback(exc_type, exc_value, exc_traceback):
 		text = _redact(text)
 		with open(trace_path, 'w') as f:
 			f.write(text)
-		print("An error occurred. A traceback was saved to {}".format(trace_path))
+	print("An error occurred. A traceback was saved to {}".format(trace_path))
 	except Exception:
-		pass
+		try:
+			mc_log('Failed to capture traceback to file', level='WARNING')
+		except Exception:
+			pass
 
 def submit_support_bundle_email(zip_path=None, include_traceback=True):
     if not zip_path:
@@ -213,16 +211,22 @@ def submit_support_bundle_email(zip_path=None, include_traceback=True):
             mc_log("Failed to create bundle.", level="ERROR")
             return False
     bundle_size = os.path.getsize(zip_path)
-    if bundle_size > 1572864:
-        mc_log("Bundle too large ({} bytes) - discarding.".format(bundle_size), level="WARNING")
-        os.remove(zip_path)
-        return False
     config, _ = load_configuration()
     email_config = config.get('MediLink_Config', {}).get('error_reporting', {}).get('email', {})
-    if not email_config.get('enabled', False):
-        mc_log("Email reporting disabled.", level="INFO")
+    # Determine max size from config with default 1.5MB
+    try:
+        max_bytes = int(email_config.get('max_bundle_bytes', 1572864))
+    except Exception:
+        max_bytes = 1572864
+    if bundle_size > max_bytes:
+        mc_log("Bundle too large ({} bytes > {} bytes) - leaving in queue.".format(bundle_size, max_bytes), level="WARNING")
+        return False
+    # Feature is always available; proceed if recipients and token are available
+    # Normalize and validate recipients
+    to_emails = _normalize_recipients(email_config.get('to', []))
+    if not to_emails:
+        mc_log("No valid recipients configured in error_reporting.email.to", level="ERROR")
         return False
-    to_emails = email_config.get('to', [])
     subject_prefix = email_config.get('subject_prefix', 'MediCafe Error Report')
     access_token = get_access_token()
     if not access_token:
@@ -245,12 +249,105 @@ def submit_support_bundle_email(zip_path=None, include_traceback=True):
     resp = requests.post('https://gmail.googleapis.com/gmail/v1/users/me/messages/send', headers=headers, json=data)
     if resp.status_code == 200:
         mc_log("Report sent successfully!", level="INFO")
-        os.remove(zip_path)
+        try:
+            os.remove(zip_path)
+        except Exception:
+            pass
         return True
     else:
-        mc_log("Failed to send: {} - {}".format(resp.status_code, resp.text), level="ERROR")
+        # Handle auth errors by prompting re-consent using existing OAuth helpers
+        if resp.status_code in (401, 403):
+            try:
+                from MediLink.MediLink_Gmail import get_authorization_url, open_browser_with_executable
+                auth_url = get_authorization_url()
+                mc_log("Gmail send unauthorized ({}). Opening browser for re-consent.".format(resp.status_code), level="WARNING")
+                try:
+                    print("Your Google session needs to be refreshed to gain gmail.send permission. A browser will open to re-authorize.")
+                except Exception:
+                    pass
+                open_browser_with_executable(auth_url)
+            except Exception:
+                pass
+        mc_log("Failed to send: {} - {}".format(resp.status_code, _redact(resp.text)), level="ERROR")
+        # Preserve bundle in queue for manual retry
         return False
 
+
+def _normalize_recipients(to_field):
+    try:
+        # Flatten to a list of strings
+        if isinstance(to_field, str):
+            candidates = [p.strip() for p in to_field.split(',')]
+        elif isinstance(to_field, list):
+            candidates = [str(p).strip() for p in to_field]
+        else:
+            candidates = []
+        # Basic email regex: local@domain.tld
+        import re
+        email_re = re.compile(r'^[^@\s]+@[^@\s]+\.[^@\s]+$')
+        valid = []
+        for addr in candidates:
+            if not addr:
+                continue
+            if email_re.match(addr):
+                valid.append(addr)
+            else:
+                try:
+                    mc_log("Invalid email recipient skipped: {}".format(addr), level="WARNING")
+                except Exception:
+                    pass
+        return valid
+    except Exception:
+        return []
+
+
+def list_queued_bundles():
+    try:
+        config, _ = load_configuration()
+        medi = config.get('MediLink_Config', {})
+        local_storage_path = medi.get('local_storage_path', '.')
+        queue_dir = os.path.join(local_storage_path, 'reports_queue')
+        if not os.path.isdir(queue_dir):
+            return []
+        files = [os.path.join(queue_dir, f) for f in os.listdir(queue_dir) if f.endswith('.zip')]
+        files.sort()
+        return files
+    except Exception:
+        return []
+
+
+def submit_all_queued_bundles():
+    sent = 0
+    failed = 0
+    try:
+        queued = list_queued_bundles()
+        for z in queued:
+            try:
+                ok = submit_support_bundle_email(zip_path=z, include_traceback=False)
+                if ok:
+                    sent += 1
+                else:
+                    failed += 1
+            except Exception:
+                failed += 1
+    except Exception:
+        pass
+    return sent, failed
+
+
+def delete_all_queued_bundles():
+    deleted = 0
+    try:
+        for z in list_queued_bundles():
+            try:
+                os.remove(z)
+                deleted += 1
+            except Exception:
+                pass
+    except Exception:
+        pass
+    return deleted
+
 def email_error_report_flow():
     try:
         sent = submit_support_bundle_email(zip_path=None, include_traceback=True)

{medicafe-0.251026.0 → medicafe-0.251027.1}/MediLink/MediLink_Gmail.py

@@ -115,11 +115,34 @@ def get_authorization_url():
 def exchange_code_for_token(auth_code, retries=3):
     return oauth_exchange_code_for_token(auth_code, CREDENTIALS_PATH, REDIRECT_URI, log, retries=retries)
 
+def _mask_token_value(value):
+    try:
+        s = str(value or '')
+        if len(s) <= 8:
+            return '***'
+        return s[:4] + '…' + s[-4:]
+    except Exception:
+        return '***'
+
+
+def _mask_token_payload(token_data):
+    try:
+        if not isinstance(token_data, dict):
+            return '{"token":"***"}'
+        masked = dict(token_data)
+        for k in ('access_token', 'refresh_token', 'id_token'):
+            if k in masked:
+                masked[k] = _mask_token_value(masked.get(k))
+        return masked
+    except Exception:
+        return '{"token":"***"}'
+
+
 def get_access_token():
     if os.path.exists(TOKEN_PATH):
         with open(TOKEN_PATH, 'r') as token_file:
             token_data = json.load(token_file)
-            log("Loaded token data:\n {}".format(token_data))
+            log("Loaded token data (masked):\n {}".format(_mask_token_payload(token_data)))
             if 'access_token' in token_data and 'expires_in' in token_data:
                 try:
                     token_time = token_data.get('token_time', time.time())
@@ -128,7 +151,7 @@ def get_access_token():
                     log("KeyError while accessing token data: {}".format(e))
                     return None
                 if token_expiry_time > time.time():
-                    log("Access token is still valid. Expires in {} seconds.".format(token_expiry_time - time.time()))
+                    log("Access token is still valid. Expires in {} seconds.".format(int(token_expiry_time - time.time())))
                     return token_data['access_token']
                 else:
                     log("Access token has expired. Current time: {}, Expiry time: {}".format(time.time(), token_expiry_time))
@@ -137,10 +160,10 @@ def get_access_token():
                         new_token_data['token_time'] = time.time()
                         with open(TOKEN_PATH, 'w') as token_file:
                             json.dump(new_token_data, token_file)
-                        log("Access token refreshed successfully. New token data: {}".format(new_token_data))
+                        log("Access token refreshed successfully. New token data (masked): {}".format(_mask_token_payload(new_token_data)))
                         return new_token_data['access_token']
                     else:
-                        log("Failed to refresh access token. New token data: {}".format(new_token_data))
+                        log("Failed to refresh access token. Response (masked): {}".format(_mask_token_payload(new_token_data)))
                         return None
     log("Access token not found. Please authenticate.")
     return None

{medicafe-0.251026.0 → medicafe-0.251027.1}/MediLink/MediLink_main.py

@@ -23,7 +23,7 @@ if PERFORMANCE_LOGGING:
 # Now import core utilities after path setup
 from MediCafe.core_utils import get_shared_config_loader, setup_module_paths, extract_medilink_config
 from MediCafe.error_reporter import collect_support_bundle, capture_unhandled_traceback
-from MediCafe.error_reporter import submit_support_bundle_email
+from MediCafe.error_reporter import submit_support_bundle_email, list_queued_bundles, submit_all_queued_bundles, delete_all_queued_bundles
 setup_module_paths(__file__)
 
 # Import modules after path setup
@@ -74,6 +74,7 @@ def _tools_menu(config, medi):
         options = [
             "Rebuild submission index now",
             "Submit Error Report (email)",
+            "Resolve Queued Error Reports",
             "Back"
         ]
         MediLink_UI.display_menu(options)
@@ -113,6 +114,18 @@ def _tools_menu(config, medi):
             except Exception as e:
                 print("Error during email report submission: {}".format(e))
         elif choice == '3':
+            try:
+                queued = list_queued_bundles()
+                if not queued:
+                    print("No queued bundles found.")
+                else:
+                    print("Found {} queued bundle(s).".format(len(queued)))
+                    print("Attempting to send now...")
+                    sent, failed = submit_all_queued_bundles()
+                    print("Queued send complete. Sent: {} Failed: {}".format(sent, failed))
+            except Exception as e:
+                print("Error while processing queued bundles: {}".format(e))
+        elif choice == '4':
             break
         else:
             MediLink_UI.display_invalid_choice()
@@ -502,21 +515,36 @@ if __name__ == "__main__":
             online = check_internet_connection()
             if online:
                 success = submit_support_bundle_email(zip_path)
-                if not success:
-                    print("Send failed - bundle discarded.")
+                if success:
+                    # On success, remove the bundle
+                    try:
+                        os.remove(zip_path)
+                    except Exception:
+                        pass
+                else:
+                    # Preserve bundle for manual retry
+                    print("Send failed - bundle preserved at {} for retry.".format(zip_path))
             else:
                 ans = input("Offline. Connect to internet, then press Y to retry or N to discard: ").strip().lower()
                 if ans == 'y':
                     online = check_internet_connection()
                     if online:
                         success = submit_support_bundle_email(zip_path)
-                        if not success:
-                            print("Send failed - bundle discarded.")
+                        if success:
+                            try:
+                                os.remove(zip_path)
+                            except Exception:
+                                pass
+                        else:
+                            print("Send failed - bundle preserved at {} for retry.".format(zip_path))
                     else:
-                        print("Still offline - discarding.")
+                        print("Still offline - preserving bundle at {} for retry.".format(zip_path))
                 else:
-                    print("Discarding.")
-            os.remove(zip_path) if os.path.exists(zip_path) else None
+                    print("Discarding bundle at user request.")
+                    try:
+                        os.remove(zip_path)
+                    except Exception:
+                        pass
         exit_code = 1
     finally:
         if exit_code == 0 and PERFORMANCE_LOGGING:

{medicafe-0.251026.0 → medicafe-0.251027.1}/MediLink/__init__.py

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

{medicafe-0.251026.0/medicafe.egg-info → medicafe-0.251027.1}/PKG-INFO

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

{medicafe-0.251026.0 → medicafe-0.251027.1/medicafe.egg-info}/PKG-INFO

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

{medicafe-0.251026.0 → medicafe-0.251027.1}/setup.py

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