66f4471e53
**Critical Fixes:**
1. **Fixed Error Hierarchy** (wikijs/exceptions.py)
- ConnectionError and TimeoutError now properly inherit from APIError
- Ensures consistent exception handling across the SDK
- Added proper __init__ methods with status_code=None
2. **Fixed test_connection Method** (wikijs/client.py)
- Changed from basic HTTP GET to proper GraphQL query validation
- Now uses query { site { title } } to validate API connectivity
- Provides better error messages for authentication failures
- Validates both connectivity AND API access
3. **Implemented JWT Token Refresh** (wikijs/auth/jwt.py)
- Added base_url parameter to JWTAuth class
- Implemented complete refresh() method with HTTP request to /api/auth/refresh
- Handles token, refresh token, and expiration updates
- Proper error handling for network failures and auth errors
**Bonus Fixes:**
- Dynamic user agent version (uses __version__ from version.py instead of hardcoded)
- Updated all JWT tests to include required base_url parameter
- Updated test mocks to match new GraphQL-based test_connection
**Test Results:**
- All 231 tests passing ✅
- Test coverage: 91.64% (target: 85%) ✅
- No test failures or errors
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
112 lines
3.4 KiB
Python
112 lines
3.4 KiB
Python
"""Exception hierarchy for wikijs-python-sdk."""
|
|
|
|
from typing import Any, Dict, Optional
|
|
|
|
|
|
class WikiJSException(Exception):
|
|
"""Base exception for all SDK errors."""
|
|
|
|
def __init__(self, message: str, details: Optional[Dict[str, Any]] = None):
|
|
super().__init__(message)
|
|
self.message = message
|
|
self.details = details or {}
|
|
|
|
|
|
class ConfigurationError(WikiJSException):
|
|
"""Raised when there's an issue with SDK configuration."""
|
|
|
|
|
|
class AuthenticationError(WikiJSException):
|
|
"""Raised when authentication fails."""
|
|
|
|
|
|
class ValidationError(WikiJSException):
|
|
"""Raised when input validation fails."""
|
|
|
|
def __init__(self, message: str, field: Optional[str] = None, value: Any = None):
|
|
super().__init__(message)
|
|
self.field = field
|
|
self.value = value
|
|
|
|
|
|
class APIError(WikiJSException):
|
|
"""Base class for API-related errors."""
|
|
|
|
def __init__(
|
|
self,
|
|
message: str,
|
|
status_code: Optional[int] = None,
|
|
response: Optional[Any] = None,
|
|
details: Optional[Dict[str, Any]] = None,
|
|
):
|
|
super().__init__(message, details)
|
|
self.status_code = status_code
|
|
self.response = response
|
|
|
|
|
|
class ClientError(APIError):
|
|
"""Raised for 4xx HTTP status codes (client errors)."""
|
|
|
|
|
|
class ServerError(APIError):
|
|
"""Raised for 5xx HTTP status codes (server errors)."""
|
|
|
|
|
|
class NotFoundError(ClientError):
|
|
"""Raised when a requested resource is not found (404)."""
|
|
|
|
|
|
class PermissionError(ClientError):
|
|
"""Raised when access is forbidden (403)."""
|
|
|
|
|
|
class RateLimitError(ClientError):
|
|
"""Raised when rate limit is exceeded (429)."""
|
|
|
|
def __init__(
|
|
self, message: str, retry_after: Optional[int] = None, **kwargs: Any
|
|
) -> None:
|
|
# Remove status_code from kwargs if present to avoid duplicate argument
|
|
kwargs.pop("status_code", None)
|
|
super().__init__(message, status_code=429, **kwargs)
|
|
self.retry_after = retry_after
|
|
|
|
|
|
class ConnectionError(APIError):
|
|
"""Raised when there's a connection issue."""
|
|
|
|
def __init__(self, message: str, details: Optional[Dict[str, Any]] = None) -> None:
|
|
super().__init__(message, status_code=None, response=None, details=details)
|
|
|
|
|
|
class TimeoutError(APIError):
|
|
"""Raised when a request times out."""
|
|
|
|
def __init__(self, message: str, details: Optional[Dict[str, Any]] = None) -> None:
|
|
super().__init__(message, status_code=None, response=None, details=details)
|
|
|
|
|
|
def create_api_error(status_code: int, message: str, response: Any = None) -> APIError:
|
|
"""Create appropriate API error based on status code.
|
|
|
|
Args:
|
|
status_code: HTTP status code
|
|
message: Error message
|
|
response: Raw response object
|
|
|
|
Returns:
|
|
Appropriate APIError subclass instance
|
|
"""
|
|
if status_code == 404:
|
|
return NotFoundError(message, status_code=status_code, response=response)
|
|
elif status_code == 403:
|
|
return PermissionError(message, status_code=status_code, response=response)
|
|
elif status_code == 429:
|
|
return RateLimitError(message, status_code=status_code, response=response)
|
|
elif 400 <= status_code < 500:
|
|
return ClientError(message, status_code=status_code, response=response)
|
|
elif 500 <= status_code < 600:
|
|
return ServerError(message, status_code=status_code, response=response)
|
|
else:
|
|
return APIError(message, status_code=status_code, response=response)
|