unitysvc-services 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

unitysvc_services/api.py

@@ -62,7 +62,8 @@ class UnitySvcAPI:
             JSON response as dictionary
 
         Raises:
-            RuntimeError: If curl command fails or returns non-200 status
+            httpx.HTTPStatusError: If HTTP status code indicates error (with response details)
+            RuntimeError: If curl command fails or times out
         """
         url = f"{self.base_url}{endpoint}"
         if params:
@@ -71,7 +72,8 @@ class UnitySvcAPI:
         cmd = [
             "curl",
             "-s",  # Silent mode
-            "-f",  # Fail on HTTP errors
+            "-w",
+            "\n%{http_code}",  # Write status code on new line
             "-H",
             f"X-API-Key: {self.api_key}",
             "-H",
@@ -86,15 +88,34 @@ class UnitySvcAPI:
             stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=30.0)
 
             if proc.returncode != 0:
-                error_msg = stderr.decode().strip() if stderr else "Unknown error"
-                raise RuntimeError(f"HTTP request failed: {error_msg}")
+                error_msg = stderr.decode().strip() if stderr else "Curl command failed"
+                raise RuntimeError(f"Curl error: {error_msg}")
 
+            # Parse response: last line is status code, rest is body
             output = stdout.decode().strip()
-            return json.loads(output)
+            lines = output.split("\n")
+            status_code = int(lines[-1])
+            body = "\n".join(lines[:-1])
+
+            # Parse JSON response
+            try:
+                response_data = json.loads(body) if body else {}
+            except json.JSONDecodeError:
+                response_data = {"error": body}
+
+            # Raise exception for non-2xx status codes (mimics httpx behavior)
+            if status_code < 200 or status_code >= 300:
+                # Create a mock response object to raise HTTPStatusError
+                mock_request = httpx.Request("GET", url)
+                mock_response = httpx.Response(status_code=status_code, content=body.encode(), request=mock_request)
+                raise httpx.HTTPStatusError(f"HTTP {status_code}", request=mock_request, response=mock_response)
+
+            return response_data
         except TimeoutError:
             raise RuntimeError("Request timed out after 30 seconds")
-        except json.JSONDecodeError as e:
-            raise RuntimeError(f"Invalid JSON response: {e}")
+        except httpx.HTTPStatusError:
+            # Re-raise HTTP errors as-is
+            raise
 
     async def _make_post_request_curl(
         self, endpoint: str, json_data: dict[str, Any] | None = None, params: dict[str, Any] | None = None
@@ -110,7 +131,8 @@ class UnitySvcAPI:
             JSON response as dictionary
 
         Raises:
-            RuntimeError: If curl command fails or returns non-200 status
+            httpx.HTTPStatusError: If HTTP status code indicates error (with response details)
+            RuntimeError: If curl command fails or times out
         """
         url = f"{self.base_url}{endpoint}"
         if params:
@@ -119,7 +141,8 @@ class UnitySvcAPI:
         cmd = [
             "curl",
             "-s",  # Silent mode
-            "-f",  # Fail on HTTP errors
+            "-w",
+            "\n%{http_code}",  # Write status code on new line
             "-X",
             "POST",
             "-H",
@@ -142,15 +165,34 @@ class UnitySvcAPI:
             stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=30.0)
 
             if proc.returncode != 0:
-                error_msg = stderr.decode().strip() if stderr else "Unknown error"
-                raise RuntimeError(f"HTTP request failed: {error_msg}")
+                error_msg = stderr.decode().strip() if stderr else "Curl command failed"
+                raise RuntimeError(f"Curl error: {error_msg}")
 
+            # Parse response: last line is status code, rest is body
             output = stdout.decode().strip()
-            return json.loads(output)
+            lines = output.split("\n")
+            status_code = int(lines[-1])
+            body = "\n".join(lines[:-1])
+
+            # Parse JSON response
+            try:
+                response_data = json.loads(body) if body else {}
+            except json.JSONDecodeError:
+                response_data = {"error": body}
+
+            # Raise exception for non-2xx status codes (mimics httpx behavior)
+            if status_code < 200 or status_code >= 300:
+                # Create a mock response object to raise HTTPStatusError
+                mock_request = httpx.Request("POST", url)
+                mock_response = httpx.Response(status_code=status_code, content=body.encode(), request=mock_request)
+                raise httpx.HTTPStatusError(f"HTTP {status_code}", request=mock_request, response=mock_response)
+
+            return response_data
         except TimeoutError:
             raise RuntimeError("Request timed out after 30 seconds")
-        except json.JSONDecodeError as e:
-            raise RuntimeError(f"Invalid JSON response: {e}")
+        except httpx.HTTPStatusError:
+            # Re-raise HTTP errors as-is
+            raise
 
     async def get(self, endpoint: str, params: dict[str, Any] | None = None) -> dict[str, Any]:
         """Make a GET request to the backend API with automatic curl fallback.
@@ -246,8 +288,9 @@ class UnitySvcAPI:
                 raise ValueError(f"Task {task_id} timed out after {timeout}s")
 
             # Check task status using get() with automatic curl fallback
+            # Use UnitySvcAPI.get to ensure we call the async version, not sync wrapper
             try:
-                status = await self.get(f"/tasks/{task_id}")
+                status = await UnitySvcAPI.get(self, f"/tasks/{task_id}")
             except Exception:
                 # Network error while checking status - retry
                 await asyncio.sleep(poll_interval)

unitysvc_services/cli.py

@@ -2,7 +2,7 @@
 
 import typer
 
-from . import format_data, populate, publisher, query, scaffold, update, validator
+from . import format_data, populate, publisher, query, scaffold, test, update, validator
 from . import list as list_cmd
 
 app = typer.Typer()
@@ -14,6 +14,7 @@ app.add_typer(list_cmd.app, name="list")
 app.add_typer(query.app, name="query")
 app.add_typer(publisher.app, name="publish")
 app.add_typer(update.app, name="update")
+app.add_typer(test.app, name="test")
 
 # Register standalone commands at root level
 app.command("format")(format_data.format_data)

unitysvc_services/populate.py

@@ -9,6 +9,7 @@ from pathlib import Path
 import typer
 from rich.console import Console
 
+from .format_data import format_data
 from .utils import find_files_by_schema
 
 app = typer.Typer(help="Populate services")
@@ -38,6 +39,9 @@ def populate(
 
     This command scans provider files for 'services_populator' configuration and executes
     the specified commands with environment variables from 'provider_access_info'.
+
+    After successful execution, automatically runs formatting on all generated files to
+    ensure they conform to the format specification (equivalent to running 'usvc format').
     """
     # Set data directory
     if data_dir is None:
@@ -178,5 +182,19 @@ def populate(
     console.print(f"  [yellow]⏭️  Skipped: {total_skipped}[/yellow]")
     console.print(f"  [red]✗ Failed: {total_failed}[/red]")
 
+    # Format generated files if any populate scripts executed successfully
+    if total_executed > 0 and not dry_run:
+        console.print("\n" + "=" * 50)
+        console.print("[bold cyan]Formatting generated files...[/bold cyan]")
+        console.print("[dim]Running automatic formatting to ensure data conforms to format specification[/dim]\n")
+
+        try:
+            # Run format command on the data directory
+            format_data(data_dir)
+            console.print("\n[green]✓ Formatting completed successfully[/green]")
+        except Exception as e:
+            console.print(f"\n[yellow]⚠ Warning: Formatting failed: {e}[/yellow]")
+            console.print("[dim]You may want to run 'usvc format' manually to fix formatting issues[/dim]")
+
     if total_failed > 0:
         raise typer.Exit(code=1)