update server and hass integration

custom_components/ava/__init__.py

@@ -167,20 +167,20 @@ async def async_process(
                 response=intent_response, conversation_id=conversation_id
             )
 
-        messages.append(query_response.message.model_dump(exclude_none=True))
+        messages.append(query_response.message)
         self.history[conversation_id] = messages
 
         self.hass.bus.async_fire(
             EVENT_CONVERSATION_FINISHED,
             {
-                "response": query_response.response.model_dump(),
+                "response": query_response.message,
                 "user_input": user_input,
                 "messages": messages,
             },
         )
 
         intent_response = intent.IntentResponse(language=user_input.language)
-        intent_response.async_set_speech(query_response.message.content)
+        intent_response.async_set_speech(query_response.message)
         return conversation.ConversationResult(
             response=intent_response, conversation_id=conversation_id
         )
@@ -190,7 +190,7 @@ def _generate_system_message(
     ):
         raw_prompt = self.entry.options.get(CONF_PROMPT, DEFAULT_PROMPT)
         prompt = self._async_generate_prompt(raw_prompt, exposed_entities, user_input)
-        return {"role": "system", "content": prompt}
+        return {"role": "user", "content": prompt}
 
     def _async_generate_prompt(
         self,
@@ -248,8 +248,6 @@ async def query(
             user=user_input.conversation_id,
         )
 
-        _LOGGER.info("Response %s", response.model_dump(exclude_none=True))
-
         choice: Choice = response.choices[0]
         message = choice.message
 

docs/tsconfig.json

@@ -1,4 +1,4 @@
 {
   // https://nuxt.com/docs/guide/concepts/typescript
-  "extends": "./.nuxt/tsconfig.json"
+  "extends": ["./.nuxt/tsconfig.json", "../tsconfig.json"]
 }

package.json

@@ -7,7 +7,7 @@
     "packages/*",
     "skills/*",
     "docs",
-    "oai"
+    "server"
   ],
   "resolutions": {
     "typescript": "^5.0.0",

packages/oai-openapi/.gitignore

@@ -0,0 +1 @@
+generated/

packages/oai-openapi/README.md

@@ -0,0 +1,3 @@
+# @ava/oai-openapi
+
+[OAI OpenAPI](https://github.com/openai/openai-openapi) type definitions.

packages/oai-openapi/index.ts

@@ -0,0 +1,4 @@
+/**
+ * Please run generate script to use this module, it should run on postinstall automatically
+ */
+export * from './generated'

packages/oai-openapi/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "@ava/oai-openapi",
+  "module": "index.ts",
+  "type": "module",
+  "scripts": {
+    "generate": "bun run scripts/generate.ts",
+    "postinstall": "bun --bun run generate"
+  },
+  "devDependencies": {
+    "@types/bun": "latest",
+    "openapi-typescript-codegen": "^0.29.0"
+  },
+  "peerDependencies": {
+    "typescript": "^5.0.0"
+  }
+}

packages/oai-openapi/scripts/generate.ts

@@ -0,0 +1,15 @@
+import { $, write } from 'bun'
+import { mkdir } from 'fs/promises'
+import { join } from 'path'
+import { tmpdir } from 'os'
+
+const tmpDir = join(tmpdir(), '@ava/oai-openapi')
+await mkdir(tmpDir, { recursive: true })
+const cwd = join(__dirname, '../generated')
+await mkdir(cwd, { recursive: true })
+const res = await fetch('https://raw.githubusercontent.com/openai/openai-openapi/2.0.0/openapi.yaml')
+const def = await res.text()
+const dest = join(tmpDir, 'openapi.yaml')
+await write(dest, def)
+console.log(cwd, dest)
+await $`openapi --input ${dest} --output ${cwd}`

packages/oai-openapi/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json",
+}

server/README.md

@@ -0,0 +1,15 @@
+# Elysia with Bun runtime
+
+## Getting Started
+To get started with this template, simply paste this command into your terminal:
+```bash
+bun create elysia ./elysia-example
+```
+
+## Development
+To start the development server run:
+```bash
+bun run dev
+```
+
+Open http://localhost:3000/ with your browser to see the result.

oai/package.json → server/package.json

@@ -1,15 +1,19 @@
 {
-  "name": "@ava/oai",
+  "name": "server",
   "version": "1.0.50",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "bun run --watch src/index.ts"
   },
   "dependencies": {
     "@ava/lang": "workspace:../packages/lang",
-    "@ava/skills-homeassistant": "workspace:../skills/homeassistant",
+    "@ava/oai-openapi": "workspace:../packages/oai-openapi",
+    "@ava/skills-homeassistant": "workspace:../packages/skills-homeassistant",
     "@bogeychan/elysia-logger": "^0.0.21",
+    "@elysiajs/swagger": "^1.0.3",
     "elysia": "latest",
+    "elysia-autoload": "^0.2.3",
+    "elysia-autoroutes": "^0.5.0",
+    "uuid": "^9.0.1",
     "znv": "^0.4.0",
     "zod": "^3.22.5"
   },

server/src/index.ts

@@ -0,0 +1,19 @@
+import { Elysia } from 'elysia'
+import { swagger } from './services/swagger'
+import { autoload } from "elysia-autoload"
+import { PORT } from './services/config'
+import { elysiaLogger } from './services/logger'
+import { getAssistant } from './services/assistant'
+
+const assistant = await getAssistant()
+console.log('Assistant initialized', assistant.getName())
+
+const app = new Elysia()
+.use(swagger)
+.use(elysiaLogger)
+.use(autoload())
+  .listen(PORT, (server) => {
+    console.log(`listening on http://${server.hostname}:${server.port}`)
+  })
+
+export type ElysiaApp = typeof app

server/src/routes/health/ready.ts

@@ -0,0 +1,3 @@
+import type { ElysiaApp } from "~/index";
+
+export default (app: ElysiaApp) => app.get('/', { ready: true })

server/src/routes/v1/chat/completions.ts

@@ -0,0 +1,12 @@
+import type { CreateChatCompletionRequest, CreateChatCompletionResponse } from "@ava/oai-openapi";
+import { t } from "elysia";
+import type { ElysiaApp } from "~/index";
+import { executeChatCompletion } from "~/services/oai/lang";
+
+export default (app: ElysiaApp) => {
+  return app.post('/', async ({ body }): Promise<CreateChatCompletionResponse> => {
+    return executeChatCompletion(body as CreateChatCompletionRequest)
+  }, {
+    type: 'json'
+  })
+}

server/src/services/assistant.ts

@@ -0,0 +1,19 @@
+import { createAssistant, type ToolInterface } from "@ava/lang";
+
+let assistant: Awaited<ReturnType<typeof createAssistant>> | null = null
+
+export const getAssistant = async () => {
+  if (assistant) {
+    return assistant
+  }
+
+  const tools: ToolInterface[] = []
+
+  if (process.env.HOMEASSISTANT) {
+    const { createHomeAssistantToolkit } = await import('@ava/skills-homeassistant')
+    tools.push(...await createHomeAssistantToolkit())
+  }
+
+  assistant = await createAssistant(tools)
+  return assistant
+}

server/src/services/config.ts

@@ -0,0 +1,12 @@
+import {parseEnv, port, z} from 'znv'
+
+export const { PORT, LOG_LEVEL } = parseEnv(process.env, {
+  PORT: {
+    schema: port().default(2881),
+    description: 'Port for HTTP server to listen on'
+  },
+  LOG_LEVEL: {
+    schema: z.enum(["fatal", "error", "warn", "info", "debug", "trace"]).default('info'),
+    description: 'Log level for the server'
+  }
+})

server/src/services/logger.ts

@@ -0,0 +1,7 @@
+import { logger } from "@bogeychan/elysia-logger";
+import { LOG_LEVEL } from "./config";
+
+export const elysiaLogger =  logger({
+  name: '@ava/server',
+  level: LOG_LEVEL
+})

server/src/services/oai/lang.ts

@@ -0,0 +1,61 @@
+import type { ChatCompletionRequestMessage, CreateChatCompletionRequest, CreateChatCompletionResponse } from "@ava/oai-openapi"
+import { v4 } from "uuid"
+import { getAssistant } from "../assistant"
+import { AIMessage, HumanMessage, SystemMessage } from "@ava/lang"
+
+const oaiToLangMessage = (messages: ChatCompletionRequestMessage[]) => {
+  return messages.map(({role, content}) => {
+    if(!content) return
+
+    switch (role) {
+      case 'user':
+        return new HumanMessage(content)
+      case 'assistant':
+        return new AIMessage(content)
+      case 'system':
+        return new SystemMessage(content)
+      default:
+        return
+    }
+  }).filter(Boolean)
+}
+
+export const executeChatCompletion = async (req: CreateChatCompletionRequest): Promise<CreateChatCompletionResponse> => {
+  const id = v4()
+  const assistant = await getAssistant()
+
+  if(req.stream) {
+    throw new Error('streaming is not supported yet')
+  }
+
+  const lastMessage = req.messages[req.messages.length - 1]
+  if (lastMessage.role !== 'user') {
+    throw new Error('last message must be from user role')
+  }
+  const input = lastMessage.content
+  const chat_history = oaiToLangMessage(req.messages.slice(0, -1))
+
+
+  const res = await assistant.invoke({
+    input,
+    chat_history,
+  }, {
+    configurable: {
+      sessionId: id
+    }
+  })
+
+  return {
+    id,
+    model: 'ava',
+    choices: [
+      {
+        index: 0,
+        finish_reason: 'stop',
+        message: res.output,
+      }
+    ],
+    object: 'chat.completion',
+    created: Math.floor(Date.now() / 1000)
+  }
+}

server/src/services/swagger.ts

@@ -0,0 +1,11 @@
+import Swagger from '@elysiajs/swagger'
+
+export const swagger = Swagger({
+  documentation: {
+    info: {
+      title: 'Ava',
+      description: 'Ava API',
+      version: '0.0.0'
+    }
+  }
+})

server/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "paths": {
+      "~/*": ["./src/*"],
+    }
+  }
+}

tsconfig.json

@@ -5,7 +5,6 @@
     "target": "ESNext",
     "module": "ESNext",
     "moduleDetection": "force",
-    "jsx": "react-jsx",
     "allowJs": true,
 
     // Bundler mode