unitysvc-services 0.1.1__py3-none-any.whl → 0.1.5__py3-none-any.whl

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

unitysvc_services/utils.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from typing import Any
 
 import tomli_w
+from jinja2 import Template
 
 
 def load_data_file(file_path: Path) -> tuple[dict[str, Any], str]:
@@ -56,9 +57,7 @@ def write_data_file(file_path: Path, data: dict[str, Any], format: str) -> None:
 
 
 @lru_cache(maxsize=128)
-def find_data_files(
-    data_dir: Path, extensions: tuple[str, ...] | None = None
-) -> list[Path]:
+def find_data_files(data_dir: Path, extensions: tuple[str, ...] | None = None) -> list[Path]:
     """
     Find all data files in a directory with specified extensions.
 
@@ -208,9 +207,7 @@ def resolve_provider_name(file_path: Path) -> str | None:
     return None
 
 
-def resolve_service_name_for_listing(
-    listing_file: Path, listing_data: dict[str, Any]
-) -> str | None:
+def resolve_service_name_for_listing(listing_file: Path, listing_data: dict[str, Any]) -> str | None:
     """
     Resolve the service name for a listing file.
 
@@ -340,3 +337,55 @@ def convert_convenience_fields_to_documents(
         del data[terms_field]
 
     return data
+
+
+def render_template_file(
+    file_path: Path,
+    listing: dict[str, Any] | None = None,
+    offering: dict[str, Any] | None = None,
+    provider: dict[str, Any] | None = None,
+    seller: dict[str, Any] | None = None,
+) -> tuple[str, str]:
+    """Render a Jinja2 template file and return content and new filename.
+
+    If the file is not a template (.j2 extension), returns the file content as-is
+    and the original filename.
+
+    Args:
+        file_path: Path to the file (may or may not be a .j2 template)
+        listing: Listing data for template rendering (optional)
+        offering: Offering data for template rendering (optional)
+        provider: Provider data for template rendering (optional)
+        seller: Seller data for template rendering (optional)
+
+    Returns:
+        Tuple of (rendered_content, new_filename_without_j2)
+
+    Raises:
+        Exception: If template rendering fails
+    """
+    # Read file content
+    with open(file_path, encoding="utf-8") as f:
+        file_content = f.read()
+
+    # Check if this is a Jinja2 template
+    is_template = file_path.name.endswith(".j2")
+
+    if is_template:
+        # Render the template
+        template = Template(file_content)
+        rendered_content = template.render(
+            listing=listing or {},
+            offering=offering or {},
+            provider=provider or {},
+            seller=seller or {},
+        )
+
+        # Strip .j2 from filename
+        # Example: test.py.j2 -> test.py
+        new_filename = file_path.name[:-3]  # Remove last 3 characters (.j2)
+
+        return rendered_content, new_filename
+    else:
+        # Not a template - return as-is
+        return file_content, file_path.name

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
@@ -60,16 +59,12 @@ class DataValidator:
                 if "anyOf" in obj:
                     any_of = obj["anyOf"]
                     # Count non-null items for the check
-                    non_null_items = [
-                        item for item in any_of if item.get("type") != "null"
-                    ]
+                    non_null_items = [item for item in any_of if item.get("type") != "null"]
                     has_plain_string = any(
-                        item.get("type") == "string" and "format" not in item
-                        for item in non_null_items
+                        item.get("type") == "string" and "format" not in item for item in non_null_items
                     )
                     has_uri_string = any(
-                        item.get("type") == "string" and item.get("format") == "uri"
-                        for item in non_null_items
+                        item.get("type") == "string" and item.get("format") == "uri" for item in non_null_items
                     )
 
                     # Check for Union[str, HttpUrl] or Union[str, HttpUrl, None]
@@ -84,9 +79,7 @@ class DataValidator:
 
                 # Check other schema structures
                 for key, value in obj.items():
-                    if key not in ["properties", "anyOf"] and isinstance(
-                        value, dict | list
-                    ):
+                    if key not in ["properties", "anyOf"] and isinstance(value, dict | list):
                         traverse_schema(value, path)
 
             elif isinstance(obj, list):
@@ -96,9 +89,7 @@ class DataValidator:
         traverse_schema(schema)
         return union_fields
 
-    def validate_file_references(
-        self, data: dict[str, Any], file_path: Path, union_fields: set[str]
-    ) -> list[str]:
+    def validate_file_references(self, data: dict[str, Any], file_path: Path, union_fields: set[str]) -> list[str]:
         """
         Validate that file references in Union[str, HttpUrl] fields exist.
 
@@ -120,9 +111,7 @@ class DataValidator:
                     ):
                         # Empty string is not a valid file reference
                         if value == "":
-                            errors.append(
-                                f"Empty string in field '{new_path}' is not a valid file reference or URL"
-                            )
+                            errors.append(f"Empty string in field '{new_path}' is not a valid file reference or URL")
                         # It's a file reference, must be relative path
                         elif Path(value).is_absolute():
                             errors.append(
@@ -172,9 +161,7 @@ class DataValidator:
         check_field(data, str(file_path))
         return errors
 
-    def validate_name_consistency(
-        self, data: dict[str, Any], file_path: Path, schema_name: str
-    ) -> list[str]:
+    def validate_name_consistency(self, data: dict[str, Any], file_path: Path, schema_name: str) -> list[str]:
         """Validate that the name field matches the directory name."""
         errors: list[str] = []
 
@@ -199,9 +186,7 @@ class DataValidator:
         elif file_path.name in ["service.json", "service.toml"]:
             # For service.json, the service directory should match the service name
             service_directory_name = file_path.parent.name
-            if self._normalize_name(name_value) != self._normalize_name(
-                service_directory_name
-            ):
+            if self._normalize_name(name_value) != self._normalize_name(service_directory_name):
                 normalized_name = self._normalize_name(name_value)
                 errors.append(
                     f"Service name '{name_value}' does not match "
@@ -220,9 +205,55 @@ class DataValidator:
         normalized = normalized.strip("-")
         return normalized
 
-    def load_data_file(
-        self, file_path: Path
-    ) -> tuple[dict[str, Any] | None, list[str]]:
+    def validate_with_pydantic_model(self, data: dict[str, Any], schema_name: str) -> list[str]:
+        """
+        Validate data using Pydantic models for additional validation rules.
+
+        This complements JSON schema validation with Pydantic field validators
+        like name format validation.
+
+        Args:
+            data: The data to validate
+            schema_name: The schema name (e.g., 'provider_v1', 'seller_v1')
+
+        Returns:
+            List of validation error messages
+        """
+        from pydantic import BaseModel
+
+        from unitysvc_services.models import ListingV1, ProviderV1, SellerV1, ServiceV1
+
+        errors: list[str] = []
+
+        # Map schema names to Pydantic model classes
+        model_map: dict[str, type[BaseModel]] = {
+            "provider_v1": ProviderV1,
+            "seller_v1": SellerV1,
+            "service_v1": ServiceV1,
+            "listing_v1": ListingV1,
+        }
+
+        if schema_name not in model_map:
+            return errors  # No Pydantic model for this schema
+
+        model_class = model_map[schema_name]
+
+        try:
+            # Validate using the Pydantic model
+            model_class.model_validate(data)
+
+        except Exception as e:
+            # Extract meaningful error message from Pydantic ValidationError
+            error_msg = str(e)
+            # Pydantic errors can be verbose, try to extract just the relevant part
+            if "validation error" in error_msg.lower():
+                errors.append(f"Pydantic validation error: {error_msg}")
+            else:
+                errors.append(error_msg)
+
+        return errors
+
+    def load_data_file(self, file_path: Path) -> tuple[dict[str, Any] | None, list[str]]:
         """Load data from JSON or TOML file."""
         errors: list[str] = []
 
@@ -237,9 +268,7 @@ class DataValidator:
                 return None, [f"Unsupported file format: {file_path.suffix}"]
             return data, errors
         except Exception as e:
-            format_name = {".json": "JSON", ".toml": "TOML"}.get(
-                file_path.suffix, "data"
-            )
+            format_name = {".json": "JSON", ".toml": "TOML"}.get(file_path.suffix, "data")
             return None, [f"Failed to parse {format_name}: {e}"]
 
     def validate_data_file(self, file_path: Path) -> tuple[bool, list[str]]:
@@ -268,20 +297,20 @@ class DataValidator:
 
         # Validate against schema with format checking enabled
         try:
-            validator = Draft7Validator(
-                schema, format_checker=Draft7Validator.FORMAT_CHECKER
-            )
+            validator = Draft7Validator(schema, format_checker=Draft7Validator.FORMAT_CHECKER)
             validator.check_schema(schema)  # Validate the schema itself
             validation_errors = list(validator.iter_errors(data))
             for error in validation_errors:
                 errors.append(f"Schema validation error: {error.message}")
                 if error.absolute_path:
-                    errors.append(
-                        f"  Path: {'.'.join(str(p) for p in error.absolute_path)}"
-                    )
+                    errors.append(f"  Path: {'.'.join(str(p) for p in error.absolute_path)}")
         except Exception as e:
             errors.append(f"Validation error: {e}")
 
+        # Also validate using Pydantic models for additional validation rules
+        pydantic_errors = self.validate_with_pydantic_model(data, schema_name)
+        errors.extend(pydantic_errors)
+
         # Find Union[str, HttpUrl] fields and validate file references
         union_fields = self.find_union_fields(schema)
         file_ref_errors = self.validate_file_references(data, file_path, union_fields)
@@ -293,8 +322,15 @@ class DataValidator:
 
         return len(errors) == 0, errors
 
-    def validate_md_file(self, file_path: Path) -> tuple[bool, list[str]]:
-        """Validate a markdown file (basic existence check and Jinja2 syntax)."""
+    def validate_jinja2_file(self, file_path: Path) -> tuple[bool, list[str]]:
+        """Validate a file with Jinja2 template syntax.
+
+        This validates any file ending with .j2 extension, including:
+        - .md.j2 (Jinja2 markdown templates)
+        - .py.j2 (Jinja2 Python code example templates)
+        - .js.j2 (Jinja2 JavaScript code example templates)
+        - .sh.j2 (Jinja2 shell script templates)
+        """
         errors: list[str] = []
 
         try:
@@ -315,7 +351,7 @@ class DataValidator:
 
             return len(errors) == 0, errors
         except Exception as e:
-            return False, [f"Failed to read markdown file: {e}"]
+            return False, [f"Failed to read template file: {e}"]
 
     def validate_seller_uniqueness(self) -> tuple[bool, list[str]]:
         """
@@ -331,6 +367,10 @@ class DataValidator:
 
         # Find all data files with seller_v1 schema
         for file_path in self.data_dir.rglob("*"):
+            # Skip hidden directories (those starting with .)
+            if any(part.startswith(".") for part in file_path.parts):
+                continue
+
             if file_path.is_file() and file_path.suffix in [".json", ".toml"]:
                 try:
                     data, load_errors = self.load_data_file(file_path)
@@ -346,9 +386,7 @@ class DataValidator:
                 "No seller file found. Each repository must have exactly one data file using the 'seller_v1' schema."
             )
         elif len(seller_files) > 1:
-            errors.append(
-                f"Found {len(seller_files)} seller files, but only one is allowed per repository:"
-            )
+            errors.append(f"Found {len(seller_files)} seller files, but only one is allowed per repository:")
             for seller_file in seller_files:
                 errors.append(f"  - {seller_file}")
 
@@ -366,20 +404,17 @@ class DataValidator:
 
         warnings: list[str] = []
 
-        # Find all provider files
-        provider_files = list(self.data_dir.glob("*/provider.*"))
+        # Find all provider files (skip hidden directories)
+        provider_files = [
+            f for f in self.data_dir.glob("*/provider.*") if not any(part.startswith(".") for part in f.parts)
+        ]
 
         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:
+                # Load provider data using existing helper method
+                data, load_errors = self.load_data_file(provider_file)
+                if load_errors or data is None:
+                    warnings.append(f"Failed to load provider file {provider_file}: {load_errors}")
                     continue
 
                 # Parse as ProviderV1
@@ -400,9 +435,7 @@ class DataValidator:
                             )
 
             except Exception as e:
-                warnings.append(
-                    f"Error checking provider status in {provider_file}: {e}"
-                )
+                warnings.append(f"Error checking provider status in {provider_file}: {e}")
 
         # Return True (valid) but with warnings
         return True, warnings
@@ -418,20 +451,15 @@ class DataValidator:
 
         warnings: list[str] = []
 
-        # Find all seller files
-        seller_files = list(self.data_dir.glob("seller.*"))
+        # Find all seller files (skip hidden files)
+        seller_files = [f for f in self.data_dir.glob("seller.*") if not f.name.startswith(".")]
 
         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:
+                # Load seller data using existing helper method
+                data, load_errors = self.load_data_file(seller_file)
+                if load_errors or data is None:
+                    warnings.append(f"Failed to load seller file {seller_file}: {load_errors}")
                     continue
 
                 # Parse as SellerV1
@@ -475,15 +503,24 @@ class DataValidator:
                 provider_warnings,
             )  # Warnings, not errors
 
-        # Find all data and MD files recursively
+        # Find all data and MD files recursively, skipping hidden directories
         for file_path in self.data_dir.rglob("*"):
-            if file_path.is_file() and file_path.suffix in [".json", ".toml", ".md"]:
+            # Skip hidden directories (those starting with .)
+            if any(part.startswith(".") for part in file_path.parts):
+                continue
+
+            # Check if file should be validated
+            # Only .j2 files (Jinja2 templates) are validated for Jinja2 syntax
+            is_template = file_path.name.endswith(".j2")
+            is_data_file = file_path.suffix in [".json", ".toml"]
+
+            if file_path.is_file() and (is_data_file or is_template):
                 relative_path = file_path.relative_to(self.data_dir)
 
-                if file_path.suffix in [".json", ".toml"]:
+                if is_data_file:
                     is_valid, errors = self.validate_data_file(file_path)
-                elif file_path.suffix == ".md":
-                    is_valid, errors = self.validate_md_file(file_path)
+                elif is_template:
+                    is_valid, errors = self.validate_jinja2_file(file_path)
                 else:
                     continue
 
@@ -525,9 +562,7 @@ class DataValidator:
                 if schema == "service_v1":
                     service_name = data.get("name")
                     if not service_name:
-                        raise DataValidationError(
-                            f"Service file {file_path} missing 'name' field"
-                        )
+                        raise DataValidationError(f"Service file {file_path} missing 'name' field")
 
                     # Check for duplicate service names in same directory
                     if service_name in services:
@@ -555,9 +590,7 @@ class DataValidator:
             if service_name:
                 # If service_name is explicitly defined, it must match a service in the directory
                 if service_name not in services:
-                    available_services = (
-                        ", ".join(services.keys()) if services else "none"
-                    )
+                    available_services = ", ".join(services.keys()) if services else "none"
                     raise DataValidationError(
                         f"Listing file {listing_file} references service_name '{service_name}' "
                         f"which does not exist in the same directory.\n"
@@ -591,6 +624,10 @@ class DataValidator:
 
         for pattern in ["*.json", "*.toml"]:
             for file_path in data_dir.rglob(pattern):
+                # Skip hidden directories (those starting with .)
+                if any(part.startswith(".") for part in file_path.parts):
+                    continue
+
                 try:
                     data, load_errors = self.load_data_file(file_path)
                     if load_errors or data is None:
@@ -621,7 +658,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)",
     ),
 ):
     """
@@ -634,11 +671,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}")
@@ -668,9 +701,7 @@ def validate(
     validation_errors.extend(directory_errors)
 
     if validation_errors:
-        console.print(
-            f"[red]✗ Validation failed with {len(validation_errors)} error(s):[/red]"
-        )
+        console.print(f"[red]✗ Validation failed with {len(validation_errors)} error(s):[/red]")
         console.print()
         for i, error in enumerate(validation_errors, 1):
             console.print(f"[red]{i}.[/red] {error}")