Skip to content

Commit 3a033b4

Browse files
sirkitreesirkitree
authored
Merge pull request #412 from ai16z/fix-services
feat: services
2 parents 743aa78 + 48d6fdb commit 3a033b4

28 files changed

+402
-318
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
</div>
1212

1313
## 🌍 README Translations
14+
1415
[中文说明](./README_CN.md) | [日本語の説明](./README_JA.md) | [한국어 설명](./README_KOR.md) | [Français](./README_FR.md) | [Português](./README_PTBR.md) | [Türkçe](./README_TR.md) | [Русский](./README_RU.md) | [Español](./README_ES.md) | [Italiano](./README_IT.md)
1516

1617
## ✨ Features

‎packages/agent/src/index.ts

+12-8
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import { DiscordClientInterface } from "@ai16z/client-discord";
55
import { AutoClientInterface } from "@ai16z/client-auto";
66
import { TelegramClientInterface } from "@ai16z/client-telegram";
77
import { TwitterClientInterface } from "@ai16z/client-twitter";
8-
import { defaultCharacter } from "@ai16z/eliza";
9-
import { AgentRuntime } from "@ai16z/eliza";
10-
import { settings } from "@ai16z/eliza";
118
import {
9+
defaultCharacter,
10+
AgentRuntime,
11+
settings,
1212
Character,
1313
IAgentRuntime,
14-
IDatabaseAdapter,
1514
ModelProviderName,
15+
elizaLogger,
1616
} from "@ai16z/eliza";
1717
import { bootstrapPlugin } from "@ai16z/plugin-bootstrap";
1818
import { solanaPlugin } from "@ai16z/plugin-solana";
@@ -219,7 +219,11 @@ export async function createAgent(
219219
db: any,
220220
token: string
221221
) {
222-
console.log("Creating runtime for character", character.name);
222+
elizaLogger.success(
223+
elizaLogger.successesTitle,
224+
"Creating runtime for character",
225+
character.name
226+
);
223227
return new AgentRuntime({
224228
databaseAdapter: db,
225229
token,
@@ -279,7 +283,7 @@ const startAgents = async () => {
279283
await startAgent(character, directClient);
280284
}
281285
} catch (error) {
282-
console.error("Error starting agents:", error);
286+
elizaLogger.error("Error starting agents:", error);
283287
}
284288

285289
function chat() {
@@ -292,12 +296,12 @@ const startAgents = async () => {
292296
});
293297
}
294298

295-
console.log("Chat started. Type 'exit' to quit.");
299+
elizaLogger.log("Chat started. Type 'exit' to quit.");
296300
chat();
297301
};
298302

299303
startAgents().catch((error) => {
300-
console.error("Unhandled error in startAgents:", error);
304+
elizaLogger.error("Unhandled error in startAgents:", error);
301305
process.exit(1); // Exit the process after logging
302306
});
303307

‎packages/client-direct/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class DirectClient {
6161
private agents: Map<string, AgentRuntime>;
6262

6363
constructor() {
64-
console.log("DirectClient constructor");
64+
elizaLogger.log("DirectClient constructor");
6565
this.app = express();
6666
this.app.use(cors());
6767
this.agents = new Map();

‎packages/client-discord/src/actions/download_media.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ export default {
8686
callback: HandlerCallback
8787
) => {
8888
const videoService = runtime
89-
.getService(ServiceType.VIDEO)
90-
.getInstance<IVideoService>();
89+
.getService<IVideoService>(ServiceType.VIDEO)
90+
.getInstance();
9191
if (!state) {
9292
state = (await runtime.composeState(message)) as State;
9393
}

‎packages/client-discord/src/attachments.ts

+25-20
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ export class AttachmentManager {
104104
} else if (
105105
attachment.contentType?.startsWith("video/") ||
106106
this.runtime
107-
.getService(ServiceType.VIDEO)
108-
.getInstance<IVideoService>()
107+
.getService<IVideoService>(ServiceType.VIDEO)
109108
.isVideoUrl(attachment.url)
110109
) {
111110
media = await this.processVideoAttachment(attachment);
@@ -137,10 +136,16 @@ export class AttachmentManager {
137136
throw new Error("Unsupported audio/video format");
138137
}
139138

140-
const transcription = await this.runtime
141-
.getService(ServiceType.TRANSCRIPTION)
142-
.getInstance<ITranscriptionService>()
143-
.transcribeAttachment(audioBuffer);
139+
const transcriptionService =
140+
this.runtime.getService<ITranscriptionService>(
141+
ServiceType.TRANSCRIPTION
142+
);
143+
if (!transcriptionService) {
144+
throw new Error("Transcription service not found");
145+
}
146+
147+
const transcription =
148+
await transcriptionService.transcribeAttachment(audioBuffer);
144149
const { title, description } = await generateSummary(
145150
this.runtime,
146151
transcription
@@ -220,8 +225,7 @@ export class AttachmentManager {
220225
const response = await fetch(attachment.url);
221226
const pdfBuffer = await response.arrayBuffer();
222227
const text = await this.runtime
223-
.getService(ServiceType.PDF)
224-
.getInstance<IPdfService>()
228+
.getService<IPdfService>(ServiceType.PDF)
225229
.convertPdfToText(Buffer.from(pdfBuffer));
226230
const { title, description } = await generateSummary(
227231
this.runtime,
@@ -289,8 +293,9 @@ export class AttachmentManager {
289293
): Promise<Media> {
290294
try {
291295
const { description, title } = await this.runtime
292-
.getService(ServiceType.IMAGE_DESCRIPTION)
293-
.getInstance<IImageDescriptionService>()
296+
.getService<IImageDescriptionService>(
297+
ServiceType.IMAGE_DESCRIPTION
298+
)
294299
.describeImage(attachment.url);
295300
return {
296301
id: attachment.id,
@@ -322,16 +327,16 @@ export class AttachmentManager {
322327
private async processVideoAttachment(
323328
attachment: Attachment
324329
): Promise<Media> {
325-
if (
326-
this.runtime
327-
.getService(ServiceType.VIDEO)
328-
.getInstance<IVideoService>()
329-
.isVideoUrl(attachment.url)
330-
) {
331-
const videoInfo = await this.runtime
332-
.getService(ServiceType.VIDEO)
333-
.getInstance<IVideoService>()
334-
.processVideo(attachment.url);
330+
const videoService = this.runtime.getService<IVideoService>(
331+
ServiceType.VIDEO
332+
);
333+
334+
if (!videoService) {
335+
throw new Error("Video service not found");
336+
}
337+
338+
if (videoService.isVideoUrl(attachment.url)) {
339+
const videoInfo = await videoService.processVideo(attachment.url);
335340
return {
336341
id: attachment.id,
337342
url: attachment.url,

‎packages/client-discord/src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import { VoiceManager } from "./voice.ts";
2525

2626
export class DiscordClient extends EventEmitter {
2727
apiToken: string;
28-
private client: Client;
29-
private runtime: IAgentRuntime;
28+
client: Client;
29+
runtime: IAgentRuntime;
3030
character: Character;
3131
private messageManager: MessageManager;
3232
private voiceManager: VoiceManager;
@@ -193,7 +193,7 @@ export class DiscordClient extends EventEmitter {
193193
}
194194

195195
async handleReactionRemove(reaction: MessageReaction, user: User) {
196-
console.log("Reaction removed");
196+
elizaLogger.log("Reaction removed");
197197
// if (user.bot) return;
198198

199199
let emoji = reaction.emoji.name;

‎packages/client-discord/src/messages.ts

+48-18
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,23 @@ export class MessageManager {
515515
}
516516
if (message.channel.type === ChannelType.GuildVoice) {
517517
// For voice channels, use text-to-speech
518-
const audioStream = await this.runtime
519-
.getService(ServiceType.SPEECH_GENERATION)
520-
.getInstance<ISpeechService>()
521-
.generate(this.runtime, content.text);
518+
519+
const speechService =
520+
this.runtime.getService<ISpeechService>(
521+
ServiceType.SPEECH_GENERATION
522+
);
523+
524+
if (!speechService) {
525+
throw new Error(
526+
"Speech generation service not found"
527+
);
528+
}
529+
530+
const audioStream = await speechService.generate(
531+
this.runtime,
532+
content.text
533+
);
534+
522535
await this.voiceManager.playAudioStream(
523536
userId,
524537
audioStream
@@ -603,10 +616,18 @@ export class MessageManager {
603616
if (message.channel.type === ChannelType.GuildVoice) {
604617
// For voice channels, use text-to-speech for the error message
605618
const errorMessage = "Sorry, I had a glitch. What was that?";
606-
const audioStream = await this.runtime
607-
.getService(ServiceType.SPEECH_GENERATION)
608-
.getInstance<ISpeechService>()
609-
.generate(this.runtime, errorMessage);
619+
620+
const speechService = this.runtime.getService<ISpeechService>(
621+
ServiceType.SPEECH_GENERATION
622+
);
623+
if (!speechService) {
624+
throw new Error("Speech generation service not found");
625+
}
626+
627+
const audioStream = await speechService.generate(
628+
this.runtime,
629+
errorMessage
630+
);
610631
await this.voiceManager.playAudioStream(userId, audioStream);
611632
} else {
612633
// For text channels, send the error message
@@ -670,14 +691,17 @@ export class MessageManager {
670691
for (const url of urls) {
671692
if (
672693
this.runtime
673-
.getService(ServiceType.VIDEO)
674-
.getInstance<IVideoService>()
694+
.getService<IVideoService>(ServiceType.VIDEO)
675695
.isVideoUrl(url)
676696
) {
677-
const videoInfo = await this.runtime
678-
.getService(ServiceType.VIDEO)
679-
.getInstance<IVideoService>()
680-
.processVideo(url);
697+
const videoService = this.runtime.getService<IVideoService>(
698+
ServiceType.VIDEO
699+
);
700+
if (!videoService) {
701+
throw new Error("Video service not found");
702+
}
703+
const videoInfo = await videoService.processVideo(url);
704+
681705
attachments.push({
682706
id: `youtube-${Date.now()}`,
683707
url: url,
@@ -687,10 +711,16 @@ export class MessageManager {
687711
text: videoInfo.text,
688712
});
689713
} else {
690-
const { title, bodyContent } = await this.runtime
691-
.getService(ServiceType.BROWSER)
692-
.getInstance<IBrowserService>()
693-
.getPageContent(url, this.runtime);
714+
const browserService = this.runtime.getService<IBrowserService>(
715+
ServiceType.BROWSER
716+
);
717+
if (!browserService) {
718+
throw new Error("Browser service not found");
719+
}
720+
721+
const { title, bodyContent } =
722+
await browserService.getPageContent(url, this.runtime);
723+
694724
const { title: newTitle, description } = await generateSummary(
695725
this.runtime,
696726
title + "\n" + bodyContent

0 commit comments

Comments
 (0)