unitysvc-services 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

unitysvc_services/models/listing_v1.py

@@ -3,12 +3,7 @@ from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from unitysvc_services.models.base import (
-    AccessInterface,
-    Document,
-    ListingStatusEnum,
-    Pricing,
-)
+from unitysvc_services.models.base import AccessInterface, Document, ListingStatusEnum, Pricing
 
 
 class ListingV1(BaseModel):
@@ -32,6 +27,10 @@ class ListingV1(BaseModel):
 
     seller_name: str | None = Field(default=None, description="Name of the seller offering this service listing")
 
+    name: str = Field(
+        max_length=255,
+        description="Name identifier for the service listing, default to filename",
+    )
     # unique name for each provider, usually following upstream naming convention
     # status of the service, public, deprecated etc
     listing_status: ListingStatusEnum = Field(

unitysvc_services/publisher.py

@@ -106,6 +106,11 @@ class ServiceDataPublisher:
 
         # Resolve file references and include content
         base_path = data_file.parent
+        data = convert_convenience_fields_to_documents(
+            data, base_path, logo_field="logo", terms_field="terms_of_service"
+        )
+
+        # Resolve file references and include content
         data_with_content = self.resolve_file_references(data, base_path)
 
         # Extract provider_name from directory structure
@@ -154,6 +159,10 @@ class ServiceDataPublisher:
         # Load the listing data file
         data = self.load_data_file(data_file)
 
+        # If name is not provided, use filename (without extension)
+        if "name" not in data or not data.get("name"):
+            data["name"] = data_file.stem
+
         # Resolve file references and include content
         base_path = data_file.parent
         data_with_content = self.resolve_file_references(data, base_path)

unitysvc_services/query.py

@@ -39,45 +39,53 @@ class ServiceDataQuery:
             timeout=30.0,
         )
 
-    def list_service_offerings(self) -> list[dict[str, Any]]:
-        """List all service offerings from the backend."""
-        response = self.client.get(f"{self.base_url}/publish/offerings")
-        response.raise_for_status()
-        result = response.json()
-        return result.get("data", result) if isinstance(result, dict) else result
+    def list_service_offerings(self, skip: int = 0, limit: int = 100) -> list[dict[str, Any]]:
+        """List all service offerings from the backend.
 
-    def list_service_listings(self) -> list[dict[str, Any]]:
-        """List all service listings from the backend."""
-        response = self.client.get(f"{self.base_url}/publish/listings")
+        Args:
+            skip: Number of records to skip (for pagination)
+            limit: Maximum number of records to return
+        """
+        response = self.client.get(f"{self.base_url}/publish/offerings", params={"skip": skip, "limit": limit})
         response.raise_for_status()
         result = response.json()
         return result.get("data", result) if isinstance(result, dict) else result
 
-    def list_providers(self) -> list[dict[str, Any]]:
-        """List all providers from the backend."""
-        response = self.client.get(f"{self.base_url}/publish/providers")
+    def list_service_listings(self, skip: int = 0, limit: int = 100) -> list[dict[str, Any]]:
+        """List all service listings from the backend.
+
+        Args:
+            skip: Number of records to skip (for pagination)
+            limit: Maximum number of records to return
+        """
+        response = self.client.get(f"{self.base_url}/publish/listings", params={"skip": skip, "limit": limit})
         response.raise_for_status()
         result = response.json()
         return result.get("data", result) if isinstance(result, dict) else result
 
-    def list_sellers(self) -> list[dict[str, Any]]:
-        """List all sellers from the backend."""
-        response = self.client.get(f"{self.base_url}/publish/sellers")
+    def list_providers(self, skip: int = 0, limit: int = 100) -> list[dict[str, Any]]:
+        """List all providers from the backend.
+
+        Args:
+            skip: Number of records to skip (for pagination)
+            limit: Maximum number of records to return
+        """
+        response = self.client.get(f"{self.base_url}/publish/providers", params={"skip": skip, "limit": limit})
         response.raise_for_status()
         result = response.json()
         return result.get("data", result) if isinstance(result, dict) else result
 
-    def list_access_interfaces(self) -> dict[str, Any]:
-        """List all access interfaces from the backend (private endpoint)."""
-        response = self.client.get(f"{self.base_url}/private/interfaces")
-        response.raise_for_status()
-        return response.json()
+    def list_sellers(self, skip: int = 0, limit: int = 100) -> list[dict[str, Any]]:
+        """List all sellers from the backend.
 
-    def list_documents(self) -> dict[str, Any]:
-        """List all documents from the backend (private endpoint)."""
-        response = self.client.get(f"{self.base_url}/private/documents")
+        Args:
+            skip: Number of records to skip (for pagination)
+            limit: Maximum number of records to return
+        """
+        response = self.client.get(f"{self.base_url}/publish/sellers", params={"skip": skip, "limit": limit})
         response.raise_for_status()
-        return response.json()
+        result = response.json()
+        return result.get("data", result) if isinstance(result, dict) else result
 
     def close(self):
         """Close the HTTP client."""
@@ -111,6 +119,16 @@ def query_sellers(
             "created_at, updated_at, status"
         ),
     ),
+    skip: int = typer.Option(
+        0,
+        "--skip",
+        help="Number of records to skip (for pagination)",
+    ),
+    limit: int = typer.Option(
+        100,
+        "--limit",
+        help="Maximum number of records to return (default: 100)",
+    ),
 ):
     """Query all sellers from the backend.
 
@@ -121,6 +139,12 @@ def query_sellers(
         # Show only specific fields
         unitysvc_services query sellers --fields id,name,contact_email
 
+        # Retrieve more than 100 records
+        unitysvc_services query sellers --limit 500
+
+        # Pagination: skip first 100, get next 100
+        unitysvc_services query sellers --skip 100 --limit 100
+
         # Show all available fields
         unitysvc_services query sellers --fields \\
             id,name,display_name,seller_type,contact_email,homepage,created_at,updated_at
@@ -158,7 +182,7 @@ def query_sellers(
 
     try:
         with ServiceDataQuery() as query:
-            sellers = query.list_sellers()
+            sellers = query.list_sellers(skip=skip, limit=limit)
 
             if format == "json":
                 # For JSON, filter fields if not all are requested
@@ -255,6 +279,16 @@ def query_providers(
             "homepage, description, status, created_at, updated_at"
         ),
     ),
+    skip: int = typer.Option(
+        0,
+        "--skip",
+        help="Number of records to skip (for pagination)",
+    ),
+    limit: int = typer.Option(
+        100,
+        "--limit",
+        help="Maximum number of records to return (default: 100)",
+    ),
 ):
     """Query all providers from the backend.
 
@@ -262,6 +296,12 @@ def query_providers(
         # Use default fields
         unitysvc_services query providers
 
+        # Retrieve more than 100 records
+        unitysvc_services query providers --limit 500
+
+        # Pagination: skip first 100, get next 100
+        unitysvc_services query providers --skip 100 --limit 100
+
         # Show only specific fields
         unitysvc_services query providers --fields id,name,contact_email
 
@@ -298,7 +338,7 @@ def query_providers(
 
     try:
         with ServiceDataQuery() as query:
-            providers = query.list_providers()
+            providers = query.list_providers(skip=skip, limit=limit)
 
             if format == "json":
                 # For JSON, filter fields if not all are requested
@@ -389,6 +429,16 @@ def query_offerings(
             "service_type, provider_name"
         ),
     ),
+    skip: int = typer.Option(
+        0,
+        "--skip",
+        help="Number of records to skip (for pagination)",
+    ),
+    limit: int = typer.Option(
+        100,
+        "--limit",
+        help="Maximum number of records to return (default: 100)",
+    ),
 ):
     """Query all service offerings from UnitySVC backend.
 
@@ -399,6 +449,12 @@ def query_offerings(
         # Show only specific fields
         unitysvc_services query offerings --fields id,service_name,status
 
+        # Retrieve more than 100 records
+        unitysvc_services query offerings --limit 500
+
+        # Pagination: skip first 100, get next 100
+        unitysvc_services query offerings --skip 100 --limit 100
+
         # Show all available fields
         unitysvc_services query offerings --fields \\
             id,service_name,service_type,provider_name,status,price,definition_id,provider_id
@@ -430,7 +486,7 @@ def query_offerings(
 
     try:
         with ServiceDataQuery() as query:
-            offerings = query.list_service_offerings()
+            offerings = query.list_service_offerings(skip=skip, limit=limit)
 
             if format == "json":
                 # For JSON, filter fields if not all are requested
@@ -489,11 +545,21 @@ def query_listings(
         "--fields",
         help=(
             "Comma-separated list of fields to display. Available fields: "
-            "id, offering_id, seller_id, status, created_at, updated_at, "
+            "id, offering_id, offering_status, seller_id, status, created_at, updated_at, "
             "parameters_schema, parameters_ui_schema, tags, service_name, "
             "service_type, provider_name, seller_name, listing_type"
         ),
     ),
+    skip: int = typer.Option(
+        0,
+        "--skip",
+        help="Number of records to skip (for pagination)",
+    ),
+    limit: int = typer.Option(
+        100,
+        "--limit",
+        help="Maximum number of records to return (default: 100)",
+    ),
 ):
     """Query all service listings from UnitySVC backend.
 
@@ -504,6 +570,12 @@ def query_listings(
         # Show only specific fields
         unitysvc_services query listings --fields id,service_name,status
 
+        # Retrieve more than 100 records
+        unitysvc_services query listings --limit 500
+
+        # Pagination: skip first 100, get next 100
+        unitysvc_services query listings --skip 100 --limit 100
+
         # Show all available fields
         unitysvc_services query listings --fields \\
             id,service_name,service_type,seller_name,listing_type,status,provider_name
@@ -515,6 +587,7 @@ def query_listings(
     allowed_fields = {
         "id",
         "offering_id",
+        "offering_status",
         "seller_id",
         "status",
         "created_at",
@@ -541,7 +614,7 @@ def query_listings(
 
     try:
         with ServiceDataQuery() as query:
-            listings = query.list_service_listings()
+            listings = query.list_service_listings(skip=skip, limit=limit)
 
             if format == "json":
                 # For JSON, filter fields if not all are requested
@@ -583,232 +656,3 @@ def query_listings(
     except Exception as e:
         console.print(f"[red]✗[/red] Failed to query service listings: {e}", style="bold red")
         raise typer.Exit(code=1)
-
-
-@app.command("interfaces")
-def query_interfaces(
-    format: str = typer.Option(
-        "table",
-        "--format",
-        "-f",
-        help="Output format: table, json",
-    ),
-    fields: str = typer.Option(
-        "id,name,context_type,access_method,is_active",
-        "--fields",
-        help=(
-            "Comma-separated list of fields to display. Available fields: "
-            "id, entity_id, context_type, access_method, api_endpoint, name, "
-            "description, request_transformer, rate_limits, constraint, "
-            "is_active, is_primary, sort_order, created_at, updated_at"
-        ),
-    ),
-):
-    """Query all access interfaces from UnitySVC backend (private endpoint).
-
-    Examples:
-        # Use default fields
-        unitysvc_services query interfaces
-
-        # Show only specific fields
-        unitysvc_services query interfaces --fields id,name,access_method
-
-        # Show all available fields
-        unitysvc_services query interfaces --fields \\
-            id,name,context_type,access_method,entity_id,is_active,is_primary
-    """
-    # Parse fields list
-    field_list = [f.strip() for f in fields.split(",")]
-
-    # Define allowed fields from AccessInterfacePublic model
-    allowed_fields = {
-        "id",
-        "entity_id",
-        "context_type",
-        "access_method",
-        "api_endpoint",
-        "name",
-        "description",
-        "request_transformer",
-        "rate_limits",
-        "constraint",
-        "is_active",
-        "is_primary",
-        "sort_order",
-        "created_at",
-        "updated_at",
-    }
-
-    # Validate fields
-    invalid_fields = [f for f in field_list if f not in allowed_fields]
-    if invalid_fields:
-        console.print(
-            f"[red]Error:[/red] Invalid field(s): {', '.join(invalid_fields)}",
-            style="bold red",
-        )
-        console.print(f"[yellow]Available fields:[/yellow] {', '.join(sorted(allowed_fields))}")
-        raise typer.Exit(code=1)
-
-    try:
-        with ServiceDataQuery() as query:
-            data = query.list_access_interfaces()
-
-            if format == "json":
-                # For JSON, filter fields if not all are requested
-                interfaces = data.get("data", [])
-                if set(field_list) != allowed_fields:
-                    filtered_interfaces = [
-                        {k: v for k, v in interface.items() if k in field_list} for interface in interfaces
-                    ]
-                    console.print(json.dumps({"data": filtered_interfaces, "count": data.get("count", 0)}, indent=2))
-                else:
-                    console.print(json.dumps(data, indent=2))
-            else:
-                interfaces = data.get("data", [])
-                if not interfaces:
-                    console.print("[yellow]No access interfaces found.[/yellow]")
-                else:
-                    table = Table(title="Access Interfaces")
-
-                    # Add columns dynamically based on selected fields
-                    for field in field_list:
-                        # Capitalize and format field names for display
-                        column_name = field.replace("_", " ").title()
-                        table.add_column(column_name)
-
-                    # Add rows
-                    for interface in interfaces:
-                        row = []
-                        for field in field_list:
-                            value = interface.get(field)
-                            if value is None:
-                                row.append("N/A")
-                            elif isinstance(value, dict | list):
-                                row.append(str(value)[:50])  # Truncate complex types
-                            else:
-                                row.append(str(value))
-                        table.add_row(*row)
-
-                    console.print(table)
-                    console.print(f"\n[green]Total:[/green] {data.get('count', 0)} access interface(s)")
-    except ValueError as e:
-        console.print(f"[red]✗[/red] {e}", style="bold red")
-        raise typer.Exit(code=1)
-    except Exception as e:
-        console.print(f"[red]✗[/red] Failed to query access interfaces: {e}", style="bold red")
-        raise typer.Exit(code=1)
-
-
-@app.command("documents")
-def query_documents(
-    format: str = typer.Option(
-        "table",
-        "--format",
-        "-f",
-        help="Output format: table, json",
-    ),
-    fields: str = typer.Option(
-        "id,title,category,mime_type,context_type,is_public",
-        "--fields",
-        help=(
-            "Comma-separated list of fields to display. Available fields: "
-            "id, entity_id, context_type, title, description, mime_type, "
-            "version, category, meta, sort_order, is_active, is_public, "
-            "external_url, object_key, filename, filesize, created_at, updated_at"
-        ),
-    ),
-):
-    """Query all documents from UnitySVC backend (private endpoint).
-
-    Examples:
-        # Use default fields
-        unitysvc_services query documents
-
-        # Show only specific fields
-        unitysvc_services query documents --fields id,title,category
-
-        # Show all available fields
-        unitysvc_services query documents --fields \\
-            id,title,category,mime_type,context_type,is_public,filename,filesize
-    """
-    # Parse fields list
-    field_list = [f.strip() for f in fields.split(",")]
-
-    # Define allowed fields from DocumentPublic model
-    allowed_fields = {
-        "id",
-        "entity_id",
-        "context_type",
-        "title",
-        "description",
-        "mime_type",
-        "version",
-        "category",
-        "meta",
-        "sort_order",
-        "is_active",
-        "is_public",
-        "external_url",
-        "object_key",
-        "filename",
-        "filesize",
-        "created_at",
-        "updated_at",
-    }
-
-    # Validate fields
-    invalid_fields = [f for f in field_list if f not in allowed_fields]
-    if invalid_fields:
-        console.print(
-            f"[red]Error:[/red] Invalid field(s): {', '.join(invalid_fields)}",
-            style="bold red",
-        )
-        console.print(f"[yellow]Available fields:[/yellow] {', '.join(sorted(allowed_fields))}")
-        raise typer.Exit(code=1)
-
-    try:
-        with ServiceDataQuery() as query:
-            data = query.list_documents()
-
-            if format == "json":
-                # For JSON, filter fields if not all are requested
-                documents = data.get("data", [])
-                if set(field_list) != allowed_fields:
-                    filtered_documents = [{k: v for k, v in doc.items() if k in field_list} for doc in documents]
-                    console.print(json.dumps({"data": filtered_documents, "count": data.get("count", 0)}, indent=2))
-                else:
-                    console.print(json.dumps(data, indent=2))
-            else:
-                documents = data.get("data", [])
-                if not documents:
-                    console.print("[yellow]No documents found.[/yellow]")
-                else:
-                    table = Table(title="Documents")
-
-                    # Add columns dynamically based on selected fields
-                    for field in field_list:
-                        # Capitalize and format field names for display
-                        column_name = field.replace("_", " ").title()
-                        table.add_column(column_name)
-
-                    # Add rows
-                    for doc in documents:
-                        row = []
-                        for field in field_list:
-                            value = doc.get(field)
-                            if value is None:
-                                row.append("N/A")
-                            elif isinstance(value, dict | list):
-                                row.append(str(value)[:50])  # Truncate complex types
-                            else:
-                                row.append(str(value))
-                        table.add_row(*row)
-
-                    console.print(table)
-                    console.print(f"\n[green]Total:[/green] {data.get('count', 0)} document(s)")
-    except ValueError as e:
-        console.print(f"[red]✗[/red] {e}", style="bold red")
-        raise typer.Exit(code=1)
-    except Exception as e:
-        console.print(f"[red]✗[/red] Failed to query documents: {e}", style="bold red")
-        raise typer.Exit(code=1)

{unitysvc_services-0.2.3.dist-info → unitysvc_services-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-services
-Version: 0.2.3
+Version: 0.2.5
 Summary: SDK for digital service providers on UnitySVC
 Author-email: Bo Peng <bo.peng@unitysvc.com>
 Maintainer-email: Bo Peng <bo.peng@unitysvc.com>
@@ -87,8 +87,11 @@ unitysvc_services publish
 # Or publish specific types only
 unitysvc_services publish providers
 
-# Verify
+# Verify with default fields
 unitysvc_services query offerings
+
+# Query with custom fields
+unitysvc_services query providers --fields id,name,contact_email
 ```
 
 ## Key Features

{unitysvc_services-0.2.3.dist-info → unitysvc_services-0.2.5.dist-info}/RECORD

@@ -3,22 +3,22 @@ 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=qEkui7T7DQr_CfXzDvWMuTJrPpKbcldfwPi6Ocv-ILA,35367
+unitysvc_services/publisher.py,sha256=s3px0i1ov6FisnnYG-gkkMHwJhnGbf-Ug225vosfxxM,35733
 unitysvc_services/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-unitysvc_services/query.py,sha256=p-fG1iosAuzdHYnaYmEe2zdHQVZzWk2LhWmu5B4sAdA,30203
+unitysvc_services/query.py,sha256=M8-zklRYvIaLZSzmDVroZBf48OyGUa1nvhUaLzZXeuU,24092
 unitysvc_services/scaffold.py,sha256=Y73IX8vskImxSvxDgR0mvEFuAMYnBKfttn3bjcz3jmQ,40331
 unitysvc_services/update.py,sha256=K9swocTUnqqiSgARo6GmuzTzUySSpyqqPPW4xF7ZU-g,9659
 unitysvc_services/utils.py,sha256=GN0gkVTU8fOx2G0EbqnWmx8w9eFsoPfRprPjwCyPYkE,11371
 unitysvc_services/validator.py,sha256=zuFA44ezKlfUTtdJ8M2Xd7nk1Eot4HxbBksEUaIIpZs,26790
 unitysvc_services/models/__init__.py,sha256=hJCc2KSZmIHlKWKE6GpLGdeVB6LIpyVUKiOKnwmKvCs,200
 unitysvc_services/models/base.py,sha256=gm3xlcC35QNRST5ikJPhdk-dTTXoY9D_5Jxkyt8SBCU,13173
-unitysvc_services/models/listing_v1.py,sha256=CC_GXoN3NHJFzEQ3cBHDQpdUaBNpvLdHARHJ-LmC0RM,2305
+unitysvc_services/models/listing_v1.py,sha256=8cSd91weXGpP5tX9aQg0iagi1H3gSd5WJddVhOJji3c,2421
 unitysvc_services/models/provider_v1.py,sha256=cYK5kDDmzQEnLvUC2C8dKz-ZXci7hVn3fjNrJkaSr10,2050
 unitysvc_services/models/seller_v1.py,sha256=SU4rqYAh9hE4EeUrEkqaVrLwusenV7MotPF77VcsRKo,3263
 unitysvc_services/models/service_v1.py,sha256=u16zqM3khrJoTw_v0d45tMcKXjko5k_v3w8xwUtZ6nM,2720
-unitysvc_services-0.2.3.dist-info/licenses/LICENSE,sha256=_p8V6A8OMPu2HIztn3O01v0-urZFwk0Dd3Yk_PTIlL8,1065
-unitysvc_services-0.2.3.dist-info/METADATA,sha256=MqWBQxgCpX6dpqmS1K95RXr-2yhvS8YyHDqfE0mZiYU,6515
-unitysvc_services-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unitysvc_services-0.2.3.dist-info/entry_points.txt,sha256=-vodnbPmo7QQmFu8jdG6sCyGRVM727w9Nhwp4Vwau_k,64
-unitysvc_services-0.2.3.dist-info/top_level.txt,sha256=GIotQj-Ro2ruR7eupM1r58PWqIHTAq647ORL7E2kneo,18
-unitysvc_services-0.2.3.dist-info/RECORD,,
+unitysvc_services-0.2.5.dist-info/licenses/LICENSE,sha256=_p8V6A8OMPu2HIztn3O01v0-urZFwk0Dd3Yk_PTIlL8,1065
+unitysvc_services-0.2.5.dist-info/METADATA,sha256=G6wUb0qoOpZtYWLYnp-MfOgv3tMZWHqh-K78vAm1POI,6628
+unitysvc_services-0.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unitysvc_services-0.2.5.dist-info/entry_points.txt,sha256=-vodnbPmo7QQmFu8jdG6sCyGRVM727w9Nhwp4Vwau_k,64
+unitysvc_services-0.2.5.dist-info/top_level.txt,sha256=GIotQj-Ro2ruR7eupM1r58PWqIHTAq647ORL7E2kneo,18
+unitysvc_services-0.2.5.dist-info/RECORD,,