Merge branch 'develop' into 'main'

Develop

See merge request jevalideca/yapp/breathaudio-frontend!1
This commit is contained in:
francois 2023-05-08 02:30:35 +00:00
commit e3f171afe4
10 changed files with 462 additions and 90 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/.idea/

21
Dockerfile Normal file
View file

@ -0,0 +1,21 @@
FROM python:3.10-slim
EXPOSE 8052
WORKDIR /app
# Install the app's dependencies
RUN pip install --upgrade pip
COPY requirements.txt .
RUN pip install -r requirements.txt
COPY install.py .
RUN python install.py
# Copy the app's code
COPY main.py .
# Set the entrypoint to run the app
ENTRYPOINT [ "streamlit", "run" ]
CMD [ "main.py", "--server.port=8052", "--server.headless", "true", "--server.fileWatcherType", "none", "--browser.gatherUsageStats", "false"]

220
LICENSE Normal file

File diff suppressed because one or more lines are too long

View file

@ -1,92 +1,2 @@
# breathaudio-frontend
## Getting started
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
## Add your files
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
```
cd existing_repo
git remote add origin https://git.jevalide.ca/gitlab/jevalideca/breathaudio-frontend.git
git branch -M main
git push -uf origin main
```
## Integrate with your tools
- [ ] [Set up project integrations](https://git.jevalide.ca/gitlab/jevalideca/breathaudio-frontend/-/settings/integrations)
## Collaborate with your team
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
## Test and Deploy
Use the built-in continuous integration in GitLab.
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
***
# Editing this README
When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
## Suggestions for a good README
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
## Name
Choose a self-explaining name for your project.
## Description
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
## Badges
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
## Visuals
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
## Installation
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
## Usage
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
## Support
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
## Roadmap
If you have ideas for releases in the future, it is a good idea to list them in the README.
## Contributing
State if you are open to contributions and what your requirements are for accepting them.
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
## Authors and acknowledgment
Show your appreciation to those who have contributed to the project.
## License
For open source projects, say how it is licensed.
## Project status
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.

19
build-local.sh Normal file
View file

@ -0,0 +1,19 @@
#!/usr/bin/zsh
#
# Copyright (C) 2023 François Pelletier - Je valide ça, service-conseil
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
docker build -t local/breathaudio-frontend .

22
docker-run.sh Normal file
View file

@ -0,0 +1,22 @@
#!/usr/bin/zsh
#
# Copyright (C) 2023 François Pelletier - Je valide ça, service-conseil
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
docker stop breathaudio-frontend
docker rm breathaudio-frontend
# Ce programme sert à lancer le breathaudio-frontend dans un docker localement pour tester
docker run -p 8052:8052 --name breathaudio-frontend --network host local/breathaudio-frontend

15
install.py Normal file
View file

@ -0,0 +1,15 @@
# Copyright (C) 2023 François Pelletier - Je valide ça, service-conseil
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

142
main.py Normal file
View file

@ -0,0 +1,142 @@
import requests
# Copyright (C) 2023 François Pelletier - Je valide ça, service-conseil
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import streamlit as st
from pydantic import BaseModel
BACKEND_URL = "http://localhost:8000"
class AudioProperties(BaseModel):
"""
Audio properties
"""
main_frequency: int
lag_frequency: int
volume: float
breath_pattern_in: int
breath_pattern_out: int
bell_sound: str
class VideoProperties(BaseModel):
"""
Video properties
"""
main_frequency: int
breath_pattern_in: int
breath_pattern_out: int
color_scheme = str
def write_app():
st.title("Audio Respiration")
st.write("Cette application permet de générer des visualisation avec audio pour rythmer la respiration")
# Select main_frequency with a slider from 30 to 3000
main_frequency = st.sidebar.slider(
"Choisissez la fréquence de la portion gauche",
min_value=30,
max_value=3000,
value=3000,
step=10
)
# Select lag_frequency with a slider from 30 to 3000
lag_frequency = st.sidebar.slider(
"Choisissez la fréquence de la portion droite",
min_value=main_frequency - 100,
max_value=main_frequency + 100,
value=main_frequency,
step=1
)
# Select volume from 0 to 1 by 0.01 increments
volume = st.sidebar.slider(
"Choisissez le volume",
min_value=0.0,
max_value=1.0,
value=0.01,
step=0.01
)
# Select length of breathing in seconds with a slider from 0 to 30
breath_pattern_in = st.sidebar.slider(
"Choisissez la durée d'inspiration",
min_value=0,
max_value=30,
value=4,
step=1
)
# Select length of breathing out seconds with a slider from 0 to 30
breath_pattern_out = st.sidebar.slider(
"Choisissez la durée d'expiration",
min_value=0,
max_value=30,
value=4,
step=1
)
# Choisir le son de cloche parmi une liste
bell_sound = st.sidebar.selectbox(
"Choisissez le son de cloche",
options=["Cloche", "Bol tibétain"]
)
# Choisir la couleur principale de la visualisation
color_scheme = st.sidebar.selectbox(
"Choisissez la couleur principale de la visualisation",
options=["Rouge", "Orange", "Jaune", "Vert", "Bleu", "Indigo", "Violet"]
)
# Bouton pour générer l'audio
generate_audio = st.sidebar.button("Générer l'audio")
if generate_audio:
ap = AudioProperties(
main_frequency=main_frequency,
lag_frequency=lag_frequency,
volume=volume,
breath_pattern_in=breath_pattern_in,
breath_pattern_out=breath_pattern_out,
bell_sound=bell_sound
)
audio_response = requests.get(
BACKEND_URL + "/generate_audio",
json=ap.dict(),
headers={"Content-Type": "application/json"})
st.write(audio_response.reason)
# Save the generated audio to a file
with open("audio.wav", "wb") as audio_file:
audio_file.write(audio_response.content)
st.audio("audio.wav")
generate_video = st.sidebar.button("Générer la vidéo")
if generate_video:
vp = VideoProperties(
main_frequency=main_frequency,
breath_pattern_in=breath_pattern_in,
breath_pattern_out=breath_pattern_out,
color_scheme=color_scheme
)
video_response = requests.get(
BACKEND_URL + "/generate_video",
json=vp.dict(),
headers={"Content-Type": "application/json"})
st.write(video_response.reason)
# Save the generated video to a file
with open("video.gif", "wb") as video_file:
video_file.write(video_response.content)
st.image("video.gif")
st.sidebar.write("App réalisé par François Pelletier")
def main():
write_app()
if __name__ == "__main__":
main()

3
requirements.txt Normal file
View file

@ -0,0 +1,3 @@
streamlit~=1.20.0
requests~=2.28.2
pydantic~=1.10.7

19
run-app.sh Normal file
View file

@ -0,0 +1,19 @@
#!/usr/bin/zsh
#
# Copyright (C) 2023 François Pelletier - Je valide ça, service-conseil
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
streamlit run main.py