Merge pull request #1315 from synapsy-ai/vNext

Version 3.2.5
synapsy-ai · Dec 22, 2024 · 744dad7 · 744dad7
2 parents 5a8c5fc + a54f564
commit 744dad7
Show file tree

Hide file tree

Showing 8 changed files with 1,142 additions and 3,291 deletions.
diff --git a/app/[lng]/create/create.tsx b/app/[lng]/create/create.tsx
@@ -159,7 +159,11 @@ export default function Create(props: Props) {
     let models: ModelList = { openAiModels: [], mistralModels: [] };
     let gpt4 = hasGpt4Access();
     for (let i = 0; i < availableModels.openAiModels.length; i++) {
-      if (availableModels.openAiModels[i].includes("gpt-4") && !gpt4) continue;
+      if (
+        availableModels.openAiModels[i].includes("gpt-4") ||
+        (availableModels.openAiModels[i].includes("o1") && !gpt4)
+      )
+        continue;
       models.openAiModels.push(availableModels.openAiModels[i]);
     }
     models.mistralModels = availableModels.mistralModels;
@@ -174,7 +178,8 @@ export default function Create(props: Props) {
     };
     for (let i = 0; i < m.openAiModels.length; i++) {
       if (
-        m.openAiModels[i].includes("gpt-4") &&
+        (m.openAiModels[i].includes("gpt-4") ||
+          m.openAiModels[i].includes("o1")) &&
         !m.openAiModels[i].includes("mini") &&
         !hasGpt4Access()
       ) {
@@ -271,7 +276,10 @@ export default function Create(props: Props) {
     setRes("");
 
     // If the user has selected GPT-4, check if they have access to the model
-    if (model.includes("gpt-4") && !model.includes("mini")) {
+    if (
+      (model.includes("gpt-4") && !model.includes("mini")) ||
+      model.includes("o1")
+    ) {
       if (gpt4Quotas <= 0) return;
       if (props.user && props.user && gpt4Quotas > 0) {
         let q = gpt4Quotas - 1;
@@ -461,16 +469,18 @@ export default function Create(props: Props) {
       </div>
       <div className="mx-auto grid w-full max-w-6xl items-start gap-6 md:grid-cols-[1fr_300px] lg:grid-cols-[1fr_350px]">
         <div className="grid gap-6">
-          {!unlimited && model.includes("gpt-4") && !model.includes("mini") && (
-            <Card className="border-violet-500 bg-violet-500/20 print:hidden">
-              <div className="m-2 flex items-center space-x-2">
-                <Info size={16} color="#8b5cf6" />
-                <p className="font-bold text-violet-500">
-                  {t("gpt-4-remaining-quotas")} {gpt4Quotas}
-                </p>
-              </div>
-            </Card>
-          )}
+          {!unlimited &&
+            (model.includes("gpt-4") || model.includes("o1")) &&
+            !model.includes("mini") && (
+              <Card className="border-violet-500 bg-violet-500/20 print:hidden">
+                <div className="m-2 flex items-center space-x-2">
+                  <Info size={16} color="#8b5cf6" />
+                  <p className="font-bold text-violet-500">
+                    {t("gpt-4-remaining-quotas")} {gpt4Quotas}
+                  </p>
+                </div>
+              </Card>
+            )}
           <Card className="print:hidden">
             <CardHeader>
               <CardTitle>{t("prompt")}</CardTitle>

diff --git a/app/[lng]/settings/page.tsx b/app/[lng]/settings/page.tsx
@@ -9,7 +9,6 @@ import {
   Trash,
 } from "lucide-react";
 import { useTranslation } from "../../i18n/client";
-import { Separator } from "@/components/ui/separator";
 import { Button } from "@/components/ui/button";
 import { useTheme } from "next-themes";
 import { FontType, Settings } from "@/lib/settings";
@@ -43,7 +42,6 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { m } from "framer-motion";
 import {
   Card,
   CardContent,
@@ -250,7 +248,11 @@ export default function SettingsPage({
                     <TabsContent value="openAI">
                       <div>
                         {models.openAiModels
-                          ?.filter((s) => s.toLowerCase().startsWith("gpt"))
+                          ?.filter(
+                            (s) =>
+                              s.toLowerCase().startsWith("gpt") ||
+                              s.toLowerCase().startsWith("o1"),
+                          )
                           .filter((s) =>
                             s.toLowerCase().includes(modelQuery.toLowerCase()),
                           )
@@ -267,7 +269,10 @@ export default function SettingsPage({
                     <TabsContent value="mistral">
                       <div>
                         {models.mistralModels
-                          ?.filter((s) =>
+                          ?.filter(
+                            (s) => !s.toLowerCase().startsWith("pixtral"),
+                          )
+                          .filter((s) =>
                             s.toLowerCase().includes(modelQuery.toLowerCase()),
                           )
                           .map((m, i) => (

diff --git a/components/model-selector.tsx b/components/model-selector.tsx
@@ -43,18 +43,20 @@ export default function ModelSelector({
           <ScrollArea className="h-[200px]">
             {tab === "openAI" &&
               avModels.openAiModels
-                .filter((m) => m.startsWith("gpt"))
+                .filter((m) => m.startsWith("gpt") || m.startsWith("o1"))
                 .map((el, i) => (
                   <SelectItem key={i} value={el}>
                     {getModelString(el)}
                   </SelectItem>
                 ))}
             {tab === "mistral" &&
-              avModels.mistralModels.map((el, i) => (
-                <SelectItem key={i} value={el}>
-                  {getModelString(el)}
-                </SelectItem>
-              ))}
+              avModels.mistralModels
+                .filter((m) => !m.includes("pixtral"))
+                .map((el, i) => (
+                  <SelectItem key={i} value={el}>
+                    {getModelString(el)}
+                  </SelectItem>
+                ))}
             <TabsContent value="mistral"></TabsContent>
           </ScrollArea>
         </Tabs>

diff --git a/lib/models.ts b/lib/models.ts
@@ -19,6 +19,20 @@ const modelStrings: { [key: string]: string } = {
   "gpt-4o-mini-2024-07-18": "GPT-4o Mini (07/2024)",
   "gpt-4o-mini-2024-08-06": "GPT-4o Mini (08/2024)",
   "gpt-4o-2024-08-06": "GPT-4o (08/2024)",
+  "gpt-4o-2024-11-20": "GPT-4o (11/2024)",
+  "gpt-4o-audio-preview-2024-10-01": "GPT-4o Audio Preview (10/2024)",
+  "gpt-4o-audio-preview": "GPT-4o Audio Preview",
+  "gpt-4o-mini-audio-preview-2024-12-17": "GPT-4o Mini Audio Preview (12/2024)",
+  "gpt-4o-mini-audio-preview": "GPT-4o Mini Audio Preview",
+  "gpt-4o-realtime-preview-2024-10-01": "GPT-4o Realtime Preview (10/2024)",
+  "gpt-4o-realtime-preview": "GPT-4o Realtime Preview",
+  "gpt-4o-mini-realtime-preview-2024-12-17":
+    "GPT-4o Mini Realtime Preview (12/2024)",
+  "gpt-4o-mini-realtime-preview": "GPT-4o Mini Realtime Preview",
+  "o1-mini-2024-09-12": "o1 Mini (09/2024)",
+  "o1-mini": "o1 Mini",
+  "o1-preview-2024-09-12": "o1 Preview (09/2024)",
+  "o1-preview": "o1 Preview",
   "gpt-3.5-turbo-16k": "GPT-3.5 Turbo (16k)",
   "gpt-3.5-turbo-0613": "GPT-3.5 Turbo (06/2023)",
   "gpt-3.5-turbo-16k-0613": "GPT-3.5 Turbo (16k - 06/2023)",
@@ -36,13 +50,15 @@ const modelStrings: { [key: string]: string } = {
   "mistral-embed": "Mistral Embed",
   "mistral-large-2402": "Mistral Large (2402)",
   "mistral-large-2407": "Mistral Large (2407)",
+  "mistral-large-2411": "Mistral Large (2411)",
   "mistral-large-latest": "Mistral Large (Latest)",
   "mistral-medium": "Mistral Medium",
   "mistral-medium-2312": "Mistral Medium (2312)",
   "mistral-medium-latest": "Mistral Medium (Latest)",
   "mistral-small": "Mistral Small",
   "mistral-small-2312": "Mistral Small (2312)",
   "mistral-small-2402": "Mistral Small (2402)",
+  "mistral-small-2409": "Mistral Small (2409)",
   "mistral-small-latest": "Mistral Small (Latest)",
   "mistral-tiny": "Mistral Tiny",
   "mistral-tiny-2312": "Mistral Tiny (2312)",
@@ -55,6 +71,12 @@ const modelStrings: { [key: string]: string } = {
   "open-mixtral-8x22b": "Open Mixtral 8x22B",
   "open-mixtral-8x22b-2404": "Open Mixtral 8x22B (2404)",
   "open-mixtral-8x7b": "Open Mixtral 8x7B",
+  "ministral-3b-2410": "Ministral 3B (2410)",
+  "ministral-3b-latest": "Ministral 3B (Latest)",
+  "ministral-8b-2410": "Ministral 8B (2410)",
+  "ministral-8b-latest": "Ministral 8B (Latest)",
+  "mistral-moderation-2411": "Mistral Moderation (2411)",
+  "mistral-moderation-latest": "Mistral Moderation (Latest)",
 };
 
 export function getModelString(id: string): string {

diff --git a/lib/version.ts b/lib/version.ts
@@ -1 +1 @@
-export const version = "3.2.4";
+export const version = "3.2.5";
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const version = "3.2.4";
		export const version = "3.2.5";