@@ -289,7 +207,7 @@ export function DatabaseStudio() {
{/* Table - Fill remaining space */}
-
+
@@ -335,8 +253,7 @@ export function DatabaseStudio() {
))}
-
-
+
) : (
diff --git a/src/server/ai/provider/cloudflare.ts b/src/server/ai/provider/cloudflare.ts
index 47fd073..99a1c48 100644
--- a/src/server/ai/provider/cloudflare.ts
+++ b/src/server/ai/provider/cloudflare.ts
@@ -27,7 +27,7 @@ const createFormData = (params: any, model: CloudflareAiModel, request: TypixGen
// Append images with numbered parameter names
for (let i = 0; i < Math.min(images.length, maxInputImages); i++) {
- const imageBlob = base64ToBlob(images[i]!);
+ const imageBlob = base64ToBlob(dataURItoBase64(images[i]!));
form.append(`input_image_${i}`, imageBlob);
}
}
@@ -76,7 +76,7 @@ const generateSingle = async (request: TypixGenerateRequest, settings: ApiProvid
params.height = size?.height;
}
if (genType === "i2i") {
- params.image_b64 = request.images![0]!;
+ params.image_b64 = dataURItoBase64(request.images![0]!);
}
// Built-in Cloudflare Worker AI
diff --git a/src/server/lib/util.ts b/src/server/lib/util.ts
index 7a67f9f..bfffa81 100644
--- a/src/server/lib/util.ts
+++ b/src/server/lib/util.ts
@@ -13,7 +13,7 @@ export function base64ToBlob(base64: string, mimeType = "image/png") {
}
export function dataURItoBase64(dataURI: string) {
- return dataURI.split(",")[1];
+ return dataURI.split(",")[1]!;
}
export async function readableStreamToDataURI(stream: ReadableStream
, fmt = "png") {
diff --git a/src/server/service/file/storage.ts b/src/server/service/file/storage.ts
index c4e2452..434da6f 100644
--- a/src/server/service/file/storage.ts
+++ b/src/server/service/file/storage.ts
@@ -1,6 +1,6 @@
import { type Storage, files } from "@/server/db/schemas";
import { inBrowser } from "@/server/lib/env";
-import { fetchUrlToDataURI } from "@/server/lib/util";
+import { base64ToDataURI, fetchUrlToDataURI } from "@/server/lib/util";
import { and, eq } from "drizzle-orm";
import { getContext } from "../context";
@@ -120,7 +120,7 @@ export const getFileMetadata = async (fileId: string, userId: string) => {
};
/**
- * Get file base64-encoded string
+ * Get file base64 data URL
* @param fileId File ID to get data for
* @param userId User ID to check access
* @param redirect
@@ -138,10 +138,11 @@ export const getFileData = async (fileId: string, userId: string) => {
switch (metadata.protocol) {
case "data:":
- return metadata.accessUrl.split(",")[1]!; // Return base64 part only
+ return metadata.accessUrl;
case "file:": {
const fs = await import("node:fs/promises");
- return await fs.readFile(metadata.accessUrl, "base64");
+ const fileSuffix = metadata.accessUrl.split(".").pop();
+ return base64ToDataURI(await fs.readFile(metadata.accessUrl, "base64"), fileSuffix);
}
default:
return await fetchUrlToDataURI(metadata.accessUrl);
diff --git a/wrangler.toml b/wrangler.toml
index a5ec769..f73860f 100644
--- a/wrangler.toml
+++ b/wrangler.toml
@@ -30,7 +30,7 @@ binding = "AI"
# Authenticated users benefit from cross-device data sync and server-side data persistence.
# Provides the best of both worlds: instant local access with optional cloud features.
MODE = "client"
-GOOGLE_ANALYTICS_ID = "G-0T65G1J5DT"
+# GOOGLE_ANALYTICS_ID = "G-0T65G1J5DT"
# Authentication configuration, only for mixed mode
#