salman/igny8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance public access and error handling in site-related views and loaders

Browse Source 
- Updated `DebugScopedRateThrottle` to allow public access for blueprint list requests with site filters.
- Modified `SiteViewSet` and `SiteBlueprintViewSet` to permit public read access for list requests.
- Enhanced `loadSiteDefinition` to resolve site slugs to IDs, improving the loading process for site definitions.
- Improved error handling in `SiteDefinitionView` and `loadSiteDefinition` for better user feedback.
- Adjusted CSS styles for better layout and alignment in shared components.
This commit is contained in:
IGNY8 VPS (Salman)
2025-11-18 22:40:00 +00:00
parent 8ab15d1d79
commit 6c6133a683
14 changed files with 361 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
backend/igny8_core/modules/publisher/views.py
View File

@@ -219,61 +219,104 @@ class SiteDefinitionView(APIView):
GET /api/v1/publisher/sites/{site_id}/definition/
"""
sites_data_path = os.getenv('SITES_DATA_PATH', '/data/app/sites-data')
# Try to find latest deployed version
site_dir = Path(sites_data_path) / 'clients' / str(site_id)
if not site_dir.exists():
return error_response(
f'Site {site_id} not found',
status.HTTP_404_NOT_FOUND,
request
)
# Look for latest version (check for 'latest' symlink or highest version number)
latest_path = site_dir / 'latest' / 'site.json'
if latest_path.exists():
try:
sites_data_path = os.getenv('SITES_DATA_PATH', '/data/app/sites-data')
# Try to find latest deployed version
site_dir = Path(sites_data_path) / 'clients' / str(site_id)
if not site_dir.exists():
return error_response(
error=f'Site {site_id} not found at {site_dir}. Site may not be deployed yet.',
status_code=status.HTTP_404_NOT_FOUND,
request=request
)
# Look for latest version (check for 'latest' symlink or highest version number)
latest_path = site_dir / 'latest' / 'site.json'
if latest_path.exists():
try:
with open(latest_path, 'r', encoding='utf-8') as f:
definition = json.load(f)
return Response(definition, status=status.HTTP_200_OK)
except json.JSONDecodeError as e:
return error_response(
error=f'Invalid JSON in site definition file: {str(e)}',
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
request=request
)
except Exception as e:
return error_response(
error=f'Failed to load site definition from {latest_path}: {str(e)}',
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
request=request
)
# Fallback: find highest version number
try:
with open(latest_path, 'r', encoding='utf-8') as f:
definition = json.load(f)
return Response(definition, status=status.HTTP_200_OK)
version_dirs = [d for d in site_dir.iterdir() if d.is_dir() and d.name.startswith('v')]
except PermissionError as e:
return error_response(
error=f'Permission denied accessing site directory: {str(e)}',
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
request=request
)
except Exception as e:
return error_response(
f'Failed to load site definition: {str(e)}',
status.HTTP_500_INTERNAL_SERVER_ERROR,
request
error=f'Error reading site directory: {str(e)}',
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
request=request
)
if not version_dirs:
return error_response(
error=f'No deployed versions found for site {site_id}. Site may not be deployed yet.',
status_code=status.HTTP_404_NOT_FOUND,
request=request
)
# Sort by version number (extract number from 'v1', 'v2', etc.)
try:
version_dirs.sort(key=lambda d: int(d.name[1:]) if d.name[1:].isdigit() else 0, reverse=True)
latest_version_dir = version_dirs[0]
site_json_path = latest_version_dir / 'site.json'
if site_json_path.exists():
with open(site_json_path, 'r', encoding='utf-8') as f:
definition = json.load(f)
return Response(definition, status=status.HTTP_200_OK)
else:
return error_response(
error=f'Site definition file not found at {site_json_path}',
status_code=status.HTTP_404_NOT_FOUND,
request=request
)
except json.JSONDecodeError as e:
return error_response(
error=f'Invalid JSON in site definition file: {str(e)}',
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
request=request
)
except Exception as e:
return error_response(
error=f'Failed to load site definition: {str(e)}',
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
request=request
)
# Fallback: find highest version number
version_dirs = [d for d in site_dir.iterdir() if d.is_dir() and d.name.startswith('v')]
if not version_dirs:
return error_response(
f'No deployed versions found for site {site_id}',
status.HTTP_404_NOT_FOUND,
request
)
# Sort by version number (extract number from 'v1', 'v2', etc.)
try:
version_dirs.sort(key=lambda d: int(d.name[1:]) if d.name[1:].isdigit() else 0, reverse=True)
latest_version_dir = version_dirs[0]
site_json_path = latest_version_dir / 'site.json'
if site_json_path.exists():
with open(site_json_path, 'r', encoding='utf-8') as f:
definition = json.load(f)
return Response(definition, status=status.HTTP_200_OK)
except Exception as e:
return error_response(
f'Failed to load site definition: {str(e)}',
status.HTTP_500_INTERNAL_SERVER_ERROR,
request
error=f'Site definition not found for site {site_id}',
status_code=status.HTTP_404_NOT_FOUND,
request=request
)
except Exception as e:
# Catch any unhandled exceptions
import logging
logger = logging.getLogger(__name__)
logger.error(f'Unhandled exception in SiteDefinitionView: {str(e)}', exc_info=True)
return error_response(
error=f'Internal server error: {str(e)}',
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
request=request
)
return error_response(
f'Site definition not found for site {site_id}',
status.HTTP_404_NOT_FOUND,
request
)