Merge pull request #26 from TrueSelph/0.1.11

Increase timeouts and enhance logging

Author: eldonm

deepdoc_client_action/CHANGELOG.md

@@ -71,4 +71,7 @@
 
 # 0.1.10
 - Bugfix in deepdoc_callback
-- Updated docs
+- Updated docs
+
+# 0.1.11
+- Increase timeout and add logs

deepdoc_client_action/app/app.py

@@ -181,7 +181,7 @@ def render(router: StreamlitRouter, agent_id: str, action_id: str, info: dict) -
                 result = call_api(
                     endpoint="action/walker/deepdoc_client_action/add_documents",
                     files=files,
-                    timeout=60,
+                    timeout=120,
                 )
                 if result.status_code == 422:
                     error_detail = result.json().get(
@@ -309,6 +309,7 @@ def get_status_badge(status: str) -> str:
                 "per_page": st.session_state.per_page,
                 "reporting": True,
             },
+            timeout=120,
         )
 
         if result and result.status_code == 200:
@@ -371,6 +372,7 @@ def get_status_badge(status: str) -> str:
                                 call_api(
                                     endpoint="action/walker/deepdoc_client_action/retrieve_job",
                                     json_data={"agent_id": agent_id, "job_id": job_id},
+                                    timeout=120,
                                 )
                                 st.rerun()
                         else:
@@ -420,6 +422,7 @@ def get_status_badge(status: str) -> str:
                                             "agent_id": agent_id,
                                             "job_id": job_id,
                                         },
+                                        timeout=120,
                                     )
                                     if (
                                         cancel_result
@@ -469,6 +472,7 @@ def get_status_badge(status: str) -> str:
                                             "agent_id": agent_id,
                                             "job_id": job_id,
                                         },
+                                        timeout=120,
                                     )
                                     if (
                                         delete_result
@@ -568,6 +572,7 @@ def get_status_badge(status: str) -> str:
                                                         }
                                                     ],
                                                 },
+                                                timeout=120,
                                             )
                                             if delete_result:
                                                 st.session_state.confirm_state = {

deepdoc_client_action/deepdoc_client_action.jac

@@ -56,7 +56,7 @@ node DeepDocClientAction(Action) {
             };
         }
         try {
-            response = requests.get(f"{self.api_url}/health");
+            response = requests.get(f"{self.api_url}/health", timeout=1440);
             return response.status_code == 200;
         } except Exception as e {
             self.logger.error(traceback.format_exc());
@@ -151,7 +151,8 @@ node DeepDocClientAction(Action) {
             response = requests.post(
                 f"{self.api_url}/upload_and_chunk",
                 files=files_data,
-                data=payload
+                data=payload,
+                timeout=1440
             );
 
             if not response {
@@ -255,7 +256,7 @@ node DeepDocClientAction(Action) {
         # """
         try {
             # Make the GET request to the DeepDoc service
-            response = requests.get(f"{self.api_url}/job/{job_id}");
+            response = requests.get(f"{self.api_url}/job/{job_id}", timeout=1440);
 
             # Check if the response is successful
             if response.status_code != 200 {
@@ -287,6 +288,8 @@ node DeepDocClientAction(Action) {
 
         job_data = self.get_job_status(job_id=job_id);
         job_entry = self.get_job_entry(job_id=job_id);
+        job_data["job_id"] = job_id;
+        self.logger.info(f"DeepDoc job result:{job_data}");
 
         if not job_data or not job_entry {
             self.logger.error("DeepDoc job data is incomplete or missing");
@@ -300,6 +303,9 @@ node DeepDocClientAction(Action) {
         }
 
         job_status = job_data.get("status");
+        if job_status in ["cancelled"] {
+            self.cancel_job(job_id);
+        }
 
         if job_status in ["failed", "error"] {
             self.logger.error(f"Job {job_id} failed with status: {job_status}");
@@ -357,7 +363,7 @@ node DeepDocClientAction(Action) {
         # """
         try {
             # Make the GET request to the DeepDoc service
-            response = requests.post(f"{self.api_url}/job/{job_id}/cancel");
+            response = requests.post(f"{self.api_url}/job/{job_id}/cancel", timeout=1440);
 
             # Check if the response is successful
             if response.status_code != 200 {

deepdoc_client_action/info.yaml

@@ -2,7 +2,7 @@ package:
   name: jivas/deepdoc_client_action
   author: V75 Inc.
   archetype: DeepDocClientAction
-  version: 0.1.10
+  version: 0.1.11
   meta:
     title: DeepDoc Client Action
     description: Integrates with DeepDoc OCR and document parsing services to ingest documents into a vector store