Merge branch 'develop' into origin/master

leon-ai · Dec 28, 2021 · fdeff12 · fdeff12
2 parents 28326ae + 38d0436
commit fdeff12
Show file tree

Hide file tree

Showing 47 changed files with 31,087 additions and 12,085 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,5 +1,5 @@
 # Main settings of Leon
-# https://docs.getleon.ai/configuration.html
+# https://docs.getleon.ai/configuration
 
 # Language currently used
 LEON_LANG=en-US

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -12,12 +12,12 @@ Please note we have a [code of conduct](https://github.com/leon-ai/leon/blob/dev
 
 Here are few examples about how you could help on Leon, by:
 
-- [Creating a new module](https://docs.getleon.ai/packages-modules.html).
-- [Working on new features](https://roadmap.getleon.ai) (what is in backlog or todo).
+- [Creating a new module](https://docs.getleon.ai/packages-modules).
+- [Working on new features](http://roadmap.getleon.ai) (what is in backlog or todo).
 - [Suggesting new ideas](https://github.com/leon-ai/leon/issues/new/choose).
 - [Reporting a bug](https://github.com/leon-ai/leon/issues/new?labels=bug&template=BUG.md).
 - [Improving the documentation](https://github.com/leon-ai/docs.getleon.ai) (translations, typos, better writing, etc.).
-- [Buying me a fruit juice](https://donate.getleon.ai).
+- [Sponsoring Leon](http://sponsor.getleon.ai).
 
 
 ## Pull Requests
@@ -141,9 +141,15 @@ git commit -m "chore: split training script into awesome blocks"
 git commit -m "style(web app): remove chatbot useless parentheses"
 ```
 
-## Donate
+## Sponsor
 
-You can also contribute by [buying me a fruit juice](https://donate.getleon.ai).
+You can also contribute by [sponsoring Leon](http://sponsor.getleon.ai).
+
+Please note that I dedicate most of my free time to Leon.
+
+By sponsoring the project you make the project sustainable and faster to develop features.
+
+The focus is not only limited to the activity you see on GitHub but also a lot of thinking about the direction of the project. Which is naturally related to the overall design, architecture, vision, learning process and so on...
 
 ## Spread the Word
 

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,8 +1,8 @@
 # These are supported funding model platforms
 
-# github: [louistiti]
+github: [louistiti]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-custom: https://donate.getleon.ai
+custom: # http://sponsor.getleon.ai
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+version: 2
+updates:
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+      day: 'friday'
+      time: '22:00'
+    commit-message:
+      prefix: 'chore'
+      include: 'scope'
+    reviewers:
+      - 'louistiti'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,29 +8,27 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-20.04
-    container: leonai/ci:latest
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Cache node_modules
-        uses: actions/cache@v2
+      - name: Use Python
+        uses: actions/setup-python@v2
         with:
-          path: node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-
-      - name: Cache Pipenv
-        uses: actions/cache@v2
+          python-version: 3.x
+
+      - name: Use Node.js
+        uses: actions/setup-node@v2
         with:
-          path: bridges/python/.venv
-          key: ${{ runner.os }}-pipenv-${{ env.cache-name }}-${{ hashFiles('bridges/python/Pipfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pipenv-
+          node-version: 16.x
+          cache: npm
+
+      - name: Install Pipenv
+        run: pip install --upgrade pip && pip install pipenv
+
       - name: Install
-        run: npm ci
+        run: npm install
 
       - name: Check setup
         run: npm run check

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,29 +8,27 @@ on:
 
 jobs:
   lint:
-
-    runs-on: ubuntu-20.04
-    container: leonai/ci:latest
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Cache node_modules
-        uses: actions/cache@v2
+      - name: Use Python
+        uses: actions/setup-python@v2
         with:
-          path: node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-
-      - name: Cache Pipenv
-        uses: actions/cache@v2
+          python-version: 3.x
+
+      - name: Use Node.js
+        uses: actions/setup-node@v2
         with:
-          path: bridges/python/.venv
-          key: ${{ runner.os }}-pipenv-${{ env.cache-name }}-${{ hashFiles('bridges/python/Pipfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pipenv-
+          node-version: 16.x
+          cache: npm
+
+      - name: Install Pipenv
+        run: pip install --upgrade pip && pip install pipenv
+
       - name: Install
-        run: npm ci
+        run: npm install
 
       - name: Run linter
         run: npm run lint
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,29 +8,27 @@ on:
 
 jobs:
   tests:
-
-    runs-on: ubuntu-20.04
-    container: leonai/ci:latest
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Cache node_modules
-        uses: actions/cache@v2
+      - name: Use Python
+        uses: actions/setup-python@v2
         with:
-          path: node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-
-      - name: Cache Pipenv
-        uses: actions/cache@v2
+          python-version: 3.x
+
+      - name: Use Node.js
+        uses: actions/setup-node@v2
         with:
-          path: bridges/python/.venv
-          key: ${{ runner.os }}-pipenv-${{ env.cache-name }}-${{ hashFiles('bridges/python/Pipfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pipenv-
-      - name: Install npm dependencies
-        run: npm ci
+          node-version: 16.x
+          cache: npm
+
+      - name: Install Pipenv
+        run: pip install --upgrade pip && pip install pipenv
+
+      - name: Install
+        run: npm install
 
       - name: Run JSON tests
         run: npm run test:json

diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -0,0 +1,11 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+if ! [ -x "$(command -v npm)" ]; then
+  echo "npm: command not found"
+  echo "If you use a version manager tool such as nvm and a git GUI such as GitKraken, please read: https://typicode.github.io/husky/#/?id=command-not-found" >&2
+  exit 1
+else
+  npm run lint && node_modules/@babel/node/bin/babel-node.js scripts/commit-msg.js
+fi
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# [1.0.0-beta.5](https://github.com/leon-ai/leon/compare/v1.0.0-beta.4...1.0.0-beta.5) (2021-12-28) / Refocus
+
+*This release marks a major turn in the future versions of the Leon core. Please [read this blog post](https://blog.getleon.ai/i-ran-away-from-open-source/) to know more.*
+
+### BREAKING CHANGES
+ - Node.js 16+ and npm 8+ minimum requirements [2f66f1c1](https://github.com/leon-ai/leon/commit/2f66f1c17bb2e4a1c18b4251d49de252b8d87344)
+### Features
+ - **server:** support arrays on NER between conditions [7cf7f979](https://github.com/leon-ai/leon/commit/7cf7f9791254e1950fe9128ce1b3a58079cc2ada)
+### Bug Fixes
+ - jest-extended new setup due to latest update [02f766d6](https://github.com/leon-ai/leon/commit/02f766d6a8453609ebaec78356aa6e6d4df0967b)
+### Performance Improvements
+ - Windows setup on DeepSpeech dep removal [13f5a49f](https://github.com/leon-ai/leon/commit/13f5a49f678f8f67a93b67d4f558cddcf237e204)
+### Documentation Changes
+ - URL redirect managed by registrar [c16d5b28](https://github.com/leon-ai/leon/commit/c16d5b280b758f7e18305e30678adec79f0a0716)  
+
 # [1.0.0-beta.4](https://github.com/leon-ai/leon/compare/1.0.0-beta.2...1.0.0-beta.4) (2021-05-01) / Getting Rid of Dust
 
 *This release includes a lot of changes that are made under the hood and are not displayed here, please **[read the blog post](https://blog.getleon.ai/getting-rid-of-dust-1-0-0-beta-4/)** to know more.*

diff --git a/Dockerfile b/Dockerfile
@@ -1,25 +1,20 @@
-FROM node:14-alpine
+FROM node:16-alpine
 ENV IS_DOCKER true
 WORKDIR /app
 
 # Install system packages
 RUN apk add --no-cache --no-progress \
-    ca-certificates \
-    python3 \
-    git \
-    tzdata
+  ca-certificates \
+  py3-pip \
+  git \
+  tzdata
 
 # Upgrade pip and install Pipenv
 RUN pip3 install --no-cache-dir --progress-bar off pipenv
 
 # Install Leon
-# Need to explicitly run the npm preinstall and npm posinstall scripts (not needed with npm@7)
-# because npm tries to downgrade its privileges, and these scripts are not executed
-COPY ./package*.json ./
-RUN npm clean-install
 COPY ./ ./
-RUN npm run preinstall
-RUN npm run postinstall
+RUN npm install
 RUN npm run build
 
 CMD ["npm", "start"]
diff --git a/README.md b/README.md
@@ -1,9 +1,11 @@
 <p align="center">
-  <a href="https://getleon.ai"><img width="96" src="https://getleon.ai/img/logo.svg"></a><br><br>
-  <a href="https://www.youtube.com/watch?v=p7GRGiicO1c"><img width="512" src="https://getleon.ai/img/1.0.0-beta.0_preview_en.png"></a><br>
+  <a href="https://getleon.ai"><img width="800" src="https://getleon.ai/img/hero-animation.gif" /></a>
 </p>
 
-<h1 align="center">Leon</h1>
+<h1 align="center">
+  <a href="https://getleon.ai"><img width="96" src="https://getleon.ai/img/logo.svg" alt="Leon"></a><br>
+  Leon
+</h1>
 
 *<p align="center">Your open-source personal assistant.</p>*
 
@@ -22,11 +24,15 @@
 <p align="center">
   <a href="https://getleon.ai">Website</a> ::
   <a href="https://docs.getleon.ai">Documentation</a> ::
-  <a href="https://roadmap.getleon.ai">Roadmap</a> ::
+  <a href="http://roadmap.getleon.ai">Roadmap</a> ::
   <a href="https://github.com/leon-ai/leon/blob/develop/.github/CONTRIBUTING.md">Contributing</a> ::
   <a href="https://blog.getleon.ai/the-story-behind-leon/">Story</a>
 </p>
 
+<svg width="4438" height="1000" viewBox="0 0 4438 1000" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2223.75 250C2051.25 250 1926.87 362.5 1926.87 531.25C1926.87 700 2066.72 812.5 2239.38 812.5C2343.59 812.5 2435.47 771.25 2492.34 701.719L2372.81 632.656C2341.25 667.188 2293.28 687.344 2239.38 687.344C2164.53 687.344 2100.94 648.281 2077.34 585.781H2515.16C2518.59 568.281 2520.63 550.156 2520.63 531.094C2520.63 362.5 2396.41 250 2223.75 250ZM2076.09 476.562C2095.62 414.219 2149.06 375 2223.75 375C2298.59 375 2352.03 414.219 2371.41 476.562H2076.09ZM2040.78 78.125L1607.81 828.125L1174.69 78.125H1337.03L1607.66 546.875L1878.28 78.125H2040.78ZM577.344 0L1154.69 1000H0L577.344 0ZM3148.75 531.25C3148.75 625 3210 687.5 3305 687.5C3369.38 687.5 3417.66 658.281 3442.5 610.625L3562.5 679.844C3512.81 762.656 3419.69 812.5 3305 812.5C3132.34 812.5 3008.13 700 3008.13 531.25C3008.13 362.5 3132.5 250 3305 250C3419.69 250 3512.66 299.844 3562.5 382.656L3442.5 451.875C3417.66 404.219 3369.38 375 3305 375C3210.16 375 3148.75 437.5 3148.75 531.25ZM4437.5 78.125V796.875H4296.88V78.125H4437.5ZM3906.25 250C3733.75 250 3609.38 362.5 3609.38 531.25C3609.38 700 3749.38 812.5 3921.88 812.5C4026.09 812.5 4117.97 771.25 4174.84 701.719L4055.31 632.656C4023.75 667.188 3975.78 687.344 3921.88 687.344C3847.03 687.344 3783.44 648.281 3759.84 585.781H4197.66C4201.09 568.281 4203.12 550.156 4203.12 531.094C4203.12 362.5 4078.91 250 3906.25 250ZM3758.59 476.562C3778.13 414.219 3831.41 375 3906.25 375C3981.09 375 4034.53 414.219 4053.91 476.562H3758.59ZM2961.25 265.625V417.031C2945.63 412.5 2929.06 409.375 2911.25 409.375C2820.47 409.375 2755 471.875 2755 565.625V796.875H2614.38V265.625H2755V409.375C2755 330 2847.34 265.625 2961.25 265.625Z" fill="black"/>
+</svg>
+
 ---
 
 ## 👋 Introduction
@@ -75,8 +81,8 @@ Gitpod will automatically setup an environment and run an instance for you.
 
 ### Prerequisites
 
-- [Node.js](https://nodejs.org/) >= 14
-- [npm](https://npmjs.com/) >= 5
+- [Node.js](https://nodejs.org/) >= 16
+- [npm](https://npmjs.com/) >= 8
 - [Python](https://www.python.org/downloads/) >= 3
 - [Pipenv](https://docs.pipenv.org) >= 2020.11.15
 - Supported OSes: Linux, macOS and Windows
@@ -130,9 +136,13 @@ npm run docker:run
 
 For full documentation, visit [docs.getleon.ai](https://docs.getleon.ai).
 
+## 📺 Video
+
+[Watch a demo](https://www.youtube.com/watch?v=p7GRGiicO1c).
+
 ## 🧭 Roadmap
 
-To know what is going on, follow [roadmap.getleon.ai](https://roadmap.getleon.ai).
+To know what is going on, follow [roadmap.getleon.ai](http://roadmap.getleon.ai).
 
 ## ❤️ Contributing
 
@@ -146,19 +156,72 @@ You'll find a write-up on this [blog post](https://blog.getleon.ai/the-story-beh
 
 ## 🔔 Stay Tuned
 
-- [Newsletter](https://getleon.ai)
+- [Twitter](https://twitter.com/louistiti_fr)
+- [Newsletter](http://newsletter.getleon.ai)
 - [Blog](https://blog.getleon.ai)
 - [GitHub issues](https://github.com/leon-ai/leon/issues)
-- [Twitter](https://twitter.com/louistiti_fr)
+- [YouTube](https://www.youtube.com/channel/UCW6mk6j6nQUzFYY97r47emQ)
 - [#LeonAI](https://twitter.com/hashtag/LeonAI)
 
 ## 👨 Author
 
 **Louis Grenard** ([@louistiti_fr](https://twitter.com/louistiti_fr))
 
-## 👍 Donate
-
-You can also contribute by [buying me a fruit juice](https://donate.getleon.ai).
+## 👍 Sponsors
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle" width="128">
+        <a href="https://github.com/Francaoz">
+          <img src="https://github.com/Francaoz.png?size=128" />
+          Francaoz
+        </a><br>
+        <sub><sup>100 USD / month</sup></sub>
+      </td>
+      <td align="center" valign="middle" width="128">
+        <a href="https://github.com/GregoireAMATO">
+          <img src="https://github.com/GregoireAMATO.png?size=128" />
+          GrAMATO
+        </a><br>
+        <sub><sup>30 USD / month</sup></sub>
+      </td>
+      <td align="center" valign="middle" width="128">
+        <a href="https://github.com/phareal">
+          <img src="https://github.com/phareal.png?size=128" />
+          phareal
+        </a><br>
+        <sub><sup>17 USD / month</sup></sub>
+      </td>
+      <td align="center" valign="middle" width="128">
+        <a href="https://github.com/marvinpoo">
+          <img src="https://github.com/marvinpoo.png?size=128" />
+          marvinpoo
+        </a><br>
+        <sub><sup>10 USD / month</sup></sub>
+      </td>
+      <td align="center" valign="middle" width="128">
+      	<a href="http://sponsor.getleon.ai/">
+          You?
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+You can also contribute by [sponsoring Leon](http://sponsor.getleon.ai).
+
+Please note that I dedicate most of my free time to Leon.
+
+By sponsoring the project you make the project sustainable and faster to develop features.
+
+The focus is not only limited to the activity you see on GitHub but also a lot of thinking about the direction of the project. Which is naturally related to the overall design, architecture, vision, learning process and so on...
+
+### Special Thanks
+
+<a href="https://vercel.com/?utm_source=leon-ai&utm_campaign=oss">
+  <img src="https://i.imgur.com/S5olXWh.png" alt="Vercel" width="128" />
+</a>
 
 ## 📝 License
 [MIT License](https://github.com/leon-ai/leon/blob/develop/LICENSE.md)