mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-10-26 19:01:39 -04:00
58de8c7c5b
Python 3.11 is now required, old versions were causing unpredictability in tests. (Sanic does not yet support 3.12) Sanic has been upgraded to 23.6.0, which is the latest version that avoids this bug: https://github.com/sanic-org/sanic/issues/2921 New strategy for multiprocessing is to create all multiprocessing tools in one process, then fork to other processes. The previous strategy was to declare multiprocessing tools at the top of every file, or wherever they were needed at import/creation. Now all multiprocessing tools are attached to the app.shared_ctx. This means `api_app` is imported in many, many places. This forced a change in how the DownloadManager works. Previously, it would continually run download workers which would pull downloads from a multiprocessing.Queue. Now, a single worker checks for new downloads and sends a Sanic signal. Flags have been reworked to use the `api_app`. I removed the `which` flag functionality because the `which` are called at import and needed their own multiprocessing.Event.
55 lines
1.7 KiB
Python
55 lines
1.7 KiB
Python
from http import HTTPStatus
|
|
from pathlib import Path
|
|
|
|
from sanic import Request, response, Blueprint
|
|
from sanic_ext import validate
|
|
from sanic_ext.extensions.openapi import openapi
|
|
|
|
from modules.map import lib, schema
|
|
from wrolpi import flags
|
|
from wrolpi.api_utils import json_response
|
|
from wrolpi.common import wrol_mode_check, get_media_directory, background_task
|
|
from wrolpi.errors import ValidationError
|
|
from wrolpi.vars import PYTEST, DOCKERIZED
|
|
|
|
map_bp = Blueprint('Map', '/api/map')
|
|
|
|
|
|
@map_bp.post('/import')
|
|
@openapi.definition(
|
|
summary='Import PBF/dump map files',
|
|
body=schema.ImportPost,
|
|
)
|
|
@validate(schema.ImportPost)
|
|
@wrol_mode_check
|
|
async def import_pbfs(_: Request, body: schema.ImportPost):
|
|
if flags.map_importing.is_set():
|
|
return response.json({'error': 'Map import already running'}, HTTPStatus.CONFLICT)
|
|
|
|
paths = [i for i in body.files if i]
|
|
if not paths:
|
|
raise ValidationError('No PBF or dump files were provided')
|
|
|
|
coro = lib.import_files(paths)
|
|
if PYTEST:
|
|
await coro
|
|
else:
|
|
background_task(coro)
|
|
return response.empty()
|
|
|
|
|
|
@map_bp.get('/files')
|
|
@openapi.description('Find any map files, get their import status')
|
|
def get_files_status(request: Request):
|
|
paths = lib.get_import_status()
|
|
paths = sorted(paths, key=lambda i: str(i.path))
|
|
pending = request.app.shared_ctx.map_importing.get('pending')
|
|
if pending:
|
|
pending = [Path(i).relative_to(get_media_directory()) for i in pending]
|
|
body = dict(
|
|
files=paths,
|
|
pending=pending,
|
|
import_running=flags.map_importing.is_set(),
|
|
dockerized=DOCKERIZED,
|
|
)
|
|
return json_response(body, HTTPStatus.OK)
|