unitysvc-services 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

unitysvc_services/scaffold.py

@@ -17,6 +17,18 @@ from typing import Any
 import typer
 from rich.console import Console
 
+from .interactive_prompt import (
+    LISTING_GROUPS,
+    OFFERING_GROUPS,
+    PROVIDER_GROUPS,
+    SELLER_GROUPS,
+    PromptEngine,
+    create_listing_data,
+    create_offering_data,
+    create_provider_data,
+    create_seller_data,
+)
+
 try:
     import tomli_w
 
@@ -718,20 +730,46 @@ def init_offering(
             )
             raise typer.Exit(code=1)
     else:
-        # Generate from schema
-        console.print(f"[blue]Creating service offering:[/blue] {name}")
-        console.print(f"[blue]Output directory:[/blue] {output_dir}")
-        console.print(f"[blue]Format:[/blue] {format}\n")
+        # Interactive mode - prompt for values
+        console.print("[bold cyan]Creating service offering interactively[/bold cyan]")
+        console.print(f"[dim]Output directory:[/dim] {output_dir / name}")
+        console.print(f"[dim]Format:[/dim] {format}\n")
 
         try:
-            create_schema_based_structure(
-                dest_dir=output_dir / name,
-                dir_name=name,
-                schema_name="service_v1",
-                format_type=format,
-                force=False,
-            )
-            console.print(f"[green]✓[/green] Service offering created: {output_dir / name}")
+            # Create directory structure
+            offering_dir = output_dir / name
+            offering_dir.mkdir(parents=True, exist_ok=True)
+
+            # Create prompt engine
+            engine = PromptEngine(OFFERING_GROUPS)
+
+            # Prompt for all fields (pass name if provided via CLI)
+            user_input = engine.prompt_all(context={"name": name})
+
+            # Create offering data structure (pass offering_dir for document file validation)
+            offering_data = create_offering_data(user_input, offering_dir=offering_dir)
+
+            # Write service file
+            service_file = offering_dir / f"service.{format}"
+            if format == "json":
+                with open(service_file, "w") as f:
+                    json.dump(offering_data, f, indent=2)
+                    f.write("\n")
+            else:  # toml
+                if not TOML_WRITE_AVAILABLE:
+                    console.print(
+                        "[red]✗[/red] TOML write support not available. Install tomli_w.",
+                        style="bold red",
+                    )
+                    raise typer.Exit(code=1)
+                with open(service_file, "wb") as f:
+                    tomli_w.dump(offering_data, f)
+
+            console.print(f"\n[green]✓[/green] Service offering created: {offering_dir}")
+            console.print(f"  Added: {service_file.name}")
+        except typer.Abort:
+            console.print("[yellow]Service offering creation cancelled[/yellow]")
+            raise typer.Exit(code=1)
         except Exception as e:
             console.print(
                 f"[red]✗[/red] Failed to create service offering: {e}",
@@ -797,20 +835,46 @@ def init_listing(
             )
             raise typer.Exit(code=1)
     else:
-        # Generate from schema
-        console.print(f"[blue]Creating service listing:[/blue] {name}")
-        console.print(f"[blue]Output directory:[/blue] {output_dir}")
-        console.print(f"[blue]Format:[/blue] {format}\n")
+        # Interactive mode - prompt for values
+        console.print("[bold cyan]Creating service listing interactively[/bold cyan]")
+        console.print(f"[dim]Output directory:[/dim] {output_dir / name}")
+        console.print(f"[dim]Format:[/dim] {format}\n")
 
         try:
-            create_schema_based_structure(
-                dest_dir=output_dir / name,
-                dir_name=name,
-                schema_name="listing_v1",
-                format_type=format,
-                force=False,
-            )
-            console.print(f"[green]✓[/green] Service listing created: {output_dir / name}")
+            # Create directory structure
+            listing_dir = output_dir / name
+            listing_dir.mkdir(parents=True, exist_ok=True)
+
+            # Create prompt engine
+            engine = PromptEngine(LISTING_GROUPS)
+
+            # Prompt for all fields (pass name if provided via CLI)
+            user_input = engine.prompt_all(context={"name": name})
+
+            # Create listing data structure (pass listing_dir for document file validation)
+            listing_data = create_listing_data(user_input, listing_dir=listing_dir)
+
+            # Write listing file
+            listing_file = listing_dir / f"listing.{format}"
+            if format == "json":
+                with open(listing_file, "w") as f:
+                    json.dump(listing_data, f, indent=2)
+                    f.write("\n")
+            else:  # toml
+                if not TOML_WRITE_AVAILABLE:
+                    console.print(
+                        "[red]✗[/red] TOML write support not available. Install tomli_w.",
+                        style="bold red",
+                    )
+                    raise typer.Exit(code=1)
+                with open(listing_file, "wb") as f:
+                    tomli_w.dump(listing_data, f)
+
+            console.print(f"\n[green]✓[/green] Service listing created: {listing_dir}")
+            console.print(f"  Added: {listing_file.name}")
+        except typer.Abort:
+            console.print("[yellow]Service listing creation cancelled[/yellow]")
+            raise typer.Exit(code=1)
         except Exception as e:
             console.print(
                 f"[red]✗[/red] Failed to create service listing: {e}",
@@ -873,20 +937,46 @@ def init_provider(
             console.print(f"[red]✗[/red] Failed to create provider: {e}", style="bold red")
             raise typer.Exit(code=1)
     else:
-        # Generate from schema
-        console.print(f"[blue]Creating provider:[/blue] {name}")
-        console.print(f"[blue]Output directory:[/blue] {output_dir}")
-        console.print(f"[blue]Format:[/blue] {format}\n")
+        # Interactive mode - prompt for values
+        console.print("[bold cyan]Creating provider interactively[/bold cyan]")
+        console.print(f"[dim]Output directory:[/dim] {output_dir / name}")
+        console.print(f"[dim]Format:[/dim] {format}\n")
 
         try:
-            create_schema_based_structure(
-                dest_dir=output_dir / name,
-                dir_name=name,
-                schema_name="provider_v1",
-                format_type=format,
-                force=False,
-            )
-            console.print(f"[green]✓[/green] Provider created: {output_dir / name}")
+            # Create prompt engine
+            engine = PromptEngine(PROVIDER_GROUPS)
+
+            # Prompt for all fields (pass name if provided via CLI)
+            user_input = engine.prompt_all(context={"name": name})
+
+            # Create provider data structure
+            provider_data = create_provider_data(user_input)
+
+            # Create directory structure
+            provider_dir = output_dir / name
+            provider_dir.mkdir(parents=True, exist_ok=True)
+
+            # Write provider file
+            provider_file = provider_dir / f"provider.{format}"
+            if format == "json":
+                with open(provider_file, "w") as f:
+                    json.dump(provider_data, f, indent=2)
+                    f.write("\n")
+            else:  # toml
+                if not TOML_WRITE_AVAILABLE:
+                    console.print(
+                        "[red]✗[/red] TOML write support not available. Install tomli_w.",
+                        style="bold red",
+                    )
+                    raise typer.Exit(code=1)
+                with open(provider_file, "wb") as f:
+                    tomli_w.dump(provider_data, f)
+
+            console.print(f"\n[green]✓[/green] Provider created: {provider_dir}")
+            console.print(f"  Added: {provider_file.name}")
+        except typer.Abort:
+            console.print("[yellow]Provider creation cancelled[/yellow]")
+            raise typer.Exit(code=1)
         except Exception as e:
             console.print(f"[red]✗[/red] Failed to create provider: {e}", style="bold red")
             raise typer.Exit(code=1)
@@ -983,40 +1073,24 @@ def init_seller(
             console.print(f"[red]✗[/red] Failed to create seller: {e}", style="bold red")
             raise typer.Exit(code=1)
     else:
-        # Generate from schema
-        console.print(f"[blue]Creating seller:[/blue] {name}")
-        console.print(f"[blue]Output directory:[/blue] {output_dir}")
-        console.print(f"[blue]Format:[/blue] {format}\n")
+        # Interactive mode - prompt for values
+        console.print("[bold cyan]Creating seller interactively[/bold cyan]")
+        console.print(f"[dim]Output directory:[/dim] {output_dir}")
+        console.print(f"[dim]Format:[/dim] {format}\n")
 
         try:
+            # Create prompt engine
+            engine = PromptEngine(SELLER_GROUPS)
+
+            # Prompt for all fields (pass name if provided via CLI)
+            user_input = engine.prompt_all(context={"name": name})
+
+            # Create seller data structure
+            seller_data = create_seller_data(user_input)
+
             # Ensure output directory exists
             output_dir.mkdir(parents=True, exist_ok=True)
 
-            # Get schema directory
-            pkg_path = Path(__file__).parent
-            schema_dir = pkg_path / "schema"
-
-            # Load schema to generate example
-            schema_file = schema_dir / "seller_v1.json"
-            if not schema_file.exists():
-                raise FileNotFoundError(f"Schema file not found: {schema_file}")
-
-            with open(schema_file) as f:
-                json.load(f)
-
-            # Create basic seller data from schema
-            seller_data = {
-                "schema": "seller_v1",
-                "time_created": datetime.utcnow().isoformat() + "Z",
-                "name": name,
-                "display_name": name.replace("-", " ").replace("_", " ").title(),
-                "seller_type": "individual",
-                "contact_email": "contact@example.com",
-                "description": f"{name} seller",
-                "is_active": True,
-                "is_verified": False,
-            }
-
             # Write to file
             output_file = output_dir / f"seller.{format}"
             if format == "json":
@@ -1033,7 +1107,10 @@ def init_seller(
                 with open(output_file, "wb") as f:
                     tomli_w.dump(seller_data, f)
 
-            console.print(f"[green]✓[/green] Seller created: {output_file}")
+            console.print(f"\n[green]✓[/green] Seller created: {output_file}")
+        except typer.Abort:
+            console.print("[yellow]Seller creation cancelled[/yellow]")
+            raise typer.Exit(code=1)
         except Exception as e:
             console.print(f"[red]✗[/red] Failed to create seller: {e}", style="bold red")
             raise typer.Exit(code=1)

unitysvc_services/test.py

@@ -1,12 +1,10 @@
 """Test command group - test code examples with upstream credentials."""
 
 import fnmatch
-import json
 import os
 import shutil
 import subprocess
 import tempfile
-import tomllib
 from pathlib import Path
 from typing import Any
 
@@ -154,26 +152,27 @@ def load_related_data(listing_file: Path) -> dict[str, Any]:
     return result
 
 
-def load_provider_credentials(provider_file: Path) -> dict[str, str] | None:
-    """Load API key and endpoint from provider file.
+def load_provider_credentials(listing_file: Path) -> dict[str, str] | None:
+    """Load API key and endpoint from service offering file.
 
     Args:
-        provider_file: Path to provider.toml or provider.json
+        listing_file: Path to the listing file (used to locate the service offering)
 
     Returns:
         Dictionary with api_key and api_endpoint, or None if not found
     """
     try:
-        if provider_file.suffix == ".toml":
-            with open(provider_file, "rb") as f:
-                provider_data = tomllib.load(f)
-        else:
-            with open(provider_file) as f:
-                provider_data = json.load(f)
+        # Load related data including the offering
+        related_data = load_related_data(listing_file)
+        offering = related_data.get("offering", {})
+
+        if not offering:
+            return None
 
-        access_info = provider_data.get("provider_access_info", {})
-        api_key = access_info.get("api_key") or access_info.get("FIREWORKS_API_KEY")
-        api_endpoint = access_info.get("api_endpoint") or access_info.get("FIREWORKS_API_BASE_URL")
+        # Extract credentials from upstream_access_interface
+        upstream_access = offering.get("upstream_access_interface", {})
+        api_key = upstream_access.get("api_key")
+        api_endpoint = upstream_access.get("api_endpoint")
 
         if api_key and api_endpoint:
             return {
@@ -181,7 +180,7 @@ def load_provider_credentials(provider_file: Path) -> dict[str, str] | None:
                 "api_endpoint": str(api_endpoint),
             }
     except Exception as e:
-        console.print(f"[yellow]Warning: Failed to load provider credentials: {e}[/yellow]")
+        console.print(f"[yellow]Warning: Failed to load service credentials: {e}[/yellow]")
 
     return None
 
@@ -610,28 +609,6 @@ def run(
 
     console.print(f"[blue]Scanning for listing files in:[/blue] {data_dir}\n")
 
-    # Find all provider files first to get credentials
-    provider_results = find_files_by_schema(data_dir, "provider_v1")
-    provider_credentials: dict[str, dict[str, str]] = {}
-
-    for provider_file, _format, provider_data in provider_results:
-        prov_name = provider_data.get("name", "unknown")
-
-        # Skip if provider filter is set and doesn't match
-        if provider_name and prov_name != provider_name:
-            continue
-
-        credentials = load_provider_credentials(provider_file)
-        if credentials:
-            provider_credentials[prov_name] = credentials
-            console.print(f"[green]✓[/green] Loaded credentials for provider: {prov_name}")
-
-    if not provider_credentials:
-        console.print("[yellow]No provider credentials found.[/yellow]")
-        raise typer.Exit(code=0)
-
-    console.print()
-
     # Find all listing files
     listing_results = find_files_by_schema(data_dir, "listing_v1")
 
@@ -642,7 +619,7 @@ def run(
     console.print(f"[cyan]Found {len(listing_results)} listing file(s)[/cyan]\n")
 
     # Extract code examples from all listings
-    all_code_examples: list[tuple[dict[str, Any], str]] = []
+    all_code_examples: list[tuple[dict[str, Any], str, dict[str, str]]] = []
 
     for listing_file, _format, listing_data in listing_results:
         # Determine provider for this listing
@@ -661,8 +638,10 @@ def run(
         if provider_name and prov_name != provider_name:
             continue
 
-        # Skip if we don't have credentials for this provider
-        if prov_name not in provider_credentials:
+        # Load credentials from service offering for this listing
+        credentials = load_provider_credentials(listing_file)
+        if not credentials:
+            console.print(f"[yellow]⚠ No credentials found for listing: {listing_file}[/yellow]")
             continue
 
         # Filter by service directory name if patterns are provided
@@ -686,7 +665,7 @@ def run(
                 if not file_path.endswith(test_file):
                     continue
 
-            all_code_examples.append((example, prov_name))
+            all_code_examples.append((example, prov_name, credentials))
 
     if not all_code_examples:
         console.print("[yellow]No code examples found in listings.[/yellow]")
@@ -697,13 +676,12 @@ def run(
     # Execute each code example
     results = []
 
-    for example, prov_name in all_code_examples:
+    for example, prov_name, credentials in all_code_examples:
         service_name = example["service_name"]
         title = example["title"]
 
         console.print(f"[bold]Testing:[/bold] {service_name} - {title}")
 
-        credentials = provider_credentials[prov_name]
         result = execute_code_example(example, credentials)
 
         results.append(

{unitysvc_services-0.1.10.dist-info → unitysvc_services-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-services
-Version: 0.1.10
+Version: 0.1.11
 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.1.10.dist-info → unitysvc_services-0.1.11.dist-info}/RECORD

@@ -1,14 +1,15 @@
 unitysvc_services/__init__.py,sha256=J6F3RlZCJUVjhZoprfbrYCxe3l9ynQQbGO7pf7FyqlM,110
-unitysvc_services/api.py,sha256=d3xY4ElA4aCAl62xrwjZ6qIWUoYT-4Q8wJ8BJbyZzXI,11990
+unitysvc_services/api.py,sha256=RgqTxaxg2YLM36ePzlxeOyFB3tJGQsTP0ZQD0Q8ssn0,11990
 unitysvc_services/cli.py,sha256=omHzrWk8iZJUjZTE5KCmEK1wnRGGnQk_BNV-hKqucnA,725
 unitysvc_services/format_data.py,sha256=Jl9Vj3fRX852fHSUa5DzO-oiFQwuQHC3WMCDNIlo1Lc,5460
+unitysvc_services/interactive_prompt.py,sha256=cnadxhshsTYovNNO51_71FACIpMQMqaVv1vRPW-xFHc,39292
 unitysvc_services/list.py,sha256=QDp9BByaoeFeJxXJN9RQ-jU99mH9Guq9ampfXCbpZmI,7033
-unitysvc_services/populate.py,sha256=jiqS2D3_widV6siPe3OBvw7ZdG9MuddEIOuTUCtMM5c,7605
-unitysvc_services/publisher.py,sha256=7KFzQ3cB33t5t5LDUPYZ7LoP6LXoT9Y5PgqNzP-kOmk,61695
+unitysvc_services/populate.py,sha256=lAbu-EMbvM3qk9P_MQ0sQc74IyZigcj-u3eUcgi9Qpw,8063
+unitysvc_services/publisher.py,sha256=EQoqH8pJunjEj7ecN4Ot7UPgzNlVkIo9BssTztjOvss,67729
 unitysvc_services/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unitysvc_services/query.py,sha256=q0_g5YAl9cPlHpW7k7Y6A-t4fQSdI-_4Jl6g2KgkEm0,24049
-unitysvc_services/scaffold.py,sha256=Y73IX8vskImxSvxDgR0mvEFuAMYnBKfttn3bjcz3jmQ,40331
-unitysvc_services/test.py,sha256=Uf06_mgRcEGf9HHYzW2BGTzrDKwd3n7Xb60DFChP8kM,32472
+unitysvc_services/scaffold.py,sha256=v4BVx3kRHSPj9QQR9UoGm4VSEQKe5ZbApjfh8zWNnWQ,43706
+unitysvc_services/test.py,sha256=d9ToiTJB9nHsCjzBOGCLbP5epc8CfDCUi2w_J10Tk0I,31713
 unitysvc_services/update.py,sha256=K9swocTUnqqiSgARo6GmuzTzUySSpyqqPPW4xF7ZU-g,9659
 unitysvc_services/utils.py,sha256=4tEBdO90XpkS6j73ZXnz5dNLVXJaPUILWMwzk5_fUQ4,15276
 unitysvc_services/validator.py,sha256=NYoIWV2iMyjse1-mIVz2GnFXNDewLnJVDIDAjqnsBCs,30241
@@ -23,9 +24,9 @@ unitysvc_services/schema/listing_v1.json,sha256=gzSK5ncnqmcb44WPnv0FG9xyJ-wUznca
 unitysvc_services/schema/provider_v1.json,sha256=L2rudq1RcfAE67WJXmowJu5_YReqxioiQO0263SWaNc,22033
 unitysvc_services/schema/seller_v1.json,sha256=QhYuaJBugWVbgAEBhrSyYAPT1Ss_6Z0rz0lA2FhJOo8,8841
 unitysvc_services/schema/service_v1.json,sha256=sifCZzx0hT7k6tpDCkPUgXYG9e5OVUaeKudTjEPFO4E,24293
-unitysvc_services-0.1.10.dist-info/licenses/LICENSE,sha256=_p8V6A8OMPu2HIztn3O01v0-urZFwk0Dd3Yk_PTIlL8,1065
-unitysvc_services-0.1.10.dist-info/METADATA,sha256=oehP4td47B1x0c1Rg8zNO2OLlvdKvLhzbvqb5mIQCgk,7235
-unitysvc_services-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unitysvc_services-0.1.10.dist-info/entry_points.txt,sha256=RBhVHKky3rsOly4jVa29c7UAw5ZwNNWnttmtzozr5O0,97
-unitysvc_services-0.1.10.dist-info/top_level.txt,sha256=GIotQj-Ro2ruR7eupM1r58PWqIHTAq647ORL7E2kneo,18
-unitysvc_services-0.1.10.dist-info/RECORD,,
+unitysvc_services-0.1.11.dist-info/licenses/LICENSE,sha256=_p8V6A8OMPu2HIztn3O01v0-urZFwk0Dd3Yk_PTIlL8,1065
+unitysvc_services-0.1.11.dist-info/METADATA,sha256=6_cV9lPBvfTjh9eUiVvRuf2E0ThyFUz4BLQmSJUl49g,7235
+unitysvc_services-0.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unitysvc_services-0.1.11.dist-info/entry_points.txt,sha256=RBhVHKky3rsOly4jVa29c7UAw5ZwNNWnttmtzozr5O0,97
+unitysvc_services-0.1.11.dist-info/top_level.txt,sha256=GIotQj-Ro2ruR7eupM1r58PWqIHTAq647ORL7E2kneo,18
+unitysvc_services-0.1.11.dist-info/RECORD,,