(20251126) Now a separate Cron Script does the Selenium automation and caches the results in a JSON file.

backend/api/blueprints/reports/in_out_report.py

@@ -162,68 +162,18 @@ async def in_out_report_generate(
     report_data = None
 
     # Figure out the paths:
-    base_dir = files.get_parent_directory(
+    proj_dir = files.get_parent_directory(
         files.get_file_directory(include_filename = False),
         depth = 4
     )
+    cache_file = os.path.join(proj_dir, "local", "cache", "in_out_summary_cache.json")
 
-    # Put together the directory for the drivers, the downloads, etc.:
-    chrome_driver_dir = os.path.join(base_dir, r"drivers/chrome")
-    user_data_dir = os.path.join(base_dir, r"browser/user_data")
-    downloads_dir = os.path.join(base_dir, r"downloads")
+    # Read the report:
+    try: report_data = json.from_file(cache_file)
+    except Exception as e: pass
 
-    # Show all the paths for debugging:
-    current_app.printer("PATHS:", chrome_driver_dir, user_data_dir, downloads_dir)
-
-    # Wait for the semaphore so that only one instance is automating Chrome at a time:
-    async with current_app.chrome_semaphore:
-
-        # First kill the previous processes:
-        kill_count = CosecWeb.kill_chrome_processes()
-        current_app.printer("Killed Chrome Procs.", kill_count)
-        if kill_count > 0: time.sleep(2.5)
-
-        # Create an instance of the automation object:
-        cosec = CosecWeb(
-            cosec_url = inbound_headers.cosecUrl,
-            username = inbound_headers.cosecUsername,
-            password = inbound_headers.cosecPassword,
-            driver_dir = chrome_driver_dir,
-            user_data_dir = user_data_dir,
-            downloads_dir = downloads_dir,
-        )
-
-        # Perform the login:
-        cosec.login(initial_sleep = 2.5)
-
-        # Get the in/out report:
-        report_path = cosec.get_in_out_summary(
-            initial_sleep = 1.0,
-            from_date = inbound_data.fromDate,
-            to_date = inbound_data.toDate,
-            group_ids = inbound_data.groupIds,
-            download_timeout = 60.0
-        )
-
-        # Log out to end the cycle:
-        cosec.logout()
-
-        # Close the browser window:
-        cosec.quit()
-
-    # If we didn't get any path, the download failed:
-    if report_path is None:
-        success = False
-
-    # If the data was loaded successfully:
-    else:
-        success = True
-        report_df = cosec.read_in_out_summary_xls(report_path)
-        ##############
-        #Added by Yatmesh on 22 nov 17:40
-        report_df = report_df.where(report_df.notna(),None)
-        ###################################
-        report_data = report_df.to_dict(orient = "records")
+    # Note down the status of success or failure:
+    success = True if report_data else False
 
     # ┳┓
     # ┣┫┏┓┏┏┓┏┓┏┓┏┏┓

backend/api/blueprints/reports/muster_roll.py

@@ -175,39 +175,19 @@ async def muster_roll_report_generate(
     success = False
     report_data = None
 
-    # Get the muster roll data:
-    async with current_app.chrome_semaphore:
-        report_data = muster_roll.load(
-            cosec_url = inbound_headers.cosecUrl,
-            username = inbound_headers.cosecUsername,
-            password = inbound_headers.cosecPassword,
-            group_ids = inbound_data.groupIds,
-            on_date = inbound_data.onDate,
-        )
+    # Figure out the paths:
+    proj_dir = files.get_parent_directory(
+        files.get_file_directory(include_filename = False),
+        depth = 4
+    )
+    cache_file = os.path.join(proj_dir, "local", "cache", "muster_roll_cache.json")
 
-    # If data was loaded:
-    if report_data is not None:
-        # report_data = report_data.copy()
-        # report_data = report_data[[
-        #     "User ID", "User Name", "Category Name",
-        #     "Grade Name", "Branch Name", "Department Name",
-        #     "Direct Reporting", "Level-1"
-        # ]]
-        # unique_branches = report_data["Branch Name"].unique().tolist()
-        # unique_depts = report_data[["Branch Name", "Department Name"]].drop_duplicates().to_dict(orient = "records")
-        # unique_reportees = report_data[["Branch Name", "Department Name", "Direct Reporting"]].drop_duplicates().to_dict(orient = "records")
-        # unique_combos = {
-        #     "Branch Name": unique_branches,
-        #     "Department Name": unique_depts,
-        #     "Direct Reporting": unique_reportees
-        # }
-        # report_data = unique_combos
-        ##############
-        # Added by Yatmesh on 25 nov 15:08
-        report_data = report_data.where(report_data.notna(), None)
-        ###################################
-        report_data = report_data.to_dict(orient = "records")
-        success = True
+    # Read the report:
+    try: report_data = json.from_file(cache_file)
+    except Exception as e: pass
+
+    # Note down the status of success or failure:
+    success = True if report_data else False
 
     # ┳┓
     # ┣┫┏┓┏┏┓┏┓┏┓┏┏┓