docu-devs-api-client 1.9.1__tar.gz → 1.9.2__tar.gz

{docu_devs_api_client-1.9.1 → docu_devs_api_client-1.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docu-devs-api-client
-Version: 1.9.1
+Version: 1.9.2
 Summary: A client library for accessing DocuDevs API
 Project-URL: Homepage, https://www.docudevs.ai/
 Project-URL: Repository, https://github.com/piizei/docudevs.git

{docu_devs_api_client-1.9.1 → docu_devs_api_client-1.9.2}/docudevs/docudevs_client.py

@@ -2175,6 +2175,26 @@ class DocuDevsClient:
             return SimpleNamespace(**response_data)
         return response
 
+    async def _wait_for_operation_job_result(
+        self,
+        operation_job_guid: str,
+        *,
+        parent_job_guid: str,
+        operation_type: str,
+        timeout: int,
+        poll_interval: float,
+    ) -> Any:
+        operation_result = await self.wait_until_ready(
+            guid=operation_job_guid,
+            timeout=timeout,
+            poll_interval=poll_interval,
+        )
+        if hasattr(operation_result, "__dict__"):
+            operation_result.job_guid = operation_job_guid
+            operation_result.parent_job_guid = parent_job_guid
+            operation_result.operation_type = operation_type
+        return operation_result
+
     async def submit_and_wait_for_operation(self, job_guid: str, operation_type: str, timeout: int = 120, poll_interval: float = 2.0):
         """Submit an operation and wait for result.
         
@@ -2201,44 +2221,13 @@ class DocuDevsClient:
         
         if not operation_job_guid:
             raise Exception(f"No operation job GUID returned from submit {operation_type} operation")
-        
-        # Wait for the operation to complete using operation status polling
-        import asyncio
-        import time
-        start_time = time.time()
-        operation_completed = False
-        
-        while time.time() - start_time < timeout:
-            status_response = await self.get_operation_status(job_guid=job_guid)
-            if status_response and hasattr(status_response, 'operations'):
-                target_ops = [op for op in status_response.operations if op.operation_type == operation_type]
-                
-                if target_ops and target_ops[0].status == "COMPLETED":
-                    operation_completed = True
-                    break
-                elif target_ops and target_ops[0].status == "ERROR":
-                    raise Exception(f"Operation failed with error: {target_ops[0].error}")
-            
-            await asyncio.sleep(poll_interval)
-        
-        if not operation_completed:
-            raise TimeoutError(f"Operation {operation_type} did not complete within {timeout} seconds")
-        
-        # Get the result
-        result_response = await self.get_operation_result(job_guid=job_guid, operation_type=operation_type)
-        # The get_operation_result method returns either a SimpleNamespace (success) or Response (failure)
-        # If it's a SimpleNamespace, it's already parsed; if it's a Response, check status code
-        if hasattr(result_response, 'status_code'):
-            if result_response.status_code != HTTPStatus.OK:
-                content_str = result_response.content.decode('utf-8', errors='replace')
-                raise Exception(f"Error getting operation result: {content_str}")
-            # Parse the response manually
-            import json
-            response_data = json.loads(result_response.content.decode('utf-8'))
-            return SimpleNamespace(**response_data)
-        else:
-            # Already parsed as SimpleNamespace
-            return result_response
+        return await self._wait_for_operation_job_result(
+            operation_job_guid,
+            parent_job_guid=job_guid,
+            operation_type=operation_type,
+            timeout=timeout,
+            poll_interval=poll_interval,
+        )
 
     async def submit_and_wait_for_image_selection(
         self,
@@ -2386,42 +2375,13 @@ class DocuDevsClient:
         
         if not task_job_guid:
             raise Exception("No job GUID returned from create generative task")
-        
-        # Wait for the generative task to complete using operation status polling
-        start_time = time.time()
-        task_completed = False
-        
-        while time.time() - start_time < timeout:
-            status_response = await self.get_operation_status(job_guid=parent_job_id)
-            if status_response and hasattr(status_response, 'operations'):
-                generative_ops = [op for op in status_response.operations if op.operation_type == "generative-task"]
-                
-                if generative_ops and generative_ops[0].status == "COMPLETED":
-                    task_completed = True
-                    break
-                elif generative_ops and generative_ops[0].status == "ERROR":
-                    raise Exception(f"Generative task failed with error: {generative_ops[0].error}")
-            
-            await asyncio.sleep(poll_interval)
-        
-        if not task_completed:
-            raise TimeoutError(f"Generative task did not complete within {timeout} seconds")
-        
-        # Get the result
-        result_response = await self.get_operation_result(job_guid=parent_job_id, operation_type="generative-task")
-        # The get_operation_result method returns either a SimpleNamespace (success) or Response (failure)
-        # If it's a SimpleNamespace, it's already parsed; if it's a Response, check status code
-        if hasattr(result_response, 'status_code'):
-            if result_response.status_code != HTTPStatus.OK:
-                content_str = result_response.content.decode('utf-8', errors='replace')
-                raise Exception(f"Error getting generative task result: {content_str}")
-            # Parse the response manually
-            import json
-            response_data = json.loads(result_response.content.decode('utf-8'))
-            return SimpleNamespace(**response_data)
-        else:
-            # Already parsed as SimpleNamespace
-            return result_response
+        return await self._wait_for_operation_job_result(
+            task_job_guid,
+            parent_job_guid=parent_job_id,
+            operation_type="generative-task",
+            timeout=timeout,
+            poll_interval=poll_interval,
+        )
 
     async def submit_and_wait_for_operation_with_parameters(self, job_guid: str, operation_type: str, llm_type: Optional[str] = None, custom_parameters: Optional[dict] = None, timeout: int = 120, poll_interval: float = 2.0):
         """Submit an operation with parameters and wait for result.
@@ -2456,42 +2416,13 @@ class DocuDevsClient:
         
         if not operation_job_guid:
             raise Exception(f"No operation job GUID returned from submit {operation_type} operation")
-        
-        # Wait for the operation to complete using operation status polling
-        start_time = time.time()
-        operation_completed = False
-        
-        while time.time() - start_time < timeout:
-            status_response = await self.get_operation_status(job_guid=job_guid)
-            if status_response and hasattr(status_response, 'operations'):
-                target_ops = [op for op in status_response.operations if op.operation_type == operation_type]
-                
-                if target_ops and target_ops[0].status == "COMPLETED":
-                    operation_completed = True
-                    break
-                elif target_ops and target_ops[0].status == "ERROR":
-                    raise Exception(f"Operation failed with error: {target_ops[0].error}")
-            
-            await asyncio.sleep(poll_interval)
-        
-        if not operation_completed:
-            raise TimeoutError(f"Operation {operation_type} did not complete within {timeout} seconds")
-        
-        # Get the result
-        result_response = await self.get_operation_result(job_guid=job_guid, operation_type=operation_type)
-        # The get_operation_result method returns either a SimpleNamespace (success) or Response (failure)
-        # If it's a SimpleNamespace, it's already parsed; if it's a Response, check status code
-        if hasattr(result_response, 'status_code'):
-            if result_response.status_code != HTTPStatus.OK:
-                content_str = result_response.content.decode('utf-8', errors='replace')
-                raise Exception(f"Error getting operation result: {content_str}")
-            # Parse the response manually
-            import json
-            response_data = json.loads(result_response.content.decode('utf-8'))
-            return SimpleNamespace(**response_data)
-        else:
-            # Already parsed as SimpleNamespace
-            return result_response
+        return await self._wait_for_operation_job_result(
+            operation_job_guid,
+            parent_job_guid=job_guid,
+            operation_type=operation_type,
+            timeout=timeout,
+            poll_interval=poll_interval,
+        )
 
     async def submit_and_process_document(
         self,

{docu_devs_api_client-1.9.1 → docu_devs_api_client-1.9.2}/docudevs_client.py

@@ -2175,6 +2175,26 @@ class DocuDevsClient:
             return SimpleNamespace(**response_data)
         return response
 
+    async def _wait_for_operation_job_result(
+        self,
+        operation_job_guid: str,
+        *,
+        parent_job_guid: str,
+        operation_type: str,
+        timeout: int,
+        poll_interval: float,
+    ) -> Any:
+        operation_result = await self.wait_until_ready(
+            guid=operation_job_guid,
+            timeout=timeout,
+            poll_interval=poll_interval,
+        )
+        if hasattr(operation_result, "__dict__"):
+            operation_result.job_guid = operation_job_guid
+            operation_result.parent_job_guid = parent_job_guid
+            operation_result.operation_type = operation_type
+        return operation_result
+
     async def submit_and_wait_for_operation(self, job_guid: str, operation_type: str, timeout: int = 120, poll_interval: float = 2.0):
         """Submit an operation and wait for result.
         
@@ -2201,44 +2221,13 @@ class DocuDevsClient:
         
         if not operation_job_guid:
             raise Exception(f"No operation job GUID returned from submit {operation_type} operation")
-        
-        # Wait for the operation to complete using operation status polling
-        import asyncio
-        import time
-        start_time = time.time()
-        operation_completed = False
-        
-        while time.time() - start_time < timeout:
-            status_response = await self.get_operation_status(job_guid=job_guid)
-            if status_response and hasattr(status_response, 'operations'):
-                target_ops = [op for op in status_response.operations if op.operation_type == operation_type]
-                
-                if target_ops and target_ops[0].status == "COMPLETED":
-                    operation_completed = True
-                    break
-                elif target_ops and target_ops[0].status == "ERROR":
-                    raise Exception(f"Operation failed with error: {target_ops[0].error}")
-            
-            await asyncio.sleep(poll_interval)
-        
-        if not operation_completed:
-            raise TimeoutError(f"Operation {operation_type} did not complete within {timeout} seconds")
-        
-        # Get the result
-        result_response = await self.get_operation_result(job_guid=job_guid, operation_type=operation_type)
-        # The get_operation_result method returns either a SimpleNamespace (success) or Response (failure)
-        # If it's a SimpleNamespace, it's already parsed; if it's a Response, check status code
-        if hasattr(result_response, 'status_code'):
-            if result_response.status_code != HTTPStatus.OK:
-                content_str = result_response.content.decode('utf-8', errors='replace')
-                raise Exception(f"Error getting operation result: {content_str}")
-            # Parse the response manually
-            import json
-            response_data = json.loads(result_response.content.decode('utf-8'))
-            return SimpleNamespace(**response_data)
-        else:
-            # Already parsed as SimpleNamespace
-            return result_response
+        return await self._wait_for_operation_job_result(
+            operation_job_guid,
+            parent_job_guid=job_guid,
+            operation_type=operation_type,
+            timeout=timeout,
+            poll_interval=poll_interval,
+        )
 
     async def submit_and_wait_for_image_selection(
         self,
@@ -2386,42 +2375,13 @@ class DocuDevsClient:
         
         if not task_job_guid:
             raise Exception("No job GUID returned from create generative task")
-        
-        # Wait for the generative task to complete using operation status polling
-        start_time = time.time()
-        task_completed = False
-        
-        while time.time() - start_time < timeout:
-            status_response = await self.get_operation_status(job_guid=parent_job_id)
-            if status_response and hasattr(status_response, 'operations'):
-                generative_ops = [op for op in status_response.operations if op.operation_type == "generative-task"]
-                
-                if generative_ops and generative_ops[0].status == "COMPLETED":
-                    task_completed = True
-                    break
-                elif generative_ops and generative_ops[0].status == "ERROR":
-                    raise Exception(f"Generative task failed with error: {generative_ops[0].error}")
-            
-            await asyncio.sleep(poll_interval)
-        
-        if not task_completed:
-            raise TimeoutError(f"Generative task did not complete within {timeout} seconds")
-        
-        # Get the result
-        result_response = await self.get_operation_result(job_guid=parent_job_id, operation_type="generative-task")
-        # The get_operation_result method returns either a SimpleNamespace (success) or Response (failure)
-        # If it's a SimpleNamespace, it's already parsed; if it's a Response, check status code
-        if hasattr(result_response, 'status_code'):
-            if result_response.status_code != HTTPStatus.OK:
-                content_str = result_response.content.decode('utf-8', errors='replace')
-                raise Exception(f"Error getting generative task result: {content_str}")
-            # Parse the response manually
-            import json
-            response_data = json.loads(result_response.content.decode('utf-8'))
-            return SimpleNamespace(**response_data)
-        else:
-            # Already parsed as SimpleNamespace
-            return result_response
+        return await self._wait_for_operation_job_result(
+            task_job_guid,
+            parent_job_guid=parent_job_id,
+            operation_type="generative-task",
+            timeout=timeout,
+            poll_interval=poll_interval,
+        )
 
     async def submit_and_wait_for_operation_with_parameters(self, job_guid: str, operation_type: str, llm_type: Optional[str] = None, custom_parameters: Optional[dict] = None, timeout: int = 120, poll_interval: float = 2.0):
         """Submit an operation with parameters and wait for result.
@@ -2456,42 +2416,13 @@ class DocuDevsClient:
         
         if not operation_job_guid:
             raise Exception(f"No operation job GUID returned from submit {operation_type} operation")
-        
-        # Wait for the operation to complete using operation status polling
-        start_time = time.time()
-        operation_completed = False
-        
-        while time.time() - start_time < timeout:
-            status_response = await self.get_operation_status(job_guid=job_guid)
-            if status_response and hasattr(status_response, 'operations'):
-                target_ops = [op for op in status_response.operations if op.operation_type == operation_type]
-                
-                if target_ops and target_ops[0].status == "COMPLETED":
-                    operation_completed = True
-                    break
-                elif target_ops and target_ops[0].status == "ERROR":
-                    raise Exception(f"Operation failed with error: {target_ops[0].error}")
-            
-            await asyncio.sleep(poll_interval)
-        
-        if not operation_completed:
-            raise TimeoutError(f"Operation {operation_type} did not complete within {timeout} seconds")
-        
-        # Get the result
-        result_response = await self.get_operation_result(job_guid=job_guid, operation_type=operation_type)
-        # The get_operation_result method returns either a SimpleNamespace (success) or Response (failure)
-        # If it's a SimpleNamespace, it's already parsed; if it's a Response, check status code
-        if hasattr(result_response, 'status_code'):
-            if result_response.status_code != HTTPStatus.OK:
-                content_str = result_response.content.decode('utf-8', errors='replace')
-                raise Exception(f"Error getting operation result: {content_str}")
-            # Parse the response manually
-            import json
-            response_data = json.loads(result_response.content.decode('utf-8'))
-            return SimpleNamespace(**response_data)
-        else:
-            # Already parsed as SimpleNamespace
-            return result_response
+        return await self._wait_for_operation_job_result(
+            operation_job_guid,
+            parent_job_guid=job_guid,
+            operation_type=operation_type,
+            timeout=timeout,
+            poll_interval=poll_interval,
+        )
 
     async def submit_and_process_document(
         self,

{docu_devs_api_client-1.9.1 → docu_devs_api_client-1.9.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "docu-devs-api-client"
-version = "1.9.1"
+version = "1.9.2"
 description = "A client library for accessing DocuDevs API"
 authors = [{name = "pj@docudevs.ai"}]
 readme = "README.md"