Skip to content

Commit

Permalink
Merge remote-tracking branch 'ai16z/develop' into jure/integration-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jzvikart
jzvikart committed Dec 18, 2024
2 parents 969db65 + 855c029 commit be74341
Show file tree
Hide file tree
Showing 59 changed files with 1,922 additions and 1,490 deletions.
189 changes: 186 additions & 3 deletions CHANGELOG.md
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ COPY --from=builder /app/scripts ./scripts
COPY --from=builder /app/characters ./characters

# Set the command to run the application
CMD ["pnpm", "start", "--non-interactive"]
CMD ["pnpm", "start"]
118 changes: 59 additions & 59 deletions agent/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
{
"name": "@ai16z/agent",
"version": "0.1.5-alpha.6",
"main": "src/index.ts",
"type": "module",
"scripts": {
"start": "node --loader ts-node/esm src/index.ts",
"dev": "node --loader ts-node/esm src/index.ts",
"check-types": "tsc --noEmit"
},
"nodemonConfig": {
"watch": [
"src",
"../core/dist"
],
"ext": "ts,json",
"exec": "node --enable-source-maps --loader ts-node/esm src/index.ts"
},
"dependencies": {
"@ai16z/adapter-postgres": "workspace:*",
"@ai16z/adapter-sqlite": "workspace:*",
"@ai16z/client-auto": "workspace:*",
"@ai16z/client-direct": "workspace:*",
"@ai16z/client-discord": "workspace:*",
"@ai16z/client-farcaster": "workspace:*",
"@ai16z/client-lens": "workspace:*",
"@ai16z/client-telegram": "workspace:*",
"@ai16z/client-twitter": "workspace:*",
"@ai16z/client-slack": "workspace:*",
"@ai16z/eliza": "workspace:*",
"@ai16z/plugin-0g": "workspace:*",
"@ai16z/plugin-aptos": "workspace:*",
"@ai16z/plugin-bootstrap": "workspace:*",
"@ai16z/plugin-intiface": "workspace:*",
"@ai16z/plugin-coinbase": "workspace:*",
"@ai16z/plugin-conflux": "workspace:*",
"@ai16z/plugin-evm": "workspace:*",
"@ai16z/plugin-flow": "workspace:*",
"@ai16z/plugin-story": "workspace:*",
"@ai16z/plugin-goat": "workspace:*",
"@ai16z/plugin-icp": "workspace:*",
"@ai16z/plugin-image-generation": "workspace:*",
"@ai16z/plugin-nft-generation": "workspace:*",
"@ai16z/plugin-node": "workspace:*",
"@ai16z/plugin-solana": "workspace:*",
"@ai16z/plugin-starknet": "workspace:*",
"@ai16z/plugin-ton": "workspace:*",
"@ai16z/plugin-sui": "workspace:*",
"@ai16z/plugin-tee": "workspace:*",
"@ai16z/plugin-multiversx": "workspace:*",
"@ai16z/plugin-near": "workspace:*",
"@ai16z/plugin-zksync-era": "workspace:*",
"readline": "1.3.0",
"ws": "8.18.0",
"yargs": "17.7.2"
},
"devDependencies": {
"ts-node": "10.9.2",
"tsup": "8.3.5"
}
"name": "@ai16z/agent",
"version": "0.1.6-alpha.4",
"main": "src/index.ts",
"type": "module",
"scripts": {
"start": "node --loader ts-node/esm src/index.ts",
"dev": "node --loader ts-node/esm src/index.ts",
"check-types": "tsc --noEmit"
},
"nodemonConfig": {
"watch": [
"src",
"../core/dist"
],
"ext": "ts,json",
"exec": "node --enable-source-maps --loader ts-node/esm src/index.ts"
},
"dependencies": {
"@ai16z/adapter-postgres": "workspace:*",
"@ai16z/adapter-sqlite": "workspace:*",
"@ai16z/client-auto": "workspace:*",
"@ai16z/client-direct": "workspace:*",
"@ai16z/client-discord": "workspace:*",
"@ai16z/client-farcaster": "workspace:*",
"@ai16z/client-lens": "workspace:*",
"@ai16z/client-telegram": "workspace:*",
"@ai16z/client-twitter": "workspace:*",
"@ai16z/client-slack": "workspace:*",
"@ai16z/eliza": "workspace:*",
"@ai16z/plugin-0g": "workspace:*",
"@ai16z/plugin-aptos": "workspace:*",
"@ai16z/plugin-bootstrap": "workspace:*",
"@ai16z/plugin-intiface": "workspace:*",
"@ai16z/plugin-coinbase": "workspace:*",
"@ai16z/plugin-conflux": "workspace:*",
"@ai16z/plugin-evm": "workspace:*",
"@ai16z/plugin-flow": "workspace:*",
"@ai16z/plugin-story": "workspace:*",
"@ai16z/plugin-goat": "workspace:*",
"@ai16z/plugin-icp": "workspace:*",
"@ai16z/plugin-image-generation": "workspace:*",
"@ai16z/plugin-nft-generation": "workspace:*",
"@ai16z/plugin-node": "workspace:*",
"@ai16z/plugin-solana": "workspace:*",
"@ai16z/plugin-starknet": "workspace:*",
"@ai16z/plugin-ton": "workspace:*",
"@ai16z/plugin-sui": "workspace:*",
"@ai16z/plugin-tee": "workspace:*",
"@ai16z/plugin-multiversx": "workspace:*",
"@ai16z/plugin-near": "workspace:*",
"@ai16z/plugin-zksync-era": "workspace:*",
"readline": "1.3.0",
"ws": "8.18.0",
"yargs": "17.7.2"
},
"devDependencies": {
"ts-node": "10.9.2",
"tsup": "8.3.5"
}
}
14 changes: 10 additions & 4 deletions agent/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ export const wait = (minTime: number = 1000, maxTime: number = 3000) => {
};

const logFetch = async (url: string, options: any) => {
elizaLogger.info(`Fetching ${url}`);
elizaLogger.debug(`Fetching ${url}`);
// Disabled to avoid disclosure of sensitive information such as API keys
// elizaLogger.info(JSON.stringify(options, null, 2));
// elizaLogger.debug(JSON.stringify(options, null, 2));
return fetch(url, options);
};

Expand Down Expand Up @@ -648,10 +648,16 @@ const startAgents = async () => {
elizaLogger.error("Error starting agents:", error);
}

// upload some agent functionality into directClient
directClient.startAgent = async (character) => {
// wrap it so we don't have to inject directClient later
return startAgent(character, directClient);
};
directClient.start(serverPort);

elizaLogger.log("Visit the following URL to chat with your agents:");
elizaLogger.log(`http://localhost:5173`);
elizaLogger.log(
"Run `pnpm start:client` to start the client and visit the outputted URL (http://localhost:5173) to chat with your agents"
);
};

startAgents().catch((error) => {
Expand Down
90 changes: 45 additions & 45 deletions client/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
{
"name": "eliza-client",
"private": true,
"version": "0.1.5-alpha.1",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"check-types": "tsc --noEmit",
"lint": "eslint .",
"preview": "vite preview"
},
"dependencies": {
"@ai16z/eliza": "workspace:*",
"@radix-ui/react-dialog": "1.1.2",
"@radix-ui/react-separator": "1.1.0",
"@radix-ui/react-slot": "1.1.0",
"@radix-ui/react-tooltip": "1.1.4",
"@tanstack/react-query": "5.61.0",
"class-variance-authority": "0.7.1",
"clsx": "2.1.1",
"lucide-react": "0.460.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.22.1",
"tailwind-merge": "2.5.5",
"tailwindcss-animate": "1.0.7",
"vite-plugin-top-level-await": "1.4.4",
"vite-plugin-wasm": "3.3.0"
},
"devDependencies": {
"@eslint/js": "9.16.0",
"@types/node": "22.8.4",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@vitejs/plugin-react": "4.3.3",
"autoprefixer": "10.4.20",
"eslint-plugin-react-hooks": "5.0.0",
"eslint-plugin-react-refresh": "0.4.14",
"globals": "15.11.0",
"postcss": "8.4.49",
"tailwindcss": "3.4.15",
"typescript": "5.6.3",
"typescript-eslint": "8.11.0",
"vite": "link:@tanstack/router-plugin/vite"
}
"name": "eliza-client",
"private": true,
"version": "0.1.6-alpha.4",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"check-types": "tsc --noEmit",
"lint": "eslint .",
"preview": "vite preview"
},
"dependencies": {
"@ai16z/eliza": "workspace:*",
"@radix-ui/react-dialog": "1.1.2",
"@radix-ui/react-separator": "1.1.0",
"@radix-ui/react-slot": "1.1.0",
"@radix-ui/react-tooltip": "1.1.4",
"@tanstack/react-query": "5.61.0",
"class-variance-authority": "0.7.1",
"clsx": "2.1.1",
"lucide-react": "0.460.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.22.1",
"tailwind-merge": "2.5.5",
"tailwindcss-animate": "1.0.7",
"vite-plugin-top-level-await": "1.4.4",
"vite-plugin-wasm": "3.3.0"
},
"devDependencies": {
"@eslint/js": "9.16.0",
"@types/node": "22.8.4",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@vitejs/plugin-react": "4.3.3",
"autoprefixer": "10.4.20",
"eslint-plugin-react-hooks": "5.0.0",
"eslint-plugin-react-refresh": "0.4.14",
"globals": "15.11.0",
"postcss": "8.4.49",
"tailwindcss": "3.4.15",
"typescript": "5.6.3",
"typescript-eslint": "8.11.0",
"vite": "link:@tanstack/router-plugin/vite"
}
}
Loading

0 comments on commit be74341

Please sign in to comment.