Skip to content

Commit

Permalink
Merge pull request #498 from mydroidandi/fb/estebanways
Browse files Browse the repository at this point in the history
Consolidating Changes: Modifications, Additions, Movements, and Delet…
  • Loading branch information
estebanways authored Jul 8, 2024
2 parents 0f313b0 + d4da5be commit 4780bb7
Show file tree
Hide file tree
Showing 80 changed files with 7,030 additions and 124 deletions.
15 changes: 12 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,11 @@ certificates/*
# Ignore the contents of the "src/client/assets" directory
src/client/assets/*

# Ignore the contents of the "src/client/bundles" directory
# Ignore the contents of the "src/client/bundles" directory except for
# specific files.
src/client/bundles/*
!src/client/bundles/terminal-chat-gpt/
!src/client/bundles/terminal-chat-gpt/terminal_chat_gpt.py

# Ignore the contents of the "src/client/config" directory
src/client/config/*
Expand All @@ -158,10 +161,16 @@ src/client/log/*
# Ignore the contents of the "src/client/serial_communication" directory
src/client/serial_communication/*

# Ignore the contents of the "src/server/skills_db" directory except for the file
# named "open_the_web_browser.json".
# Ignore the contents of the "src/server/skills_db" directory except for
# specific files.
src/server/skills_db/*
!src/server/skills_db/bash/
!src/server/skills_db/bash/f/
!src/server/skills_db/bash/f/firefox/
!src/server/skills_db/bash/f/firefox/open_the_web_browser.json
!src/server/skills_db/bash/o/
!src/server/skills_db/bash/o/openai/
!src/server/skills_db/bash/o/openai/open_terminal_chat_gpt.json

# Ignore the contents of the "src/tests" directory
src/tests/*
Expand Down
14 changes: 6 additions & 8 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -497,21 +497,21 @@ $ pip3.12 install pytest
Install Python in an Anaconda Python environment
-------------------------------------------------

Alternatively, you can replace Python 3.12 with Anaconda Python. Anaconda Python includes some well-optimized Python packages, so the speech recognition AI is supposed to work faster with Anaconda Python than with the official running Python, but everything depends on many factors, such as package versions and system resource availability.
With this alternative, you can skip using your current system Python (for example, Python 3.11) by installing 3.12 in an Anaconda Python environment for Commbase. Anaconda Python includes some well-optimized Python packages, so the speech recognition AI is supposed to work faster with Anaconda Python than with the official running Python. However, everything depends on many factors, such as package versions and system resource availability.

More information on Anaconda: https://www.anaconda.com/

After the installation of Anaconda Python, you should see the string "(base)" in the foobar.

In case your system has a single Python installation using Anaconda Python if it is set up for running only in the Bash shell, you must enter the Bash shell before starting Commbase, starting anaconda-navigator, or starting any other Python script/program incapable of starting with the current Python's runtime that is preinstalled within your Operating System distribution:
If your system has a single Python installation using Anaconda Python, and it is set up to run only in the Bash shell, you must enter the Bash shell before starting Commbase, anaconda-navigator, or any other Python script/program that cannot start with the current Python runtime preinstalled within your Operating System distribution.

Example of foobar before entering Bash:

USER-NAME@HOSTNAME:~$ bash

Example of foobar with Anaconda Python, identified by the string "(base)", after entering Bash:

(base) USER-NAME@shark:~$
(base) USER-NAME@HOSTNAME:~$

To install PyPi-like packages in the (base) in Anaconda Python, use the command "conda":

Expand Down Expand Up @@ -549,8 +549,6 @@ To verify the package was installed, in your terminal window or an Anaconda Pyth

(commbase_env) $ conda list | grep ipython

Note: This documentation and Commbase code would be updated for future releases of Python to make everything Commbase compatible.

To deactivate the current environment and go back to (base) use:

(commbase_env) $ conda deactivate
Expand Down Expand Up @@ -605,7 +603,7 @@ Verify that Whisper is installed properly.

$ conda list | grep openai-whisper

Install the rest pip packages, individually, from the commmbase_env environment.
Install the rest pip packages, individually, within the commmbase_env environment.

$ pip install daal

Expand Down Expand Up @@ -725,7 +723,7 @@ It contains the sh command.

- espeak:

It is an alternative to festival.
Espeak is an alternative to Festival and is required by pyttsx3 on Linux.

- festival.

Expand Down Expand Up @@ -1160,4 +1158,4 @@ The output should be the Commbase introduction.

From here, you can program new custom skills to customize your voice assistant or to create J.A.R.V.I.S. from Iron Man.

Check out the document User's Guide in the directory docs/ for a complete list of options.
Check out the document User's Guide in the directory assets/docs/ for a complete list of options.
Loading

0 comments on commit 4780bb7

Please sign in to comment.