Update mtdna_backend.py

mtdna_backend.py

@@ -512,25 +512,41 @@ def hash_user_id(user_input):
 #     except (json.JSONDecodeError, ValueError):
 #         print("⚠️ Warning: user_usage.json is corrupted or invalid. Resetting.")
 #         return {}  # fallback to empty dict
+# def load_user_usage():
+#     try:
+#         creds_dict = json.loads(os.environ["GCP_CREDS_JSON"])
+#         scope = ['https://spreadsheets.google.com/feeds', 'https://www.googleapis.com/auth/drive']
+#         creds = ServiceAccountCredentials.from_json_keyfile_dict(creds_dict, scope)
+#         client = gspread.authorize(creds)
+
+#         sheet = client.open("user_usage_log").sheet1
+#         data = sheet.get_all_records()  # Assumes columns: email, usage_count
+
+#         usage = {}
+#         for row in data:
+#             email = row.get("email", "").strip().lower()
+#             count = int(row.get("usage_count", 0))
+#             if email:
+#                 usage[email] = count
+#         return usage
+#     except Exception as e:
+#         print(f"⚠️ Failed to load user usage from Google Sheets: {e}")
+#         return {}
 def load_user_usage():
     try:
-        creds_dict = json.loads(os.environ["GCP_CREDS_JSON"])
-        scope = ['https://spreadsheets.google.com/feeds', 'https://www.googleapis.com/auth/drive']
-        creds = ServiceAccountCredentials.from_json_keyfile_dict(creds_dict, scope)
-        client = gspread.authorize(creds)
+        parent_id = get_or_create_drive_folder("mtDNA-Location-Classifier")
+        iterate3_id = get_or_create_drive_folder("iterate3", parent_id=parent_id)
 
-        sheet = client.open("user_usage_log").sheet1
-        data = sheet.get_all_records()  # Assumes columns: email, usage_count
+        found = find_drive_file("user_usage_log.json", parent_folder_id=iterate3_id)
+        if not found:
+            return {}  # not found, start fresh
+
+        file_id = found[0]["id"]
+        content = download_drive_file_content(file_id)
+        return json.loads(content.strip()) if content.strip() else {}
 
-        usage = {}
-        for row in data:
-            email = row.get("email", "").strip().lower()
-            count = int(row.get("usage_count", 0))
-            if email:
-                usage[email] = count
-        return usage
     except Exception as e:
-        print(f"⚠️ Failed to load user usage from Google Sheets: {e}")
+        print(f"⚠️ Failed to load user_usage_log.json from Google Drive: {e}")
         return {}
 
 
@@ -539,21 +555,35 @@ def load_user_usage():
 #     with open(USER_USAGE_TRACK_FILE, "w") as f:
 #         json.dump(usage, f, indent=2)
 
+# def save_user_usage(usage_dict):
+#     try:
+#         creds_dict = json.loads(os.environ["GCP_CREDS_JSON"])
+#         scope = ['https://spreadsheets.google.com/feeds', 'https://www.googleapis.com/auth/drive']
+#         creds = ServiceAccountCredentials.from_json_keyfile_dict(creds_dict, scope)
+#         client = gspread.authorize(creds)
+
+#         sheet = client.open("user_usage_log").sheet1
+#         sheet.clear()  # clear old contents first
+
+#         # Write header + rows
+#         rows = [["email", "usage_count"]] + [[email, count] for email, count in usage_dict.items()]
+#         sheet.update(rows)
+#     except Exception as e:
+#         print(f"❌ Failed to save user usage to Google Sheets: {e}")
 def save_user_usage(usage_dict):
     try:
-        creds_dict = json.loads(os.environ["GCP_CREDS_JSON"])
-        scope = ['https://spreadsheets.google.com/feeds', 'https://www.googleapis.com/auth/drive']
-        creds = ServiceAccountCredentials.from_json_keyfile_dict(creds_dict, scope)
-        client = gspread.authorize(creds)
+        parent_id = get_or_create_drive_folder("mtDNA-Location-Classifier")
+        iterate3_id = get_or_create_drive_folder("iterate3", parent_id=parent_id)
+
+        import tempfile
+        tmp_path = os.path.join(tempfile.gettempdir(), "user_usage_log.json")
+        with open(tmp_path, "w") as f:
+            json.dump(usage_dict, f, indent=2)
 
-        sheet = client.open("user_usage_log").sheet1
-        sheet.clear()  # clear old contents first
+        upload_file_to_drive(tmp_path, "user_usage_log.json", parent_folder_id=iterate3_id)
 
-        # Write header + rows
-        rows = [["email", "usage_count"]] + [[email, count] for email, count in usage_dict.items()]
-        sheet.update(rows)
     except Exception as e:
-        print(f"❌ Failed to save user usage to Google Sheets: {e}")
+        print(f"❌ Failed to save user_usage_log.json to Google Drive: {e}")
 
 
 # def increment_usage(user_id, num_samples=1):