unitysvc-services 0.2.7__py3-none-any.whl → 0.3.0__py3-none-any.whl

unitysvc_services/publisher.py

@@ -97,6 +97,67 @@ class ServiceDataPublisher:
 
         return result
 
+    async def _poll_task_status(
+        self,
+        task_id: str,
+        entity_type: str,
+        entity_name: str,
+        context_info: str = "",
+        poll_interval: float = 2.0,
+        timeout: float = 300.0,
+    ) -> dict[str, Any]:
+        """
+        Poll task status until completion or timeout.
+
+        Args:
+            task_id: Celery task ID
+            entity_type: Type of entity being published (for error messages)
+            entity_name: Name of the entity being published (for error messages)
+            context_info: Additional context for error messages
+            poll_interval: Seconds between status checks
+            timeout: Maximum seconds to wait
+
+        Returns:
+            Task result dictionary
+
+        Raises:
+            ValueError: If task fails or times out
+        """
+        import time
+
+        start_time = time.time()
+
+        while True:
+            elapsed = time.time() - start_time
+            if elapsed > timeout:
+                context_msg = f" ({context_info})" if context_info else ""
+                raise ValueError(f"Task timed out after {timeout}s for {entity_type} '{entity_name}'{context_msg}")
+
+            # Check task status
+            try:
+                response = await self.async_client.get(f"{self.base_url}/tasks/{task_id}")
+                response.raise_for_status()
+                status = response.json()
+            except (httpx.HTTPError, httpx.NetworkError, httpx.TimeoutException):
+                # Network error while checking status - retry
+                await asyncio.sleep(poll_interval)
+                continue
+
+            state = status.get("state", "PENDING")
+
+            # Check if task is complete
+            if status.get("status") == "completed" or state == "SUCCESS":
+                # Task succeeded
+                return status.get("result", {})
+            elif status.get("status") == "failed" or state == "FAILURE":
+                # Task failed
+                error = status.get("error", "Unknown error")
+                context_msg = f" ({context_info})" if context_info else ""
+                raise ValueError(f"Task failed for {entity_type} '{entity_name}'{context_msg}: {error}")
+
+            # Still processing - wait and retry
+            await asyncio.sleep(poll_interval)
+
     async def _post_with_retry(
         self,
         endpoint: str,
@@ -107,7 +168,13 @@ class ServiceDataPublisher:
         max_retries: int = 3,
     ) -> dict[str, Any]:
         """
-        Generic retry wrapper for posting data to backend API.
+        Generic retry wrapper for posting data to backend API with task polling.
+
+        The backend now returns HTTP 202 with a task_id. This method:
+        1. Submits the publish request
+        2. Gets the task_id from the response
+        3. Polls /tasks/{task_id} until completion
+        4. Returns the final result
 
         Args:
             endpoint: API endpoint path (e.g., "/publish/listing")
@@ -131,6 +198,25 @@ class ServiceDataPublisher:
                     json=data,
                 )
 
+                # Handle task-based response (HTTP 202)
+                if response.status_code == 202:
+                    # Backend returns task_id - poll for completion
+                    response_data = response.json()
+                    task_id = response_data.get("task_id")
+
+                    if not task_id:
+                        context_msg = f" ({context_info})" if context_info else ""
+                        raise ValueError(f"No task_id in response for {entity_type} '{entity_name}'{context_msg}")
+
+                    # Poll task status until completion
+                    result = await self._poll_task_status(
+                        task_id=task_id,
+                        entity_type=entity_type,
+                        entity_name=entity_name,
+                        context_info=context_info,
+                    )
+                    return result
+
                 # Provide detailed error information if request fails
                 if not response.is_success:
                     # Don't retry on 4xx errors (client errors) - they won't succeed on retry
@@ -167,6 +253,7 @@ class ServiceDataPublisher:
                             f"'{entity_name}'{context_msg}: {error_detail}"
                         )
 
+                # For non-202 success responses, return the body
                 return response.json()
 
             except (httpx.NetworkError, httpx.TimeoutException) as e:
@@ -478,7 +565,7 @@ class ServiceDataPublisher:
                 console.print(f"  [red]✗[/red] Failed to publish offering: [cyan]{offering_name}[/cyan] - {str(e)}")
                 return (offering_file, e)
 
-    def publish_all_offerings(self, data_dir: Path) -> dict[str, Any]:
+    async def publish_all_offerings(self, data_dir: Path) -> dict[str, Any]:
         """
         Publish all service offerings found in a directory tree concurrently.
 
@@ -510,14 +597,10 @@ class ServiceDataPublisher:
         console = Console()
 
         # Run all offering publications concurrently with rate limiting
-        async def _publish_all() -> list[tuple[Path, dict[str, Any] | Exception]]:
-            # Create semaphore to limit concurrent requests
-            semaphore = asyncio.Semaphore(self.max_concurrent_requests)
-            tasks = [self._publish_offering_task(offering_file, console, semaphore) for offering_file in offering_files]
-            return await asyncio.gather(*tasks)
-
-        # Execute async tasks
-        task_results = asyncio.run(_publish_all())
+        # Create semaphore to limit concurrent requests
+        semaphore = asyncio.Semaphore(self.max_concurrent_requests)
+        tasks = [self._publish_offering_task(offering_file, console, semaphore) for offering_file in offering_files]
+        task_results = await asyncio.gather(*tasks)
 
         # Process results
         for offering_file, result in task_results:
@@ -565,7 +648,7 @@ class ServiceDataPublisher:
                 console.print(f"  [red]✗[/red] Failed to publish listing: [cyan]{listing_file}[/cyan] - {str(e)}")
                 return (listing_file, e)
 
-    def publish_all_listings(self, data_dir: Path) -> dict[str, Any]:
+    async def publish_all_listings(self, data_dir: Path) -> dict[str, Any]:
         """
         Publish all service listings found in a directory tree concurrently.
 
@@ -597,14 +680,10 @@ class ServiceDataPublisher:
         console = Console()
 
         # Run all listing publications concurrently with rate limiting
-        async def _publish_all() -> list[tuple[Path, dict[str, Any] | Exception]]:
-            # Create semaphore to limit concurrent requests
-            semaphore = asyncio.Semaphore(self.max_concurrent_requests)
-            tasks = [self._publish_listing_task(listing_file, console, semaphore) for listing_file in listing_files]
-            return await asyncio.gather(*tasks)
-
-        # Execute async tasks
-        task_results = asyncio.run(_publish_all())
+        # Create semaphore to limit concurrent requests
+        semaphore = asyncio.Semaphore(self.max_concurrent_requests)
+        tasks = [self._publish_listing_task(listing_file, console, semaphore) for listing_file in listing_files]
+        task_results = await asyncio.gather(*tasks)
 
         # Process results
         for listing_file, result in task_results:
@@ -647,7 +726,7 @@ class ServiceDataPublisher:
                 console.print(f"  [red]✗[/red] Failed to publish provider: [cyan]{provider_name}[/cyan] - {str(e)}")
                 return (provider_file, e)
 
-    def publish_all_providers(self, data_dir: Path) -> dict[str, Any]:
+    async def publish_all_providers(self, data_dir: Path) -> dict[str, Any]:
         """
         Publish all providers found in a directory tree concurrently.
 
@@ -667,14 +746,10 @@ class ServiceDataPublisher:
         console = Console()
 
         # Run all provider publications concurrently with rate limiting
-        async def _publish_all() -> list[tuple[Path, dict[str, Any] | Exception]]:
-            # Create semaphore to limit concurrent requests
-            semaphore = asyncio.Semaphore(self.max_concurrent_requests)
-            tasks = [self._publish_provider_task(provider_file, console, semaphore) for provider_file in provider_files]
-            return await asyncio.gather(*tasks)
-
-        # Execute async tasks
-        task_results = asyncio.run(_publish_all())
+        # Create semaphore to limit concurrent requests
+        semaphore = asyncio.Semaphore(self.max_concurrent_requests)
+        tasks = [self._publish_provider_task(provider_file, console, semaphore) for provider_file in provider_files]
+        task_results = await asyncio.gather(*tasks)
 
         # Process results
         for provider_file, result in task_results:
@@ -717,7 +792,7 @@ class ServiceDataPublisher:
                 console.print(f"  [red]✗[/red] Failed to publish seller: [cyan]{seller_name}[/cyan] - {str(e)}")
                 return (seller_file, e)
 
-    def publish_all_sellers(self, data_dir: Path) -> dict[str, Any]:
+    async def publish_all_sellers(self, data_dir: Path) -> dict[str, Any]:
         """
         Publish all sellers found in a directory tree concurrently.
 
@@ -737,14 +812,10 @@ class ServiceDataPublisher:
         console = Console()
 
         # Run all seller publications concurrently with rate limiting
-        async def _publish_all() -> list[tuple[Path, dict[str, Any] | Exception]]:
-            # Create semaphore to limit concurrent requests
-            semaphore = asyncio.Semaphore(self.max_concurrent_requests)
-            tasks = [self._publish_seller_task(seller_file, console, semaphore) for seller_file in seller_files]
-            return await asyncio.gather(*tasks)
-
-        # Execute async tasks
-        task_results = asyncio.run(_publish_all())
+        # Create semaphore to limit concurrent requests
+        semaphore = asyncio.Semaphore(self.max_concurrent_requests)
+        tasks = [self._publish_seller_task(seller_file, console, semaphore) for seller_file in seller_files]
+        task_results = await asyncio.gather(*tasks)
 
         # Process results
         for seller_file, result in task_results:
@@ -756,7 +827,7 @@ class ServiceDataPublisher:
 
         return results
 
-    def publish_all_models(self, data_dir: Path) -> dict[str, Any]:
+    async def publish_all_models(self, data_dir: Path) -> dict[str, Any]:
         """
         Publish all data types in the correct order.
 
@@ -788,7 +859,7 @@ class ServiceDataPublisher:
 
         for data_type, publish_method in publish_order:
             try:
-                results = publish_method(data_dir)
+                results = await publish_method(data_dir)
                 all_results[data_type] = results
                 all_results["total_success"] += results["success"]
                 all_results["total_failed"] += results["failed"]
@@ -805,9 +876,25 @@ class ServiceDataPublisher:
 
         return all_results
 
+    async def aclose(self):
+        """Close HTTP client asynchronously."""
+        await self.async_client.aclose()
+
     def close(self):
-        """Close HTTP client."""
-        asyncio.run(self.async_client.aclose())
+        """Close HTTP client synchronously (best effort)."""
+        try:
+            # Try to close if there's an event loop running
+            loop = asyncio.get_event_loop()
+            if loop.is_running():
+                # Can't close synchronously if loop is running
+                # The client will be garbage collected
+                return
+            else:
+                # Loop exists but not running, we can use it
+                loop.run_until_complete(self.async_client.aclose())
+        except RuntimeError:
+            # No event loop or loop is closed - just let it be garbage collected
+            pass
 
     def __enter__(self):
         """Context manager entry."""
@@ -870,8 +957,8 @@ def publish_callback(
 
     try:
         with ServiceDataPublisher() as publisher:
-            # Call the publish_all_models method
-            all_results = publisher.publish_all_models(data_path)
+            # Call the publish_all_models method (now async)
+            all_results = asyncio.run(publisher.publish_all_models(data_path))
 
             # Display results for each data type
             data_type_display_names = {
@@ -965,7 +1052,7 @@ def publish_providers(
             else:
                 console.print(f"[blue]Scanning for providers in:[/blue] {data_path}")
                 console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
-                results = publisher.publish_all_providers(data_path)
+                results = asyncio.run(publisher.publish_all_providers(data_path))
 
                 # Display summary
                 console.print("\n[bold]Publishing Summary:[/bold]")
@@ -1024,7 +1111,7 @@ def publish_sellers(
             else:
                 console.print(f"[blue]Scanning for sellers in:[/blue] {data_path}")
                 console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
-                results = publisher.publish_all_sellers(data_path)
+                results = asyncio.run(publisher.publish_all_sellers(data_path))
 
                 console.print("\n[bold]Publishing Summary:[/bold]")
                 console.print(f"  Total found: {results['total']}")
@@ -1080,8 +1167,8 @@ def publish_offerings(
             # Handle directory
             else:
                 console.print(f"[blue]Scanning for service offerings in:[/blue] {data_path}")
-                console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
-                results = publisher.publish_all_offerings(data_path)
+                console.print(f"[blue]Backend URL:[/bold blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
+                results = asyncio.run(publisher.publish_all_offerings(data_path))
 
                 console.print("\n[bold]Publishing Summary:[/bold]")
                 console.print(f"  Total found: {results['total']}")
@@ -1139,7 +1226,7 @@ def publish_listings(
             else:
                 console.print(f"[blue]Scanning for service listings in:[/blue] {data_path}")
                 console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
-                results = publisher.publish_all_listings(data_path)
+                results = asyncio.run(publisher.publish_all_listings(data_path))
 
                 console.print("\n[bold]Publishing Summary:[/bold]")
                 console.print(f"  Total found: {results['total']}")

{unitysvc_services-0.2.7.dist-info → unitysvc_services-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-services
-Version: 0.2.7
+Version: 0.3.0
 Summary: SDK for digital service providers on UnitySVC
 Author-email: Bo Peng <bo.peng@unitysvc.com>
 Maintainer-email: Bo Peng <bo.peng@unitysvc.com>

{unitysvc_services-0.2.7.dist-info → unitysvc_services-0.3.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ unitysvc_services/cli.py,sha256=OK0IZyAckxP15jRWU_W49hl3t7XcNRtd8BoDMyRKqNM,682
 unitysvc_services/format_data.py,sha256=Jl9Vj3fRX852fHSUa5DzO-oiFQwuQHC3WMCDNIlo1Lc,5460
 unitysvc_services/list.py,sha256=QDp9BByaoeFeJxXJN9RQ-jU99mH9Guq9ampfXCbpZmI,7033
 unitysvc_services/populate.py,sha256=zkcjIy8BWuQSO7JwiRNHKgGoxQvc3ujluUQdYixdBvY,6626
-unitysvc_services/publisher.py,sha256=xQqIajb3JRDX9Qg6N94hqtT_mc0NBYbUYKKMm4zsKyE,48686
+unitysvc_services/publisher.py,sha256=sNqGbLQ3QulNCGzyRjBg6ks-I2nTVgip4vGFV4XCUto,52285
 unitysvc_services/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unitysvc_services/query.py,sha256=x2VUnfva21-mVd-JgtChajNBgXG1AQJ6c3umCw2FNWU,24089
 unitysvc_services/scaffold.py,sha256=Y73IX8vskImxSvxDgR0mvEFuAMYnBKfttn3bjcz3jmQ,40331
@@ -16,9 +16,9 @@ unitysvc_services/models/listing_v1.py,sha256=PPb9hIdWQp80AWKLxFXYBDcWXzNcDrO4v6
 unitysvc_services/models/provider_v1.py,sha256=76EK1i0hVtdx_awb00-ZMtSj4Oc9Zp4xZ-DeXmG3iTY,2701
 unitysvc_services/models/seller_v1.py,sha256=oll2ZZBPBDX8wslHrbsCKf_jIqHNte2VEj5RJ9bawR4,3520
 unitysvc_services/models/service_v1.py,sha256=Xpk-K-95M1LRqYM8nNJcll8t-lsW9Xdi2_bVbYNs8-M,3019
-unitysvc_services-0.2.7.dist-info/licenses/LICENSE,sha256=_p8V6A8OMPu2HIztn3O01v0-urZFwk0Dd3Yk_PTIlL8,1065
-unitysvc_services-0.2.7.dist-info/METADATA,sha256=8KqcRPrJwkYb9zCgT3rytQTOrmIBGm3hHctp-7VYM3A,6628
-unitysvc_services-0.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unitysvc_services-0.2.7.dist-info/entry_points.txt,sha256=-vodnbPmo7QQmFu8jdG6sCyGRVM727w9Nhwp4Vwau_k,64
-unitysvc_services-0.2.7.dist-info/top_level.txt,sha256=GIotQj-Ro2ruR7eupM1r58PWqIHTAq647ORL7E2kneo,18
-unitysvc_services-0.2.7.dist-info/RECORD,,
+unitysvc_services-0.3.0.dist-info/licenses/LICENSE,sha256=_p8V6A8OMPu2HIztn3O01v0-urZFwk0Dd3Yk_PTIlL8,1065
+unitysvc_services-0.3.0.dist-info/METADATA,sha256=QPZzgXqlKCPdsJCuWnbxxcXe7sfk-SBTxCJbq2npEc8,6628
+unitysvc_services-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unitysvc_services-0.3.0.dist-info/entry_points.txt,sha256=-vodnbPmo7QQmFu8jdG6sCyGRVM727w9Nhwp4Vwau_k,64
+unitysvc_services-0.3.0.dist-info/top_level.txt,sha256=GIotQj-Ro2ruR7eupM1r58PWqIHTAq647ORL7E2kneo,18
+unitysvc_services-0.3.0.dist-info/RECORD,,