Skip to content
This repository has been archived by the owner on Nov 7, 2022. It is now read-only.

CELA-DEV -> MERGE -> DEVELOP #65

Open
wants to merge 101 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
157a7f5
Update functions.yml
panaC Oct 28, 2021
01e8440
Update functions.yml
panaC Oct 28, 2021
dcde325
Update functions.yml
panaC Oct 28, 2021
70560f3
sdk test prod
panaC Oct 28, 2021
d0b93ab
Merge remote-tracking branch 'origin/main' into main
panaC Oct 28, 2021
a85d692
test save service
panaC Oct 28, 2021
4993fa8
Revert "selection menu lvl3"
panaC Oct 29, 2021
e67920c
follow previous reverse commit
panaC Oct 29, 2021
8c11979
follow previous commit : remove unused file
panaC Oct 29, 2021
afb8b1b
fix: test sdk prod
panaC Oct 29, 2021
6d44cd1
Update README.md
panaC Nov 4, 2021
565f1bc
actions update
panaC Nov 17, 2021
b2a1364
fix: test
panaC Nov 17, 2021
56b226c
Migration DEVELOP to MAIN (PR #16)
panaC Dec 23, 2021
424e007
fix github actions deploy function
panaC Dec 23, 2021
a1f44a6
set prod mode in the webhook
panaC Dec 23, 2021
a5b5535
fix: test1
panaC Dec 23, 2021
ac29add
Merge branch 'main' of https://github.com/edrlab/lis-mon-livre
panaC Dec 23, 2021
f587973
cela first commit
panaC Dec 23, 2021
a96b6e2
rm unused file
panaC Dec 23, 2021
b9e409d
sdk prod pull
panaC Dec 23, 2021
73166f3
Merge branch 'main' of https://github.com/edrlab/lis-mon-livre into c…
panaC Dec 23, 2021
eb79fa5
merge sdk prod to cela-prod
panaC Dec 23, 2021
470206a
update: fr.json main.welcome
panaC Jan 13, 2022
c1e4dbe
[skip-ci] deploy actions
panaC Jan 31, 2022
dbd39eb
chore cela-dev
panaC Jan 31, 2022
50f8ad2
chore github actions
panaC Jan 31, 2022
0e8157e
chore: pull latest sdk
panaC Jan 31, 2022
8445b11
fix: pronunciation dev
panaC Jan 31, 2022
c40f169
cela-2 branding
panaC Mar 8, 2022
0908956
rm old cela-2 cela-dev files
panaC Mar 8, 2022
016a84c
merge from develop edrlab-1
panaC Mar 8, 2022
e349818
Update README.md
panaC Mar 8, 2022
80509f5
Merge pull request #30 from edrlab/develop
panaC Mar 8, 2022
c2f3d08
push and then pull gactions sdk
panaC Mar 8, 2022
5dbc9a6
Merge branch 'cela-dev' of https://github.com/edrlab/lis-mon-livre in…
panaC Mar 8, 2022
78cdc90
replace edrlab-1 with cela-2
panaC Mar 9, 2022
d0228d3
fix: remove to set NO_LINKED to authenticationState when no storageMo…
panaC Mar 9, 2022
9d1df4e
github actions: add function deploy for cela-dev
panaC Mar 9, 2022
9a3d051
set CELA API URLs
panaC Mar 9, 2022
0237313
fix: add authentication credentials to edrlab cloud function
panaC Mar 9, 2022
c723734
update gitignore
panaC Mar 9, 2022
fd7bc87
fix: NAME
panaC Mar 11, 2022
57bdedf
fix test: replace edrlab with cela
panaC Mar 11, 2022
788dad3
i18n: french translation
panaC Mar 14, 2022
a28846f
sdk: settings EN and FR
panaC Mar 14, 2022
aa3201c
README
panaC Mar 14, 2022
883d45a
sdk: french intents
panaC Mar 14, 2022
77bdd2b
sdk: fix type in search and select book intent
panaC Mar 14, 2022
9f5563e
fix: locale
panaC Mar 14, 2022
2c5748b
sdk: search french intent
panaC Mar 14, 2022
174904a
fix: alexa to google assistant keyword
panaC Mar 15, 2022
4cd0dd5
sdk: recommandations in collections intent:
panaC Mar 15, 2022
7b9c210
fix: home_user scene on-enter
panaC Mar 15, 2022
50292ab
fix: home_user intent help and regular user state
panaC Mar 15, 2022
5bd33a1
fix: locale in app catch Assistant
panaC Mar 15, 2022
aaa5895
fix: add a point in selection list i18n
panaC Mar 15, 2022
338c5e5
sdk: bookshelf and search intents
panaC Mar 16, 2022
ab705c8
feature: recent_books intent
panaC Mar 16, 2022
7d9212c
fix: player_prequel
panaC Mar 16, 2022
71a048d
test: fix previous commit
panaC Mar 16, 2022
036244b
fix: peer review with @Laurent
panaC Mar 18, 2022
ea77f03
fixes #44 : CELA NAME in en/fr
panaC Mar 18, 2022
5a310ad
fixes #46 selection - select_books intent
panaC Mar 18, 2022
784de92
fix: home_user playing test
panaC Mar 18, 2022
aadec7b
fix: persist media player on cancel and fallback3 and silence3
panaC Mar 18, 2022
da17131
fix: handle bad fetcher request with a stub opdsFeed - no publications
panaC Mar 18, 2022
2abef9b
feature: add a timeout on app.handle
panaC Mar 18, 2022
228965f
fix infinite loop in gactions platform beetwen selection and search
panaC Mar 18, 2022
01e015b
fix: search on enter should say somthing
panaC Mar 18, 2022
284645a
fix: double the timer 4s to 8s @todo see in real life the impact
panaC Mar 18, 2022
d7cde91
Update of the French and English dialogs
llemeurfr Mar 21, 2022
fca1d17
fixes #53 fixes #49: infinite loop on empty search
panaC Mar 21, 2022
4c38077
fixes #53 fixes #49: infinite loop on empty search
panaC Mar 21, 2022
5381177
fixes #55: info.about.1 twice said
panaC Mar 21, 2022
d34e2c9
fixes #51: home_user new_playing missing a translation
panaC Mar 21, 2022
d33e988
fixes #38: void
panaC Mar 21, 2022
fc0af1d
sdk: send prompt disalbled for en/fr -> fail submissiong
panaC Mar 21, 2022
c5a305f
sdk: bookshelf and recent_books fr
panaC Mar 21, 2022
e58ec27
merge from cela-dev
panaC Mar 21, 2022
1cb4824
pull from gactions
panaC Mar 21, 2022
a3f607b
add test on en translation
panaC Mar 21, 2022
da80bf4
fix info yes or membership en
panaC Mar 21, 2022
8f7410e
New dialog enhancements, mainly english
llemeurfr Mar 21, 2022
fb1be09
Tidy up the list of titles / collections message
llemeurfr Mar 21, 2022
731a2d4
translation review with unitary tests
panaC Mar 21, 2022
c169bf0
fix test previous commit
panaC Mar 21, 2022
260719b
fix: info intent info__intent__no
panaC Mar 22, 2022
ee9ab76
sdk: select book intent
panaC Mar 22, 2022
1c50fdd
sdk: by genre
panaC Mar 22, 2022
d796f6f
fix PR #61 update translations
panaC Mar 22, 2022
d9f7499
fix: surround webpub request with a try catch
panaC Mar 22, 2022
3738590
follow previous commit
panaC Mar 22, 2022
e0fbfb2
merge from cela-dev
panaC Mar 23, 2022
9442e82
Update functions-edrlab-dev.yml
panaC Mar 23, 2022
1fbc76b
Merge branch 'cela-dev' into merge
panaC Mar 23, 2022
3160d3f
readme
panaC Mar 23, 2022
5d62bde
readme
panaC Mar 23, 2022
aaba49b
sdk settings
panaC Mar 23, 2022
35580d8
url
panaC Mar 23, 2022
46f1b38
merge codebase and test
panaC Mar 23, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions .github/workflows/function-deploy-cela-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@

name: functions deploy

on:
push:
branches: [ cela-dev ]
paths:
- 'webhooks/**'
- '.github/workflows/function-deploy-cela-dev.yml'

jobs:
deploy:
name: "Deploy Firebase functions"
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

env:
working-directory: './webhooks/functions'
project-id: 'cela-2'
defaults:
run:
working-directory: './webhooks/functions'

steps:
- name: Checkout repo
uses: actions/checkout@v2

- name : GITHUB CONTEXT
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"

- name: Install node ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install Dependencies
run: npm ci --no-audit
working-directory: ${{ env.working-directory }}

- name: test
run: npm test
working-directory: ${{ env.working-directory }}

- name: lint
run: npm run lint
working-directory: ${{ env.working-directory }}

- name: build
run: npm run build
working-directory: ${{ env.working-directory }}

- name: set commit name to function config
uses: w9jds/firebase-action@master
with:
args: functions:config:set debug.message=\"${{ github.event.head_commit.message }}\" --project ${{ env.project-id }}
env:
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
PROJECT_PATH: './webhooks'

- name: Deploy to Firebase
uses: w9jds/firebase-action@master
with:
args: deploy --only \"functions:ActionsOnGoogleFulfillment\" --project ${{ env.project-id }} --message \"${{ github.event.head_commit.message }}\"
env:
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
PROJECT_PATH: './webhooks'
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@

node_modules
service_account.json

.nyc_output/
firebase-debug.log
ui-debug.log
6 changes: 5 additions & 1 deletion sdk/custom/intents/another_one.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{}
trainingPhrases:
- prochain
- suivant
- page suivante
- un autre
11 changes: 10 additions & 1 deletion sdk/custom/intents/bookshelf.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
{}
trainingPhrases:
- voir mon étagère
- consulter ma liste personnelle
- voir ma liste personnelle
- liste personnelle
- consulter mon étagère
- étagère
- mon étagère
- bibliothèque
- ma bibliothèque
5 changes: 4 additions & 1 deletion sdk/custom/intents/by_genre.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
{}
trainingPhrases:
- par genre
- genre
- je préfère par genre
5 changes: 4 additions & 1 deletion sdk/custom/intents/by_theme.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
{}
trainingPhrases:
- par thème
- thème
- je préfère par thème
7 changes: 6 additions & 1 deletion sdk/custom/intents/collections.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
{}
trainingPhrases:
- recommandations
- collections
- navigue dans les collections
- sélections
- navigue dans les sélections
2 changes: 1 addition & 1 deletion sdk/custom/intents/en/by_genre.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ trainingPhrases:
- by genre please
- genre
- I prefer by genre
- I prefer to get a book selection by genre
- I prefer collections by genre
- by genre
1 change: 1 addition & 0 deletions sdk/custom/intents/en/collections.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
trainingPhrases:
- recommendations
- collections
- Browse collections
1 change: 1 addition & 0 deletions sdk/custom/intents/en/learn_more.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
trainingPhrases:
- information
- learn more
3 changes: 3 additions & 0 deletions sdk/custom/intents/en/recent_books.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
trainingPhrases:
- resume playings
- recent books
2 changes: 2 additions & 0 deletions sdk/custom/intents/en/search.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
trainingPhrases:
- find
- search for
- I am looking for a book ($query 'The Little Prince by Antoine de Saint-Exupéry'
auto=false)
- I want to listen ($query 'this book title' auto=false)
Expand Down
13 changes: 9 additions & 4 deletions sdk/custom/intents/en/selects_book.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
trainingPhrases:
- ($number 'four' auto=true)
- ($number 'five' auto=true)
- number ($number 'five' auto=true)
- number ($number 'four' auto=true)
- number ($number 'three' auto=true)
- the ($number 'fifth' auto=false)
- the ($number 'fourth' auto=false)
- the ($number 'first' auto=false)
- the ($number 'second' auto=false)
- the ($number 'third' auto=false)
- the number ($number 'one' auto=false)
- the number ($number 'three' auto=true)
- ($number 'three' auto=true)
- ($number 'two' auto=true)
- ($number 'one' auto=false)
- the ($number 'two' auto=true)
- the ($number 'one' auto=false)
- number ($number 'two' auto=false)
- number ($number 'one' auto=false)
3 changes: 2 additions & 1 deletion sdk/custom/intents/help.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
trainingPhrases:
- aide
- aider moi
- aide moi
- de l'aide
1 change: 1 addition & 0 deletions sdk/custom/intents/learn_more.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
trainingPhrases:
- en apprendre plus
- en savoir plus
- information
1 change: 1 addition & 0 deletions sdk/custom/intents/link_account.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
trainingPhrases:
- je veux me connecter
- me connecter
1 change: 1 addition & 0 deletions sdk/custom/intents/maybe_later.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
trainingPhrases:
- plus tard
- peut être plus tard
12 changes: 12 additions & 0 deletions sdk/custom/intents/recent_books.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
trainingPhrases:
- mes livres récents
- reprends
- reprendre ma lecture
- reprendre la lecture
- derniers livres
- livres récents
- voir mes derniers livres
- voir mes livres récents
- reprendre ma lecture
- reprendre la lecture
- derniers livres lus
2 changes: 2 additions & 0 deletions sdk/custom/intents/repeat.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
trainingPhrases:
- répéter
- répête
- je ne comprends pas
16 changes: 16 additions & 0 deletions sdk/custom/intents/search.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,19 @@ parameters:
- name: query
type:
name: string
trainingPhrases:
- chercher un livre
- chercher un livre audio
- chercher ($number1 'un' auto=true) nouveau livre
- chercher
- je veux chercher un livre audio
- je veux chercher un livre
- recherche un livre
- recherche
- je veux rechercher un livre
- Je recherche ($query 'Le Petit Prince par Antoine de Saint-Exupéry' auto=false)
- Cherche ($query 'La Peste' auto=false)
- Recherche ($query 'La Horla' auto=false)
- Je veux écouter ($query 'Ce livre' auto=false)
- Je veux lire ($query 'Ce livre par cet auteur' auto=false)
- Je cherche un livre écrit par ($query 'Auteur' auto=false)
3 changes: 3 additions & 0 deletions sdk/custom/intents/search_query.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ parameters:
- name: query
type:
name: string
trainingPhrases:
- ($query 'La Peste de Camus' auto=false)
- ($query 'Le Petit Prince par Antoine de Saint-Exupéry' auto=false)
27 changes: 20 additions & 7 deletions sdk/custom/intents/selects_book.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,23 @@ parameters:
type:
name: actions.type.Number
trainingPhrases:
- ($letter 'c' auto=false)
- ($letter 'b' auto=false)
- ($letter 'C' auto=false)
- ($letter 'B' auto=false)
- ($letter 'ah' auto=false)
- ($letter 'A' auto=false)
- ($letter 'a' auto=false)
- Le ($number 'premier' auto=false)
- Le ($number 'second' auto=false)
- Le ($number 'troisième' auto=false)
- Le ($number 'quatrième' auto=false)
- Le ($number 'cinquième' auto=false)
- Numéro ($number 'un' auto=false)
- Numéro ($number 'deux' auto=false)
- Numéro ($number 'trois' auto=false)
- Numéro ($number 'quatre' auto=false)
- Numéro ($number 'cinq' auto=false)
- Le numéro ($number 'un' auto=false)
- Le numéro ($number 'deux' auto=false)
- Le numéro ($number 'trois' auto=false)
- Le numéro ($number 'quatre' auto=false)
- Le numéro ($number 'cinq' auto=false)
- ($number 'un' auto=false)
- ($number 'deux' auto=false)
- ($number 'trois' auto=false)
- ($number 'quatre' auto=false)
- ($number 'cinq' auto=false)
2 changes: 1 addition & 1 deletion sdk/custom/scenes/home_new_user_AccountLinking.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ slots:
writeSessionParam: AccountLinkingSlot
config:
'@type': type.googleapis.com/google.actions.conversation.v3.SignInSpec
opt_context: To keep using EDRLab
opt_context: ""
defaultValue:
sessionParam: AccountLinkingSlot
name: AccountLinkingSlot
Expand Down
3 changes: 3 additions & 0 deletions sdk/custom/scenes/home_user.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ intentEvents:
- handler:
webhookHandler: home_user__intent__search
intent: search
- handler:
webhookHandler: home_user__intent__recent_books
intent: recent_books
- handler:
webhookHandler: home_user__intent__fallback
intent: actions.intent.NO_MATCH_1
Expand Down
3 changes: 3 additions & 0 deletions sdk/custom/scenes/info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ intentEvents:
webhookHandler: info__intent__yes
intent: membership
transitionToScene: actions.scene.END_CONVERSATION
- handler:
webhookHandler: info__intent__no
intent: "no"
- handler:
webhookHandler: info__intent__fallback
intent: actions.intent.NO_MATCH_1
Expand Down
2 changes: 2 additions & 0 deletions sdk/webhooks/ActionsOnGoogleFulfillment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ handlers:
- name: player_prequel__on_enter
- name: player_prequel__intent__yes
- name: player_prequel__intent__no
- name: home_user__intent__recent_books
- name: info__intent__no
httpsEndpoint:
baseUrl: https://us-central1-edrlab-1.cloudfunctions.net/ActionsOnGoogleFulfillment
endpointApiVersion: 2
66 changes: 0 additions & 66 deletions webhooks/.gitignore

This file was deleted.

Loading