Skip to content

Commit 8132709

Browse files
authored
Merge branch 'develop' into feature/solana-plugin-tests
2 parents d7f64ac + 446dd00 commit 8132709

File tree

182 files changed

+4993
-2740
lines changed

Some content is hidden

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

182 files changed

+4993
-2740
lines changed

.dockerignore

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Ignore node_modules from the build context
2+
node_modules
3+
4+
# Ignore logs and temporary files
5+
*.log
6+
*.tmp
7+
.DS_Store
8+
9+
# Ignore Git files and metadata
10+
.gitignore
11+
12+
# Ignore IDE and editor config files
13+
.vscode
14+
.idea
15+
*.swp
16+
17+
# Ignore build artifacts from the host
18+
dist
19+
build

.env.example

+17-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ PGLITE_DATA_DIR= #../pgLite/ if selecting a directory --- or memory:// if
99

1010
# Eliza Port Config
1111
SERVER_PORT=3000
12+
VITE_SERVER_PORT=${SERVER_PORT}
1213

1314
# Supabase Configuration
1415
SUPABASE_URL=
1516
SUPABASE_ANON_KEY=
1617

17-
# Remote character url (optional)
18-
REMOTE_CHARACTER_URL=
18+
# Comma separated list of remote character urls (optional)
19+
REMOTE_CHARACTER_URLS=
1920

2021
###############################
2122
#### Client Configurations ####
@@ -365,7 +366,7 @@ SQUID_SDK_URL=https://apiplus.squidrouter.com # Default: https://apiplus.squidro
365366
SQUID_INTEGRATOR_ID= # get integrator id through https://docs.squidrouter.com/
366367
SQUID_EVM_ADDRESS=
367368
SQUID_EVM_PRIVATE_KEY=
368-
SQUID_API_THROTTLE_INTERVAL= # Default: 0; Used to throttle API calls to avoid rate limiting (in ms)
369+
SQUID_API_THROTTLE_INTERVAL=1000 # Default: 1000; Used to throttle API calls to avoid rate limiting (in ms)
369370

370371
# TEE Configuration
371372
# TEE_MODE options:
@@ -602,3 +603,16 @@ AKASH_MANIFEST_VALIDATION_LEVEL=strict
602603
# Quai Network Ecosystem
603604
QUAI_PRIVATE_KEY=
604605
QUAI_RPC_URL=https://rpc.quai.network
606+
607+
# Instagram Configuration
608+
INSTAGRAM_DRY_RUN=false
609+
INSTAGRAM_USERNAME= # Account username
610+
INSTAGRAM_PASSWORD= # Account password
611+
INSTAGRAM_APP_ID= # Instagram App ID is required
612+
INSTAGRAM_APP_SECRET= # Instagram App Secret is required
613+
INSTAGRAM_BUSINESS_ACCOUNT_ID= # Optional Business Account ID for additional features
614+
INSTAGRAM_POST_INTERVAL_MIN=60 # Default: 60 minutes
615+
INSTAGRAM_POST_INTERVAL_MAX=120 # Default: 120 minutes
616+
INSTAGRAM_ENABLE_ACTION_PROCESSING=false # Enable/disable action processing
617+
INSTAGRAM_ACTION_INTERVAL=5 # Interval between actions in minutes
618+
INSTAGRAM_MAX_ACTIONS=1 # Maximum number of actions to process at once

.github/workflows/generate-readme-translations.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ jobs:
2424
{ code: "TH", name: "Thai" },
2525
{ code: "TR", name: "Turkish" },
2626
{ code: "VI", name: "Vietnamese" },
27+
{ code: "AR", name: "Arabic" },
28+
{ code: "RS", name: "Srpski" },
29+
{ code: "TG", name: "Tagalog" },
30+
{ code: "PL", name: "Polski" },
31+
{ code: "HU", name: "Hungarian" },
32+
{ code: "FA", name: "Persian" },
33+
{ code: "RO", name: "Romanian" },
34+
{ code: "GR", name: "Greek" },
35+
{ code: "NL", name: "Dutch" },
2736
]
2837
permissions:
2938
contents: write
@@ -53,7 +62,7 @@ jobs:
5362
"content_path": "README.md"
5463
}
5564
],
56-
"save_path": "README_${{ matrix.language.code }}.md",
65+
save_path: "i18n/readme/README_${{ matrix.language.code }}.md",
5766
"model": "gpt-4o"
5867
}
5968

Dockerfile

+43-19
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,62 @@
11
# Use a specific Node.js version for better reproducibility
22
FROM node:23.3.0-slim AS builder
33

4-
# Install pnpm globally and install necessary build tools
4+
# Install pnpm globally and necessary build tools
55
RUN npm install -g pnpm@9.4.0 && \
66
apt-get update && \
7-
apt-get install -y git python3 make g++ && \
7+
apt-get upgrade -y && \
8+
apt-get install -y \
9+
git \
10+
python3 \
11+
python3-pip \
12+
curl \
13+
node-gyp \
14+
ffmpeg \
15+
libtool-bin \
16+
autoconf \
17+
automake \
18+
libopus-dev \
19+
make \
20+
g++ \
21+
build-essential \
22+
libcairo2-dev \
23+
libjpeg-dev \
24+
libpango1.0-dev \
25+
libgif-dev \
26+
openssl \
27+
libssl-dev && \
828
apt-get clean && \
929
rm -rf /var/lib/apt/lists/*
1030

1131
# Set Python 3 as the default python
12-
RUN ln -s /usr/bin/python3 /usr/bin/python
32+
RUN ln -sf /usr/bin/python3 /usr/bin/python
1333

1434
# Set the working directory
1535
WORKDIR /app
1636

17-
# Copy package.json and other configuration files
18-
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc turbo.json ./
37+
# Copy application code
38+
COPY . .
1939

20-
# Copy the rest of the application code
21-
COPY agent ./agent
22-
COPY packages ./packages
23-
COPY scripts ./scripts
24-
COPY characters ./characters
40+
# Install dependencies
41+
RUN pnpm install --no-frozen-lockfile
2542

26-
# Install dependencies and build the project
27-
RUN pnpm install \
28-
&& pnpm build-docker \
29-
&& pnpm prune --prod
43+
# Build the project
44+
RUN pnpm run build && pnpm prune --prod
3045

31-
# Create a new stage for the final image
46+
# Final runtime image
3247
FROM node:23.3.0-slim
3348

34-
# Install runtime dependencies if needed
49+
# Install runtime dependencies
3550
RUN npm install -g pnpm@9.4.0 && \
3651
apt-get update && \
37-
apt-get install -y git python3 && \
52+
apt-get install -y \
53+
git \
54+
python3 \
55+
ffmpeg && \
3856
apt-get clean && \
3957
rm -rf /var/lib/apt/lists/*
4058

59+
# Set the working directory
4160
WORKDIR /app
4261

4362
# Copy built artifacts and production dependencies from the builder stage
@@ -47,9 +66,14 @@ COPY --from=builder /app/.npmrc ./
4766
COPY --from=builder /app/turbo.json ./
4867
COPY --from=builder /app/node_modules ./node_modules
4968
COPY --from=builder /app/agent ./agent
69+
COPY --from=builder /app/client ./client
70+
COPY --from=builder /app/lerna.json ./
5071
COPY --from=builder /app/packages ./packages
5172
COPY --from=builder /app/scripts ./scripts
5273
COPY --from=builder /app/characters ./characters
5374

54-
# Set the command to run the application
55-
CMD ["pnpm", "start"]
75+
# Expose necessary ports
76+
EXPOSE 3000 5173
77+
78+
# Command to start the application
79+
CMD ["sh", "-c", "pnpm start & pnpm start:client"]

Dockerfile.docs

+8-28
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,43 @@
11
# syntax=docker/dockerfile:1
22

3-
## Modified version of https://docusaurus.community/knowledge/deployment/docker/
4-
53
# Stage 1: Base image.
64
## Start with a base image containing NodeJS so we can build Docusaurus.
75
FROM node:23.3.0-slim AS base
86
## Disable colour output from yarn to make logs easier to read.
9-
10-
## https://pnpm.io/docker
11-
ENV PNPM_HOME="/pnpm"
12-
ENV PATH="$PNPM_HOME:$PATH"
13-
147
ENV FORCE_COLOR=0
158
## Enable corepack.
169
RUN corepack enable
1710
## Set the working directory to `/opt/docusaurus`.
1811
WORKDIR /opt/docusaurus
1912

20-
## Required by docusaurus: [ERROR] Loading of version failed for version current
21-
RUN apt-get update && apt-get install -y git
22-
13+
# Stage 2a: Development mode.
2314
FROM base AS dev
2415
## Set the working directory to `/opt/docusaurus`.
2516
WORKDIR /opt/docusaurus
2617
## Expose the port that Docusaurus will run on.
2718
EXPOSE 3000
2819
## Run the development server.
29-
CMD [ -d "node_modules" ] && npm run start -- --host 0.0.0.0 --poll 1000 || pnpm install && pnpm run start -- --host 0.0.0.0 --poll 1000
20+
CMD [ -d "node_modules" ] && pnpm start -- --host 0.0.0.0 --poll 1000 || pnpm install && pnpm start -- --host 0.0.0.0 --poll 1000
3021

3122
# Stage 2b: Production build mode.
32-
FROM base AS preprod
23+
FROM base AS prod
3324
## Set the working directory to `/opt/docusaurus`.
3425
WORKDIR /opt/docusaurus
3526

36-
## This is in case someone needs to build the lock file
37-
#RUN apt install python-is-python3 g++ make -y
38-
39-
COPY docs/package.json /opt/docusaurus/package.json
40-
COPY docs/package-lock.json /opt/docusaurus/package-lock.json
41-
42-
FROM preprod AS prod
43-
44-
## Install dependencies with `--immutable` to ensure reproducibility.
45-
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install
46-
47-
## Copy over the source code.
4827
COPY docs/ /opt/docusaurus/
4928
COPY packages/ /opt/packages/
5029

5130
## Required buy docusaurus [ERROR] Loading of version failed for version current
5231
COPY .git/ /opt/.git/
5332

54-
# Build from sources
55-
RUN pnpm run build
33+
## Install dependencies with `--frozen-lockfile` to ensure reproducibility.
34+
RUN pnpm install --no-frozen-lockfile
35+
## Build the static site.
36+
RUN pnpm build
5637

5738
# Stage 3a: Serve with `docusaurus serve`.
5839
FROM prod AS serve
5940
## Expose the port that Docusaurus will run on.
6041
EXPOSE 3000
6142
## Run the production server.
62-
CMD ["npm", "run", "serve", "--", "--host", "0.0.0.0", "--no-open"]
63-
43+
CMD ["pnpm", "run", "serve", "--host", "0.0.0.0", "--no-open"]

README.md

+6-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
## 🌍 README Translations
1414

15-
[中文说明](./README_CN.md) | [日本語の説明](./README_JA.md) | [한국어 설명](./README_KOR.md) | [Persian](./README_FA.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) | [ไทย](./README_TH.md) | [Deutsch](./README_DE.md) | [Tiếng Việt](./README_VI.md) | [עִברִית](https://github.com/elizaos/Elisa/blob/main/README_HE.md) | [Tagalog](./README_TG.md) | [Polski](./README_PL.md) | [Arabic](./README_AR.md) | [Hungarian](./README_HU.md) | [Srpski](./README_RS.md) | [Română](./README_RO.md) | [Nederlands](./README_NL.md) | [Ελληνικά](./README_GR.md)
15+
[中文说明](i18n/readme/README_CN.md) | [日本語の説明](i18n/readme/README_JA.md) | [한국어 설명](i18n/readme/README_KOR.md) | [Persian](i18n/readme/README_FA.md) | [Français](i18n/readme/README_FR.md) | [Português](i18n/readme/README_PTBR.md) | [Türkçe](i18n/readme/README_TR.md) | [Русский](i18n/readme/README_RU.md) | [Español](i18n/readme/README_ES.md) | [Italiano](i18n/readme/README_IT.md) | [ไทย](i18n/readme/README_TH.md) | [Deutsch](i18n/readme/README_DE.md) | [Tiếng Việt](i18n/readme/README_VI.md) | [עִברִית](i18n/readme/README_HE.md) | [Tagalog](i18n/readme/README_TG.md) | [Polski](i18n/readme/README_PL.md) | [Arabic](i18n/readme/README_AR.md) | [Hungarian](i18n/readme/README_HU.md) | [Srpski](i18n/readme/README_RS.md) | [Română](i18n/readme/README_RO.md) | [Nederlands](i18n/readme/README_NL.md) | [Ελληνικά](i18n/readme/README_GR.md)
1616

1717
## 🚩 Overview
1818

@@ -85,7 +85,6 @@ cp .env.example .env
8585

8686
Note: .env is optional. If you're planning to run multiple distinct agents, you can pass secrets through the character JSON
8787

88-
8988
#### Start Eliza
9089

9190
```bash
@@ -99,17 +98,17 @@ pnpm clean
9998

10099
### Interact via Browser
101100

102-
```
103101
Once the agent is running, you should see the message to run "pnpm start:client" at the end.
104-
Open another terminal and move to same directory and then run below command and follow the URL to chat to your agent.
102+
103+
Open another terminal, move to same directory, run the command below, then follow the URL to chat with your agent.
105104

106105
```bash
107106
pnpm start:client
108107
```
109108

110109
Then read the [Documentation](https://elizaos.github.io/eliza/) to learn how to customize your Eliza.
111110

112-
----
111+
---
113112

114113
### Automatically Start Eliza
115114

@@ -123,7 +122,7 @@ For detailed instructions on using the start script, including character managem
123122

124123
> **Note**: The start script handles all dependencies, environment setup, and character management automatically.
125124
126-
----
125+
---
127126

128127
### Modify Character
129128

@@ -144,8 +143,8 @@ You may need to install Sharp. If you see an error when starting up, try install
144143
```
145144
pnpm install --include=optional sharp
146145
```
147-
---
148146

147+
---
149148

150149
### Start Eliza with Gitpod
151150

0 commit comments

Comments
 (0)