add filler

app.py

@@ -7,7 +7,7 @@ import shutil
 import uuid
 
 # Ensure sibling module fluency is discoverable
-#sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__))))
+#sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
 from fluency.fluency_api import main as analyze_fluency_main
 from tone_modulation.tone_api import main as analyze_tone_main
@@ -19,26 +19,6 @@ from ves.ves import calc_voice_engagement_score
 from transcribe import transcribe_audio
 from filler_count.filler_score import analyze_fillers
 
-import logging
-
-# Configure logging
-logging.basicConfig(
-    level=logging.INFO,  # Or DEBUG for more verbose logs
-    format="%(asctime)s - %(levelname)s - %(message)s",
-    handlers=[
-        logging.StreamHandler(sys.stdout)
-    ]
-)
-
-logger = logging.getLogger(__name__)
-
-
-
-
-
-
-
-
 app = FastAPI()
 
 app.add_middleware(
@@ -49,47 +29,6 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-@app.get("/")
-def home():
-    return {"status": "Running"}
-
-@app.get("/health")
-def health_check():
-    return {"status": "ok"}
-
-
-# this will just rturen that audio file is being ready for analysis
-@app.post("/audio_status/")
-async def audio_status(file: UploadFile):
-    """
-    Endpoint to check the status of an uploaded audio file (.wav or .mp3).
-    """
-    if not file.filename.endswith(('.wav', '.mp3')):
-        raise HTTPException(status_code=400, detail="Invalid file type. Only .wav and .mp3 files are supported.")
-    
-    # Generate a safe temporary file path
-    temp_filename = f"temp_{uuid.uuid4()}{os.path.splitext(file.filename)[1]}"
-    temp_dir = "temp_uploads"
-    temp_filepath = os.path.join(temp_dir, temp_filename)
-    os.makedirs(temp_dir, exist_ok=True)
-
-    try:
-        # Save uploaded file
-        with open(temp_filepath, "wb") as buffer:
-            shutil.copyfileobj(file.file, buffer)
-
-        return JSONResponse(content={"status": "File is ready for analysis"})
-
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"File status check failed: {str(e)}")
-
-    finally:
-        # Clean up temporary file
-        if os.path.exists(temp_filepath):
-            os.remove(temp_filepath)
-
-
-
 @app.post("/analyze_fluency/")
 async def analyze_fluency(file: UploadFile):
     # idk if we can use pydantic model here If we need I can add later
@@ -120,74 +59,38 @@ async def analyze_fluency(file: UploadFile):
         if os.path.exists(temp_filepath):
             os.remove(temp_filepath)
             
-# @app.post('/analyze_tone/')
-# async def analyze_tone(file: UploadFile):
-#     """
-#     Endpoint to analyze tone of an uploaded audio file (.wav or .mp3).
-#     """
-#     if not file.filename.endswith(('.wav', '.mp3')):
-#         raise HTTPException(status_code=400, detail="Invalid file type. Only .wav and .mp3 files are supported.")
-    
-#     # Generate a safe temporary file path
-#     temp_filename = f"temp_{uuid.uuid4()}{os.path.splitext(file.filename)[1]}"
-#     temp_dir = "temp_uploads"
-#     temp_filepath = os.path.join(temp_dir, temp_filename)
-#     os.makedirs(temp_dir, exist_ok=True)
-
-#     try:
-#         # Save uploaded file
-#         with open(temp_filepath, "wb") as buffer:
-#             shutil.copyfileobj(file.file, buffer)
-
-#         # Analyze tone using your custom function
-#         result = analyze_tone_main(temp_filepath)
-
-#         return JSONResponse(content=result)
-
-#     except Exception as e:
-#         raise HTTPException(status_code=500, detail=f"Tone analysis failed: {str(e)}")
-
-#     finally:
-#         # Clean up temporary file
-#         if os.path.exists(temp_filepath):
-#             os.remove(temp_filepath)
-
 @app.post('/analyze_tone/')
 async def analyze_tone(file: UploadFile):
-    logger.info(f"Received file for tone analysis: {file.filename}")
-
+    """
+    Endpoint to analyze tone of an uploaded audio file (.wav or .mp3).
+    """
     if not file.filename.endswith(('.wav', '.mp3')):
-        logger.warning("Invalid file type received")
         raise HTTPException(status_code=400, detail="Invalid file type. Only .wav and .mp3 files are supported.")
     
+    # Generate a safe temporary file path
     temp_filename = f"temp_{uuid.uuid4()}{os.path.splitext(file.filename)[1]}"
     temp_dir = "temp_uploads"
     temp_filepath = os.path.join(temp_dir, temp_filename)
     os.makedirs(temp_dir, exist_ok=True)
 
     try:
-        logger.info(f"Saving uploaded file to {temp_filepath}")
+        # Save uploaded file
         with open(temp_filepath, "wb") as buffer:
             shutil.copyfileobj(file.file, buffer)
 
-        logger.info("Calling analyze_tone_main...")
+        # Analyze tone using your custom function
         result = analyze_tone_main(temp_filepath)
-        logger.info("Tone analysis completed successfully")
 
         return JSONResponse(content=result)
 
     except Exception as e:
-        logger.error(f"Tone analysis failed: {str(e)}", exc_info=True)
         raise HTTPException(status_code=500, detail=f"Tone analysis failed: {str(e)}")
 
     finally:
+        # Clean up temporary file
         if os.path.exists(temp_filepath):
-            logger.info(f"Cleaning up temporary file: {temp_filepath}")
             os.remove(temp_filepath)
 
-
-
-
 @app.post('/analyze_vcs/')
 async def analyze_vcs(file: UploadFile):
     """
@@ -454,6 +357,7 @@ async def analyze_all(file: UploadFile):
         voice_confidence_result = analyze_voice_confidence_main(temp_filepath)
         vps_result = analyze_vps_main(temp_filepath)
         ves_result = calc_voice_engagement_score(temp_filepath)
+        filler_count = analyze_fillers(temp_filepath)  # Assuming this function returns a dict with filler count
         transcript = transcribe_audio(temp_filepath)
 
         # Combine results into a single response
@@ -465,6 +369,7 @@ async def analyze_all(file: UploadFile):
             "voice_confidence": voice_confidence_result,
             "vps": vps_result,
             "ves": ves_result,
+            "filler_words": filler_count,
             "transcript": transcript
         }
 
@@ -477,7 +382,3 @@ async def analyze_all(file: UploadFile):
         # Clean up temporary file
         if os.path.exists(temp_filepath):
             os.remove(temp_filepath)
-            
-# if __name__ == "__main__":
-#     import uvicorn
-#     uvicorn.run("main:app", host="0.0.0.0", port=int(os.environ.get("PORT", 10000)), reload=False)