bitcashorg
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 0 deletions b/‎.gitignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎apps/hasura/metadata/databases/masterbots/tables/public_thread.yaml‎
Lines changed: 5 additions & 3 deletions b/‎apps/hasura/metadata/databases/masterbots/tables/public_thread.yaml‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎apps/hasura/migrations/masterbots/1747434920420_alter_table_public_thread_alter_column_is_public/down.sql‎
Lines changed: 1 addition & 0 deletions b/‎apps/hasura/migrations/masterbots/1747434920420_alter_table_public_thread_alter_column_is_public/down.sql‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎apps/hasura/migrations/masterbots/1747434920420_alter_table_public_thread_alter_column_is_public/up.sql‎
Lines changed: 1 addition & 0 deletions b/‎apps/hasura/migrations/masterbots/1747434920420_alter_table_public_thread_alter_column_is_public/up.sql‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎apps/hasura/migrations/masterbots/1747898744695_alter_table_public_thread_add_column_metadata/down.sql‎
Lines changed: 4 additions & 0 deletions b/‎apps/hasura/migrations/masterbots/1747898744695_alter_table_public_thread_add_column_metadata/down.sql‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎apps/hasura/migrations/masterbots/1747898744695_alter_table_public_thread_add_column_metadata/up.sql‎
Lines changed: 1 addition & 0 deletions b/‎apps/hasura/migrations/masterbots/1747898744695_alter_table_public_thread_add_column_metadata/up.sql‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎apps/masterbots.ai/.env.example‎
Lines changed: 5 additions & 1 deletion b/‎apps/masterbots.ai/.env.example‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎apps/masterbots.ai/app/actions/ai-main-call.actions.ts‎
Lines changed: 1 addition & 1 deletion b/‎apps/masterbots.ai/app/actions/ai-main-call.actions.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/masterbots.ai/app/actions/thread.actions.ts‎
Lines changed: 179 additions & 1 deletion b/‎apps/masterbots.ai/app/actions/thread.actions.ts‎
Lines changed: 179 additions & 1 deletion
diff --git a/‎apps/masterbots.ai/app/api/attachments/upload/route.ts‎
Lines changed: 70 additions & 0 deletions b/‎apps/masterbots.ai/app/api/attachments/upload/route.ts‎
Lines changed: 70 additions & 0 deletions
@@ -12,3 +12,5 @@ __dev
 .vercel
 
 bun.lockb
+
+gcp-serv-acct-key.json
@@ -75,6 +75,7 @@ select_permissions:
         - is_approved
         - is_blocked
         - is_public
+        - metadata
         - model
         - parent_thread_id
         - short_link
@@ -93,6 +94,7 @@ select_permissions:
         - is_approved
         - is_blocked
         - is_public
+        - metadata
         - model
         - parent_thread_id
         - short_link
@@ -111,6 +113,7 @@ select_permissions:
         - is_approved
         - is_blocked
         - is_public
+        - metadata
         - model
         - parent_thread_id
         - short_link
@@ -166,7 +169,6 @@ delete_permissions:
   - role: user
     permission:
       filter:
-        thread:
-          user_id:
-            _eq: X-Hasura-User-Id
+        user_id:
+          _eq: X-Hasura-User-Id
     comment: ""
@@ -0,0 +1 @@
+alter table "public"."thread" alter column "is_public" set default 'true';
@@ -0,0 +1 @@
+alter table "public"."thread" alter column "is_public" set default 'false';
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."thread" add column "metadata" jsonb
+--  null default jsonb_build_object();
@@ -0,0 +1 @@
+alter table "public"."thread" add column "metadata" jsonb null default null;
@@ -24,4 +24,8 @@ NEXT_PUBLIC_PROFILE_N_BOT_PAGE_HAS_POPUP="true"
 
 SENTRY_AUTH_TOKEN="your_sentry_auth_token"
 
-# DATABASE_URL="postgres://user:pass@localhost:5433/masterbots?sslmode=disable"
+DATABASE_URL="postgres://user:pass@localhost:5433/masterbots?sslmode=disable"
+GCS_BUCKET_NAME="your_bucket"
+GCS_PROJECT_ID="your_project_id"
+GCS_CLIENT_EMAIL="your_service_account_email@your_project_id.iam.gserviceaccount.com"
+GCS_SECRET_ACCESS_KEY="-----BEGIN PRIVATE KEY-----\n0x1...\n-----END PRIVATE KEY-----\n"
@@ -341,7 +341,7 @@ export async function createResponseStream(
 	try {
 		let response: ReturnType<typeof streamText>
 
-		const coreMessages = convertToCoreMessages(
+		const coreMessages = await convertToCoreMessages(
 			messages as OpenAI.ChatCompletionMessageParam[],
 		)
 
 
@@ -1,7 +1,12 @@
 'use server'
 
-import { eq } from 'drizzle-orm'
+import type { FileAttachment } from '@/lib/hooks/use-chat-attachments'
+import type { ThreadMetadata } from '@/lib/hooks/use-indexed-db'
+import { Storage } from '@google-cloud/storage'
+import { eq, inArray, isNotNull } from 'drizzle-orm'
+import { uniqBy } from 'lodash'
 import { db, message, thread } from 'mb-drizzle'
+import { appConfig } from 'mb-env'
 
 export async function doesMessageSlugExist(slug: string) {
 	const results = await db
@@ -30,3 +35,176 @@ export async function doesThreadSlugExist(slug: string) {
 			Number.parseFloat(results[0]?.slug.split('-').pop() as string) || 0,
 	}
 }
+
+export async function getUserThreadsMetadata(messageIds: string[]) {
+	const results = await db
+		.select({
+			threadId: thread.threadId,
+			slug: thread.slug,
+			metadata: thread.metadata,
+		})
+		.from(thread)
+		.innerJoin(message, eq(thread.threadId, message.threadId))
+		.where(inArray(message.messageId, messageIds))
+
+	if (results.length === 0) return null
+
+	return results[0]
+}
+
+export async function getAllUserThreadMetadata() {
+	const results = await db
+		.select({
+			metadata: thread.metadata,
+		})
+		.from(thread)
+		.where(isNotNull(thread.metadata))
+
+	if (results.length === 0) return null
+
+	const metadata = results.flatMap(
+		(result) => (result.metadata as ThreadMetadata).attachments,
+	)
+
+	return metadata
+}
+
+export async function updateThreadMetadata(
+	messagesIds: string[],
+	metadata: ThreadMetadata,
+) {
+	// First, select the threadIds that need to be updated
+	const threadsToUpdate = await db
+		.selectDistinct({
+			threadId: message.threadId,
+			messageId: message.messageId,
+		})
+		.from(message)
+		.where(inArray(message.messageId, messagesIds))
+
+	if (threadsToUpdate.length === 0) {
+		console.error(
+			'No threads found for the provided message IDs. Cannot update metadata.',
+		)
+		return {
+			threads: [],
+			attachments: {},
+		}
+	}
+
+	const threadsDataIds = threadsToUpdate.map(
+		(t) => [t.threadId as string, t.messageId] as const,
+	)
+
+	const attachments: ThreadMetadata = {}
+
+	let result: (typeof thread.$inferSelect)[] = []
+
+	let previousThreadId: string | null = null
+
+	for (const [threadId, messageId] of threadsDataIds) {
+		let relatedThreadAttachments = metadata.attachments.filter((att) =>
+			att.messageIds.includes(messageId),
+		)
+
+		if (previousThreadId === threadId) {
+			relatedThreadAttachments.push(...(attachments[threadId] || []))
+		}
+
+		previousThreadId = threadId
+		relatedThreadAttachments = uniqBy(relatedThreadAttachments, 'id')
+
+		// Then, update the threads using the selected threadIds
+		result = [
+			...result,
+			...(await db
+				.update(thread)
+				.set({
+					metadata: {
+						attachments: relatedThreadAttachments,
+					},
+				})
+				.where(eq(thread.threadId, threadId))
+				.returning()),
+		]
+
+		attachments[threadId] = relatedThreadAttachments
+	}
+
+	result = uniqBy(result, 'threadId')
+
+	return {
+		threads: result,
+		attachments,
+	}
+}
+
+export async function uploadAttachmentToBucket({
+	attachment,
+	threadSlug,
+}: {
+	attachment: FileAttachment
+	threadSlug: string
+}) {
+	const { id, name, contentType, content, size } = attachment
+
+	if (!content) {
+		throw new Error('Attachment content is required for upload')
+	}
+
+	const buffer: Buffer =
+		typeof content === 'string'
+			? Buffer.from(content.split(',')[1], 'base64')
+			: Buffer.from(content)
+	const byteSize = buffer.byteLength
+	const fileExtension = name.split('.').pop() || 'txt'
+	const bucketKey = `attachments/${threadSlug}/${name}`
+
+	console.log(
+		`Uploading attachment: ${name}, ID: ${id}, Size: ${size} bytes, Content-Type: ${contentType}`,
+	)
+
+	if (byteSize !== size) {
+		throw new Error(
+			`Attachment size mismatch: expected ${size} bytes, got ${byteSize} bytes`,
+		)
+	}
+
+	const storage = new Storage({
+		projectId: appConfig.features.storageProjectId,
+		credentials: {
+			client_email: appConfig.features.storageClientEmail,
+			private_key: appConfig.features.storageSecretAccessKey,
+		},
+	})
+	const bucket = storage.bucket(appConfig.features.storageBucketName)
+	const fileUpload = bucket.file(bucketKey)
+
+	await fileUpload.save(buffer, {
+		metadata: {
+			id,
+			fileExtension,
+			contentType,
+			threadSlug,
+		},
+		resumable: false,
+		// public: true,
+	})
+
+	const expires = Date.now() + 1000 * 60 * 60 * 24 * 7 // 7 days
+	const [signedUrl] = await fileUpload.getSignedUrl({
+		version: 'v4',
+		action: 'read',
+		expires,
+	})
+
+	return {
+		id,
+		name,
+		contentType,
+		url: signedUrl,
+		size: byteSize,
+		content: bucketKey, // Store the bucket key instead of the content
+		expires: new Date(expires).toISOString(),
+	}
+}
@@ -0,0 +1,70 @@
+import { uploadAttachmentToBucket } from '@/app/actions'
+import { logErrorToSentry } from '@/lib/sentry'
+import { appConfig } from 'mb-env'
+
+export async function POST(request: Request) {
+	const { attachment, thread } = await request.json()
+
+	if (!attachment || !thread) {
+		return new Response(
+			JSON.stringify({
+				error: 'Attachment and thread data are required.',
+			}),
+			{
+				status: 400,
+				headers: {
+					'Content-Type': 'application/json',
+				},
+			},
+		)
+	}
+
+	try {
+		const uploadResults = await uploadAttachmentToBucket({
+			attachment,
+			threadSlug: thread.slug,
+		})
+
+		if (appConfig.features.devMode) {
+			console.info(
+				'Attachment uploaded successfully to gCloud Bucket:',
+				uploadResults,
+			)
+		}
+
+		return new Response(
+			JSON.stringify({
+				data: uploadResults,
+				error: null,
+			}),
+		)
+	} catch (error) {
+		logErrorToSentry(
+			(error as Error)?.message || 'Failed to upload file to Bucket',
+			{
+				error,
+				message: 'Failed to complete chat.',
+				level: 'error',
+				extra: {
+					attachmentName: attachment.name,
+					attachmentContentType: attachment.contentType,
+					attachmentMessageIds: attachment.messageIds,
+					threadSlug: thread.slug,
+				},
+			},
+		)
+
+		return new Response(
+			JSON.stringify({
+				data: null,
+				error: 'Failed to upload attachment to Bucket.',
+			}),
+			{
+				status: 500,
+				headers: {
+					'Content-Type': 'application/json',
+				},
+			},
+		)
+	}
+}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+alter table "public"."thread" alter column "is_public" set default 'true';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+alter table "public"."thread" add column "metadata" jsonb null default null;`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ export async function createResponseStream(`
`341`	`341`	`try {`
`342`	`342`	`let response: ReturnType<typeof streamText>`
`343`	`343`
`344`		`- const coreMessages = convertToCoreMessages(`
	`344`	`+ const coreMessages = await convertToCoreMessages(`
`345`	`345`	`messages as OpenAI.ChatCompletionMessageParam[],`
`346`	`346`	`)`
`347`	`347`