add zod validation

Author: DaWe35

package.json

@@ -28,7 +28,8 @@
     "multer": "2.0.1",
     "google-auth-library": "^9.0.0",
     "@aws-sdk/client-s3": "^3.450.0",
-    "@aws-sdk/lib-storage": "^3.450.0"
+    "@aws-sdk/lib-storage": "^3.450.0",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "nodemon": "^3.0.3",

src/services/validateImageParams.js

@@ -1,56 +1,40 @@
+import { z } from 'zod'
 import { imageModels } from '../shared/imageModels/index.js'
 
-// Validate the parameters for the image generation request and return only the valid parameters
+const bodySchema = z.object({
+  prompt: z.string().min(1, { message: "'prompt' is a required parameter" }),
+  model: z.string().min(1, { message: "'model' is a required parameter" }),
+  response_format: z.enum(['url', 'b64_json']).default('url'),
+  quality: z.enum(['auto', 'low', 'medium', 'high']).optional()
+})
+
 export function validateImageParams(req) {
-    const { prompt, model, response_format, size, quality } = req.body
-    const files = req.files || {}
+  const parseResult = bodySchema.safeParse(req.body)
+  if (!parseResult.success) {
+    throw new Error(parseResult.error.errors[0].message)
+  }
 
-    if (!prompt) throw new Error("'prompt' is a required parameter")
-    if (!model) throw new Error("'model' is a required parameter")
+  const { prompt, model, response_format, quality } = parseResult.data
+  const files = req.files || {}
 
-    if (model === 'google/gemini-2.0-flash-prev') {
-        throw new Error("'google/gemini-2.0-flash-prev' is temporary disabled. Please use 'google/gemini-2.0-flash-exp' instead.")
-    }
+  if (model === 'google/gemini-2.0-flash-prev') {
+    throw new Error("'google/gemini-2.0-flash-prev' is temporary disabled. Please use 'google/gemini-2.0-flash-exp' instead.")
+  }
 
-    // Validate model parameter and config
-    const modelConfig = imageModels[model]
-    if (!modelConfig) throw new Error("model '" + model + "' is not available")
-    if (!modelConfig?.providers[0].id) throw new Error("model provider for '" + model + "' is not available")
+  const modelConfig = imageModels[model]
+  if (!modelConfig) throw new Error(`model '${model}' is not available`)
+  if (!modelConfig?.providers[0]?.id) throw new Error(`model provider for '${model}' is not available`)
 
-    // Set default response_format and validate
-    const validResponseFormat = response_format || 'url'
-    if (!['url', 'b64_json'].includes(validResponseFormat)) {
-        throw new Error("'response_format' must be either 'url' or 'b64_json'")
-    }
-    if (size) {
-        throw new Error("'size' is not yet supported.")
-    }
-    // Validate quality parameter. Can be low, medium, high.
-    let qualityLower
-    if (quality) {
-        qualityLower = quality.toLowerCase()
-        const allowedQualities = ['auto', 'low', 'medium', 'high']
-        if (!allowedQualities.includes(qualityLower)) {
-            throw new Error(`'quality' must be one of: ${allowedQualities.join(', ')}`)
-        }
-    }
-    
-    // Initialize validFiles object
-    let validFiles = {}
-    
-    // Validate image parameter - can be multiple images (up to 16)
-    if (files.image) {
-        validFiles.image = files.image
-        // Ensure we don't exceed the maximum number of images
-        if (Array.isArray(validFiles.image) && validFiles.image.length > 16) {
-            throw new Error("Maximum of 16 images can be uploaded")
-        }
-    }
-    
-    // Validate mask parameter
-    if (files.mask) {
-        validFiles.mask = files.mask
-    }
+  // Validate files
+  const validFiles = {}
+  if (files.image) {
+    const images = Array.isArray(files.image) ? files.image : [files.image]
+    if (images.length > 16) throw new Error('Maximum of 16 images can be uploaded')
+    validFiles.image = images
+  }
+  if (files.mask) {
+    validFiles.mask = Array.isArray(files.mask) ? files.mask[0] : files.mask
+  }
 
-    return { prompt, model, response_format: validResponseFormat, quality: qualityLower, files: validFiles }
+  return { prompt, model, response_format, quality, files: validFiles }
 }

src/services/validateVideoParams.js

@@ -1,30 +1,25 @@
+import { z } from 'zod'
 import { videoModels } from '../shared/videoModels/index.js'
 
+const bodySchema = z.object({
+  prompt: z.string().min(1, { message: "'prompt' is a required parameter" }),
+  model: z.string().min(1, { message: "'model' is a required parameter" }),
+  response_format: z.enum(['url', 'b64_json']).default('url'),
+})
+
 // Validate the parameters for the video generation request and return only the valid parameters
 export function validateVideoParams(req) {
-    const { prompt, model, response_format, size, quality } = req.body
+    const parseResult = bodySchema.safeParse(req.body)
+    if (!parseResult.success) {
+        throw new Error(parseResult.error.errors[0].message)
+    }
 
-    if (!prompt) throw new Error("'prompt' is a required parameter")
-    if (!model) throw new Error("'model' is a required parameter")
+    const { prompt, model, response_format } = parseResult.data
 
     // Validate model parameter and config
     const modelConfig = videoModels[model]
-    if (!modelConfig) throw new Error("model '" + model + "' is not available")
-    if (!modelConfig?.providers[0].id) throw new Error("model provider for '" + model + "' is not available")
-
-    // Set default response_format and validate
-    const validResponseFormat = response_format || 'url'
-    if (!['url', 'b64_json'].includes(validResponseFormat)) {
-        throw new Error("'response_format' must be either 'url' or 'b64_json'")
-    }
-    if (size) {
-        throw new Error("'size' is not yet supported.")
-    }
-    
-    
-    if (quality) {
-        throw new Error("'quality' is not yet supported.")
-    }
+    if (!modelConfig) throw new Error(`model '${model}' is not available`)
+    if (!modelConfig?.providers[0]?.id) throw new Error(`model provider for '${model}' is not available`)
 
-    return { prompt, model, response_format: validResponseFormat }
+    return { prompt, model, response_format }
 }