Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
louistiti committed Aug 24, 2022
2 parents f179e10 + 0bd07cb commit cb2db41
Show file tree
Hide file tree
Showing 374 changed files with 10,711 additions and 4,648 deletions.
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
node_modules/
bridges/python/.venv/*

!bridges/python/.venv/.gitkeep
10 changes: 8 additions & 2 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,28 @@ LEON_TTS=false
# Text-to-speech provider
LEON_TTS_PROVIDER=flite

# Enable/disable packages to be available over HTTP
# Enable/disable skills to be available over HTTP
LEON_OVER_HTTP=true
# HTTP API key (use "npm run generate:http-api-key" to regenerate one)
LEON_HTTP_API_KEY=
# Language used for the HTTP API
LEON_HTTP_API_LANG=en-US

# Enable/disable collaborative logger
LEON_LOGGER=true

# Python TCP server
LEON_PY_TCP_SERVER_HOST=0.0.0.0
LEON_PY_TCP_SERVER_PORT=1342

# Path to the Pipfile
PIPENV_PIPFILE=bridges/python/Pipfile

# Path to the virtual env in .venv/
PIPENV_VENV_IN_PROJECT=true

# Fix https://click.palletsprojects.com/en/7.x/python3/#python-3-surrogate-handling
# If Leon replies you something like "Sorry, it seems I have a problem with the ... module" but
# If Leon replies you something like "Sorry, it seems I have a problem with the ... skill" but
# still gives you the right answer, then:
## 1. Run `locale -a`
## 2. Pick a locale
Expand Down
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at <louis.grenard@gmail.com>. All
reported by contacting the project team at <louis@getleon.ai>. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
11 changes: 4 additions & 7 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Thanks a lot for your interest in contributing to Leon! :heart:

**Leon needs open source to live**, the more modules he has, the more skillful he becomes.
**Leon needs open source to live**, the more skills he has, the more skillful he becomes.

**Before submitting your contribution**, please take a moment to review this document.

Expand Down Expand Up @@ -97,9 +97,6 @@ npm run docker:dev
## Versioning
- We use [Semantic Versioning](https://semver.org) for releases.
- A new Leon module creation increases the MINOR version number of its relevant Leon package.
- Each time a MAJOR or MINOR version number of a Leon package is increased, then the MINOR version number of the project should also be increased.
- Each time a PATCH version number of a Leon package is increased, then the PATCH version number of the projet should also be increased.
## Commits
Expand Down Expand Up @@ -130,13 +127,13 @@ Scopes define high-level nodes of Leon.
- web app
- server
- hotword
- package/package_name
- skill/skill_name
### Examples
```sh
git commit -m "feat(server): awesome new server feature"
git commit -m "docs(package/leon): fix spelling"
git commit -m "docs(skill/leon): fix spelling"
git commit -m "chore: split training script into awesome blocks"
git commit -m "style(web app): remove chatbot useless parentheses"
```
Expand All @@ -153,4 +150,4 @@ The focus is not only limited to the activity you see on GitHub but also a lot o
## Spread the Word
Use [#LeonAI](https://twitter.com/hashtag/LeonAI) if you tweet about Leon and/or mention [@louistiti_fr](https://twitter.com/louistiti_fr).
Use [#LeonAI](https://twitter.com/search?f=live&q=%23LeonAI%20(from%3Agrenlouis%20OR%20from%3Alouistiti_fr)&src=typed_query) if you tweet about Leon and/or mention [@grenlouis](https://twitter.com/grenlouis).
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ If the bug is related to the setup, please submit the issue at: https://github.c
- Node.js version:
- Complete "leon check" (or "npm run check") output:
- (if using Docker) Complete "npm run docker:check" output:
- (optional) Leon package version:
- (optional) Leon skill version:

### Expected Behavior

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: Build

on:
push:
branches: [master, develop]
# branches: [master, develop]
branches: [master]
pull_request:
branches: [master, develop]
# branches: [master, develop]
branches: [master]

jobs:
build:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: Lint

on:
push:
branches: [master, develop]
# branches: [master, develop]
branches: [master]
pull_request:
branches: [master, develop]
# branches: [master, develop]
branches: [master]

jobs:
lint:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: Tests

on:
push:
branches: [master, develop]
# branches: [master, develop]
branches: [master]
pull_request:
branches: [master, develop]
# branches: [master, develop]
branches: [master]

jobs:
tests:
Expand Down
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ test/coverage/
bridges/python/.venv/*
downloads/*
logs/*
server/src/config/**/*.json
core/config/**/*.json
bin/coqui/*
bin/flite/*

Expand All @@ -22,7 +22,9 @@ debug.log
!bridges/python/.venv/.gitkeep
!**/*.sample*
packages/**/config/config.json
skills/**/src/config.json
packages/**/data/db/*.json
server/src/data/leon-model.nlp
skills/**/memory/*.json
core/data/models/*.nlp
package.json.backup
.python-version
10 changes: 5 additions & 5 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
image: 'gitpod/workspace-full'
image: gitpod/workspace-full

tasks:
- before: 'npm install'
init: 'npm run check && npm run build'
command: 'npm start'
- before: npm install -g @leon-ai/cli
init: leon create birth
command: leon start

ports:
- port: 1337
onOpen: 'notify'
onOpen: notify

github:
prebuilds:
Expand Down
Loading

0 comments on commit cb2db41

Please sign in to comment.