Merge pull request #56 from NillionNetwork/fix/various

fix/various

Author: psofiterol

docker-compose-nilcc.yaml

@@ -1,6 +1,6 @@
 services:
   app:
-    image: public.ecr.aws/x8g8t2h7/nilgpt:0.4.5
+    image: public.ecr.aws/x8g8t2h7/nilgpt:0.4.6
     container_name: nilGPT
     ports:
       - "3000:3000"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nil-gpt",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "private": true,
   "scripts": {
     "dev": "next dev",

src/app/api/createUser/route.ts

@@ -48,7 +48,18 @@ export async function POST(request: NextRequest) {
       console.error("User doesn't exist, proceeding with creation", readError);
     }
 
-    const creationTime = new Date().toISOString();
+    // Create a predictable creation time rounded to the closest 5 minutes
+    const now = new Date();
+    const minutes = now.getMinutes();
+    const roundedMinutes = Math.ceil(minutes / 5) * 5;
+    const creationTime = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate(),
+      now.getHours(),
+      roundedMinutes,
+    );
+    const creationTimeString = creationTime.toISOString();
 
     // Get UTM parameters from request body if provided
     let utmData: USER_SCHEMA["utm"];
@@ -64,7 +75,7 @@ export async function POST(request: NextRequest) {
     const userData: USER_SCHEMA = {
       _id: recordId,
       provider: auth.authProvider,
-      created_at: creationTime,
+      created_at: creationTimeString,
       ...(utmData && { utm: utmData }),
     };
 

src/components/AttestationModal.tsx

@@ -2,6 +2,7 @@ import { CheckCircle, Copy, RefreshCw } from "lucide-react";
 import { useState } from "react";
 import useDeployedMeasurementHash from "@/hooks/useDeployedMeasurementHash";
 import useNilCCMeasurementHash from "@/hooks/useNilCCMeasurementHash";
+import API_ENDPOINTS from "@/services/API/constants";
 import { LINKS } from "../constants";
 import {
   Accordion,
@@ -54,15 +55,15 @@ const AttestationModal = () => {
               </AccordionTrigger>
               <AccordionContent className="p-0 mt-1">
                 <p className="text-xs text-gray-600">
-                  You can do this yourself by hex encoding report.measurement
+                  You can do this yourself by fetching the report.measurement
                   from{" "}
                   <a
-                    href="https://nilgpt.xyz/nilcc/api/v1/report"
+                    href={API_ENDPOINTS.NILCC_GENERATE_REPORT}
                     target="_blank"
                     rel="noopener noreferrer"
                     className="text-blue-600 hover:text-blue-800 underline"
                   >
-                    https://nilgpt.xyz/nilcc/api/v1/report
+                    {API_ENDPOINTS.NILCC_GENERATE_REPORT}
                   </a>{" "}
                   .
                 </p>
@@ -79,7 +80,7 @@ const AttestationModal = () => {
                       GET
                     </span>
                     <code className="text-sm font-mono text-gray-600 bg-gray-100 px-1 py-0.5 rounded break-all">
-                      https://nilgpt.xyz/nilcc/api/v1/report
+                      {API_ENDPOINTS.NILCC_GENERATE_REPORT}
                     </code>
                   </div>
                   <Button

src/components/chat/PersonaSelector.tsx

@@ -1,5 +1,6 @@
 import { ChevronDown, Loader2, PlusIcon } from "lucide-react";
 import Image from "next/image";
+import { usePathname } from "next/navigation";
 import type React from "react";
 import { useEffect, useRef, useState } from "react";
 import {
@@ -26,12 +27,36 @@ const PersonaSelector: React.FC<PersonaSelectorProps> = ({
   onPersonaChange,
   disabled = false,
 }) => {
-  const { selectedPersona: selectedPersonaId, setSelectedPersona } = useApp();
+  const {
+    selectedPersona: selectedPersonaId,
+    setSelectedPersona,
+    chatHistory,
+  } = useApp();
   const { createChat, isCreatingChat } = useCreateChat();
   const [isOpen, setIsOpen] = useState(false);
+  const pathname = usePathname();
 
+  // Get current chat ID from pathname
+  const currentChatId = pathname?.match(/\/app\/chat\/(.+)/)?.[1];
+
+  // Determine which persona to show
+  const getCurrentPersona = () => {
+    // If we're in an existing chat, find the current chat's persona
+    if (currentChatId) {
+      const currentChat = chatHistory.find(
+        (chat) => chat._id === currentChatId,
+      );
+      if (currentChat?.persona) {
+        return currentChat.persona;
+      }
+    }
+    // Fall back to the selected persona from AppContext (for new chats)
+    return selectedPersonaId;
+  };
+
+  const currentPersonaId = getCurrentPersona();
   const selectedPersona =
-    personas.find((persona) => persona.id === selectedPersonaId) || personas[0];
+    personas.find((persona) => persona.id === currentPersonaId) || personas[0];
   const dropdownRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
@@ -112,7 +137,7 @@ const PersonaSelector: React.FC<PersonaSelectorProps> = ({
               <button
                 key={persona.id}
                 className={`block w-full text-left px-4 py-3 text-sm hover:bg-neutral-50 ${
-                  selectedPersona.id === persona.id
+                  currentPersonaId === persona.id
                     ? "text-neutral-900 bg-neutral-50"
                     : "text-neutral-700"
                 }`}
@@ -125,7 +150,7 @@ const PersonaSelector: React.FC<PersonaSelectorProps> = ({
                       {persona.description}
                     </div>
                   </div>
-                  {selectedPersona.id === persona.id && (
+                  {currentPersonaId === persona.id && (
                     <Image
                       src="/img/tick_icon.svg"
                       alt="Selected"

src/components/chat/Sidebar.tsx

@@ -184,21 +184,23 @@ const Sidebar: React.FC<SidebarProps> = ({ isCollapsed, onClose }) => {
 
               const finalChats = [...optimistic, ...realChats];
 
-              // Check if there's a UTM-based persona selection first (higher priority)
-              const utmParams = getStoredUTMParameters();
-              const personaFromUTM = getPersonaFromUTM(utmParams);
-
-              if (personaFromUTM) {
-                console.log(
-                  `UTM campaign detected, skipping latest chat persona selection`,
-                );
-              } else {
-                // Extract the latest persona from the most recent chat (fallback)
-                if (finalChats.length > 0) {
-                  const latestChat = finalChats[0]; // First chat is the most recent
-                  if (latestChat.persona) {
-                    // Set the persona in AppContext
-                    setSelectedPersona(latestChat.persona);
+              if (!currentChatId) {
+                // Check if there's a UTM-based persona selection first (higher priority)
+                const utmParams = getStoredUTMParameters();
+                const personaFromUTM = getPersonaFromUTM(utmParams);
+
+                if (personaFromUTM) {
+                  console.log(
+                    `UTM campaign detected, skipping latest chat persona selection`,
+                  );
+                } else {
+                  // Extract the latest persona from the most recent chat (fallback)
+                  if (finalChats.length > 0) {
+                    const latestChat = finalChats[0]; // First chat is the most recent
+                    if (latestChat.persona) {
+                      // Set the persona in AppContext
+                      setSelectedPersona(latestChat.persona);
+                    }
                   }
                 }
               }

src/hooks/useNilCCMeasurementHash.ts

@@ -1,6 +1,5 @@
 import { useState } from "react";
 import API from "@/services/API";
-import bytesToHex from "@/utils/bytesToHex";
 
 const useNilCCMeasurementHash = () => {
   const [measurementHash, setMeasurementHash] = useState<string | null>(null);
@@ -9,10 +8,10 @@ const useNilCCMeasurementHash = () => {
   const getMeasurementHash = async () => {
     setIsLoading(true);
     const response = await API.generateNilCCReport();
-    const measurement = response?.data?.report?.measurement ?? null;
+    const measurementHash = response?.data?.report?.measurement ?? null;
 
-    if (measurement) {
-      setMeasurementHash(bytesToHex(measurement));
+    if (measurementHash) {
+      setMeasurementHash(measurementHash);
     }
     setIsLoading(false);
   };

src/services/API/constants.ts

@@ -1,5 +1,5 @@
 const API_ENDPOINTS = {
-  NILCC_GENERATE_REPORT: "https://nilgpt.xyz/nilcc/api/v1/report",
+  NILCC_GENERATE_REPORT: "https://nilgpt.xyz/nilcc/api/v2/report",
 };
 
 export default API_ENDPOINTS;

src/services/API/types.ts

@@ -1,5 +1,5 @@
 export interface INilCCReportGenerationResponse {
   report: {
-    measurement: number[];
+    measurement: string;
   };
 }