merging master into development (#61)

merging master into development to bring development up-to-speed with master

Author: Kabeer2004

src/client/app/personality-test/page.js

@@ -9,6 +9,7 @@ import AnimatedLogo from "@components/AnimatedLogo" // Component for displaying
 import ShiningButton from "@components/ShiningButton" // Custom button component with a shining effect
 import AnimatedBeam from "@components/AnimatedBeam" // Component for animated beam effect
 import ShinyCard from "@components/ShinyCard" // Custom card component with a shiny effect
+import ModelSelection from "@components/ModelSelection"
 import toast from "react-hot-toast" // Library for displaying toast notifications
 
 /**
@@ -169,6 +170,7 @@ const PersonalityTest = () => {
 	const [isReferred, setIsReferred] = useState(null) // isReferred: boolean | null
 	// State to store the referral code entered by the user.
 	const [referralCode, setReferralCode] = useState("") // referralCode: string
+	const [showModelSelection, setShowModelSelection] = useState(false)
 
 	/**
 	 * useEffect hook to fetch existing personality data on component mount.

src/client/components/ModelSelection.js

@@ -0,0 +1,135 @@
+import React, { useState, useEffect } from "react"
+import ShiningButton from "@components/ShiningButton"
+import ModalDialog from "@components/ModalDialog" // Assume this is available
+import toast from "react-hot-toast"
+
+const ModelSelection = ({ onProceed }) => {
+	const [availableModels, setAvailableModels] = useState([])
+	const [selectedModel, setSelectedModel] = useState("")
+	const [apiKeyDialog, setApiKeyDialog] = useState(false)
+	const [apiKey, setApiKey] = useState("")
+	const [selectedProvider, setSelectedProvider] = useState("")
+
+	const cloudModels = [
+		{ name: "OpenAI", value: "openai" },
+		{ name: "Gemini", value: "gemini" },
+		{ name: "Claude", value: "claude" }
+	]
+
+	useEffect(() => {
+		const fetchModels = async () => {
+			try {
+				const models = await window.electron.invoke("get-ollama-models")
+				setAvailableModels(models)
+				// Set a default model: first local model or first cloud model
+				if (models.length > 0) {
+					setSelectedModel(models[0])
+					await saveModel(models[0])
+				} else {
+					setSelectedModel(cloudModels[0].value)
+					await handleCloudModelSelection(cloudModels[0].value)
+				}
+			} catch (error) {
+				toast.error("Error fetching available models.")
+			}
+		}
+		fetchModels()
+	}, [])
+
+	const saveModel = async (model) => {
+		try {
+			await window.electron.invoke("set-db-data", {
+				data: { selectedModel: model }
+			})
+		} catch (error) {
+			toast.error("Error saving model selection.")
+		}
+	}
+
+	const handleModelChange = async (model) => {
+		setSelectedModel(model)
+		if (cloudModels.some((m) => m.value === model)) {
+			await handleCloudModelSelection(model)
+		} else {
+			await saveModel(model)
+		}
+	}
+
+	const handleCloudModelSelection = async (model) => {
+		setSelectedProvider(model)
+		const hasKey = await window.electron.invoke("check-api-key", model)
+		if (!hasKey) {
+			setApiKeyDialog(true)
+		} else {
+			await saveModel(model)
+		}
+	}
+
+	const handleApiKeySubmit = async () => {
+		try {
+			await window.electron.invoke("set-api-key", {
+				provider: selectedProvider,
+				apiKey
+			})
+			await saveModel(selectedProvider)
+			setApiKeyDialog(false)
+			setApiKey("")
+			toast.success("API key saved and model selected.")
+		} catch (error) {
+			toast.error("Error saving API key.")
+		}
+	}
+
+	return (
+		<div className="w-4/5 max-w-lg font-Poppins bg-matteblack p-10 rounded-2xl shadow-2xl text-white">
+			<h2 className="text-3xl font-bold mb-6 text-center">
+				Select AI Model
+			</h2>
+			<p className="text-gray-300 mb-4 text-center">
+				Choose a model to power your knowledge graph.
+			</p>
+			<select
+				value={selectedModel}
+				onChange={(e) => handleModelChange(e.target.value)}
+				className="bg-transparent border-2 border-gray-400 text-white p-2 rounded-xl pr-4 w-full mb-4"
+			>
+				{cloudModels.map((model) => (
+					<option
+						className="bg-matteblack"
+						key={model.value}
+						value={model.value}
+					>
+						{model.name} (Cloud)
+					</option>
+				))}
+				{availableModels.map((model) => (
+					<option className="bg-matteblack" key={model} value={model}>
+						{model} (Local)
+					</option>
+				))}
+				{availableModels.length === 0 && (
+					<option className="bg-matteblack" value="" disabled>
+						No local models available.
+					</option>
+				)}
+			</select>
+			{apiKeyDialog && (
+				<ModalDialog
+					title={`Enter API Key for ${selectedProvider}`}
+					description="Please enter your API key to use this model."
+					onCancel={() => setApiKeyDialog(false)}
+					onConfirm={handleApiKeySubmit}
+					confirmButtonText="Save"
+					showInput={true}
+					inputValue={apiKey}
+					onInputChange={setApiKey}
+				/>
+			)}
+			<ShiningButton onClick={onProceed} className="w-full mt-4">
+				Continue
+			</ShiningButton>
+		</div>
+	)
+}
+
+export default ModelSelection

src/server/agents/functions.py

@@ -148,7 +148,7 @@ async def create_message(to: str, subject: str, message: str) -> str:
         print(type(elaborated_message))
 
         msg = MIMEText(
-            elaborated_message
+            elaborated_message["email"]["body"]
             + "\n\nThis email was sent via Sentient, a personal AI companion with agentic integrations and graph memory.\n\nLearn more at https://existence.technology/sentient\n\n Emails are generated by AI models and may not always be accurate or contextually relevant."
         )
         msg.add_header("To", to)