From 0fc1fb255fd652762eafcffb4c47942d1b856cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Mon, 25 May 2026 02:34:23 +0200 Subject: [PATCH] feat(submissions): crop management --- polylan_submitter/src/Submissions.vue | 361 +++++++++++++++++++---- polylan_submitter/src/api/index.ts | 4 +- polylan_submitter/src/api/sdk.gen.ts | 27 +- polylan_submitter/src/api/types.gen.ts | 126 +++++++- polylan_submitter/submissions/api.py | 50 +++- polylan_submitter/submissions/schemas.py | 28 +- 6 files changed, 518 insertions(+), 78 deletions(-) diff --git a/polylan_submitter/src/Submissions.vue b/polylan_submitter/src/Submissions.vue index ad05e10..6b12157 100644 --- a/polylan_submitter/src/Submissions.vue +++ b/polylan_submitter/src/Submissions.vue @@ -2,7 +2,7 @@ import { ref, onMounted } from "vue"; import { storeToRefs } from "pinia"; import { useUserStore } from "@/stores/user"; -import { submissionsApiCreateSubmission, submissionsApiListUserSubmissions } from "@/api"; +import { submissionsApiCreateSubmission, submissionsApiListUserSubmissions, submissionsApiCreateImageCrop, submissionsApiDeleteImageCrop } from "@/api"; interface Props { gamePath?: string; @@ -32,8 +32,13 @@ const userSubmissions = ref([]); const isLoadingSubmissions = ref(false); const selectedSubmissionFile = ref(null); const isSubmissionFileModalOpen = ref(false); -const imageAspectRatio = ref<"portrait" | "landscape">("landscape"); const copyFeedback = ref(""); +const isDrawingCrop = ref(false); +const cropStartX = ref(0); +const cropStartY = ref(0); +const currentCrop = ref<{ x1: number; y1: number; x2: number; y2: number } | null>(null); +const cropLabel = ref(""); +const isCreatingCrop = ref(false); const openFilePreview = async (file: File) => { selectedFile.value = file; @@ -65,12 +70,50 @@ const closeModal = () => { const openSubmissionFileModal = (file: any) => { selectedSubmissionFile.value = file; isSubmissionFileModalOpen.value = true; + currentCrop.value = null; + cropLabel.value = ""; // Check image dimensions for aspect ratio if (file?.content_type?.startsWith("image/")) { const img = new Image(); img.onload = () => { - imageAspectRatio.value = img.height > img.width ? "portrait" : "landscape"; + // Initialize canvas for crop drawing + setTimeout(() => { + const canvas = document.getElementById("cropCanvas") as HTMLCanvasElement; + if (canvas && userInfo.value.isStaff) { + const container = canvas.parentElement; + if (container) { + // Set canvas resolution to image size for accurate crop coordinates + canvas.width = img.width; + canvas.height = img.height; + + // Calculate scaling to fit container while maintaining aspect ratio + const containerWidth = container.clientWidth; + const containerHeight = container.clientHeight; + const imgAspect = img.width / img.height; + const containerAspect = containerWidth / containerHeight; + + let displayWidth, displayHeight; + if (imgAspect > containerAspect) { + displayWidth = containerWidth; + displayHeight = containerWidth / imgAspect; + } else { + displayHeight = containerHeight; + displayWidth = containerHeight * imgAspect; + } + + // Apply CSS scaling to display the image at correct size + canvas.style.width = displayWidth + "px"; + canvas.style.height = displayHeight + "px"; + + const ctx = canvas.getContext("2d"); + if (ctx) { + ctx.drawImage(img, 0, 0); + redrawCropCanvas(); + } + } + } + }, 0); }; img.src = file.file_url; } @@ -98,6 +141,150 @@ const copyOCRText = async () => { } }; +const getCanvasCoordinates = (canvas: HTMLCanvasElement, clientX: number, clientY: number) => { + const rect = canvas.getBoundingClientRect(); + const scaleX = canvas.width / rect.width; + const scaleY = canvas.height / rect.height; + const x = (clientX - rect.left) * scaleX; + const y = (clientY - rect.top) * scaleY; + return { x, y }; +}; + +const startCropDraw = (e: MouseEvent) => { + const canvas = e.currentTarget as HTMLCanvasElement; + const coords = getCanvasCoordinates(canvas, e.clientX, e.clientY); + cropStartX.value = coords.x; + cropStartY.value = coords.y; + isDrawingCrop.value = true; +}; + +const drawCrop = (e: MouseEvent) => { + if (!isDrawingCrop.value) return; + + const canvas = e.currentTarget as HTMLCanvasElement; + const coords = getCanvasCoordinates(canvas, e.clientX, e.clientY); + + currentCrop.value = { + x1: Math.min(cropStartX.value, coords.x), + y1: Math.min(cropStartY.value, coords.y), + x2: Math.max(cropStartX.value, coords.x), + y2: Math.max(cropStartY.value, coords.y), + }; + + redrawCropCanvas(); +}; + +const endCropDraw = () => { + isDrawingCrop.value = false; +}; + +const redrawCropCanvas = () => { + const canvas = document.getElementById("cropCanvas") as HTMLCanvasElement; + if (!canvas) return; + + const ctx = canvas.getContext("2d"); + if (!ctx) return; + + const img = new Image(); + img.onload = () => { + ctx.clearRect(0, 0, canvas.width, canvas.height); + ctx.drawImage(img, 0, 0); + + if (currentCrop.value) { + ctx.fillStyle = "rgba(59, 130, 246, 0.1)"; + ctx.fillRect( + currentCrop.value.x1, + currentCrop.value.y1, + currentCrop.value.x2 - currentCrop.value.x1, + currentCrop.value.y2 - currentCrop.value.y1 + ); + ctx.strokeStyle = "#3b82f6"; + ctx.lineWidth = 2; + ctx.strokeRect( + currentCrop.value.x1, + currentCrop.value.y1, + currentCrop.value.x2 - currentCrop.value.x1, + currentCrop.value.y2 - currentCrop.value.y1 + ); + } + + selectedSubmissionFile.value?.crops?.forEach((crop: any) => { + ctx.fillStyle = "rgba(34, 197, 94, 0.1)"; + ctx.fillRect( + crop.x1, + crop.y1, + crop.x2 - crop.x1, + crop.y2 - crop.y1 + ); + ctx.strokeStyle = "#22c55e"; + ctx.lineWidth = 1; + ctx.strokeRect( + crop.x1, + crop.y1, + crop.x2 - crop.x1, + crop.y2 - crop.y1 + ); + }); + }; + img.src = selectedSubmissionFile.value?.file_url; +}; + +const submitCrop = async () => { + if (!currentCrop.value || !selectedSubmissionFile.value) return; + + isCreatingCrop.value = true; + try { + const { data: newCrop } = await submissionsApiCreateImageCrop({ + path: { submission_file_id: selectedSubmissionFile.value.id }, + body: { + x1: Math.round(currentCrop.value.x1), + y1: Math.round(currentCrop.value.y1), + x2: Math.round(currentCrop.value.x2), + y2: Math.round(currentCrop.value.y2), + label: cropLabel.value || null, + }, + }); + + // Add the new crop to the list immediately + if (newCrop) { + selectedSubmissionFile.value.crops = selectedSubmissionFile.value.crops || []; + selectedSubmissionFile.value.crops.push(newCrop); + } + + currentCrop.value = null; + cropLabel.value = ""; + redrawCropCanvas(); + } catch (error) { + console.error("Error creating crop:", error); + alert(`Error creating crop: ${error instanceof Error ? error.message : "Please try again."}`); + } finally { + isCreatingCrop.value = false; + } +}; + +const deleteCrop = async (cropId: string) => { + if (!confirm("Delete this crop?")) return; + + try { + await submissionsApiDeleteImageCrop({ + path: { crop_id: cropId }, + }); + selectedSubmissionFile.value.crops = selectedSubmissionFile.value.crops.filter( + (c: any) => c.id !== cropId + ); + redrawCropCanvas(); + } catch (error) { + console.error("Error deleting crop:", error); + alert(`Error deleting crop: ${error instanceof Error ? error.message : "Please try again."}`); + } +}; + +const cancelCrop = () => { + currentCrop.value = null; + cropLabel.value = ""; + redrawCropCanvas(); +}; + const getGameHeaderImage = () => { if (props.gameImage) { return props.gameImage; @@ -533,22 +720,26 @@ onMounted(() => {
-
+

{{ selectedSubmissionFile?.original_filename }}

- -
+ +
-
+

File Preview

- +
- +
@@ -573,60 +764,113 @@ onMounted(() => {
-
- - - Download File - -
- -
-

OCR Data

-
-
-
-
-

Status:

- {{ - selectedSubmissionFile.ocr_status }} + +
+ +
+

OCR Data

+
+
+
+
+

Status:

+ {{ + selectedSubmissionFile.ocr_status }} +
+
+
+
+

Extracted Text:

+ +
+
+ {{ selectedSubmissionFile.ocr_raw_data }} +
+
-
-
-
-

Extracted Text:

-
+
+
+ +

OCR is being processed...

+
+
+
+
+ +

OCR processing failed

+
+
+
+
+ +

Waiting for OCR processing...

+
+
+
+
+ + +
+

Crops Data

+
+ +
+

+ + Drag on image to create crop (blue) or existing crops (green) +

+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + +
+

Crops ({{ + selectedSubmissionFile.crops.length }}):

+
+
+
+

{{ crop.label || `Crop (${crop.x1}, ${crop.y1})` }}

+

+ {{ crop.ocr_status }} +

+
+
-
- {{ selectedSubmissionFile.ocr_raw_data }} -
-
-
-
- -

OCR is being processed...

-
-
-
-
- -

OCR processing failed

-
-
-
-
- -

Waiting for OCR processing...

+
+ No crops yet
@@ -634,6 +878,11 @@ onMounted(() => {
+ + + Download +
diff --git a/polylan_submitter/src/api/index.ts b/polylan_submitter/src/api/index.ts index 7a73327..7f57878 100644 --- a/polylan_submitter/src/api/index.ts +++ b/polylan_submitter/src/api/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { animationsApiPuzzleResults, animationsApiResults, animationsApiTopSubmissions, gamesApiListGames, noitaApiGetLeaderboard, noitaApiGetResults, noitaApiSubmitLogFile, type Options, opusMagnumApiCreateSubmission, opusMagnumApiDeleteSubmission, opusMagnumApiGetCollection, opusMagnumApiGetStats, opusMagnumApiGetSubmission, opusMagnumApiListPuzzles, opusMagnumApiListResponsesNeedingValidation, opusMagnumApiListSubmissions, opusMagnumApiValidateAuto, opusMagnumApiValidateResponse, opusMagnumApiValidateSubmission, polylanSubmitterApiClearCache, polylanSubmitterApiGetUserInfo, polylanSubmitterApiHealthCheck, submissionsApiCreateSubmission, submissionsApiGetSubmission, submissionsApiListSubmissionsByGame, submissionsApiListUserSubmissions } from './sdk.gen'; -export type { AnimationsApiPuzzleResultsData, AnimationsApiPuzzleResultsResponse, AnimationsApiPuzzleResultsResponses, AnimationsApiResultsData, AnimationsApiResultsResponse, AnimationsApiResultsResponses, AnimationsApiTopSubmissionsData, AnimationsApiTopSubmissionsResponse, AnimationsApiTopSubmissionsResponses, ClientOptions, GameOut, GamesApiListGamesData, GamesApiListGamesResponse, GamesApiListGamesResponses, Input, LeaderboardEntryOut, LeaderboardOut, NoitaApiGetLeaderboardData, NoitaApiGetLeaderboardResponse, NoitaApiGetLeaderboardResponses, NoitaApiGetResultsData, NoitaApiGetResultsResponse, NoitaApiGetResultsResponses, NoitaApiSubmitLogFileData, NoitaApiSubmitLogFileError, NoitaApiSubmitLogFileErrors, NoitaApiSubmitLogFileResponse, NoitaApiSubmitLogFileResponses, NoitaSubmissionOut, ObjectivResultOut, OpusMagnumApiCreateSubmissionData, OpusMagnumApiCreateSubmissionResponse, OpusMagnumApiCreateSubmissionResponses, OpusMagnumApiDeleteSubmissionData, OpusMagnumApiDeleteSubmissionResponses, OpusMagnumApiGetCollectionData, OpusMagnumApiGetCollectionResponse, OpusMagnumApiGetCollectionResponses, OpusMagnumApiGetStatsData, OpusMagnumApiGetStatsResponses, OpusMagnumApiGetSubmissionData, OpusMagnumApiGetSubmissionResponse, OpusMagnumApiGetSubmissionResponses, OpusMagnumApiListPuzzlesData, OpusMagnumApiListPuzzlesResponse, OpusMagnumApiListPuzzlesResponses, OpusMagnumApiListResponsesNeedingValidationData, OpusMagnumApiListResponsesNeedingValidationResponse, OpusMagnumApiListResponsesNeedingValidationResponses, OpusMagnumApiListSubmissionsData, OpusMagnumApiListSubmissionsResponse, OpusMagnumApiListSubmissionsResponses, OpusMagnumApiValidateAutoData, OpusMagnumApiValidateAutoResponse, OpusMagnumApiValidateAutoResponses, OpusMagnumApiValidateResponseData, OpusMagnumApiValidateResponseResponse, OpusMagnumApiValidateResponseResponses, OpusMagnumApiValidateSubmissionData, OpusMagnumApiValidateSubmissionResponse, OpusMagnumApiValidateSubmissionResponses, PagedSubmissionOut, PolylanSubmitterApiClearCacheData, PolylanSubmitterApiClearCacheResponses, PolylanSubmitterApiGetUserInfoData, PolylanSubmitterApiGetUserInfoResponse, PolylanSubmitterApiGetUserInfoResponses, PolylanSubmitterApiHealthCheckData, PolylanSubmitterApiHealthCheckResponses, PuzzlePointsFactorOut, PuzzleResponseIn, PuzzleResponseOut, PuzzleResponseRankingOut, PuzzleResultsOut, PuzzleSubmissionsOut, PuzzleSubmissionWithRankOut, RankingSchema, ResultsOut, SteamCollectionItemOut, SteamCollectionOut, SubmissionFileOut, SubmissionIn, SubmissionOut, SubmissionsApiCreateSubmissionData, SubmissionsApiCreateSubmissionResponse, SubmissionsApiCreateSubmissionResponses, SubmissionsApiGetSubmissionData, SubmissionsApiGetSubmissionResponse, SubmissionsApiGetSubmissionResponses, SubmissionsApiListSubmissionsByGameData, SubmissionsApiListSubmissionsByGameResponse, SubmissionsApiListSubmissionsByGameResponses, SubmissionsApiListUserSubmissionsData, SubmissionsApiListUserSubmissionsResponse, SubmissionsApiListUserSubmissionsResponses, TournamentPuzzleResultsOut, TournamentSubmissionsOut, UserDisplayOut, UserInfoOut, ValidationIn, WinnerFileOut, WinnerResponseOut } from './types.gen'; +export { animationsApiPuzzleResults, animationsApiResults, animationsApiTopSubmissions, gamesApiListGames, noitaApiGetLeaderboard, noitaApiGetResults, noitaApiSubmitLogFile, type Options, opusMagnumApiCreateSubmission, opusMagnumApiDeleteSubmission, opusMagnumApiGetCollection, opusMagnumApiGetStats, opusMagnumApiGetSubmission, opusMagnumApiListPuzzles, opusMagnumApiListResponsesNeedingValidation, opusMagnumApiListSubmissions, opusMagnumApiValidateAuto, opusMagnumApiValidateResponse, opusMagnumApiValidateSubmission, polylanSubmitterApiClearCache, polylanSubmitterApiGetUserInfo, polylanSubmitterApiHealthCheck, submissionsApiCreateImageCrop, submissionsApiCreateSubmission, submissionsApiDeleteImageCrop, submissionsApiGetSubmission, submissionsApiListSubmissionsByGame, submissionsApiListUserSubmissions } from './sdk.gen'; +export type { AnimationsApiPuzzleResultsData, AnimationsApiPuzzleResultsResponse, AnimationsApiPuzzleResultsResponses, AnimationsApiResultsData, AnimationsApiResultsResponse, AnimationsApiResultsResponses, AnimationsApiTopSubmissionsData, AnimationsApiTopSubmissionsResponse, AnimationsApiTopSubmissionsResponses, ClientOptions, GameOut, GamesApiListGamesData, GamesApiListGamesResponse, GamesApiListGamesResponses, ImageCropIn, ImageCropOut, Input, LeaderboardEntryOut, LeaderboardOut, NoitaApiGetLeaderboardData, NoitaApiGetLeaderboardResponse, NoitaApiGetLeaderboardResponses, NoitaApiGetResultsData, NoitaApiGetResultsResponse, NoitaApiGetResultsResponses, NoitaApiSubmitLogFileData, NoitaApiSubmitLogFileError, NoitaApiSubmitLogFileErrors, NoitaApiSubmitLogFileResponse, NoitaApiSubmitLogFileResponses, NoitaSubmissionOut, ObjectivResultOut, OpusMagnumApiCreateSubmissionData, OpusMagnumApiCreateSubmissionResponse, OpusMagnumApiCreateSubmissionResponses, OpusMagnumApiDeleteSubmissionData, OpusMagnumApiDeleteSubmissionResponses, OpusMagnumApiGetCollectionData, OpusMagnumApiGetCollectionResponse, OpusMagnumApiGetCollectionResponses, OpusMagnumApiGetStatsData, OpusMagnumApiGetStatsResponses, OpusMagnumApiGetSubmissionData, OpusMagnumApiGetSubmissionResponse, OpusMagnumApiGetSubmissionResponses, OpusMagnumApiListPuzzlesData, OpusMagnumApiListPuzzlesResponse, OpusMagnumApiListPuzzlesResponses, OpusMagnumApiListResponsesNeedingValidationData, OpusMagnumApiListResponsesNeedingValidationResponse, OpusMagnumApiListResponsesNeedingValidationResponses, OpusMagnumApiListSubmissionsData, OpusMagnumApiListSubmissionsResponse, OpusMagnumApiListSubmissionsResponses, OpusMagnumApiValidateAutoData, OpusMagnumApiValidateAutoResponse, OpusMagnumApiValidateAutoResponses, OpusMagnumApiValidateResponseData, OpusMagnumApiValidateResponseResponse, OpusMagnumApiValidateResponseResponses, OpusMagnumApiValidateSubmissionData, OpusMagnumApiValidateSubmissionResponse, OpusMagnumApiValidateSubmissionResponses, PagedSubmissionOut, PolylanSubmitterApiClearCacheData, PolylanSubmitterApiClearCacheResponses, PolylanSubmitterApiGetUserInfoData, PolylanSubmitterApiGetUserInfoResponse, PolylanSubmitterApiGetUserInfoResponses, PolylanSubmitterApiHealthCheckData, PolylanSubmitterApiHealthCheckResponses, PuzzlePointsFactorOut, PuzzleResponseIn, PuzzleResponseOut, PuzzleResponseRankingOut, PuzzleResultsOut, PuzzleSubmissionsOut, PuzzleSubmissionWithRankOut, RankingSchema, ResultsOut, SteamCollectionItemOut, SteamCollectionOut, SubmissionFileOut, SubmissionIn, SubmissionOut, SubmissionsApiCreateImageCropData, SubmissionsApiCreateImageCropResponse, SubmissionsApiCreateImageCropResponses, SubmissionsApiCreateSubmissionData, SubmissionsApiCreateSubmissionResponse, SubmissionsApiCreateSubmissionResponses, SubmissionsApiDeleteImageCropData, SubmissionsApiDeleteImageCropResponse, SubmissionsApiDeleteImageCropResponses, SubmissionsApiGetSubmissionData, SubmissionsApiGetSubmissionResponse, SubmissionsApiGetSubmissionResponses, SubmissionsApiListSubmissionsByGameData, SubmissionsApiListSubmissionsByGameResponse, SubmissionsApiListSubmissionsByGameResponses, SubmissionsApiListUserSubmissionsData, SubmissionsApiListUserSubmissionsResponse, SubmissionsApiListUserSubmissionsResponses, TournamentPuzzleResultsOut, TournamentSubmissionsOut, UserDisplayOut, UserInfoOut, ValidationIn, WinnerFileOut, WinnerResponseOut } from './types.gen'; diff --git a/polylan_submitter/src/api/sdk.gen.ts b/polylan_submitter/src/api/sdk.gen.ts index 1da849e..49e68f8 100644 --- a/polylan_submitter/src/api/sdk.gen.ts +++ b/polylan_submitter/src/api/sdk.gen.ts @@ -2,7 +2,7 @@ import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape } from './client'; import { client } from './client.gen'; -import type { AnimationsApiPuzzleResultsData, AnimationsApiPuzzleResultsResponses, AnimationsApiResultsData, AnimationsApiResultsResponses, AnimationsApiTopSubmissionsData, AnimationsApiTopSubmissionsResponses, GamesApiListGamesData, GamesApiListGamesResponses, NoitaApiGetLeaderboardData, NoitaApiGetLeaderboardResponses, NoitaApiGetResultsData, NoitaApiGetResultsResponses, NoitaApiSubmitLogFileData, NoitaApiSubmitLogFileErrors, NoitaApiSubmitLogFileResponses, OpusMagnumApiCreateSubmissionData, OpusMagnumApiCreateSubmissionResponses, OpusMagnumApiDeleteSubmissionData, OpusMagnumApiDeleteSubmissionResponses, OpusMagnumApiGetCollectionData, OpusMagnumApiGetCollectionResponses, OpusMagnumApiGetStatsData, OpusMagnumApiGetStatsResponses, OpusMagnumApiGetSubmissionData, OpusMagnumApiGetSubmissionResponses, OpusMagnumApiListPuzzlesData, OpusMagnumApiListPuzzlesResponses, OpusMagnumApiListResponsesNeedingValidationData, OpusMagnumApiListResponsesNeedingValidationResponses, OpusMagnumApiListSubmissionsData, OpusMagnumApiListSubmissionsResponses, OpusMagnumApiValidateAutoData, OpusMagnumApiValidateAutoResponses, OpusMagnumApiValidateResponseData, OpusMagnumApiValidateResponseResponses, OpusMagnumApiValidateSubmissionData, OpusMagnumApiValidateSubmissionResponses, PolylanSubmitterApiClearCacheData, PolylanSubmitterApiClearCacheResponses, PolylanSubmitterApiGetUserInfoData, PolylanSubmitterApiGetUserInfoResponses, PolylanSubmitterApiHealthCheckData, PolylanSubmitterApiHealthCheckResponses, SubmissionsApiCreateSubmissionData, SubmissionsApiCreateSubmissionResponses, SubmissionsApiGetSubmissionData, SubmissionsApiGetSubmissionResponses, SubmissionsApiListSubmissionsByGameData, SubmissionsApiListSubmissionsByGameResponses, SubmissionsApiListUserSubmissionsData, SubmissionsApiListUserSubmissionsResponses } from './types.gen'; +import type { AnimationsApiPuzzleResultsData, AnimationsApiPuzzleResultsResponses, AnimationsApiResultsData, AnimationsApiResultsResponses, AnimationsApiTopSubmissionsData, AnimationsApiTopSubmissionsResponses, GamesApiListGamesData, GamesApiListGamesResponses, NoitaApiGetLeaderboardData, NoitaApiGetLeaderboardResponses, NoitaApiGetResultsData, NoitaApiGetResultsResponses, NoitaApiSubmitLogFileData, NoitaApiSubmitLogFileErrors, NoitaApiSubmitLogFileResponses, OpusMagnumApiCreateSubmissionData, OpusMagnumApiCreateSubmissionResponses, OpusMagnumApiDeleteSubmissionData, OpusMagnumApiDeleteSubmissionResponses, OpusMagnumApiGetCollectionData, OpusMagnumApiGetCollectionResponses, OpusMagnumApiGetStatsData, OpusMagnumApiGetStatsResponses, OpusMagnumApiGetSubmissionData, OpusMagnumApiGetSubmissionResponses, OpusMagnumApiListPuzzlesData, OpusMagnumApiListPuzzlesResponses, OpusMagnumApiListResponsesNeedingValidationData, OpusMagnumApiListResponsesNeedingValidationResponses, OpusMagnumApiListSubmissionsData, OpusMagnumApiListSubmissionsResponses, OpusMagnumApiValidateAutoData, OpusMagnumApiValidateAutoResponses, OpusMagnumApiValidateResponseData, OpusMagnumApiValidateResponseResponses, OpusMagnumApiValidateSubmissionData, OpusMagnumApiValidateSubmissionResponses, PolylanSubmitterApiClearCacheData, PolylanSubmitterApiClearCacheResponses, PolylanSubmitterApiGetUserInfoData, PolylanSubmitterApiGetUserInfoResponses, PolylanSubmitterApiHealthCheckData, PolylanSubmitterApiHealthCheckResponses, SubmissionsApiCreateImageCropData, SubmissionsApiCreateImageCropResponses, SubmissionsApiCreateSubmissionData, SubmissionsApiCreateSubmissionResponses, SubmissionsApiDeleteImageCropData, SubmissionsApiDeleteImageCropResponses, SubmissionsApiGetSubmissionData, SubmissionsApiGetSubmissionResponses, SubmissionsApiListSubmissionsByGameData, SubmissionsApiListSubmissionsByGameResponses, SubmissionsApiListUserSubmissionsData, SubmissionsApiListUserSubmissionsResponses } from './types.gen'; export type Options = Options2 & { /** @@ -196,7 +196,7 @@ export const gamesApiListGames = (options? */ export const submissionsApiCreateSubmission = (options: Options) => (options.client ?? client).post({ ...formDataBodySerializer, - url: '/api/submissions/create', + url: '/api/submissions/submission/create', ...options, headers: { 'Content-Type': null, @@ -207,14 +207,31 @@ export const submissionsApiCreateSubmission = (options: Options) => (options.client ?? client).get({ url: '/api/submissions/user', ...options }); +export const submissionsApiListUserSubmissions = (options: Options) => (options.client ?? client).get({ url: '/api/submissions/submission/by/user', ...options }); /** * List Submissions By Game */ -export const submissionsApiListSubmissionsByGame = (options: Options) => (options.client ?? client).get({ url: '/api/submissions/game', ...options }); +export const submissionsApiListSubmissionsByGame = (options: Options) => (options.client ?? client).get({ url: '/api/submissions/submission/by/game', ...options }); /** * Get Submission */ -export const submissionsApiGetSubmission = (options: Options) => (options.client ?? client).get({ url: '/api/submissions/{submission_id}', ...options }); +export const submissionsApiGetSubmission = (options: Options) => (options.client ?? client).get({ url: '/api/submissions/submission/{submission_id}', ...options }); + +/** + * Create Image Crop + */ +export const submissionsApiCreateImageCrop = (options: Options) => (options.client ?? client).post({ + url: '/api/submissions/crops/s/{submission_file_id}', + ...options, + headers: { + 'Content-Type': 'application/json', + ...options.headers + } +}); + +/** + * Delete Image Crop + */ +export const submissionsApiDeleteImageCrop = (options: Options) => (options.client ?? client).delete({ url: '/api/submissions/crops/{crop_id}', ...options }); diff --git a/polylan_submitter/src/api/types.gen.ts b/polylan_submitter/src/api/types.gen.ts index 4a546e1..2ec0d08 100644 --- a/polylan_submitter/src/api/types.gen.ts +++ b/polylan_submitter/src/api/types.gen.ts @@ -371,6 +371,10 @@ export type SubmissionFileOut = { * Ocr Raw Data */ ocr_raw_data: string; + /** + * Crops + */ + crops?: Array; }; /** @@ -912,6 +916,74 @@ export type GameOut = { image?: string | null; }; +/** + * ImageCropOut + */ +export type ImageCropOut = { + /** + * Id + */ + id: string; + /** + * X1 + */ + x1: number; + /** + * Y1 + */ + y1: number; + /** + * X2 + */ + x2: number; + /** + * Y2 + */ + y2: number; + /** + * Label + */ + label: string; + /** + * Ocr Status + */ + ocr_status: string; + /** + * Ocr Raw Data + */ + ocr_raw_data: string; + /** + * Created At + */ + created_at: string; +}; + +/** + * ImageCropIn + */ +export type ImageCropIn = { + /** + * X1 + */ + x1: number; + /** + * Y1 + */ + y1: number; + /** + * X2 + */ + x2: number; + /** + * Y2 + */ + y2: number; + /** + * Label + */ + label?: string | null; +}; + export type PolylanSubmitterApiHealthCheckData = { body?: never; path?: never; @@ -1341,7 +1413,7 @@ export type SubmissionsApiCreateSubmissionData = { */ game_path: string; }; - url: '/api/submissions/create'; + url: '/api/submissions/submission/create'; }; export type SubmissionsApiCreateSubmissionResponses = { @@ -1362,7 +1434,7 @@ export type SubmissionsApiListUserSubmissionsData = { */ game_path: string; }; - url: '/api/submissions/user'; + url: '/api/submissions/submission/by/user'; }; export type SubmissionsApiListUserSubmissionsResponses = { @@ -1385,7 +1457,7 @@ export type SubmissionsApiListSubmissionsByGameData = { */ game_path: string; }; - url: '/api/submissions/game'; + url: '/api/submissions/submission/by/game'; }; export type SubmissionsApiListSubmissionsByGameResponses = { @@ -1408,7 +1480,7 @@ export type SubmissionsApiGetSubmissionData = { submission_id: string; }; query?: never; - url: '/api/submissions/{submission_id}'; + url: '/api/submissions/submission/{submission_id}'; }; export type SubmissionsApiGetSubmissionResponses = { @@ -1419,3 +1491,49 @@ export type SubmissionsApiGetSubmissionResponses = { }; export type SubmissionsApiGetSubmissionResponse = SubmissionsApiGetSubmissionResponses[keyof SubmissionsApiGetSubmissionResponses]; + +export type SubmissionsApiCreateImageCropData = { + body: ImageCropIn; + path: { + /** + * Submission File Id + */ + submission_file_id: string; + }; + query?: never; + url: '/api/submissions/crops/s/{submission_file_id}'; +}; + +export type SubmissionsApiCreateImageCropResponses = { + /** + * OK + */ + 200: ImageCropOut; +}; + +export type SubmissionsApiCreateImageCropResponse = SubmissionsApiCreateImageCropResponses[keyof SubmissionsApiCreateImageCropResponses]; + +export type SubmissionsApiDeleteImageCropData = { + body?: never; + path: { + /** + * Crop Id + */ + crop_id: string; + }; + query?: never; + url: '/api/submissions/crops/{crop_id}'; +}; + +export type SubmissionsApiDeleteImageCropResponses = { + /** + * Response + * + * OK + */ + 200: { + [key: string]: unknown; + }; +}; + +export type SubmissionsApiDeleteImageCropResponse = SubmissionsApiDeleteImageCropResponses[keyof SubmissionsApiDeleteImageCropResponses]; diff --git a/polylan_submitter/submissions/api.py b/polylan_submitter/submissions/api.py index be15228..3ed478d 100644 --- a/polylan_submitter/submissions/api.py +++ b/polylan_submitter/submissions/api.py @@ -1,17 +1,18 @@ from typing import List, Optional +from uuid import UUID from django.http import HttpRequest from ninja import Router, File, Form from ninja.files import UploadedFile from django.shortcuts import get_object_or_404 from games.models import Game -from .models import Submission, SubmissionFile -from .schemas import SubmissionOut +from .models import Submission, SubmissionFile, ImageCrop, OCRStatus +from .schemas import SubmissionOut, ImageCropIn, ImageCropOut router = Router() -@router.post("/create", response=SubmissionOut) +@router.post("/submission/create", response=SubmissionOut) def create_submission( request: HttpRequest, game_path: str, @@ -37,7 +38,7 @@ def create_submission( return submission -@router.get("/user", response=list[SubmissionOut]) +@router.get("/submission/by/user", response=list[SubmissionOut]) def list_user_submissions(request: HttpRequest, game_path: str): game = get_object_or_404(Game, path=game_path) @@ -50,7 +51,7 @@ def list_user_submissions(request: HttpRequest, game_path: str): return submissions -@router.get("/game", response=list[SubmissionOut]) +@router.get("/submission/by/game", response=list[SubmissionOut]) def list_submissions_by_game(request: HttpRequest, game_path: str): game = get_object_or_404(Game, path=game_path) @@ -60,11 +61,46 @@ def list_submissions_by_game(request: HttpRequest, game_path: str): return Submission.objects.filter(game=game) -@router.get("/{submission_id}", response=SubmissionOut) -def get_submission(request: HttpRequest, submission_id: str): +@router.get("/submission/{submission_id}", response=SubmissionOut) +def get_submission(request: HttpRequest, submission_id: UUID): submission = get_object_or_404(Submission, id=submission_id) if submission.user != request.user and not request.user.is_staff: return 403, {"detail": "Not authorized"} return submission + + +@router.post("/crops/s/{submission_file_id}", response=ImageCropOut) +def create_image_crop( + request: HttpRequest, + submission_file_id: UUID, + data: ImageCropIn, +): + if not request.user.is_staff: + return 403, {"detail": "Admin access required"} + + submission_file = get_object_or_404(SubmissionFile, id=submission_file_id) + + crop = ImageCrop.objects.create( + submission_file=submission_file, + x1=data.x1, + y1=data.y1, + x2=data.x2, + y2=data.y2, + label=data.label or "", + ocr_status=OCRStatus.TO_PROCESS, + ) + + return crop + + +@router.delete("/crops/{crop_id}", response=dict) +def delete_image_crop(request: HttpRequest, crop_id: UUID): + if not request.user.is_staff: + return 403, {"detail": "Admin access required"} + + crop = get_object_or_404(ImageCrop, id=crop_id) + crop.delete() + + return {"status": "deleted"} diff --git a/polylan_submitter/submissions/schemas.py b/polylan_submitter/submissions/schemas.py index bf8080f..ba16185 100644 --- a/polylan_submitter/submissions/schemas.py +++ b/polylan_submitter/submissions/schemas.py @@ -1,23 +1,43 @@ -from typing import Optional from datetime import datetime from uuid import UUID from ninja import Schema +class ImageCropIn(Schema): + x1: int + y1: int + x2: int + y2: int + label: str | None = None + + +class ImageCropOut(Schema): + id: UUID + x1: int + y1: int + x2: int + y2: int + label: str + ocr_status: str + ocr_raw_data: str + created_at: datetime + + class SubmissionFileOut(Schema): id: UUID original_filename: str content_type: str file_size: int - file_url: Optional[str] = None + file_url: str | None = None ocr_status: str ocr_raw_data: str + crops: list[ImageCropOut] = [] class SubmissionOut(Schema): id: UUID - game_id: Optional[int] = None - notes: Optional[str] = None + game_id: int | None = None + notes: str | None = None files: list[SubmissionFileOut] = [] created_at: datetime updated_at: datetime