mutiple fixes

opus_submitter/src/services/apiService.ts

@@ -119,9 +119,9 @@ export class ApiService {
       responses: Array<{
         puzzle_id: number
         puzzle_name: string
-        cost?: string
-        cycles?: string
-        area?: string
+        cost?: number
+        cycles?: number
+        area?: number
         needs_manual_validation?: boolean
         ocr_confidence_cost?: number
         ocr_confidence_cycles?: number
@@ -147,9 +147,9 @@ export class ApiService {
   async validateResponse(
     responseId: number,
     validationData: {
-      validated_cost?: string
-      validated_cycles?: string
-      validated_area?: string
+      validated_cost?: number
+      validated_cycles?: number
+      validated_area?: number
     }
   ): Promise<ApiResponse<PuzzleResponse>> {
     return this.request<PuzzleResponse>(`/submissions/responses/${responseId}/validate`, {
@@ -237,61 +237,23 @@ export const submissionHelpers = {
     notes?: string,
     manualValidationRequested?: boolean
   ): Promise<ApiResponse<Submission>> {
-    // Group files by detected puzzle
-    const responsesByPuzzle: Record<string, {
-      puzzle: SteamCollectionItem | null,
-      files: SubmissionFile[]
-    }> = {}
 
-    files.forEach(file => {
-      // Use manual puzzle selection if available, otherwise fall back to OCR
-      const puzzleName = file.manualPuzzleSelection || file.ocrData?.puzzle
+    const responses = files.map(item => {
 
-      if (puzzleName) {
-        if (!responsesByPuzzle[puzzleName]) {
-          responsesByPuzzle[puzzleName] = {
-            puzzle: puzzleHelpers.findPuzzleByName(puzzles, puzzleName),
-            files: []
-          }
-        }
-        responsesByPuzzle[puzzleName].files.push(file)
-      }
-    })
-
-    // Create responses array
-    const responses = Object.entries(responsesByPuzzle)
-      .filter(([_, data]) => data.puzzle) // Only include matched puzzles
-      .map(([puzzleName, data]) => {
-        // Get OCR data from the first file with complete data
-        const fileWithOCR = data.files.find(f =>
-          f.ocrData?.cost || f.ocrData?.cycles || f.ocrData?.area
-        )
-
-        // Check if manual validation is needed
-        const needsValidation = !fileWithOCR?.ocrData ||
-          !fileWithOCR.ocrData.cost ||
-          !fileWithOCR.ocrData.cycles ||
-          !fileWithOCR.ocrData.area
-
-        return {
-          puzzle_id: data.puzzle!.id,
-          puzzle_name: puzzleName,
-          cost: fileWithOCR?.ocrData?.cost,
-          cycles: fileWithOCR?.ocrData?.cycles,
-          area: fileWithOCR?.ocrData?.area,
-          needs_manual_validation: needsValidation,
-          ocr_confidence_cost: fileWithOCR?.ocrData?.confidence?.cost || 0.0,
-          ocr_confidence_cycles: fileWithOCR?.ocrData?.confidence?.cycles || 0.0,
-          ocr_confidence_area: fileWithOCR?.ocrData?.confidence?.area || 0.0
-        }
-      })
-
-    if (responses.length === 0) {
+      const puzzle = puzzleHelpers.findPuzzleByName(puzzles, item.ocrData?.puzzle || '')
+      if (!puzzle) { return }
       return {
-        error: 'No valid puzzle responses found',
-        status: 400
+        puzzle_id: puzzle.id,
+        puzzle_name: item.ocrData?.puzzle || '',
+        cost: item.ocrData?.cost,
+        cycles: item.ocrData?.cycles,
+        area: item.ocrData?.area,
+        needs_manual_validation: (item.ocrData?.confidence.overall ?? 0) <= 0.8,
+        ocr_confidence_cost: item.ocrData?.confidence?.cost || 0.0,
+        ocr_confidence_cycles: item.ocrData?.confidence?.cycles || 0.0,
+        ocr_confidence_area: item.ocrData?.confidence?.area || 0.0
       }
-    }
+    }).filter(item => item !== undefined)
 
     // Extract actual File objects for upload
     const fileObjects = files.map(f => f.file)