make archiver non-periodic due to event blocking main loop.

Pipfile

@@ -12,7 +12,6 @@ requests = "*"
 python-multipart = "*"
 fastapi = "*"
 uvicorn = "*"
-apscheduler = "*"
 
 [dev-packages]
 

Pipfile.lock

@@ -32,14 +32,6 @@
             "markers": "python_version >= '3.7'",
             "version": "==3.7.1"
         },
-        "apscheduler": {
-            "hashes": [
-                "sha256:e6df071b27d9be898e486bc7940a7be50b4af2e9da7c08f0744a96d4bd4cef4a",
-                "sha256:fb91e8a768632a4756a585f79ec834e0e27aad5860bac7eaa523d9ccefd87661"
-            ],
-            "index": "pypi",
-            "version": "==3.10.4"
-        },
         "av": {
             "hashes": [
                 "sha256:04cd0ce13a87870fb0a0ea4673f04934af2b9ac7ae844eafe92e2c19c092ab11",

main.py

@@ -1,17 +1,13 @@
-from fastapi import FastAPI, UploadFile, HTTPException, BackgroundTasks, File, Form, Depends
+from fastapi import FastAPI, UploadFile, HTTPException, File, Form, Depends
 from fastapi.responses import FileResponse, HTMLResponse
 from fastapi.security import HTTPBasic, HTTPBasicCredentials
 from typing import Optional
 from utils.process_video import process_video
 from utils.zip_response import zip_response
 from utils.api_configs import api_configs
-from utils.archiver import archiver
-from apscheduler.schedulers.asyncio import AsyncIOScheduler
-from datetime import datetime
 import shutil, os, logging, uvicorn, secrets
 
 app = FastAPI()
-scheduler = AsyncIOScheduler()
 security = HTTPBasic()
 api_configs_file = os.path.abspath("api_config_example.yml")
 
@@ -32,20 +28,6 @@ logging.basicConfig(filename='main.log',
                 format='%(asctime)s %(levelname)s %(message)s',
                 datefmt='%m/%d/%Y %I:%M:%S %p')
 
-# # 0 6 * * 6
-# @pycron.cron("*/5 * * * *")
-async def periodic_archiver(timestamp: datetime):
-    archive = os.path.abspath(os.path.join(os.getcwd(),"archive/"))
-    archiver(archive, timestamp)
-    logging.info(f"Archive writen at {timestamp}")
-
-@app.on_event("startup")
-def start_periodic_task():
-    # Schedule the job to run once every day at 3:00 AM
-    scheduler.add_job(periodic_archiver(datetime.now()), "cron", minute="*/2")
-    scheduler.start()
-
-
 @app.get("/")
 async def root():
     return {"message": "Hello from multilang-asr-captioner"}

utils/archiver.py

@@ -1,11 +1,16 @@
 import shutil, os
 from datetime import datetime
 
-def archiver(archive:str, timestamp:datetime):
+def archiver(timestamp:datetime):
+    ARCHIVE = os.path.abspath(f"archive/{timestamp.year:4d}-{timestamp.month:2d}-{timestamp.day:2d}/")
     TEMP_DIR = os.path.abspath("temp/")
     LOG_FILE = os.path.abspath("main.log")
     if os.path.exists(TEMP_DIR):
-        shutil.make_archive(os.path.join(archive, f"{timestamp.year:4d}-{timestamp.month:2d}-{timestamp.day:2d}"), 'zip', [TEMP_DIR, LOG_FILE])
+        shutil.make_archive(os.path.join(ARCHIVE, "files"), 'zip', TEMP_DIR)
         shutil.rmtree(TEMP_DIR)
     if os.path.exists(LOG_FILE):
-        os.remove(LOG_FILE)
+        shutil.copy(LOG_FILE, os.path.join(ARCHIVE, f"{timestamp.year:4d}-{timestamp.month:2d}-{timestamp.day:2d}.log"))
+        os.remove(LOG_FILE)
+
+if __name__ == '__main__':
+    archiver(timestamp=datetime.now())