Merge pull request #57 from NeurProjects/release/0.1.10

v0.1.10 Update

Author: backwardsmap

CHANGELOGS.md

@@ -1,5 +1,10 @@
 # Changelogs
 
+## v0.1.10
+
+- Message token tracking (model usage) for backend analysis
+- Fixes to solana-agent-kit implementation for decimal handling
+
 ## v0.1.9
 
 - Use correct messages when trimming the message context for gpt4o

package.json

@@ -1,6 +1,6 @@
 {
   "name": "neur-app",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "private": true,
   "scripts": {
     "vercel-build": "pnpm npx prisma generate && next build",
@@ -60,7 +60,7 @@
     "react-tweet": "^3.2.1",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
-    "solana-agent-kit": "^1.2.0",
+    "solana-agent-kit": "1.3.2",
     "sonner": "^1.7.1",
     "swr": "^2.2.5",
     "tailwind-merge": "^2.5.5",
@@ -87,5 +87,10 @@
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2"
   },
-  "packageManager": "pnpm@9.15.1+sha512.1acb565e6193efbebda772702950469150cf12bcc764262e7587e71d19dc98a423dff9536e57ea44c49bdf790ff694e83c27be5faa23d67e0c033b583be4bfcf"
+  "packageManager": "pnpm@9.15.1+sha512.1acb565e6193efbebda772702950469150cf12bcc764262e7587e71d19dc98a423dff9536e57ea44c49bdf790ff694e83c27be5faa23d67e0c033b583be4bfcf",
+  "pnpm": {
+    "patchedDependencies": {
+      "solana-agent-kit": "patches/solana-agent-kit.patch"
+    }
+  }
 }

patches/solana-agent-kit.patch

@@ -0,0 +1,13 @@
+diff --git a/dist/tools/trade.js b/dist/tools/trade.js
+index 280aa7564613238857477f791f7f7522a8faca83..47ad1ffee7884cb6a2e19e00d410fb2677ad8e2c 100644
+--- a/dist/tools/trade.js
++++ b/dist/tools/trade.js
+@@ -29,7 +29,7 @@ async function trade(agent, outputMint, inputAmount, inputMint = constants_1.TOK
+             `&amount=${scaledAmount}` +
+             `&slippageBps=${slippageBps}` +
+             `&onlyDirectRoutes=true` +
+-            `&maxAccounts=20` +
++            `&maxAccounts=64` +
+             `${agent.config.JUPITER_FEE_BPS ? `&platformFeeBps=${agent.config.JUPITER_FEE_BPS}` : ""}`)).json();
+         // Get serialized transaction
+         let feeAccount;

pnpm-lock.yaml

@@ -0,0 +1,17 @@
+-- CreateTable
+CREATE TABLE "token_stats" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "messageIds" TEXT[],
+    "totalTokens" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "token_stats_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "token_stats_userId_key" ON "token_stats"("userId");
+
+-- AddForeignKey
+ALTER TABLE "token_stats" ADD CONSTRAINT "token_stats_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20250102065518_add_message_tokens/migration.sql

@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX "token_stats_userId_key";

prisma/migrations/20250102200737_message_tokens_drop_unique_user_id/migration.sql

@@ -0,0 +1,10 @@
+/*
+  Warnings:
+
+  - Added the required column `completionTokens` to the `token_stats` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `promptTokens` to the `token_stats` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "token_stats" ADD COLUMN     "completionTokens" INTEGER NOT NULL,
+ADD COLUMN     "promptTokens" INTEGER NOT NULL;

prisma/migrations/20250103193523_token_stats_multiple_types/migration.sql

@@ -18,6 +18,7 @@ model User {
 
   wallets       Wallet[]
   conversations Conversation[]
+  tokenStats    TokenStat[]
 
   @@map("users")
 }
@@ -62,6 +63,21 @@ model Message {
   @@map("messages")
 }
 
+model TokenStat {
+  id                  String   @id @default(cuid())
+  userId              String
+  messageIds          String[]
+  promptTokens        Int
+  completionTokens    Int
+  totalTokens         Int
+  createdAt           DateTime @default(now())
+  updatedAt           DateTime @updatedAt
+
+  user User @relation(fields: [userId], references: [id])
+
+  @@map("token_stats")
+}
+
 enum Visibility {
   PRIVATE
   PUBLIC

prisma/schema.prisma

@@ -21,6 +21,7 @@ const claude35Sonnet = anthropic('claude-3-5-sonnet-20241022');
 const openai = createOpenAI({
   baseURL: process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1',
   apiKey: process.env.OPENAI_API_KEY,
+  compatibility: 'strict',
 });
 const gpt4o = openai('gpt-4o');
 

src/ai/providers.tsx

@@ -124,6 +124,15 @@ const OrdersResult = ({ orders }: { orders: DexScreenerOrder[] }) => {
 };
 
 const TokenProfile = ({ pair }: { pair: DexScreenerPair }) => {
+  if (!pair) {
+    return (
+      <Card className="bg-muted/50 p-4">
+        <p className="text-sm text-muted-foreground">
+          Token not found on DexScreener.
+        </p>
+      </Card>
+    );
+  }
   return (
     <Card className="space-y-4 bg-muted/50 p-4">
       <div className="flex items-center gap-3">
@@ -372,8 +381,6 @@ export const dexscreenerTools = {
           },
         );
 
-        console.log(response);
-
         if (!response.ok) {
           throw new Error(
             `Failed to fetch token profile: ${response.statusText}`,
@@ -382,7 +389,7 @@ export const dexscreenerTools = {
 
         const data = (await response.json()) as DexScreenerPairResponse;
 
-        if (!data.pairs.length) {
+        if (data.pairs === null || !data.pairs.length) {
           throw new Error('No pair data found');
         }
 
@@ -395,9 +402,10 @@ export const dexscreenerTools = {
           data: sortedPairs[0],
         };
       } catch (error) {
-        throw new Error(
-          `Failed to get token profile: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        );
+        return {
+          suppressFollowUp: false,
+          data: null,
+        };
       }
     },
     render: (raw: unknown) => {

src/ai/solana/dexscreener.tsx

@@ -369,26 +369,14 @@ const swap = {
           throw new Error('Failed to retrieve agent');
         }
 
-        // temporary fix for agent kit
-        // if inputMint != So11111111111111111111111111111111111111112
-        // decimals = 6
-        // else
-        // decimals = 9
-        const decimals =
-          inputMint === 'So11111111111111111111111111111111111111112'
-            ? 10 ** 9
-            : 10 ** 6;
-
-        const fixedAmount = (amount * decimals) / LAMPORTS_PER_SOL;
-
         console.log('[swapTokens] inputMint', inputMint);
         console.log('[swapTokens] outputMint', outputMint);
-        console.log('[swapTokens] fixedAmount', fixedAmount);
+        console.log('[swapTokens] amount', amount);
         console.log('[swapTokens] slippageBps', slippageBps);
 
         const signature = await agent.trade(
           new PublicKey(outputMint),
-          fixedAmount,
+          amount,
           new PublicKey(inputMint),
           slippageBps,
         );

src/ai/solana/solana.tsx

@@ -339,13 +339,19 @@ function ChatMessage({
                       console.warn('Failed to parse image URL:', e);
                     }
 
+                    const thumbnailPattern = /_thumb\.(png|jpg|jpeg|gif)$/i;
+                    const isThumbnail = thumbnailPattern.test(src);
+
+                    const width = isThumbnail ? 40 : 500;
+                    const height = isThumbnail ? 40 : 300;
+
                     // Fallback to Image component with default dimensions
                     return (
                       <Image
                         src={src}
                         alt={alt || ''}
-                        width={500}
-                        height={300}
+                        width={width}
+                        height={height}
                         className="inline-block align-middle"
                       />
                     );

src/app/(user)/chat/[id]/chat-interface.tsx

@@ -26,6 +26,7 @@ import { verifyUser } from '@/server/actions/user';
 import {
   dbCreateConversation,
   dbCreateMessages,
+  dbCreateTokenStat,
   dbDeleteConversation,
   dbGetConversation,
 } from '@/server/db/queries';
@@ -69,7 +70,7 @@ export async function POST(req: Request) {
       revalidatePath('/api/conversations');
     }
 
-    await dbCreateMessages({
+    const newUserMessage = await dbCreateMessages({
       messages: [
         {
           conversationId,
@@ -144,14 +145,16 @@ export async function POST(req: Request) {
 
       maxSteps: 15,
       messages: relevantMessages,
-      async onFinish({ response }) {
+      async onFinish({ response, usage }) {
         if (!userId) return;
 
         try {
           const sanitizedResponses = sanitizeResponseMessages(
             response.messages,
           );
-          await dbCreateMessages({
+
+          // Create messages and get their IDs back
+          const messages = await dbCreateMessages({
             messages: sanitizedResponses.map((message) => {
               return {
                 conversationId,
@@ -161,6 +164,28 @@ export async function POST(req: Request) {
             }),
           });
 
+          // Save the token stats
+          if (
+            messages &&
+            newUserMessage &&
+            !isNaN(usage.promptTokens) &&
+            !isNaN(usage.completionTokens) &&
+            !isNaN(usage.totalTokens)
+          ) {
+            const messageIds = newUserMessage
+              .concat(messages)
+              .map((message) => message.id);
+            const { promptTokens, completionTokens, totalTokens } = usage;
+
+            await dbCreateTokenStat({
+              userId,
+              messageIds,
+              promptTokens,
+              completionTokens,
+              totalTokens,
+            });
+          }
+
           revalidatePath('/api/conversations');
         } catch (error) {
           console.error('[chat/route] Failed to save messages', error);

src/app/api/chat/route.ts

@@ -69,7 +69,7 @@ export async function dbCreateMessages({
   messages: Omit<PrismaMessage, 'id' | 'createdAt'>[];
 }) {
   try {
-    return await prisma.message.createMany({
+    return await prisma.message.createManyAndReturn({
       data: messages as Prisma.MessageCreateManyInput[],
     });
   } catch (error) {
@@ -162,3 +162,34 @@ export async function dbGetConversations({ userId }: { userId: string }) {
     return [];
   }
 }
+
+export async function dbCreateTokenStat({
+  userId,
+  messageIds,
+  totalTokens,
+  promptTokens,
+  completionTokens,
+}: {
+  userId: string;
+  messageIds: string[];
+  totalTokens: number;
+  promptTokens: number;
+  completionTokens: number;
+}) {
+  try {
+    return await prisma.tokenStat.create({
+      data: {
+        userId,
+        messageIds,
+        totalTokens,
+        promptTokens,
+        completionTokens,
+      },
+    });
+  } catch (error) {
+    console.error('[DB Error] Failed to create token stats:', {
+      error,
+    });
+    return null;
+  }
+}