[#76] Improve combined prompt with header rule

Author: wayangalihpratama

backend/app/services/chat_job_service.py

@@ -19,7 +19,7 @@ async def execute_chat_job(
     app_default_prompt: str,
     knowledge_base_ids: List[int] = [],
 ):
-    """Background job executor for chat jobs (non-streaming)."""
+    """Background job executor for [chat job]s (non-streaming)."""
     job = JobService.get_job(db, job_id)
     if not job:
         return
@@ -57,8 +57,14 @@ async def execute_chat_job(
         qa_prompt = prompt_service.get_full_qa_strict_prompt()
 
         # combined prompt
-        final_prompt = qa_prompt + "\n\n" + app_final_prompt
-        logger.info(f"Chat job final prompt: {final_prompt}")
+        final_prompt = (
+            qa_prompt
+            + "\n\n**IMPORTANT: Follow these additional rules strictly:**\n\n"
+            + app_final_prompt
+        )
+        logger.info("[Chat job] BEGIN final prompt: ==============")
+        logger.info(f"[Chat job] final prompt: {final_prompt}")
+        logger.info("[Chat job] EOL final prompt: ==============")
 
         state = {
             "query": query,
@@ -70,10 +76,10 @@ async def execute_chat_job(
                 "top_k": top_k,
             },
         }
-        logger.info(f"Chat job {job_id} starting with state: {state}")
+        logger.info(f"[Chat job] {job_id} starting with state: {state}")
 
         result_state = await query_answering_workflow.ainvoke(state)
-        logger.info(f"Chat job {job_id} completed workflow")
+        logger.info(f"[Chat job] {job_id} completed workflow")
 
         answer = result_state.get("answer", "")
         error = result_state.get("error")
@@ -108,7 +114,7 @@ async def execute_chat_job(
         return output
 
     except Exception as e:
-        logger.exception(f"Chat job execution failed: {e}")
+        logger.exception(f"[Chat job] execution failed: {e}")
         JobService.update_status_to_failed(db, job_id, output=str(e))
         await send_callback_async(callback_url, job, error=str(e))
         return str(e)

backend/app/tasks/upload_task.py

@@ -9,7 +9,6 @@
 from mcp_clients.kb_mcp_endpoint_service import KnowledgeBaseMCPEndpointService
 from app.services.job_service import JobService
 from app.services.file_storage_service import FileStorageService
-from app.models.job import Job
 from app.utils import send_callback
 
 logger = logging.getLogger(__name__)
@@ -31,7 +30,7 @@ def upload_full_process_task(
         # 🔍 Get job record
         job = JobService.get_job(db=db, job_id=job_id)
         if not job:
-            logger.warning(f"Job {job_id} not found")
+            logger.warning(f"[Upload job] Job {job_id} not found")
             return
 
         # 🚀 Update to running
@@ -48,11 +47,10 @@ def upload_full_process_task(
                 )
             )
         except Exception as e:
-            logger.warning(f"Error processing upload: {e}")
+            logger.warning(f"[Upload job] Error processing upload: {e}")
             FileStorageService.mark_failed(file_paths)
             raise  # Re-raise so Celery marks it as failed
 
-
         output = json.dumps(result)
 
         # ✅ Mark completed
@@ -65,9 +63,11 @@ def upload_full_process_task(
         # 🧹 Cleanup only if all succeeded
         try:
             FileStorageService.cleanup_files(file_paths)
-            logger.info(f"Cleaned up uploaded files: {file_paths}")
+            logger.info(
+                f"[Upload job] Cleaned up uploaded files: {file_paths}"
+            )
         except Exception as clean_err:
-            logger.warning(f"Cleanup failed: {clean_err}")
+            logger.warning(f"[Upload job] Cleanup failed: {clean_err}")
 
         # 🔔 Callback if URL provided
         send_callback(callback_url, job, output=output)
@@ -76,11 +76,9 @@ def upload_full_process_task(
 
     except Exception as e:
         # ❌ Failure: mark job failed
-        JobService.update_status_to_failed(
-            db=db, job_id=job_id, output=str(e)
-        )
+        JobService.update_status_to_failed(db=db, job_id=job_id, output=str(e))
 
-        logger.exception(f"Upload job {job_id} failed: {e}")
+        logger.exception(f"[Upload job] Upload job {job_id} failed: {e}")
 
         # ⚠️ Keep files for inspection/debugging
         failed_dir = "/mnt/uploads/failed"
@@ -89,7 +87,9 @@ def upload_full_process_task(
             if os.path.exists(path):
                 new_path = os.path.join(failed_dir, os.path.basename(path))
                 os.rename(path, new_path)
-                logger.warning(f"Moved failed file {path} → {new_path}")
+                logger.warning(
+                    f"[Upload job] Moved failed file {path} → {new_path}"
+                )
 
         return str(e)