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

unitysvc_services/query.py

@@ -16,30 +16,24 @@ console = Console()
 class ServiceDataQuery:
     """Query service data from UnitySVC backend endpoints."""
 
-    def __init__(self, base_url: str, api_key: str):
-        """Initialize query client with backend URL and API key.
-
-        Args:
-            base_url: UnitySVC backend URL
-            api_key: API key for authentication
+    def __init__(self):
+        """Initialize query client from environment variables.
 
         Raises:
-            ValueError: If base_url or api_key is not provided
+            ValueError: If required environment variables are not set
         """
-        if not base_url:
-            raise ValueError(
-                "Backend URL not provided. Use --backend-url or set UNITYSVC_BACKEND_URL env var."
-            )
-        if not api_key:
-            raise ValueError(
-                "API key not provided. Use --api-key or set UNITYSVC_API_KEY env var."
-            )
-
-        self.base_url = base_url.rstrip("/")
-        self.api_key = api_key
+        self.base_url = os.environ.get("UNITYSVC_BASE_URL")
+        if not self.base_url:
+            raise ValueError("UNITYSVC_BASE_URL environment variable not set")
+
+        self.api_key = os.environ.get("UNITYSVC_API_KEY")
+        if not self.api_key:
+            raise ValueError("UNITYSVC_API_KEY environment variable not set")
+
+        self.base_url = self.base_url.rstrip("/")
         self.client = httpx.Client(
             headers={
-                "X-API-Key": api_key,
+                "X-API-Key": self.api_key,
                 "Content-Type": "application/json",
             },
             timeout=30.0,
@@ -97,41 +91,9 @@ class ServiceDataQuery:
         """Context manager exit."""
         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)
-
-        Returns:
-            ServiceDataQuery instance
-
-        Raises:
-            ValueError: If required credentials are not provided
-        """
-        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)
-
 
 @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",
@@ -141,7 +103,7 @@ def query_sellers(
 ):
     """Query all sellers from the backend."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery() as query:
             sellers = query.list_sellers()
 
             if format == "json":
@@ -179,18 +141,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",
@@ -200,7 +150,7 @@ def query_providers(
 ):
     """Query all providers from the backend."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery() as query:
             providers = query.list_providers()
 
             if format == "json":
@@ -234,18 +184,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",
@@ -255,7 +193,7 @@ def query_offerings(
 ):
     """Query all service offerings from UnitySVC backend."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery() as query:
             offerings = query.list_service_offerings()
 
             if format == "json":
@@ -283,33 +221,17 @@ def query_offerings(
                         )
 
                     console.print(table)
-                    console.print(
-                        f"\n[green]Total:[/green] {len(offerings)} service offering(s)"
-                    )
+                    console.print(f"\n[green]Total:[/green] {len(offerings)} service offering(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 service offerings: {e}", style="bold red"
-        )
+        console.print(f"[red]✗[/red] Failed to query service offerings: {e}", style="bold red")
         raise typer.Exit(code=1)
 
 
 @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",
@@ -319,7 +241,7 @@ def query_listings(
 ):
     """Query all service listings from UnitySVC backend."""
     try:
-        with ServiceDataQuery.from_env(backend_url, api_key) as query:
+        with ServiceDataQuery() as query:
             listings = query.list_service_listings()
 
             if format == "json":
@@ -336,9 +258,7 @@ def query_listings(
                     table.add_column("Interfaces")
 
                     for listing in listings:
-                        interfaces_count = len(
-                            listing.get("user_access_interfaces", [])
-                        )
+                        interfaces_count = len(listing.get("user_access_interfaces", []))
                         table.add_row(
                             str(listing.get("id", "N/A")),
                             str(listing.get("service_id", "N/A")),
@@ -348,33 +268,17 @@ def query_listings(
                         )
 
                     console.print(table)
-                    console.print(
-                        f"\n[green]Total:[/green] {len(listings)} service listing(s)"
-                    )
+                    console.print(f"\n[green]Total:[/green] {len(listings)} service listing(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 service listings: {e}", style="bold red"
-        )
+        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(
-    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",
@@ -384,7 +288,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() as query:
             data = query.list_access_interfaces()
 
             if format == "json":
@@ -413,33 +317,17 @@ def query_interfaces(
                         )
 
                     console.print(table)
-                    console.print(
-                        f"\n[green]Total:[/green] {data.get('count', 0)} access interface(s)"
-                    )
+                    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"
-        )
+        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(
-    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",
@@ -449,7 +337,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() as query:
             data = query.list_documents()
 
             if format == "json":
@@ -478,9 +366,7 @@ def query_documents(
                         )
 
                     console.print(table)
-                    console.print(
-                        f"\n[green]Total:[/green] {data.get('count', 0)} document(s)"
-                    )
+                    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)

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

@@ -56,9 +56,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 +206,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.
 

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,7 @@ class DataValidator:
         normalized = normalized.strip("-")
         return normalized
 
-    def load_data_file(
-        self, file_path: Path
-    ) -> tuple[dict[str, Any] | None, list[str]]:
+    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 +220,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,17 +249,13 @@ 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}")
 
@@ -346,9 +323,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}")
 
@@ -400,9 +375,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
@@ -525,9 +498,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 +526,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"
@@ -621,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)",
     ),
 ):
     """
@@ -634,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}")
@@ -668,9 +633,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}")