Skip to content

Commit b1c0f56

Browse files
lalalunelalalune
committed
Merge branch 'feat/add_image_text_model_provider_seperation_and_falai' of https://github.com/yoniebans/the_mf into HEAD
2 parents 4ad11c4 + 9c1e6c7 commit b1c0f56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+514
-333
lines changed

‎.env.example

+6
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,11 @@ COINBASE_GENERATED_WALLET_HEX_SEED=
163163
DSTACK_SIMULATOR_ENDPOINT=
164164
WALLET_SECRET_SALT=secret_salt
165165

166+
<<<<<<< HEAD
166167
# Galadriel Configuration
167168
GALADRIEL_API_KEY=gal-* # Get from https://dashboard.galadriel.com/
169+
=======
170+
# fal.ai Configuration
171+
FAL_API_KEY=
172+
FAL_AI_LORA_PATH=
173+
>>>>>>> 9c1e6c7cf5e9725a3d4b6dc5a64a4c420ad8f17b

‎agent/src/index.ts

+12-8
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
tradePlugin,
3232
} from "@ai16z/plugin-coinbase";
3333
import { confluxPlugin } from "@ai16z/plugin-conflux";
34+
import { imageGenerationPlugin } from "@ai16z/plugin-image-generation";
3435
import { evmPlugin } from "@ai16z/plugin-evm";
3536
import { createNodePlugin } from "@ai16z/plugin-node";
3637
import { solanaPlugin } from "@ai16z/plugin-solana";
@@ -55,8 +56,6 @@ export function parseArguments(): {
5556
character?: string;
5657
characters?: string;
5758
} {
58-
console.log("parsing arguments")
59-
console.log("process.argv", process.argv)
6059
try {
6160
return yargs(process.argv.slice(3))
6261
.option("character", {
@@ -90,10 +89,8 @@ export async function loadCharacters(
9089
?.split(",")
9190
.map((filePath) => filePath.trim());
9291
const loadedCharacters = [];
93-
console.log("****characterPaths", characterPaths)
9492

9593
if (characterPaths?.length > 0) {
96-
console.log("has characters")
9794
for (const characterPath of characterPaths) {
9895
let content = null;
9996
let resolvedPath = "";
@@ -119,7 +116,6 @@ export async function loadCharacters(
119116
content = tryLoadFile(tryPath);
120117
if (content !== null) {
121118
resolvedPath = tryPath;
122-
console.log("resolvedPath", resolvedPath)
123119
break;
124120
}
125121
}
@@ -136,7 +132,6 @@ export async function loadCharacters(
136132
try {
137133
const character = JSON.parse(content);
138134
validateCharacterConfig(character);
139-
console.log("character is", character)
140135

141136
// Handle plugins
142137
if (character.plugins) {
@@ -234,6 +229,11 @@ export function getTokenForProvider(
234229
character.settings?.secrets?.GALADRIEL_API_KEY ||
235230
settings.GALADRIEL_API_KEY
236231
);
232+
case ModelProviderName.FAL:
233+
return (
234+
character.settings?.secrets?.FAL_API_KEY ||
235+
settings.FAL_API_KEY
236+
);
237237
}
238238
}
239239

@@ -339,6 +339,11 @@ export function createAgent(
339339
getSecret(character, "COINBASE_COMMERCE_KEY")
340340
? coinbaseCommercePlugin
341341
: null,
342+
getSecret(character, "FAL_API_KEY") ||
343+
getSecret(character, "OPENAI_API_KEY") ||
344+
getSecret(character, "HEURIST_API_KEY")
345+
? imageGenerationPlugin
346+
: null,
342347
...(getSecret(character, "COINBASE_API_KEY") &&
343348
getSecret(character, "COINBASE_PRIVATE_KEY")
344349
? [coinbaseMassPaymentsPlugin, tradePlugin]
@@ -410,7 +415,6 @@ const startAgents = async () => {
410415
const args = parseArguments();
411416

412417
let charactersArg = args.characters || args.character;
413-
console.log("charactersArg is", charactersArg)
414418

415419
let characters = [defaultCharacter];
416420

@@ -472,7 +476,7 @@ async function handleUserInput(input, agentId) {
472476
);
473477

474478
const data = await response.json();
475-
data.forEach((message) => console.log(`${"Agent"}: ${message.text}`));
479+
data.forEach((message) => elizaLogger.log(`${"Agent"}: ${message.text}`));
476480
} catch (error) {
477481
console.error("Error fetching response:", error);
478482
}

‎docs/api/classes/AgentRuntime.md

+46-30
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Custom fetch function to use for making requests.
8383

8484
#### Defined in
8585

86-
[packages/core/src/runtime.ts:203](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L203)
86+
[packages/core/src/runtime.ts:208](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L208)
8787

8888
## Properties
8989

@@ -229,6 +229,22 @@ The model to use for generateText.
229229

230230
***
231231

232+
### imageModelProvider
233+
234+
> **imageModelProvider**: [`ModelProviderName`](../enumerations/ModelProviderName.md)
235+
236+
The model to use for generateImage.
237+
238+
#### Implementation of
239+
240+
[`IAgentRuntime`](../interfaces/IAgentRuntime.md).[`imageModelProvider`](../interfaces/IAgentRuntime.md#imageModelProvider)
241+
242+
#### Defined in
243+
244+
[packages/core/src/runtime.ts:104](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L104)
245+
246+
***
247+
232248
### fetch()
233249

234250
> **fetch**: (`input`, `init`?) => `Promise`\<`Response`\>(`input`, `init`?) => `Promise`\<`Response`\>
@@ -260,7 +276,7 @@ Some environments may not have access to the global fetch function and need a cu
260276

261277
#### Defined in
262278

263-
[packages/core/src/runtime.ts:105](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L105)
279+
[packages/core/src/runtime.ts:110](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L110)
264280

265281
***
266282

@@ -276,7 +292,7 @@ The character to use for the agent
276292

277293
#### Defined in
278294

279-
[packages/core/src/runtime.ts:110](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L110)
295+
[packages/core/src/runtime.ts:115](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L115)
280296

281297
***
282298

@@ -292,7 +308,7 @@ Store messages that are sent and received by the agent.
292308

293309
#### Defined in
294310

295-
[packages/core/src/runtime.ts:115](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L115)
311+
[packages/core/src/runtime.ts:120](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L120)
296312

297313
***
298314

@@ -308,7 +324,7 @@ Store and recall descriptions of users based on conversations.
308324

309325
#### Defined in
310326

311-
[packages/core/src/runtime.ts:120](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L120)
327+
[packages/core/src/runtime.ts:125](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L125)
312328

313329
***
314330

@@ -324,7 +340,7 @@ Manage the creation and recall of static information (documents, historical game
324340

325341
#### Defined in
326342

327-
[packages/core/src/runtime.ts:125](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L125)
343+
[packages/core/src/runtime.ts:130](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L130)
328344

329345
***
330346

@@ -340,7 +356,7 @@ Hold large documents that can be referenced
340356

341357
#### Defined in
342358

343-
[packages/core/src/runtime.ts:130](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L130)
359+
[packages/core/src/runtime.ts:135](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L135)
344360

345361
***
346362

@@ -356,7 +372,7 @@ Searchable document fragments
356372

357373
#### Defined in
358374

359-
[packages/core/src/runtime.ts:135](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L135)
375+
[packages/core/src/runtime.ts:140](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L140)
360376

361377
***
362378

@@ -370,7 +386,7 @@ Searchable document fragments
370386

371387
#### Defined in
372388

373-
[packages/core/src/runtime.ts:137](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L137)
389+
[packages/core/src/runtime.ts:142](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L142)
374390

375391
***
376392

@@ -380,7 +396,7 @@ Searchable document fragments
380396
381397
#### Defined in
382398

383-
[packages/core/src/runtime.ts:138](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L138)
399+
[packages/core/src/runtime.ts:143](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L143)
384400

385401
***
386402

@@ -394,7 +410,7 @@ Searchable document fragments
394410

395411
#### Defined in
396412

397-
[packages/core/src/runtime.ts:139](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L139)
413+
[packages/core/src/runtime.ts:144](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L144)
398414

399415
## Methods
400416

@@ -416,7 +432,7 @@ Searchable document fragments
416432

417433
#### Defined in
418434

419-
[packages/core/src/runtime.ts:141](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L141)
435+
[packages/core/src/runtime.ts:146](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L146)
420436

421437
***
422438

@@ -438,7 +454,7 @@ Searchable document fragments
438454

439455
#### Defined in
440456

441-
[packages/core/src/runtime.ts:156](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L156)
457+
[packages/core/src/runtime.ts:161](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L161)
442458

443459
***
444460

@@ -464,7 +480,7 @@ Searchable document fragments
464480

465481
#### Defined in
466482

467-
[packages/core/src/runtime.ts:160](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L160)
483+
[packages/core/src/runtime.ts:165](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L165)
468484

469485
***
470486

@@ -486,7 +502,7 @@ Searchable document fragments
486502

487503
#### Defined in
488504

489-
[packages/core/src/runtime.ts:169](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L169)
505+
[packages/core/src/runtime.ts:174](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L174)
490506

491507
***
492508

@@ -504,7 +520,7 @@ Searchable document fragments
504520

505521
#### Defined in
506522

507-
[packages/core/src/runtime.ts:360](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L360)
523+
[packages/core/src/runtime.ts:370](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L370)
508524

509525
***
510526

@@ -526,7 +542,7 @@ Searchable document fragments
526542

527543
#### Defined in
528544

529-
[packages/core/src/runtime.ts:424](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L424)
545+
[packages/core/src/runtime.ts:434](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L434)
530546

531547
***
532548

@@ -548,7 +564,7 @@ The number of recent messages to be kept in memory.
548564

549565
#### Defined in
550566

551-
[packages/core/src/runtime.ts:446](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L446)
567+
[packages/core/src/runtime.ts:456](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L456)
552568

553569
***
554570

@@ -574,7 +590,7 @@ The action to register.
574590

575591
#### Defined in
576592

577-
[packages/core/src/runtime.ts:454](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L454)
593+
[packages/core/src/runtime.ts:464](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L464)
578594

579595
***
580596

@@ -596,7 +612,7 @@ The evaluator to register.
596612

597613
#### Defined in
598614

599-
[packages/core/src/runtime.ts:463](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L463)
615+
[packages/core/src/runtime.ts:473](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L473)
600616

601617
***
602618

@@ -618,7 +634,7 @@ The context provider to register.
618634

619635
#### Defined in
620636

621-
[packages/core/src/runtime.ts:471](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L471)
637+
[packages/core/src/runtime.ts:481](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L481)
622638

623639
***
624640

@@ -650,7 +666,7 @@ The message to process.
650666

651667
#### Defined in
652668

653-
[packages/core/src/runtime.ts:480](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L480)
669+
[packages/core/src/runtime.ts:490](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L490)
654670

655671
***
656672

@@ -686,7 +702,7 @@ The results of the evaluation.
686702

687703
#### Defined in
688704

689-
[packages/core/src/runtime.ts:557](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L557)
705+
[packages/core/src/runtime.ts:567](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L567)
690706

691707
***
692708

@@ -718,7 +734,7 @@ An error if the participant cannot be added.
718734

719735
#### Defined in
720736

721-
[packages/core/src/runtime.ts:627](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L627)
737+
[packages/core/src/runtime.ts:637](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L637)
722738

723739
***
724740

@@ -754,7 +770,7 @@ The user name to ensure the existence of.
754770

755771
#### Defined in
756772

757-
[packages/core/src/runtime.ts:643](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L643)
773+
[packages/core/src/runtime.ts:653](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L653)
758774

759775
***
760776

@@ -778,7 +794,7 @@ The user name to ensure the existence of.
778794

779795
#### Defined in
780796

781-
[packages/core/src/runtime.ts:663](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L663)
797+
[packages/core/src/runtime.ts:673](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L673)
782798

783799
***
784800

@@ -808,7 +824,7 @@ The user name to ensure the existence of.
808824

809825
#### Defined in
810826

811-
[packages/core/src/runtime.ts:680](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L680)
827+
[packages/core/src/runtime.ts:690](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L690)
812828

813829
***
814830

@@ -839,7 +855,7 @@ An error if the room cannot be created.
839855

840856
#### Defined in
841857

842-
[packages/core/src/runtime.ts:716](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L716)
858+
[packages/core/src/runtime.ts:726](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L726)
843859

844860
***
845861

@@ -869,7 +885,7 @@ The state of the agent.
869885

870886
#### Defined in
871887

872-
[packages/core/src/runtime.ts:729](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L729)
888+
[packages/core/src/runtime.ts:739](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L739)
873889

874890
***
875891

@@ -891,4 +907,4 @@ The state of the agent.
891907

892908
#### Defined in
893909

894-
[packages/core/src/runtime.ts:1177](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L1177)
910+
[packages/core/src/runtime.ts:1187](https://github.com/ai16z/eliza/blob/main/packages/core/src/runtime.ts#L1187)

0 commit comments

Comments
 (0)