Skip to content

Commit

Permalink
fix: solve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Nov 25, 2024
2 parents f982242 + 12f9594 commit 4a1a9cc
Show file tree
Hide file tree
Showing 151 changed files with 6,885 additions and 10,902 deletions.
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,6 @@ ZEROG_INDEXER_RPC=
ZEROG_EVM_RPC=
ZEROG_PRIVATE_KEY=
ZEROG_FLOW_ADDRESS=

# Coinbase Commerce
COINBASE_COMMERCE_KEY=
3 changes: 3 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ jobs:
- name: Run Prettier
run: pnpm run prettier --check .

- name: Run Linter
run: pnpm run lint

- name: Create test env file
run: |
echo "TEST_DATABASE_CLIENT=sqlite" > packages/core/.env.test
Expand Down
76 changes: 76 additions & 0 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Pre-Release

on:
workflow_dispatch:
inputs:
release_type:
description: "Type of release (prerelease, prepatch, patch, minor, preminor, major)"
required: true
default: "prerelease"

jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-node@v4
with:
node-version: 22

- uses: pnpm/action-setup@v3
with:
version: 8

- name: Configure Git
run: |
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor }}@users.noreply.github.com"
- name: "Setup npm for npmjs"
run: |
npm config set registry https://registry.npmjs.org/
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install Protobuf Compiler
run: sudo apt-get install -y protobuf-compiler

- name: Install dependencies
run: pnpm install

- name: Build packages
run: pnpm run build

- name: Tag and Publish Packages
id: tag_publish
run: |
RELEASE_TYPE=${{ github.event_name == 'push' && 'prerelease' || github.event.inputs.release_type }}
npx lerna version $RELEASE_TYPE --conventional-commits --yes --no-private --force-publish
npx lerna publish from-git --yes --dist-tag next
- name: Get Version Tag
id: get_tag
run: echo "TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT

- name: Generate Release Body
id: release_body
run: |
if [ -f CHANGELOG.md ]; then
echo "body=$(cat CHANGELOG.md)" >> $GITHUB_OUTPUT
else
echo "body=No changelog provided for this release." >> $GITHUB_OUTPUT
fi
- name: Create GitHub Release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
PNPM_HOME: /home/runner/setup-pnpm/node_modules/.bin
with:
tag_name: ${{ steps.get_tag.outputs.TAG }}
release_name: Release
body_path: CHANGELOG.md
draft: false
prerelease: ${{ github.event_name == 'push' }}
4 changes: 4 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-node@v4
with:
node-version: 22

- uses: pnpm/action-setup@v3
with:
version: 8
Expand Down
12 changes: 12 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env sh

# Inform the user about commit message format requirements
echo "┌──────────────────────────────────────────────────────────────┐"
echo "│ ℹ️ Commit message must follow the format: 'type: description' │"
echo "│ Valid types: feat, fix, docs, style, refactor, test, chore │"
echo "│ Example: 'feat: add new login feature' │"
echo "└──────────────────────────────────────────────────────────────┘"
echo ""

# Run commitlint to validate the commit message
npx --no -- commitlint --edit ${1}
2 changes: 2 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pnpm run prettier-check
pnpm run lint
75 changes: 75 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,80 @@
# Changelog

## [v0.1.4-alpha.3](https://github.com/ai16z/eliza/tree/v0.1.4-alpha.3) (2024-11-22)

[Full Changelog](https://github.com/ai16z/eliza/compare/v0.1.4-alpha.2...v0.1.4-alpha.3)

**Merged pull requests:**

- fix: speech service fix [\#512](https://github.com/ai16z/eliza/pull/512) ([ponderingdemocritus](https://github.com/ponderingdemocritus))

## [v0.1.4-alpha.2](https://github.com/ai16z/eliza/tree/v0.1.4-alpha.2) (2024-11-22)

[Full Changelog](https://github.com/ai16z/eliza/compare/v0.1.4-alpha.1...v0.1.4-alpha.2)

**Merged pull requests:**

- fix: services fix [\#509](https://github.com/ai16z/eliza/pull/509) ([ponderingdemocritus](https://github.com/ponderingdemocritus))

## [v0.1.4-alpha.1](https://github.com/ai16z/eliza/tree/v0.1.4-alpha.1) (2024-11-22)

[Full Changelog](https://github.com/ai16z/eliza/compare/v0.1.4-alpha.0...v0.1.4-alpha.1)

**Merged pull requests:**

- fix: issue with npm [\#505](https://github.com/ai16z/eliza/pull/505) ([ponderingdemocritus](https://github.com/ponderingdemocritus))

## [v0.1.4-alpha.0](https://github.com/ai16z/eliza/tree/v0.1.4-alpha.0) (2024-11-22)

[Full Changelog](https://github.com/ai16z/eliza/compare/v0.1.3...v0.1.4-alpha.0)

**Implemented enhancements:**

- Run using Bun.sh [\#492](https://github.com/ai16z/eliza/issues/492)
- Move Trust DB into package [\#342](https://github.com/ai16z/eliza/issues/342)
- Core Unit Tests [\#340](https://github.com/ai16z/eliza/issues/340)

**Fixed bugs:**

- Twitter Dry Run not working [\#451](https://github.com/ai16z/eliza/issues/451)
- getCachedEmbeddings broken for sqlite adapter [\#251](https://github.com/ai16z/eliza/issues/251)

**Merged pull requests:**

- fix: remove sol dep [\#504](https://github.com/ai16z/eliza/pull/504) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
- fix: deps [\#503](https://github.com/ai16z/eliza/pull/503) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
- chore: add contributor license [\#502](https://github.com/ai16z/eliza/pull/502) ([futjrnaut](https://github.com/futjrnaut))
- node-v [\#501](https://github.com/ai16z/eliza/pull/501) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
- fix: improve embeddings [\#496](https://github.com/ai16z/eliza/pull/496) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
- feat: improve type saftey [\#494](https://github.com/ai16z/eliza/pull/494) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
- fix: added missing packages to tsup configs' externals [\#488](https://github.com/ai16z/eliza/pull/488) ([massivefermion](https://github.com/massivefermion))
- fix: fix character path loading [\#487](https://github.com/ai16z/eliza/pull/487) ([bmgalego](https://github.com/bmgalego))
- fix: agent loadCharacters file resolver [\#486](https://github.com/ai16z/eliza/pull/486) ([bmgalego](https://github.com/bmgalego))
- fix: agent type error and sqlite file env [\#484](https://github.com/ai16z/eliza/pull/484) ([bmgalego](https://github.com/bmgalego))
- feat: Improvements [\#482](https://github.com/ai16z/eliza/pull/482) ([bmgalego](https://github.com/bmgalego))
- refactor: add template types [\#479](https://github.com/ai16z/eliza/pull/479) ([vivoidos](https://github.com/vivoidos))
- feat: Twitter Refactor [\#478](https://github.com/ai16z/eliza/pull/478) ([bmgalego](https://github.com/bmgalego))
- feat: Added TWITTER\_COOKIE example on quickstart.md [\#476](https://github.com/ai16z/eliza/pull/476) ([haeunchin](https://github.com/haeunchin))
- fix: ci [\#475](https://github.com/ai16z/eliza/pull/475) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
- ollama generate case was using console.debug. [\#474](https://github.com/ai16z/eliza/pull/474) ([drew-royster](https://github.com/drew-royster))
- feat: Improve knowledge embeddings [\#472](https://github.com/ai16z/eliza/pull/472) ([tarrencev](https://github.com/tarrencev))
- docs: Update Contributors to bring inline with PR468 [\#470](https://github.com/ai16z/eliza/pull/470) ([odilitime](https://github.com/odilitime))
- docs: Add Discord username question [\#468](https://github.com/ai16z/eliza/pull/468) ([odilitime](https://github.com/odilitime))
- feat: adds check [\#466](https://github.com/ai16z/eliza/pull/466) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
- fix: Fixing failling tests token.test.ts and videoGeneration.test.ts [\#465](https://github.com/ai16z/eliza/pull/465) ([ai16z-demirix](https://github.com/ai16z-demirix))
- docs: Create best-practices.md documentation [\#463](https://github.com/ai16z/eliza/pull/463) ([snobbee](https://github.com/snobbee))
- feat: create-eliza-app [\#462](https://github.com/ai16z/eliza/pull/462) ([coffeeorgreentea](https://github.com/coffeeorgreentea))
- fix: Add missing fuzzystrmatch extension for levenshtein\(\) method to postgresql schema.sql definition [\#460](https://github.com/ai16z/eliza/pull/460) ([martincik](https://github.com/martincik))
- Add npm install instructions to homepage header [\#459](https://github.com/ai16z/eliza/pull/459) ([null-hax](https://github.com/null-hax))
- feat: init github client [\#456](https://github.com/ai16z/eliza/pull/456) ([tarrencev](https://github.com/tarrencev))
- fix: X dry run [\#452](https://github.com/ai16z/eliza/pull/452) ([laser-riot](https://github.com/laser-riot))
- feat: readme and linting [\#449](https://github.com/ai16z/eliza/pull/449) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
- fix: ignored modelEndpointOverride in generation [\#446](https://github.com/ai16z/eliza/pull/446) ([darwintree](https://github.com/darwintree))
- docs: Fix my name in stream notes [\#442](https://github.com/ai16z/eliza/pull/442) ([odilitime](https://github.com/odilitime))
- fix: postgres embedding issues [\#425](https://github.com/ai16z/eliza/pull/425) ([tarrencev](https://github.com/tarrencev))
- feat: Cache Manager [\#378](https://github.com/ai16z/eliza/pull/378) ([bmgalego](https://github.com/bmgalego))
- feat: adding back the renovate file for automated security scanning [\#358](https://github.com/ai16z/eliza/pull/358) ([sirkitree](https://github.com/sirkitree))

## [v0.1.3](https://github.com/ai16z/eliza/tree/v0.1.3) (2024-11-20)

[Full Changelog](https://github.com/ai16z/eliza/compare/v0.1.3-alpha.2...v0.1.3)
Expand Down
102 changes: 78 additions & 24 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,48 @@
# Contributing to Eliza

First off, thank you for considering contributing to Eliza! It's people like you that make Eliza such a great tool. We welcome contributions from everyone, regardless of their experience level.
First off, thank you for considering contributing to Eliza! We welcome contributions from everyone, regardless of experience level.

## Code of Conduct
## Contribution License Agreement

By participating in this project, you are expected to uphold our Code of Conduct. Please report unacceptable behavior.
By contributing to Eliza, you agree that your contributions will be licensed under the MIT License. This means:

## How Can I Contribute?
1. You grant us (and everyone else) a perpetual, worldwide, non-exclusive, royalty-free license to use your contributions.
2. Your contributions are and will be available as Free and Open Source Software (FOSS).
3. You have the right to submit the work under this license.
4. You understand that your contributions are public and that a record of the contribution is maintained indefinitely.

### Reporting Bugs
## The OODA Loop: A Framework for Contribution

1. Ensure the bug was not already reported by searching on GitHub under [Issues](https://github.com/ai16z/eliza/issues).
2. If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/ai16z/eliza/issues/new). Be sure to include
We believe in the power of the OODA Loop - a decision-making framework that emphasizes speed and adaptability. OODA stands for:

- a title and clear description,
- as much relevant information as possible, and
- a code sample or an executable test case demonstrating the expected behavior that is not occurring.
- **Observe**: Gather information and insights about the project, the community, and the broader AI ecosystem.
- **Orient**: Analyze your observations to identify opportunities for contribution and improvement.
- **Decide**: Choose a course of action based on your analysis. This could be proposing a new feature, fixing a bug, or creating content.
- **Act**: Execute your decision and share your work with the community.

### Suggesting Enhancements
## How to Contribute

1. Open a new issue with a clear title and detailed description of the suggested enhancement.
2. Include any relevant examples or mock-ups if applicable.
### For Developers

### Pull Requests
1. **Extend Eliza's Capabilities**

1. Fork the repo and create your branch from `main`.
- Develop new actions, evaluators, and providers
- Improve existing components and modules

2. **Enhance Infrastructure**

- Review open issues and submit PRs
- Test and update documentation
- Optimize performance
- Improve deployment solutions

3. Fork the repo and create your branch from `main`.
1. The name of the branch should start with the issue number and be descriptive of the changes you are making.
1. eg. 40--add-test-for-bug-123
2. If you've added code that should be tested, add tests.
3. Ensure the test suite passes.
4. Make sure your code lints.
5. Issue that pull request!
4. If you've added code that should be tested, add tests.
5. Ensure the test suite passes.
6. Make sure your code lints.
7. Issue that pull request!

## Styleguides

Expand Down Expand Up @@ -64,12 +76,54 @@ This section lists the labels we use to help us track and manage issues and pull
- `documentation` - Issues or pull requests related to documentation.
- `good first issue` - Good for newcomers.

## Recognition
## Getting Help

- Join [Discord](https://discord.gg/ai16z)
- Check [FAQ](docs/community/faq.md)
- Create GitHub issues

## Additional Resources

- [Local Development Guide](docs/guides/local-development.md)
- [Configuration Guide](docs/guides/configuration.md)
- [API Documentation](docs/api)

## Contributor Guide

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.

### Code of Conduct

#### Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.

#### Our Standards

Examples of behavior that contributes to creating a positive environment include:

- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior include:

- The use of sexualized language or imagery and unwelcome sexual attention or advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information without explicit permission
- Other conduct which could reasonably be considered inappropriate in a professional setting

#### Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

We value every contribution. Contributors will be recognized in our README.md file. Significant contributions may be acknowledged with special roles or responsibilities within the project.
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Questions?
#### Scope

If you have any questions, please feel free to contact the project maintainers with an issue or in discord.
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.

Thank you for your interest in contributing to Eliza!
Thank you for contributing to Eliza and helping build the future of autonomous AI agents! 🎉
Loading

0 comments on commit 4a1a9cc

Please sign in to comment.