medicafe 0.250909.0__tar.gz → 0.250912.0__tar.gz

{medicafe-0.250909.0 → medicafe-0.250912.0}/MediBot/__init__.py

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

{medicafe-0.250909.0 → medicafe-0.250912.0}/MediCafe/__init__.py

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

{medicafe-0.250909.0 → medicafe-0.250912.0}/MediLink/MediLink_Gmail.py

@@ -185,10 +185,30 @@ class RequestHandler(BaseHTTPRequestHandler):
             file_ids = [link.get('fileId', None) for link in links if link.get('fileId')]
             log("File IDs received from client: {}".format(file_ids))
             download_docx_files(links)
+            # Only delete files that actually downloaded successfully
+            downloaded_names = load_downloaded_emails()
+            successful_ids = []
+            try:
+                name_to_id = { (link.get('filename') or ''): link.get('fileId') for link in links if link.get('fileId') }
+                for name in downloaded_names:
+                    fid = name_to_id.get(name)
+                    if fid:
+                        successful_ids.append(fid)
+            except Exception as e:
+                log("Error computing successful file IDs for cleanup: {}".format(e))
+                successful_ids = file_ids  # Fallback: attempt all provided IDs
+            # Trigger cleanup in Apps Script with auth
+            try:
+                if successful_ids:
+                    send_delete_request_to_gas(successful_ids)
+                else:
+                    log("No successful file IDs to delete after download.")
+            except Exception as e:
+                log("Cleanup trigger failed: {}".format(e))
             self.send_response(200)
             self._set_headers()
             self.end_headers()
-            response = json.dumps({"status": "success", "message": "All files downloaded", "fileIds": file_ids})
+            response = json.dumps({"status": "success", "message": "All files downloaded", "fileIds": successful_ids})
             self.wfile.write(response.encode('utf-8'))
             shutdown_event.set()
             bring_window_to_foreground()
@@ -437,6 +457,38 @@ def handle_post_response(url, payload, headers):
         log("Unexpected error during link retrieval initiation: {}".format(e))
         shutdown_event.set()
 
+def send_delete_request_to_gas(file_ids):
+    """Send a delete_files action to the Apps Script web app for the provided Drive file IDs.
+    Relies on OAuth token previously obtained. Sends user notifications via GAS.
+    """
+    try:
+        medi = extract_medilink_config(config)
+        url = "https://script.google.com/macros/s/{}/exec".format(medi.get('webapp_deployment_id', ''))
+        access_token = get_access_token()
+        if not access_token:
+            log("Access token not found. Skipping cleanup request to GAS.")
+            return
+        headers = {'Authorization': 'Bearer {}'.format(access_token), 'Content-Type': 'application/json'}
+        payload = {"action": "delete_files", "fileIds": list(file_ids)}
+        log("Initiating cleanup request to GAS. Payload size: {} id(s)".format(len(file_ids)))
+        resp = requests.post(url, json=payload, headers=headers)
+        log("Cleanup response status: {}".format(resp.status_code))
+        # Print a concise console message
+        if resp.ok:
+            try:
+                body = resp.json()
+                msg = body.get('message', 'Files deleted successfully') if isinstance(body, dict) else 'Files deleted successfully'
+            except Exception:
+                msg = 'Files deleted successfully'
+            print("Cleanup complete: {} ({} file(s))".format(msg, len(file_ids)))
+        else:
+            print("Cleanup failed with status {}: {}".format(resp.status_code, resp.text))
+        if resp.status_code != 200:
+            raise RuntimeError("Cleanup request failed with status {}".format(resp.status_code))
+    except Exception as e:
+        log("Error sending delete request to GAS: {}".format(e))
+        print("Cleanup request error: {}".format(e))
+
 def inspect_token(access_token):
     return http_inspect_token(access_token, log, delete_token_file_fn=delete_token_file, stop_server_fn=stop_server)
 

{medicafe-0.250909.0 → medicafe-0.250912.0}/MediLink/__init__.py

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

{medicafe-0.250909.0 → medicafe-0.250912.0}/MediLink/webapp.html

@@ -402,6 +402,7 @@
                         links: downloadLinks.map(link => ({
                             url: link.url,
                             filename: link.filename,
+                            fileId: link.fileId,
                         }))
                     }),
                     mode: 'cors'  // Ensure the request includes CORS headers

{medicafe-0.250909.0/medicafe.egg-info → medicafe-0.250912.0}/PKG-INFO

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

{medicafe-0.250909.0 → medicafe-0.250912.0/medicafe.egg-info}/PKG-INFO

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

{medicafe-0.250909.0 → medicafe-0.250912.0}/setup.py

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