Merge pull request #412 from ai16z/fix-services

feat: services

README.md

@@ -11,6 +11,7 @@
 </div>
 
 ## 🌍 README Translations
+
 [中文说明](./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)
 
 ## ✨ Features

packages/agent/src/index.ts

@@ -5,14 +5,14 @@ import { DiscordClientInterface } from "@ai16z/client-discord";
 import { AutoClientInterface } from "@ai16z/client-auto";
 import { TelegramClientInterface } from "@ai16z/client-telegram";
 import { TwitterClientInterface } from "@ai16z/client-twitter";
-import { defaultCharacter } from "@ai16z/eliza";
-import { AgentRuntime } from "@ai16z/eliza";
-import { settings } from "@ai16z/eliza";
 import {
+    defaultCharacter,
+    AgentRuntime,
+    settings,
     Character,
     IAgentRuntime,
-    IDatabaseAdapter,
     ModelProviderName,
+    elizaLogger,
 } from "@ai16z/eliza";
 import { bootstrapPlugin } from "@ai16z/plugin-bootstrap";
 import { solanaPlugin } from "@ai16z/plugin-solana";
@@ -219,7 +219,11 @@ export async function createAgent(
     db: any,
     token: string
 ) {
-    console.log("Creating runtime for character", character.name);
+    elizaLogger.success(
+        elizaLogger.successesTitle,
+        "Creating runtime for character",
+        character.name
+    );
     return new AgentRuntime({
         databaseAdapter: db,
         token,
@@ -279,7 +283,7 @@ const startAgents = async () => {
             await startAgent(character, directClient);
         }
     } catch (error) {
-        console.error("Error starting agents:", error);
+        elizaLogger.error("Error starting agents:", error);
     }
 
     function chat() {
@@ -292,12 +296,12 @@ const startAgents = async () => {
         });
     }
 
-    console.log("Chat started. Type 'exit' to quit.");
+    elizaLogger.log("Chat started. Type 'exit' to quit.");
     chat();
 };
 
 startAgents().catch((error) => {
-    console.error("Unhandled error in startAgents:", error);
+    elizaLogger.error("Unhandled error in startAgents:", error);
     process.exit(1); // Exit the process after logging
 });
 

packages/client-direct/src/index.ts

@@ -61,7 +61,7 @@ export class DirectClient {
     private agents: Map<string, AgentRuntime>;
 
     constructor() {
-        console.log("DirectClient constructor");
+        elizaLogger.log("DirectClient constructor");
         this.app = express();
         this.app.use(cors());
         this.agents = new Map();

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

@@ -86,8 +86,8 @@ export default {
         callback: HandlerCallback
     ) => {
         const videoService = runtime
-            .getService(ServiceType.VIDEO)
-            .getInstance<IVideoService>();
+            .getService<IVideoService>(ServiceType.VIDEO)
+            .getInstance();
         if (!state) {
             state = (await runtime.composeState(message)) as State;
         }

packages/client-discord/src/attachments.ts

@@ -104,8 +104,7 @@ export class AttachmentManager {
         } else if (
             attachment.contentType?.startsWith("video/") ||
             this.runtime
-                .getService(ServiceType.VIDEO)
-                .getInstance<IVideoService>()
+                .getService<IVideoService>(ServiceType.VIDEO)
                 .isVideoUrl(attachment.url)
         ) {
             media = await this.processVideoAttachment(attachment);
@@ -137,10 +136,16 @@ export class AttachmentManager {
                 throw new Error("Unsupported audio/video format");
             }
 
-            const transcription = await this.runtime
-                .getService(ServiceType.TRANSCRIPTION)
-                .getInstance<ITranscriptionService>()
-                .transcribeAttachment(audioBuffer);
+            const transcriptionService =
+                this.runtime.getService<ITranscriptionService>(
+                    ServiceType.TRANSCRIPTION
+                );
+            if (!transcriptionService) {
+                throw new Error("Transcription service not found");
+            }
+
+            const transcription =
+                await transcriptionService.transcribeAttachment(audioBuffer);
             const { title, description } = await generateSummary(
                 this.runtime,
                 transcription
@@ -220,8 +225,7 @@ export class AttachmentManager {
             const response = await fetch(attachment.url);
             const pdfBuffer = await response.arrayBuffer();
             const text = await this.runtime
-                .getService(ServiceType.PDF)
-                .getInstance<IPdfService>()
+                .getService<IPdfService>(ServiceType.PDF)
                 .convertPdfToText(Buffer.from(pdfBuffer));
             const { title, description } = await generateSummary(
                 this.runtime,
@@ -289,8 +293,9 @@ export class AttachmentManager {
     ): Promise<Media> {
         try {
             const { description, title } = await this.runtime
-                .getService(ServiceType.IMAGE_DESCRIPTION)
-                .getInstance<IImageDescriptionService>()
+                .getService<IImageDescriptionService>(
+                    ServiceType.IMAGE_DESCRIPTION
+                )
                 .describeImage(attachment.url);
             return {
                 id: attachment.id,
@@ -322,16 +327,16 @@ export class AttachmentManager {
     private async processVideoAttachment(
         attachment: Attachment
     ): Promise<Media> {
-        if (
-            this.runtime
-                .getService(ServiceType.VIDEO)
-                .getInstance<IVideoService>()
-                .isVideoUrl(attachment.url)
-        ) {
-            const videoInfo = await this.runtime
-                .getService(ServiceType.VIDEO)
-                .getInstance<IVideoService>()
-                .processVideo(attachment.url);
+        const videoService = this.runtime.getService<IVideoService>(
+            ServiceType.VIDEO
+        );
+
+        if (!videoService) {
+            throw new Error("Video service not found");
+        }
+
+        if (videoService.isVideoUrl(attachment.url)) {
+            const videoInfo = await videoService.processVideo(attachment.url);
             return {
                 id: attachment.id,
                 url: attachment.url,

packages/client-discord/src/index.ts

@@ -25,8 +25,8 @@ import { VoiceManager } from "./voice.ts";
 
 export class DiscordClient extends EventEmitter {
     apiToken: string;
-    private client: Client;
-    private runtime: IAgentRuntime;
+    client: Client;
+    runtime: IAgentRuntime;
     character: Character;
     private messageManager: MessageManager;
     private voiceManager: VoiceManager;
@@ -193,7 +193,7 @@ export class DiscordClient extends EventEmitter {
     }
 
     async handleReactionRemove(reaction: MessageReaction, user: User) {
-        console.log("Reaction removed");
+        elizaLogger.log("Reaction removed");
         // if (user.bot) return;
 
         let emoji = reaction.emoji.name;

packages/client-discord/src/messages.ts

@@ -515,10 +515,23 @@ export class MessageManager {
                         }
                         if (message.channel.type === ChannelType.GuildVoice) {
                             // For voice channels, use text-to-speech
-                            const audioStream = await this.runtime
-                                .getService(ServiceType.SPEECH_GENERATION)
-                                .getInstance<ISpeechService>()
-                                .generate(this.runtime, content.text);
+
+                            const speechService =
+                                this.runtime.getService<ISpeechService>(
+                                    ServiceType.SPEECH_GENERATION
+                                );
+
+                            if (!speechService) {
+                                throw new Error(
+                                    "Speech generation service not found"
+                                );
+                            }
+
+                            const audioStream = await speechService.generate(
+                                this.runtime,
+                                content.text
+                            );
+
                             await this.voiceManager.playAudioStream(
                                 userId,
                                 audioStream
@@ -603,10 +616,18 @@ export class MessageManager {
             if (message.channel.type === ChannelType.GuildVoice) {
                 // For voice channels, use text-to-speech for the error message
                 const errorMessage = "Sorry, I had a glitch. What was that?";
-                const audioStream = await this.runtime
-                    .getService(ServiceType.SPEECH_GENERATION)
-                    .getInstance<ISpeechService>()
-                    .generate(this.runtime, errorMessage);
+
+                const speechService = this.runtime.getService<ISpeechService>(
+                    ServiceType.SPEECH_GENERATION
+                );
+                if (!speechService) {
+                    throw new Error("Speech generation service not found");
+                }
+
+                const audioStream = await speechService.generate(
+                    this.runtime,
+                    errorMessage
+                );
                 await this.voiceManager.playAudioStream(userId, audioStream);
             } else {
                 // For text channels, send the error message
@@ -670,14 +691,17 @@ export class MessageManager {
         for (const url of urls) {
             if (
                 this.runtime
-                    .getService(ServiceType.VIDEO)
-                    .getInstance<IVideoService>()
+                    .getService<IVideoService>(ServiceType.VIDEO)
                     .isVideoUrl(url)
             ) {
-                const videoInfo = await this.runtime
-                    .getService(ServiceType.VIDEO)
-                    .getInstance<IVideoService>()
-                    .processVideo(url);
+                const videoService = this.runtime.getService<IVideoService>(
+                    ServiceType.VIDEO
+                );
+                if (!videoService) {
+                    throw new Error("Video service not found");
+                }
+                const videoInfo = await videoService.processVideo(url);
+
                 attachments.push({
                     id: `youtube-${Date.now()}`,
                     url: url,
@@ -687,10 +711,16 @@ export class MessageManager {
                     text: videoInfo.text,
                 });
             } else {
-                const { title, bodyContent } = await this.runtime
-                    .getService(ServiceType.BROWSER)
-                    .getInstance<IBrowserService>()
-                    .getPageContent(url, this.runtime);
+                const browserService = this.runtime.getService<IBrowserService>(
+                    ServiceType.BROWSER
+                );
+                if (!browserService) {
+                    throw new Error("Browser service not found");
+                }
+
+                const { title, bodyContent } =
+                    await browserService.getPageContent(url, this.runtime);
+
                 const { title: newTitle, description } = await generateSummary(
                     this.runtime,
                     title + "\n" + bodyContent