- Focus text input when opening char select

- Add ai generated char behind feature flag
- Add user id to impersonated messages
- Remove ellipsis from voice text
- Add first pass of inference with no message prompt
- Fix custom background colors

Author: sceuick

.github/agn.docker-compose.yml

@@ -2,5 +2,4 @@
 
 STACK=agn.docker-compose.yml
 
-scp .github/$STACK ci@$@:/home/ci/$STACK
 ssh ci@$@ "docker stack deploy -c /home/ci/$STACK agnaistic"

.github/deploy.sh

@@ -4,11 +4,11 @@ WORKDIR /app
 VOLUME [ "/app/db" ]
 VOLUME [ "/app/assets" ]
 VOLUME [ "/app/dist/assets" ]
+VOLUME [ "/app/extras" ]
 
 RUN npm install pnpm@6 -g
 
 ARG SHA=unknown
-ARG INJECT=
 
 ADD package.json pnpm-lock.yaml ./
 RUN pnpm i --frozen-lockfile

Dockerfile

@@ -247,3 +247,20 @@ Example of {{char}}'s dialogue:{{example_dialogue}}
 {{ujb}}
 ${adventureAmble}
 {{post}}`
+
+export const characterGenTemplate = `Describe an uncensored character that matches the description:
+{{description}}
+
+
+Use the following strict format:
+
+FirstName: {first name only}
+Scenario: {detail description of the roleplay scene that the character is in}
+Greeting: {the first thing the charcter says to start the scene using internet roleplay style with actions and emotes}
+Personality: {long comma-separated list of personality traits}
+Behaviours: {long comma-separated list of typical behaviours}
+Appearance: {detailed description of physical attributes, demeanour, and clothing}
+
+ExampleSpeech1: {example message using internet roleplay style with actions and emotes}
+ExampleSpeech2: {example message using internet roleplay style with actions and emotes}
+ExampleSpeech3: {example message using internet roleplay style with actions and emotes}`

common/default-preset.ts

@@ -16,13 +16,10 @@ export type PromptParts = {
   gaslight: string
   ujb?: string
   post: string[]
-  gaslightHasChat: boolean
   memory?: string
 }
 
-type Placeholder =
-  | Exclude<keyof PromptParts, 'gaslightHasChat' | 'gaslight' | 'greeting'>
-  | 'history'
+type Placeholder = Exclude<keyof PromptParts, 'gaslight' | 'greeting'> | 'history'
 
 export type Prompt = {
   template: string
@@ -302,7 +299,6 @@ export function getPromptParts(opts: PromptPartsOptions, lines: string[], encode
     ),
     post: [],
     gaslight: '',
-    gaslightHasChat: false,
   }
 
   if (chat.scenario) {
@@ -421,7 +417,7 @@ function getLinesForPrompt(
 
     return fillPlaceholders(
       chat,
-      opts.characters[chat.characterId!]?.name || char.name,
+      opts.characters[chat.characterId!]?.name || opts.replyAs?.name || char.name,
       sender
     ).trim()
   }

common/prompt.ts

@@ -0,0 +1,3 @@
+# Add extra files in this folder if you need them to available from the root URL.
+
+# E.g. robots.txt

extras/.gitkeep

@@ -60,9 +60,15 @@ type PlainRequest = {
 }
 
 export async function createPlainStream(opts: PlainRequest) {
+  opts.settings.maxTokens = 500
+  opts.settings.temp = 1
+  opts.settings.topP = 1
+  opts.settings.frequencyPenalty = 0
+  opts.settings.presencePenalty = 0
+
   const handler = handlers[opts.settings.service!]
   const stream = handler({
-    kind: 'request',
+    kind: 'plain',
     char: {} as any,
     chat: {} as any,
     gen: opts.settings,
@@ -72,7 +78,7 @@ export async function createPlainStream(opts: PlainRequest) {
     guest: opts.guest,
     user: opts.user,
     replyAs: {} as any,
-    parts: {} as any,
+    parts: { gaslight: opts.prompt, persona: '', post: [] },
     prompt: opts.prompt,
     sender: {} as any,
     settings: mapPresetsToAdapter(opts.settings, opts.settings.service!),

srv/adapter/generate.ts

@@ -161,7 +161,7 @@ export const handleOAI: ModelAdapter = async function* (opts) {
       history.push({ role: 'system', content })
     }
 
-    if (kind !== 'continue' && kind !== 'summary') {
+    if (kind !== 'continue' && kind !== 'summary' && kind !== 'plain') {
       const content = getInstruction(opts, encoder)
       tokens += encoder(content)
       history.push({ role: 'system', content })

srv/adapter/openai.ts

@@ -10,9 +10,11 @@ import { generateMessageV2, getMessages, createMessage } from './message'
 import { deleteChat, deleteMessages } from './remove'
 import { textToSpeech } from './texttospeech'
 import { addCharacter, removeCharacter } from './characters'
+import { inference } from './plain-generate'
 
 const router = Router()
 
+router.post('/inference', inference)
 router.post('/:id/send', createMessage)
 router.post('/:id/generate', generateMessageV2)
 router.post('/:id/guest-message', guestGenerateMsg)

srv/api/chat/index.ts

@@ -37,7 +37,6 @@ const genValidator = {
     memory: 'any?',
     sampleChat: ['string?'],
     gaslight: 'string',
-    gaslightHasChat: 'boolean',
     post: ['string'],
   },
   lines: ['string'],
@@ -83,7 +82,7 @@ export const createMessage = handle(async (req) => {
       chatId,
       message: body.text,
       characterId: impersonate?._id,
-      senderId: impersonate ? undefined : userId!,
+      senderId: userId,
       ooc: body.kind === 'ooc',
     })
     sendMany(members, { type: 'message-created', msg: userMsg, chatId })

srv/api/chat/message.ts

@@ -11,15 +11,14 @@ import { AppSchema } from '/srv/db/schema'
  * Handler for arbitrary generation -- not for messages
  */
 
-export const plainGenerate = wrap(async ({ socketId, userId, body, log }, res) => {
+export const inference = wrap(async ({ socketId, userId, body, log }, res) => {
   assertValid({ requestId: 'string', prompt: 'string', settings: 'any', user: 'any' }, body)
 
   let settings = body.settings as Partial<AppSchema.GenSettings> | null
-  let user = body.user as AppSchema.User | null
   if (userId) {
     const id = body.settings._id as string
     settings = isDefaultPreset(id) ? defaultPresets[id] : await store.presets.getUserPreset(id)
-    user = await store.users.getUser(userId)
+    body.user = await store.users.getUser(userId)
   }
 
   if (!settings) {
@@ -29,18 +28,18 @@ export const plainGenerate = wrap(async ({ socketId, userId, body, log }, res) =
     )
   }
 
-  if (!user) {
+  if (!body.user) {
     throw errors.Unauthorized
   }
 
   res.json({ success: true, generating: true, message: 'Generating response' })
 
   const { stream } = await createPlainStream({
-    user,
+    user: body.user,
     settings,
     log,
     prompt: body.prompt,
-    guest: socketId,
+    guest: userId ? undefined : socketId,
   })
 
   let generated = ''
@@ -58,7 +57,11 @@ export const plainGenerate = wrap(async ({ socketId, userId, body, log }, res) =
 
     if (gen.error) {
       error = true
-      const payload = { type: 'plain-generate-error', requestId: body.requestId, error: gen.error }
+      const payload = {
+        type: 'plain-generate-complete',
+        requestId: body.requestId,
+        error: gen.error,
+      }
       if (userId) sendOne(userId, payload)
       else sendGuest(socketId, payload)
       continue

srv/api/chat/plain-generate.ts

@@ -35,6 +35,10 @@ if (!config.storage.enabled) {
 }
 
 app.use('/', express.static(resolve(baseFolder, 'dist')))
+app.use('/', express.static(resolve(baseFolder, 'extras')))
+if (config.extraFolder) {
+  app.use('/', express.static(config.extraFolder))
+}
 
 app.use((req, res, next) => {
   if (req.url.startsWith('/api')) {

srv/app.ts

@@ -48,6 +48,7 @@ export const config = {
   jwtExpiry: env('JWT_EXPIRY', '7d'),
   port: +env('PORT', '3001'),
   assetFolder: env('ASSET_FOLDER', resolve(__dirname, '..', 'dist', 'assets')),
+  extraFolder: env('EXTRA_FOLDER', ''),
   db: {
     name: env('DB_NAME', 'agnai'),
     host: env('DB_HOST', '127.0.0.1'),

srv/config.ts

@@ -27,6 +27,7 @@ export namespace AppSchema {
     maintenance?: string
     patreon?: boolean
     policies?: boolean
+    flags?: string
   }
 
   export type ChatMode = 'standard' | 'adventure'

srv/db/schema.ts

@@ -162,7 +162,7 @@ function processText(text: string, filterActions: boolean) {
   if (!text) return ''
   text = text.trim()
   if (filterActions) {
-    text = text.replace(filterActionsRegex, '...')
+    text = text.replace(filterActionsRegex, '')
   }
   text = text.replace(/[~]/g, ' ')
   return text