Skip to content

Commit 27f028a

Browse files
authored
Merge branch 'develop' into fix/nearai-image-model
2 parents a098d03 + af347e2 commit 27f028a

File tree

1,271 files changed

+53821
-25038
lines changed

Some content is hidden

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

1,271 files changed

+53821
-25038
lines changed

.env.example

+7-1
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ SMALL_VENICE_MODEL= # Default: llama-3.3-70b
192192
MEDIUM_VENICE_MODEL= # Default: llama-3.3-70b
193193
LARGE_VENICE_MODEL= # Default: llama-3.1-405b
194194
IMAGE_VENICE_MODEL= # Default: fluently-xl
195+
BYPASS_VENICE_SYSTEM_PROMPT= # <boolean> | Default: false
195196

196197
# Nineteen.ai Configuration
197198
NINETEEN_AI_API_KEY= # Get a free api key from https://nineteen.ai/app/api
@@ -305,6 +306,7 @@ HEURIST_EMBEDDING_MODEL= # Default: BAAI/bge-large-en-v1.5
305306
USE_HEURIST_EMBEDDING= # Set to TRUE for HEURIST embedding, leave blank for local
306307

307308
# Gaianet Configuration
309+
GAIA_API_KEY=
308310
GAIANET_MODEL=
309311
GAIANET_SERVER_URL=
310312
SMALL_GAIANET_MODEL= # Default: llama3b
@@ -1004,4 +1006,8 @@ DATA_AUTH_TOKEN= # Your d.a.t.a auth token
10041006

10051007
# NKN Configuration
10061008
NKN_CLIENT_PRIVATE_KEY= # Required, NKN client private key
1007-
NKN_CLIENT_ID= # Optional, NKN client ID
1009+
NKN_CLIENT_ID= # Optional, NKN client ID
1010+
1011+
# setting global proxy for all agents
1012+
#AGENT_PROXY=http://127.0.0.1:7890
1013+
AGENT_PROXY=

.github/workflows/fetch-news.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Fetch News Files
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *' # Run daily at midnight UTC
6+
workflow_dispatch: # Allow manual triggering
7+
8+
jobs:
9+
fetch-news:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout repository
13+
uses: actions/checkout@v4
14+
with:
15+
ref: autodocs
16+
17+
- name: Run news fetcher
18+
run: |
19+
chmod +x docs/scripts/fetch-news.sh
20+
./docs/scripts/fetch-news.sh
21+
22+
- name: Commit and push if changes exist
23+
run: |
24+
git config --global user.name 'GitHub Actions Bot'
25+
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
26+
git add docs/news/
27+
git diff --quiet && git diff --staged --quiet || (git commit -m "Auto-update news files" && git push origin autodocs)
+48-28
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,50 @@
1-
name: Generate Changelog
1+
name: Update Changelog
2+
23
on:
3-
push:
4-
tags:
5-
- "*"
4+
release:
5+
types: [published]
6+
67
jobs:
7-
changelog:
8-
runs-on: ubuntu-latest
9-
permissions:
10-
contents: write
11-
steps:
12-
- uses: actions/checkout@v4
13-
with:
14-
ref: main
15-
token: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
16-
- name: Generate Changelog
17-
run: |
18-
export PATH="$PATH:/home/runner/.local/share/gem/ruby/3.0.0/bin"
19-
gem install --user-install github_changelog_generator
20-
github_changelog_generator \
21-
-u ${{ github.repository_owner }} \
22-
-p ${{ github.event.repository.name }} \
23-
--token ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
24-
- name: Commit Changelog
25-
uses: stefanzweifel/git-auto-commit-action@v5
26-
with:
27-
commit_message: "chore: update changelog"
28-
branch: main
29-
file_pattern: "CHANGELOG.md"
30-
commit_author: "GitHub Action <actions@github.com>"
8+
update_changelog:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: write
12+
pull-requests: write
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v4
17+
18+
- name: Set up Python
19+
uses: actions/setup-python@v5
20+
with:
21+
python-version: '3.x'
22+
23+
- name: Configure Git
24+
run: |
25+
git config user.name "GitHub Actions"
26+
git config user.email "actions@github.com"
27+
28+
- name: Check if autodocs branch exists and create or switch to it
29+
run: |
30+
if git ls-remote --heads origin autodocs | grep autodocs; then
31+
echo "Branch autodocs exists, checking out"
32+
git checkout autodocs
33+
git pull origin autodocs
34+
else
35+
echo "Branch autodocs doesn't exist, creating"
36+
git checkout -b autodocs
37+
fi
38+
39+
- name: Generate changelog
40+
run: python3 docs/scripts/get-changelog.py --output docs/docs/changelog.md
41+
env:
42+
GITHUB_TOKEN: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
43+
44+
- name: Commit and push changes
45+
run: |
46+
git add docs/changelog.md
47+
git commit -m "docs: update changelog for ${{ github.event.release.tag_name }}" || echo "No changes to commit"
48+
git push origin autodocs
49+
env:
50+
GITHUB_TOKEN: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}

.github/workflows/image.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v4
2929
# Uses the `docker/login-action` action to log in to the Container registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
3030
- name: Log in to the Container registry
31-
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
31+
uses: docker/login-action@327cd5a69de6c009b9ce71bce8395f28e651bf99
3232
with:
3333
registry: ${{ env.REGISTRY }}
3434
username: ${{ github.actor }}

.github/workflows/smoke-tests.yml

+7
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,10 @@ jobs:
3030

3131
- name: Run smoke tests
3232
run: pnpm run smokeTests
33+
34+
- name: Upload test results
35+
if: always()
36+
uses: actions/upload-artifact@v4
37+
with:
38+
name: test-results-${{env.MODIFIED_BRANCH_NAME}}
39+
path: ${{env.OUTPUT_TEST_DIR}}

CONTRIBUTING.md

+63-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Contributing to Eliza
1+
# Contributing to eliza
22

3-
First off, thank you for considering contributing to Eliza! We welcome contributions from everyone, regardless of experience level.
3+
First off, thank you for considering contributing to eliza! We welcome contributions from everyone, regardless of experience level.
44

55
## Contribution License Agreement
66

7-
By contributing to Eliza, you agree that your contributions will be licensed under the MIT License. This means:
7+
By contributing to eliza, you agree that your contributions will be licensed under the MIT License. This means:
88

99
1. You grant us (and everyone else) a perpetual, worldwide, non-exclusive, royalty-free license to use your contributions.
1010
2. Your contributions are and will be available as Free and Open Source Software (FOSS).
@@ -20,11 +20,13 @@ We believe in the power of the OODA Loop - a decision-making framework that emph
2020
- **Decide**: Choose a course of action based on your analysis. This could be proposing a new feature, fixing a bug, or creating content.
2121
- **Act**: Execute your decision and share your work with the community.
2222

23+
---
24+
2325
## How to Contribute
2426

2527
### For Developers
2628

27-
1. **Extend Eliza's Capabilities**
29+
1. **Extend eliza's Capabilities**
2830

2931
- Develop new actions, evaluators, and providers
3032
- Improve existing components and modules
@@ -44,6 +46,60 @@ We believe in the power of the OODA Loop - a decision-making framework that emph
4446
6. Make sure your code lints.
4547
7. Issue that pull request!
4648

49+
### For Designers
50+
51+
1. **Improve User Experience**
52+
53+
- Conduct user research and usability testing
54+
- Design intuitive user interfaces and interactions
55+
- Create high-fidelity mockups and prototypes
56+
57+
2. **Enhance Visual Design**
58+
- Develop a consistent visual language and style guide
59+
- Create engaging illustrations, icons, and graphics
60+
- Optimize designs for accessibility and inclusivity
61+
62+
### For Writers and Storytellers
63+
64+
1. **Craft Compelling Narratives**
65+
66+
- Write blog posts, articles, and stories that communicate our vision
67+
- Develop characters and scenarios that showcase the potential of AI agents
68+
- Collaborate with artists to create immersive, multimedia experiences
69+
70+
2. **Improve Documentation**
71+
- Write clear, concise, and accessible documentation
72+
- Create tutorials, guides, and FAQs to help users get started
73+
- Provide examples and use cases to demonstrate eliza's capabilities
74+
75+
### For Artists and Creators
76+
77+
1. **Illustrate the Future**
78+
79+
- Create concept art, illustrations, and infographics that bring our vision to life
80+
- Design characters, avatars, and virtual environments for AI agents
81+
- Experiment with new mediums and formats to communicate ideas
82+
83+
2. **Produce Multimedia Content**
84+
- Create videos, animations, and interactive experiences
85+
- Develop podcasts, interviews, and audio content
86+
- Collaborate with writers and developers to create integrated campaigns
87+
88+
### For Community Builders
89+
90+
1. **Foster Engagement**
91+
92+
- Moderate forums, chat rooms, and social media channels
93+
- Organize events, meetups, and hackathons
94+
- Facilitate discussions and collaborations among contributors
95+
96+
2. **Provide Support**
97+
- Answer questions and provide guidance to new contributors
98+
- Triage issues and help prioritize bug fixes and feature requests
99+
- Act as a liaison between the community and the core development team
100+
101+
---
102+
47103
## Styleguides
48104

49105
### Git Commit Messages
@@ -84,13 +140,13 @@ This section lists the labels we use to help us track and manage issues and pull
84140

85141
## Additional Resources
86142

87-
- [Local Development Guide](docs/docs/guides/local-development.md)
143+
- [Local Development Guide](docs/notes/local-development.md)
88144
- [Configuration Guide](docs/docs/guides/configuration.md)
89145
- [API Documentation](docs/api)
90146

91147
## Contributor Guide
92148

93-
Welcome to the Eliza contributor guide! This document is designed to help you understand how you can be part of building the future of autonomous AI agents, regardless of your technical background.
149+
Welcome to the eliza contributor guide! This document is designed to help you understand how you can be part of building the future of autonomous AI agents, regardless of your technical background.
94150

95151
### Code of Conduct
96152

@@ -126,4 +182,4 @@ Project maintainers have the right and responsibility to remove, edit, or reject
126182

127183
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
128184

129-
Thank you for contributing to Eliza and helping build the future of autonomous AI agents! 🎉
185+
Thank you for contributing to eliza and helping build the future of autonomous AI agents! 🎉

Dockerfile

+20-18
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,16 @@ RUN npm install -g pnpm@9.15.4 && \
2828
apt-get clean && \
2929
rm -rf /var/lib/apt/lists/*
3030

31-
# Set Python 3 as the default python
32-
RUN ln -sf /usr/bin/python3 /usr/bin/python
31+
# Clone the repository
32+
COPY . /app/eliza
3333

34-
# Set the working directory
35-
WORKDIR /app
34+
WORKDIR /app/eliza
3635

37-
# Copy application code
38-
COPY . .
36+
# List files to ensure package.json is present
37+
RUN echo "Listing files in /app/eliza:" && ls -la
38+
39+
# Set Python 3 as the default python
40+
RUN ln -sf /usr/bin/python3 /usr/bin/python
3941

4042
# Install dependencies
4143
RUN pnpm install
@@ -60,20 +62,20 @@ RUN npm install -g pnpm@9.15.4 && \
6062
WORKDIR /app
6163

6264
# Copy built artifacts and production dependencies from the builder stage
63-
COPY --from=builder /app/package.json ./
64-
COPY --from=builder /app/pnpm-workspace.yaml ./
65-
COPY --from=builder /app/.npmrc ./
66-
COPY --from=builder /app/turbo.json ./
67-
COPY --from=builder /app/node_modules ./node_modules
68-
COPY --from=builder /app/agent ./agent
69-
COPY --from=builder /app/client ./client
70-
COPY --from=builder /app/lerna.json ./
71-
COPY --from=builder /app/packages ./packages
72-
COPY --from=builder /app/scripts ./scripts
73-
COPY --from=builder /app/characters ./characters
65+
COPY --from=builder /app/eliza/package.json ./
66+
COPY --from=builder /app/eliza/pnpm-workspace.yaml ./
67+
COPY --from=builder /app/eliza/.npmrc ./
68+
COPY --from=builder /app/eliza/turbo.json ./
69+
COPY --from=builder /app/eliza/node_modules ./node_modules
70+
COPY --from=builder /app/eliza/agent ./agent
71+
COPY --from=builder /app/eliza/client ./client
72+
COPY --from=builder /app/eliza/lerna.json ./
73+
COPY --from=builder /app/eliza/packages ./packages
74+
COPY --from=builder /app/eliza/scripts ./scripts
75+
COPY --from=builder /app/eliza/characters ./characters
7476

7577
# Expose necessary ports
7678
EXPOSE 3000 5173
7779

7880
# Command to start the application
79-
CMD ["sh", "-c", "pnpm start & pnpm start:client"]
81+
CMD ["sh", "-c", "pnpm start & pnpm start:client"]

SECURITY.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ We take the security of Eliza seriously. If you believe you have found a securit
4848
3. **Code Review**
4949
- All code changes must go through pull request review
5050
- Security-sensitive changes require additional review
51-
- Enable branch protection on main branches
51+
- Enable branch protection for main branches
5252

5353
### For Users
5454

5555
1. **Environment Setup**
5656

57-
- Follow our [secrets management guide](docs/guides/secrets-management.md) for secure configuration
57+
- Follow our [secrets management guide](docs/docs/guides/secrets-management.md) for secure configuration
5858
- Use separate API keys for development and production
5959
- Regularly rotate credentials
6060

agent/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424
"@types/node": "^22.13.5",
2525
"json5": "2.2.3",
2626
"ts-node": "^10.9.2",
27+
"undici": "^7.4.0",
2728
"yargs": "17.7.2"
2829
},
2930
"devDependencies": {
3031
"@jest/globals": "^29.7.0",
31-
"@types/jest": "^29.5.14",
32-
"jest": "^29.7.0",
32+
"@types/jest": "29.5.14",
33+
"jest": "29.7.0",
3334
"ts-jest": "^29.2.6"
3435
}
3536
}

0 commit comments

Comments
 (0)