unitysvc-services 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

unitysvc_services/query.py

@@ -27,11 +27,9 @@ class ServiceDataQuery:
             ValueError: If base_url or api_key is not provided
         """
         if not base_url:
-            raise ValueError(
-                "Backend URL not provided. Use --backend-url or set UNITYSVC_BACKEND_URL env var."
-            )
+            raise ValueError("UNITYSVC_BASE_URL environment variable not set.")
         if not api_key:
-            raise ValueError("API key not provided. Use --api-key or set UNITYSVC_API_KEY env var.")
+            raise ValueError("UNITYSVC_API_KEY environment variable not set.")
 
         self.base_url = base_url.rstrip("/")
         self.api_key = api_key
@@ -45,28 +43,28 @@ class ServiceDataQuery:
 
     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/service_offering")
+        response = self.client.get(f"{self.base_url}/publish/service_offerings")
         response.raise_for_status()
         result = response.json()
         return result.get("data", result) if isinstance(result, dict) else result
 
     def list_service_listings(self) -> list[dict[str, Any]]:
         """List all service listings from the backend."""
-        response = self.client.get(f"{self.base_url}/services/")
+        response = self.client.get(f"{self.base_url}/publish/services")
         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}/providers/")
+        response = self.client.get(f"{self.base_url}/publish/providers")
         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}/sellers/")
+        response = self.client.get(f"{self.base_url}/publish/sellers")
         response.raise_for_status()
         result = response.json()
         return result.get("data", result) if isinstance(result, dict) else result
@@ -96,40 +94,22 @@ class ServiceDataQuery:
         self.close()
 
     @staticmethod
-    def from_env(
-        backend_url: str | None = None, api_key: str | None = None
-    ) -> "ServiceDataQuery":
-        """Create ServiceDataQuery from environment variables or arguments.
-
-        Args:
-            backend_url: Optional backend URL (falls back to UNITYSVC_BACKEND_URL env var)
-            api_key: Optional API key (falls back to UNITYSVC_API_KEY env var)
+    def from_env() -> "ServiceDataQuery":
+        """Create ServiceDataQuery from environment variables.
 
         Returns:
             ServiceDataQuery instance
 
         Raises:
-            ValueError: If required credentials are not provided
+            ValueError: If required environment variables are not set
         """
-        resolved_backend_url = backend_url or os.getenv("UNITYSVC_BACKEND_URL") or ""
-        resolved_api_key = api_key or os.getenv("UNITYSVC_API_KEY") or ""
-        return ServiceDataQuery(base_url=resolved_backend_url, api_key=resolved_api_key)
+        backend_url = os.getenv("UNITYSVC_BASE_URL") or ""
+        api_key = os.getenv("UNITYSVC_API_KEY") or ""
+        return ServiceDataQuery(base_url=backend_url, api_key=api_key)
 
 
 @app.command("sellers")
 def query_sellers(
-    backend_url: str | None = typer.Option(
-        None,
-        "--backend-url",
-        "-u",
-        help="UnitySVC backend URL (default: from UNITYSVC_BACKEND_URL env var)",
-    ),
-    api_key: str | None = typer.Option(
-        None,
-        "--api-key",
-        "-k",
-        help="API key for authentication (default: from UNITYSVC_API_KEY env var)",
-    ),
     format: str = typer.Option(
         "table",
         "--format",
@@ -139,7 +119,7 @@ def query_sellers(
 ):
     """Query all sellers from the backend."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery.from_env() as query:
             sellers = query.list_sellers()
 
             if format == "json":
@@ -177,18 +157,6 @@ def query_sellers(
 
 @app.command("providers")
 def query_providers(
-    backend_url: str | None = typer.Option(
-        None,
-        "--backend-url",
-        "-u",
-        help="UnitySVC backend URL (default: from UNITYSVC_BACKEND_URL env var)",
-    ),
-    api_key: str | None = typer.Option(
-        None,
-        "--api-key",
-        "-k",
-        help="API key for authentication (default: from UNITYSVC_API_KEY env var)",
-    ),
     format: str = typer.Option(
         "table",
         "--format",
@@ -198,7 +166,7 @@ def query_providers(
 ):
     """Query all providers from the backend."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery.from_env() as query:
             providers = query.list_providers()
 
             if format == "json":
@@ -232,18 +200,6 @@ def query_providers(
 
 @app.command("offerings")
 def query_offerings(
-    backend_url: str | None = typer.Option(
-        None,
-        "--backend-url",
-        "-u",
-        help="UnitySVC backend URL (default: from UNITYSVC_BACKEND_URL env var)",
-    ),
-    api_key: str | None = typer.Option(
-        None,
-        "--api-key",
-        "-k",
-        help="API key for authentication (default: from UNITYSVC_API_KEY env var)",
-    ),
     format: str = typer.Option(
         "table",
         "--format",
@@ -253,7 +209,7 @@ def query_offerings(
 ):
     """Query all service offerings from UnitySVC backend."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery.from_env() as query:
             offerings = query.list_service_offerings()
 
             if format == "json":
@@ -292,18 +248,6 @@ def query_offerings(
 
 @app.command("listings")
 def query_listings(
-    backend_url: str | None = typer.Option(
-        None,
-        "--backend-url",
-        "-u",
-        help="UnitySVC backend URL (default: from UNITYSVC_BACKEND_URL env var)",
-    ),
-    api_key: str | None = typer.Option(
-        None,
-        "--api-key",
-        "-k",
-        help="API key for authentication (default: from UNITYSVC_API_KEY env var)",
-    ),
     format: str = typer.Option(
         "table",
         "--format",
@@ -313,7 +257,7 @@ def query_listings(
 ):
     """Query all service listings from UnitySVC backend."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery.from_env() as query:
             listings = query.list_service_listings()
 
             if format == "json":
@@ -351,18 +295,6 @@ def query_listings(
 
 @app.command("interfaces")
 def query_interfaces(
-    backend_url: str | None = typer.Option(
-        None,
-        "--backend-url",
-        "-u",
-        help="UnitySVC backend URL (default: from UNITYSVC_BACKEND_URL env var)",
-    ),
-    api_key: str | None = typer.Option(
-        None,
-        "--api-key",
-        "-k",
-        help="API key for authentication (default: from UNITYSVC_API_KEY env var)",
-    ),
     format: str = typer.Option(
         "table",
         "--format",
@@ -372,7 +304,7 @@ def query_interfaces(
 ):
     """Query all access interfaces from UnitySVC backend (private endpoint)."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery.from_env() as query:
             data = query.list_access_interfaces()
 
             if format == "json":
@@ -412,18 +344,6 @@ def query_interfaces(
 
 @app.command("documents")
 def query_documents(
-    backend_url: str | None = typer.Option(
-        None,
-        "--backend-url",
-        "-u",
-        help="UnitySVC backend URL (default: from UNITYSVC_BACKEND_URL env var)",
-    ),
-    api_key: str | None = typer.Option(
-        None,
-        "--api-key",
-        "-k",
-        help="API key for authentication (default: from UNITYSVC_API_KEY env var)",
-    ),
     format: str = typer.Option(
         "table",
         "--format",
@@ -433,7 +353,7 @@ def query_documents(
 ):
     """Query all documents from UnitySVC backend (private endpoint)."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery.from_env() as query:
             data = query.list_documents()
 
             if format == "json":

unitysvc_services/update.py

@@ -1,6 +1,5 @@
 """Update command group - update local data files."""
 
-import os
 from pathlib import Path
 from typing import Any
 
@@ -46,7 +45,7 @@ def update_offering(
         None,
         "--data-dir",
         "-d",
-        help="Directory containing data files (default: ./data or UNITYSVC_DATA_DIR env var)",
+        help="Directory containing data files (default: current directory)",
     ),
 ):
     """
@@ -83,11 +82,7 @@ def update_offering(
 
     # Set data directory
     if data_dir is None:
-        data_dir_str = os.getenv("UNITYSVC_DATA_DIR")
-        if data_dir_str:
-            data_dir = Path(data_dir_str)
-        else:
-            data_dir = Path.cwd() / "data"
+        data_dir = Path.cwd()
 
     if not data_dir.is_absolute():
         data_dir = Path.cwd() / data_dir
@@ -181,7 +176,7 @@ def update_listing(
         None,
         "--data-dir",
         "-d",
-        help="Directory containing data files (default: ./data or UNITYSVC_DATA_DIR env var)",
+        help="Directory containing data files (default: current directory)",
     ),
 ):
     """
@@ -227,11 +222,7 @@ def update_listing(
 
     # Set data directory
     if data_dir is None:
-        data_dir_str = os.getenv("UNITYSVC_DATA_DIR")
-        if data_dir_str:
-            data_dir = Path(data_dir_str)
-        else:
-            data_dir = Path.cwd() / "data"
+        data_dir = Path.cwd()
 
     if not data_dir.is_absolute():
         data_dir = Path.cwd() / data_dir
@@ -251,8 +242,13 @@ def update_listing(
     if seller_name:
         field_filter["seller_name"] = seller_name
 
+    # Convert field_filter dict to tuple for caching
+    field_filter_tuple = tuple(sorted(field_filter.items())) if field_filter else None
+
     # Find listing files matching criteria
-    listing_files = find_files_by_schema(data_dir, "listing_v1", path_filter=service_name, field_filter=field_filter)
+    listing_files = find_files_by_schema(
+        data_dir, "listing_v1", path_filter=service_name, field_filter=field_filter_tuple
+    )
 
     if not listing_files:
         console.print(

unitysvc_services/utils.py

@@ -2,6 +2,7 @@
 
 import json
 import tomllib
+from functools import lru_cache
 from pathlib import Path
 from typing import Any
 
@@ -54,23 +55,25 @@ def write_data_file(file_path: Path, data: dict[str, Any], format: str) -> None:
         raise ValueError(f"Unsupported format: {format}")
 
 
-def find_data_files(data_dir: Path, extensions: list[str] | None = None) -> list[Path]:
+@lru_cache(maxsize=128)
+def find_data_files(data_dir: Path, extensions: tuple[str, ...] | None = None) -> list[Path]:
     """
     Find all data files in a directory with specified extensions.
 
     Args:
         data_dir: Directory to search
-        extensions: List of extensions to search for (default: ["json", "toml"])
+        extensions: Tuple of extensions to search for (default: ("json", "toml"))
 
     Returns:
         List of Path objects for matching files
     """
     if extensions is None:
-        extensions = ["json", "toml"]
+        extensions = ("json", "toml")
 
     data_files: list[Path] = []
     for ext in extensions:
         data_files.extend(data_dir.rglob(f"*.{ext}"))
+
     return data_files
 
 
@@ -103,11 +106,12 @@ def find_file_by_schema_and_name(
     return None
 
 
+@lru_cache(maxsize=256)
 def find_files_by_schema(
     data_dir: Path,
     schema: str,
     path_filter: str | None = None,
-    field_filter: dict[str, Any] | None = None,
+    field_filter: tuple[tuple[str, Any], ...] | None = None,
 ) -> list[tuple[Path, str, dict[str, Any]]]:
     """
     Find all data files matching a schema with optional filters.
@@ -116,7 +120,7 @@ def find_files_by_schema(
         data_dir: Directory to search
         schema: Schema identifier (e.g., "service_v1", "listing_v1")
         path_filter: Optional string that must be in the file path
-        field_filter: Optional dict of field:value pairs to filter by
+        field_filter: Optional tuple of (key, value) pairs to filter by
 
     Returns:
         List of tuples (file_path, format, data) for matching files
@@ -124,6 +128,9 @@ def find_files_by_schema(
     data_files = find_data_files(data_dir)
     matching_files: list[tuple[Path, str, dict[str, Any]]] = []
 
+    # Convert field_filter tuple back to dict for filtering
+    field_filter_dict = dict(field_filter) if field_filter else None
+
     for data_file in data_files:
         try:
             # Apply path filter
@@ -137,8 +144,8 @@ def find_files_by_schema(
                 continue
 
             # Apply field filters
-            if field_filter:
-                if not all(data.get(k) == v for k, v in field_filter.items()):
+            if field_filter_dict:
+                if not all(data.get(k) == v for k, v in field_filter_dict.items()):
                     continue
 
             matching_files.append((data_file, file_format, data))
@@ -238,3 +245,94 @@ def resolve_service_name_for_listing(listing_file: Path, listing_data: dict[str,
 
     # Otherwise, return None (either no service files or multiple service files)
     return None
+
+
+def convert_convenience_fields_to_documents(
+    data: dict[str, Any],
+    base_path: Path,
+    *,
+    logo_field: str = "logo",
+    terms_field: str | None = "terms_of_service",
+) -> dict[str, Any]:
+    """
+    Convert convenience fields (logo, terms_of_service) to Document objects.
+
+    This utility function converts file paths or URLs in convenience fields
+    to proper Document structures that can be stored in the backend.
+
+    Args:
+        data: Data dictionary containing potential convenience fields
+        base_path: Base path for resolving relative file paths
+        logo_field: Name of the logo field (default: "logo")
+        terms_field: Name of the terms of service field (default: "terms_of_service", None to skip)
+
+    Returns:
+        Updated data dictionary with convenience fields converted to documents list
+
+    Example:
+        >>> data = {"logo": "assets/logo.png", "documents": []}
+        >>> result = convert_convenience_fields_to_documents(data, Path("/data/provider"))
+        >>> # Result will have logo removed and added to documents list
+    """
+    # Initialize documents list if not present
+    if "documents" not in data or data["documents"] is None:
+        data["documents"] = []
+
+    # Helper to determine MIME type from file path/URL
+    def get_mime_type(path_or_url: str) -> str:
+        path_lower = path_or_url.lower()
+        if path_lower.endswith((".png", ".jpg", ".jpeg")):
+            return "png" if ".png" in path_lower else "jpeg"
+        elif path_lower.endswith(".svg"):
+            return "svg"
+        elif path_lower.endswith(".pdf"):
+            return "pdf"
+        elif path_lower.endswith(".md"):
+            return "markdown"
+        else:
+            # Default to URL if it looks like a URL, otherwise markdown
+            return "url" if path_or_url.startswith("http") else "markdown"
+
+    # Convert logo field
+    if logo_field in data and data[logo_field]:
+        logo_value = data[logo_field]
+        logo_doc: dict[str, Any] = {
+            "title": "Company Logo",
+            "category": "logo",
+            "mime_type": get_mime_type(str(logo_value)),
+            "is_public": True,
+        }
+
+        # Check if it's a URL or file path
+        if str(logo_value).startswith("http"):
+            logo_doc["external_url"] = str(logo_value)
+        else:
+            # It's a file path - will be resolved by resolve_file_references
+            logo_doc["file_path"] = str(logo_value)
+
+        data["documents"].append(logo_doc)
+        # Remove the convenience field
+        del data[logo_field]
+
+    # Convert terms_of_service field if specified
+    if terms_field and terms_field in data and data[terms_field]:
+        terms_value = data[terms_field]
+        terms_doc: dict[str, Any] = {
+            "title": "Terms of Service",
+            "category": "terms_of_service",
+            "mime_type": get_mime_type(str(terms_value)),
+            "is_public": True,
+        }
+
+        # Check if it's a URL or file path
+        if str(terms_value).startswith("http"):
+            terms_doc["external_url"] = str(terms_value)
+        else:
+            # It's a file path - will be resolved by resolve_file_references
+            terms_doc["file_path"] = str(terms_value)
+
+        data["documents"].append(terms_doc)
+        # Remove the convenience field
+        del data[terms_field]
+
+    return data

unitysvc_services/validator.py

@@ -1,7 +1,6 @@
 """Data validation module for unitysvc_services."""
 
 import json
-import os
 import re
 import tomllib as toml
 from pathlib import Path
@@ -13,6 +12,8 @@ from jinja2 import Environment, TemplateSyntaxError
 from jsonschema.validators import Draft7Validator
 from rich.console import Console
 
+import unitysvc_services
+
 
 class DataValidationError(Exception):
     """Exception raised when data validation fails."""
@@ -139,6 +140,14 @@ class DataValidator:
                                 f"File path '{value}' in field '{new_path}' "
                                 f"must be a relative path, not an absolute path"
                             )
+                        # Check that the file exists
+                        else:
+                            referenced_file = file_path.parent / value
+                            if not referenced_file.exists():
+                                errors.append(
+                                    f"File reference '{value}' in field '{new_path}' "
+                                    f"does not exist at {referenced_file}"
+                                )
 
                     # Recurse into nested objects
                     if isinstance(value, dict | list):
@@ -320,6 +329,100 @@ class DataValidator:
 
         return len(errors) == 0, errors
 
+    def validate_provider_status(self) -> tuple[bool, list[str]]:
+        """
+        Validate provider status and warn about services under disabled/incomplete providers.
+
+        Returns tuple of (is_valid, warnings) where warnings indicate services
+        that will be affected by provider status.
+        """
+        from unitysvc_services.models.base import ProviderStatusEnum
+        from unitysvc_services.models.provider_v1 import ProviderV1
+
+        warnings: list[str] = []
+
+        # Find all provider files
+        provider_files = list(self.data_dir.glob("*/provider.*"))
+
+        for provider_file in provider_files:
+            try:
+                # Load provider data
+                data = {}
+                if provider_file.suffix == ".json":
+                    with open(provider_file, encoding="utf-8") as f:
+                        data = json.load(f)
+                elif provider_file.suffix == ".toml":
+                    with open(provider_file, "rb") as f:
+                        data = toml.load(f)
+                else:
+                    continue
+
+                # Parse as ProviderV1
+                provider = ProviderV1.model_validate(data)
+                provider_dir = provider_file.parent
+                provider_name = provider.name
+
+                # Check if provider is not active
+                if provider.status != ProviderStatusEnum.active:
+                    # Find all services under this provider
+                    services_dir = provider_dir / "services"
+                    if services_dir.exists():
+                        service_count = len(list(services_dir.iterdir()))
+                        if service_count > 0:
+                            warnings.append(
+                                f"Provider '{provider_name}' has status '{provider.status}' but has {service_count} "
+                                f"service(s). All services under this provider will be affected."
+                            )
+
+            except Exception as e:
+                warnings.append(f"Error checking provider status in {provider_file}: {e}")
+
+        # Return True (valid) but with warnings
+        return True, warnings
+
+    def validate_seller_status(self) -> tuple[bool, list[str]]:
+        """
+        Validate seller status and warn if seller is disabled/incomplete.
+
+        Returns tuple of (is_valid, warnings) where warnings indicate seller issues.
+        """
+        from unitysvc_services.models.base import SellerStatusEnum
+        from unitysvc_services.models.seller_v1 import SellerV1
+
+        warnings: list[str] = []
+
+        # Find all seller files
+        seller_files = list(self.data_dir.glob("seller.*"))
+
+        for seller_file in seller_files:
+            try:
+                # Load seller data
+                data = {}
+                if seller_file.suffix == ".json":
+                    with open(seller_file, encoding="utf-8") as f:
+                        data = json.load(f)
+                elif seller_file.suffix == ".toml":
+                    with open(seller_file, "rb") as f:
+                        data = toml.load(f)
+                else:
+                    continue
+
+                # Parse as SellerV1
+                seller = SellerV1.model_validate(data)
+                seller_name = seller.name
+
+                # Check if seller is not active
+                if seller.status != SellerStatusEnum.active:
+                    warnings.append(
+                        f"Seller '{seller_name}' has status '{seller.status}'. Seller will not be published to backend."
+                    )
+
+            except Exception as e:
+                warnings.append(f"Error checking seller status in {seller_file}: {e}")
+
+        # Return True (valid) but with warnings
+        return True, warnings
+
     def validate_all(self) -> dict[str, tuple[bool, list[str]]]:
         """Validate all files in the data directory."""
         results: dict[str, tuple[bool, list[str]]] = {}
@@ -332,6 +435,19 @@ class DataValidator:
         if not seller_valid:
             results["_seller_uniqueness"] = (False, seller_errors)
 
+        # Validate seller status
+        seller_status_valid, seller_warnings = self.validate_seller_status()
+        if seller_warnings:
+            results["_seller_status"] = (True, seller_warnings)  # Warnings, not errors
+
+        # Validate provider status and check for affected services
+        provider_status_valid, provider_warnings = self.validate_provider_status()
+        if provider_warnings:
+            results["_provider_status"] = (
+                True,
+                provider_warnings,
+            )  # Warnings, not errors
+
         # Find all data and MD files recursively
         for file_path in self.data_dir.rglob("*"):
             if file_path.is_file() and file_path.suffix in [".json", ".toml", ".md"]:
@@ -474,7 +590,7 @@ console = Console()
 def validate(
     data_dir: Path | None = typer.Argument(
         None,
-        help="Directory containing data files to validate (default: ./data or UNITYSVC_DATA_DIR env var)",
+        help="Directory containing data files to validate (default: current directory)",
     ),
 ):
     """
@@ -487,11 +603,7 @@ def validate(
     """
     # Determine data directory
     if data_dir is None:
-        data_dir_str = os.environ.get("UNITYSVC_DATA_DIR")
-        if data_dir_str:
-            data_dir = Path(data_dir_str)
-        else:
-            data_dir = Path.cwd() / "data"
+        data_dir = Path.cwd()
 
     if not data_dir.exists():
         console.print(f"[red]✗[/red] Data directory not found: {data_dir}")
@@ -500,9 +612,25 @@ def validate(
     console.print(f"[cyan]Validating data files in:[/cyan] {data_dir}")
     console.print()
 
+    # Get schema directory from installed package
+    schema_dir = Path(unitysvc_services.__file__).parent / "schema"
+
     # Create validator and run validation
-    validator = DataValidator(data_dir, data_dir.parent / "schema")
-    validation_errors = validator.validate_all_service_directories(data_dir)
+    validator = DataValidator(data_dir, schema_dir)
+
+    # Run comprehensive validation (schema, file references, etc.)
+    all_results = validator.validate_all()
+    validation_errors = []
+
+    # Collect all errors from validate_all()
+    for file_path, (is_valid, errors) in all_results.items():
+        if not is_valid and errors:
+            for error in errors:
+                validation_errors.append(f"{file_path}: {error}")
+
+    # Also run service directory validation (service/listing relationships)
+    directory_errors = validator.validate_all_service_directories(data_dir)
+    validation_errors.extend(directory_errors)
 
     if validation_errors:
         console.print(f"[red]✗ Validation failed with {len(validation_errors)} error(s):[/red]")