feat(ms22-p2): add agent status endpoints and chat routing (#684)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
Co-authored-by: Jason Woltje <jason@diversecanvas.com> Co-committed-by: Jason Woltje <jason@diversecanvas.com>
This commit was merged in pull request #684.
This commit is contained in:
@@ -99,7 +99,8 @@ export class ChatProxyController {
|
||||
const upstreamResponse = await this.chatProxyService.proxyChat(
|
||||
userId,
|
||||
body.messages,
|
||||
abortController.signal
|
||||
abortController.signal,
|
||||
body.agent
|
||||
);
|
||||
|
||||
const upstreamContentType = upstreamResponse.headers.get("content-type");
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
import { Type } from "class-transformer";
|
||||
import { ArrayMinSize, IsArray, IsNotEmpty, IsString, ValidateNested } from "class-validator";
|
||||
import {
|
||||
ArrayMinSize,
|
||||
IsArray,
|
||||
IsNotEmpty,
|
||||
IsOptional,
|
||||
IsString,
|
||||
ValidateNested,
|
||||
} from "class-validator";
|
||||
|
||||
export interface ChatMessage {
|
||||
role: string;
|
||||
@@ -22,4 +29,8 @@ export class ChatStreamDto {
|
||||
@ValidateNested({ each: true })
|
||||
@Type(() => ChatMessageDto)
|
||||
messages!: ChatMessageDto[];
|
||||
|
||||
@IsString({ message: "agent must be a string" })
|
||||
@IsOptional()
|
||||
agent?: string;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import {
|
||||
BadGatewayException,
|
||||
Injectable,
|
||||
Logger,
|
||||
NotFoundException,
|
||||
ServiceUnavailableException,
|
||||
} from "@nestjs/common";
|
||||
import { ConfigService } from "@nestjs/config";
|
||||
@@ -18,6 +19,13 @@ interface ContainerConnection {
|
||||
token: string;
|
||||
}
|
||||
|
||||
interface AgentConfig {
|
||||
name: string;
|
||||
displayName: string;
|
||||
personality: string;
|
||||
primaryModel: string | null;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class ChatProxyService {
|
||||
private readonly logger = new Logger(ChatProxyService.name);
|
||||
@@ -38,21 +46,38 @@ export class ChatProxyService {
|
||||
async proxyChat(
|
||||
userId: string,
|
||||
messages: ChatMessage[],
|
||||
signal?: AbortSignal
|
||||
signal?: AbortSignal,
|
||||
agentName?: string
|
||||
): Promise<Response> {
|
||||
const { url: containerUrl, token: gatewayToken } = await this.getContainerConnection(userId);
|
||||
const model = await this.getPreferredModel(userId);
|
||||
|
||||
// Get agent config if specified
|
||||
let agentConfig: AgentConfig | null = null;
|
||||
if (agentName) {
|
||||
agentConfig = await this.getAgentConfig(userId, agentName);
|
||||
}
|
||||
|
||||
const model = agentConfig?.primaryModel ?? (await this.getPreferredModel(userId));
|
||||
|
||||
const requestBody: Record<string, unknown> = {
|
||||
messages,
|
||||
model,
|
||||
stream: true,
|
||||
};
|
||||
|
||||
// Add agent config if available
|
||||
if (agentConfig) {
|
||||
requestBody.agent = agentConfig.name;
|
||||
requestBody.agent_personality = agentConfig.personality;
|
||||
}
|
||||
|
||||
const requestInit: RequestInit = {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: `Bearer ${gatewayToken}`,
|
||||
},
|
||||
body: JSON.stringify({
|
||||
messages,
|
||||
model,
|
||||
stream: true,
|
||||
}),
|
||||
body: JSON.stringify(requestBody),
|
||||
};
|
||||
|
||||
if (signal) {
|
||||
@@ -170,4 +195,32 @@ export class ChatProxyService {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private async getAgentConfig(userId: string, agentName: string): Promise<AgentConfig> {
|
||||
const agent = await this.prisma.userAgent.findUnique({
|
||||
where: { userId_name: { userId, name: agentName } },
|
||||
select: {
|
||||
name: true,
|
||||
displayName: true,
|
||||
personality: true,
|
||||
primaryModel: true,
|
||||
isActive: true,
|
||||
},
|
||||
});
|
||||
|
||||
if (!agent) {
|
||||
throw new NotFoundException(`Agent "${agentName}" not found for user`);
|
||||
}
|
||||
|
||||
if (!agent.isActive) {
|
||||
throw new NotFoundException(`Agent "${agentName}" is not active`);
|
||||
}
|
||||
|
||||
return {
|
||||
name: agent.name,
|
||||
displayName: agent.displayName,
|
||||
personality: agent.personality,
|
||||
primaryModel: agent.primaryModel,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,11 +26,21 @@ export class UserAgentController {
|
||||
return this.userAgentService.findAll(user.id);
|
||||
}
|
||||
|
||||
@Get("status")
|
||||
getAllStatuses(@CurrentUser() user: AuthUser) {
|
||||
return this.userAgentService.getAllStatuses(user.id);
|
||||
}
|
||||
|
||||
@Get(":id")
|
||||
findOne(@CurrentUser() user: AuthUser, @Param("id", ParseUUIDPipe) id: string) {
|
||||
return this.userAgentService.findOne(user.id, id);
|
||||
}
|
||||
|
||||
@Get(":id/status")
|
||||
getStatus(@CurrentUser() user: AuthUser, @Param("id", ParseUUIDPipe) id: string) {
|
||||
return this.userAgentService.getStatus(user.id, id);
|
||||
}
|
||||
|
||||
@Post()
|
||||
create(@CurrentUser() user: AuthUser, @Body() dto: CreateUserAgentDto) {
|
||||
return this.userAgentService.create(user.id, dto);
|
||||
|
||||
@@ -8,6 +8,15 @@ import { PrismaService } from "../prisma/prisma.service";
|
||||
import { CreateUserAgentDto } from "./dto/create-user-agent.dto";
|
||||
import { UpdateUserAgentDto } from "./dto/update-user-agent.dto";
|
||||
|
||||
export interface AgentStatusResponse {
|
||||
id: string;
|
||||
name: string;
|
||||
displayName: string;
|
||||
role: string;
|
||||
isActive: boolean;
|
||||
containerStatus?: "running" | "stopped" | "unknown";
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class UserAgentService {
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
@@ -119,4 +128,26 @@ export class UserAgentService {
|
||||
await this.findOne(userId, id);
|
||||
return this.prisma.userAgent.delete({ where: { id } });
|
||||
}
|
||||
|
||||
async getStatus(userId: string, id: string): Promise<AgentStatusResponse> {
|
||||
const agent = await this.findOne(userId, id);
|
||||
return {
|
||||
id: agent.id,
|
||||
name: agent.name,
|
||||
displayName: agent.displayName,
|
||||
role: agent.role,
|
||||
isActive: agent.isActive,
|
||||
};
|
||||
}
|
||||
|
||||
async getAllStatuses(userId: string): Promise<AgentStatusResponse[]> {
|
||||
const agents = await this.findAll(userId);
|
||||
return agents.map((agent) => ({
|
||||
id: agent.id,
|
||||
name: agent.name,
|
||||
displayName: agent.displayName,
|
||||
role: agent.role,
|
||||
isActive: agent.isActive,
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user