*: ⚠️ error handling and creation changes

Author: montyanderson

test/v2.errors.test.ts

@@ -34,9 +34,14 @@ await Deno.test("Error Propagation: Bad Job Config returns ProdiaUserError", {
 			err instanceof ProdiaUserError,
 			"Error should be a ProdiaUserError",
 		);
-		assertStringIncludes(err.message, "jsonschema validation failed");
-		assertStringIncludes(err.message, "steps/maximum");
+		assertStringIncludes(err.message, "steps");
 		assertStringIncludes(err.message, "maximum: got 1,000");
+		assert(
+			err.message.match(
+				/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/,
+			),
+			"Error message should contain a job id",
+		);
 	}
 });
 
@@ -49,11 +54,14 @@ await Deno.test("Error Propagation: No Job Type returns ProdiaCapacityError", {
 	});
 
 	try {
-		await client.job({
-			config: {
-				prompt: "puppies in a cloud, 4k",
+		await client.job(
+			// @ts-ignore
+			{
+				config: {
+					prompt: "puppies in a cloud, 4k",
+				},
 			},
-		});
+		);
 
 		throw new Error("Job should not succeed");
 	} catch (err) {

v2/index.ts

@@ -24,7 +24,21 @@ type JsonValue = JsonPrimitive | JsonObject | JsonArray;
 
 /* job and job configuration */
 
-export type ProdiaJob = Record<string, JsonValue>;
+export type ProdiaJob = {
+	type: string;
+	config?: Record<string, JsonValue>;
+};
+
+type ProdiaJobComplete = ProdiaJob & {
+	id: string;
+	created_at: string;
+	updated_at: string;
+	expires_at: string;
+	metrics: {
+		elapsed: number;
+		ips?: number;
+	};
+};
 
 export type ProdiaJobOptions = {
 	accept?:
@@ -41,22 +55,20 @@ const defaultJobOptions: ProdiaJobOptions = {
 	accept: undefined,
 };
 
-export type ProdiaJobResponse = {
-	job: ProdiaJob;
-
-	// currently these are the only output field for all job types.
-	// they will return the raw bytes for that output.
-	arrayBuffer: () => Promise<ArrayBuffer>;
-	uint8Array: () => Promise<Uint8Array>;
-};
-
 /* client & client configuration*/
 
 export type Prodia = {
 	job: (
 		params: ProdiaJob,
 		options?: Partial<ProdiaJobOptions>,
-	) => Promise<ProdiaJobResponse>;
+	) => Promise<{
+		job: ProdiaJobComplete;
+
+		// currently these are the only output field for all job types.
+		// they will return the raw bytes for that output.
+		arrayBuffer: () => Promise<ArrayBuffer>;
+		uint8Array: () => Promise<Uint8Array>;
+	}>;
 };
 
 export type CreateProdiaOptions = {
@@ -139,7 +151,7 @@ export const createProdia = ({
 				body: formData,
 			});
 
-			// We bail from the loop if we get a 2xx response to avoid sleeping unnecessarily.
+			// we bail from the loop if we get a 2xx response to avoid sleeping unnecessarily.
 			if (response.status >= 200 && response.status < 300) {
 				break;
 			}
@@ -151,6 +163,7 @@ export const createProdia = ({
 			}
 
 			const retryAfter = Number(response.headers.get("Retry-After")) || 1;
+
 			await new Promise((resolve) =>
 				setTimeout(resolve, retryAfter * 1000)
 			);
@@ -169,23 +182,11 @@ export const createProdia = ({
 			);
 		}
 
-		if (response.headers.get("Content-Type") === "application/json") {
-			const body = await response.json();
-
-			if ("error" in body && typeof body.error === "string") {
-				throw new ProdiaUserError(body.error);
-			}
-
-			const lastStateHistory = body.state.history.slice(-1)[0];
-
-			if (lastStateHistory && "message" in lastStateHistory) {
-				throw new ProdiaUserError(lastStateHistory.message);
-			}
-
-			throw new Error("Job Failed: Bad Content-Type: application/json");
-		}
-
-		if (response.status < 200 || response.status > 299) {
+		if (
+			!response.headers.get("Content-Type")?.startsWith(
+				"multipart/form-data",
+			)
+		) {
 			throw new ProdiaBadResponseError(
 				`${response.status} ${await response.text()}`,
 			);
@@ -197,10 +198,12 @@ export const createProdia = ({
 			new TextDecoder().decode(
 				await (body.get("job") as Blob).arrayBuffer(),
 			),
-		) as ProdiaJob;
+		) as ProdiaJobComplete;
 
-		if ("error" in job && typeof job.error === "string") {
-			throw new ProdiaUserError(job.error);
+		if (response.status >= 400 && response.status < 500) {
+			if ("error" in job && typeof job.error === "string") {
+				throw new ProdiaUserError(job.error + " " + `(id: ${job.id})`);
+			}
 		}
 
 		return {