Add gemini 2 pro (#1107)

agnaistic · Feb 11, 2025 · d69f79b · d69f79b
1 parent 3f8eab2
commit d69f79b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 25 deletions.
diff --git a/common/adapters.ts b/common/adapters.ts
@@ -282,6 +282,12 @@ export const GOOGLE_MODELS = {
   GEMINI_15_FLASH_8B: { id: 'gemini-1.5-flash-8b', label: 'Gemini 1.5 Flash 8B' },
   GEMINI_EXP_1114: { id: 'gemini-exp-1114', label: 'Gemini Exp 1114' },
   GEMINI_20_FLASH: { id: 'gemini-2.0-flash-exp', label: 'Gemini 2.0 Flash' },
+  GEMINI_20_FLASH_EXP: { id: 'gemini-2.0-flash-exp', label: 'Gemini 2.0 Flash Exp' },
+  GEMINI_20_FLASH_THINKING: {
+    id: 'gemini-2.0-flash-thinking-exp-01-21',
+    label: 'Gemini 2.0 Flash Thinking',
+  },
+  GEMINI_20_PRO_0205: { id: 'gemini-2.0-pro-exp-02-05', label: 'Gemini 2.0 02/05' },
 }
 
 export const GOOGLE_LIMITS: Record<string, number> = {

diff --git a/srv/adapter/agnaistic.ts b/srv/adapter/agnaistic.ts
@@ -128,9 +128,9 @@ export const handleAgnaistic: ModelAdapter = async function* (opts) {
   const srv = await getServerConfiguration()
 
   /**
-   * Lock per user per model
+   * Lock per user
    */
-  const lockId = `${opts.user._id}-${opts.subscription.preset.name}`
+  const lockId = `${opts.user._id}`
   if (!opts.guidance && +srv.lockSeconds > 0) {
     await obtainLock(lockId, srv.lockSeconds)
   }

diff --git a/srv/adapter/payloads.ts b/srv/adapter/payloads.ts
@@ -74,6 +74,7 @@ function getBasePayload(opts: AdapterProps, stops: string[] = []) {
     }
 
     const body: any = {
+      request_id: opts.requestId,
       prompt,
       context_limit: gen.maxContextLength,
       max_new_tokens: gen.maxTokens,

diff --git a/web/pages/Character/DownloadModal.tsx b/web/pages/Character/DownloadModal.tsx
@@ -1,13 +1,4 @@
-import {
-  Component,
-  Match,
-  Switch,
-  createEffect,
-  createMemo,
-  createSignal,
-  on,
-  onMount,
-} from 'solid-js'
+import { Component, Match, Switch, createEffect, createMemo, createSignal, on } from 'solid-js'
 import { AppSchema } from '/common/types/schema'
 import Select from '/web/shared/Select'
 import Modal from '/web/shared/Modal'
@@ -32,8 +23,18 @@ export const DownloadModal: Component<{
 }> = (props) => {
   let ref: any
   const [char, setChar] = createSignal<AppSchema.Character | undefined>(props.char)
-  onMount(async () => {
-    if (props.char) return
+
+  createEffect(async () => {
+    if (!props.char && !props.charId) {
+      setChar(undefined)
+      return
+    }
+
+    if (props.char) {
+      setChar(props.char)
+      return
+    }
+
     const res = await charsApi.getCharacterDetail(props.charId)
     if (res.result) {
       setChar(res.result)
@@ -80,8 +81,10 @@ export const DownloadModal: Component<{
   )
 
   const objectUrl = createMemo(() => {
+    if (!char()) return
+
     const url = URL.createObjectURL(
-      new Blob([charToJson(props.char || char()!, format())], { type: 'text/json' })
+      new Blob([charToJson(char()!, format())], { type: 'text/json' })
     )
     return url
   })
@@ -106,7 +109,7 @@ export const DownloadModal: Component<{
             </Match>
 
             <Match when={fileType() === 'png'}>
-              <Button onClick={() => downloadCharCard(props.char || props.charId, format())}>
+              <Button disabled={!char()} onClick={() => downloadCharCard(char()!, format())}>
                 <Save /> Download (PNG)
               </Button>
             </Match>

diff --git a/web/shared/ServiceWarning.tsx b/web/shared/ServiceWarning.tsx
@@ -59,15 +59,7 @@ const ServiceWarning: Component<{ preset?: Partial<AppSchema.GenSettings> }> = (
         </span>
       </Match>
 
-      <Match when={props.preset?.service === 'horde' && !user?.hordeName}>
-        <TitleCard type="orange">
-          Register at{' '}
-          <a class="link" href="https://aihorde.net/register" target="_blank">
-            AIHorde
-          </a>{' '}
-          for a better Horde experience.
-        </TitleCard>
-      </Match>
+      <Match when>{null}</Match>
     </Switch>
   )
 }