Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

All Pull Requests #211

Closed
wants to merge 2 commits into from
Closed

All Pull Requests #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
388333a
completed tasks
HassanAfnan Mar 29, 2024
68d72e1
Merge pull request #1 from HassanAfnan/afnan#work
HassanAfnan Apr 1, 2024
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
18 changes: 16 additions & 2 deletions software/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions software/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dateparser = "^1.2.0"
pytimeparse = "^1.1.8"
python-crontab = "^3.0.0"
inquirer = "^3.2.4"
xlib = "^0.21"

[build-system]
requires = ["poetry-core"]
Expand Down
167 changes: 126 additions & 41 deletions software/source/server/services/tts/piper/tts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,136 @@
# import ffmpeg
# import tempfile
# import os
# import subprocess
# import urllib.request
# import tarfile
# import platform


# class Tts:
# def __init__(self, config):
# self.piper_directory = ""
# self.install(config["service_directory"])

# def tts(self, text):

# with tempfile.NamedTemporaryFile(suffix=".wav", delete=False) as temp_file:
# output_file = temp_file.name
# piper_dir = self.piper_directory
# subprocess.run([
# os.path.join(piper_dir, 'piper'),
# '--model', os.path.join(piper_dir, os.getenv('PIPER_VOICE_NAME', 'en_US-lessac-medium.onnx')),
# '--output_file', output_file
# ], input=text, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)

# # TODO: hack to format audio correctly for device
# outfile = tempfile.gettempdir() + "/" + "raw.dat"
# ffmpeg.input(temp_file.name).output(outfile, f="s16le", ar="16000", ac="1", loglevel='panic').run()

# return outfile

# def install(self, service_directory):
# PIPER_FOLDER_PATH = service_directory
# self.piper_directory = os.path.join(PIPER_FOLDER_PATH, 'piper')
# if not os.path.isdir(self.piper_directory): # Check if the Piper directory exists
# os.makedirs(PIPER_FOLDER_PATH, exist_ok=True)

# # Determine OS and architecture
# OS = platform.system().lower()
# ARCH = platform.machine()
# if OS == "darwin":
# OS = "macos"
# if ARCH == "arm64":
# ARCH = "aarch64"
# elif ARCH == "x86_64":
# ARCH = "x64"
# else:
# print("Piper: unsupported architecture")
# return
# elif OS == "windows":
# if ARCH == "AMD64":
# ARCH = "amd64"
# else:
# print("Piper: unsupported architecture")
# return

# PIPER_ASSETNAME = f"piper_{OS}_{ARCH}.tar.gz"
# PIPER_URL = "https://github.com/rhasspy/piper/releases/latest/download/"

# asset_url = f"{PIPER_URL}{PIPER_ASSETNAME}"

# if OS == "windows":

# asset_url = asset_url.replace(".tar.gz", ".zip")

# # Download and extract Piper
# urllib.request.urlretrieve(asset_url, os.path.join(PIPER_FOLDER_PATH, PIPER_ASSETNAME))

# # Extract the downloaded file
# if OS == "Windows":
# import zipfile
# with zipfile.ZipFile(os.path.join(PIPER_FOLDER_PATH, PIPER_ASSETNAME), 'r') as zip_ref:
# zip_ref.extractall(path=PIPER_FOLDER_PATH)
# else:
# with tarfile.open(os.path.join(PIPER_FOLDER_PATH, PIPER_ASSETNAME), 'r:gz') as tar:
# tar.extractall(path=PIPER_FOLDER_PATH)

# PIPER_VOICE_URL = os.getenv('PIPER_VOICE_URL',
# 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/lessac/medium/')
# PIPER_VOICE_NAME = os.getenv('PIPER_VOICE_NAME', 'en_US-lessac-medium.onnx')

# # Download voice model and its json file
# urllib.request.urlretrieve(f"{PIPER_VOICE_URL}{PIPER_VOICE_NAME}",
# os.path.join(self.piper_directory, PIPER_VOICE_NAME))
# urllib.request.urlretrieve(f"{PIPER_VOICE_URL}{PIPER_VOICE_NAME}.json",
# os.path.join(self.piper_directory, f"{PIPER_VOICE_NAME}.json"))

# # Additional setup for macOS
# if OS == "macos":
# if ARCH == "x64":
# subprocess.run(['softwareupdate', '--install-rosetta', '--agree-to-license'])

# PIPER_PHONEMIZE_ASSETNAME = f"piper-phonemize_{OS}_{ARCH}.tar.gz"
# PIPER_PHONEMIZE_URL = "https://github.com/rhasspy/piper-phonemize/releases/latest/download/"
# urllib.request.urlretrieve(f"{PIPER_PHONEMIZE_URL}{PIPER_PHONEMIZE_ASSETNAME}",
# os.path.join(self.piper_directory, PIPER_PHONEMIZE_ASSETNAME))

# with tarfile.open(os.path.join(self.piper_directory, PIPER_PHONEMIZE_ASSETNAME), 'r:gz') as tar:
# tar.extractall(path=self.piper_directory)

# PIPER_DIR = self.piper_directory
# subprocess.run(['install_name_tool', '-change', '@rpath/libespeak-ng.1.dylib',
# f"{PIPER_DIR}/piper-phonemize/lib/libespeak-ng.1.dylib", f"{PIPER_DIR}/piper"])
# subprocess.run(['install_name_tool', '-change', '@rpath/libonnxruntime.1.14.1.dylib',
# f"{PIPER_DIR}/piper-phonemize/lib/libonnxruntime.1.14.1.dylib", f"{PIPER_DIR}/piper"])
# subprocess.run(['install_name_tool', '-change', '@rpath/libpiper_phonemize.1.dylib',
# f"{PIPER_DIR}/piper-phonemize/lib/libpiper_phonemize.1.dylib", f"{PIPER_DIR}/piper"])

# print("Piper setup completed.")
# else:
# print("Piper already set up. Skipping download.")







import ffmpeg
import tempfile
import os
import subprocess
import urllib.request
import tarfile
import platform

import zipfile

class Tts:
def __init__(self, config):
self.piper_directory = ""
self.install(config["service_directory"])

def tts(self, text):

with tempfile.NamedTemporaryFile(suffix=".wav", delete=False) as temp_file:
output_file = temp_file.name
piper_dir = self.piper_directory
Expand All @@ -36,9 +153,9 @@ def install(self, service_directory):
os.makedirs(PIPER_FOLDER_PATH, exist_ok=True)

# Determine OS and architecture
OS = platform.system().lower()
OS = platform.system()
ARCH = platform.machine()
if OS == "darwin":
if OS == "Darwin":
OS = "macos"
if ARCH == "arm64":
ARCH = "aarch64"
Expand All @@ -47,65 +164,33 @@ def install(self, service_directory):
else:
print("Piper: unsupported architecture")
return
elif OS == "windows":
elif OS == "Windows":
if ARCH == "AMD64":
ARCH = "amd64"
ARCH = "x64"
else:
print("Piper: unsupported architecture")
return

PIPER_ASSETNAME = f"piper_{OS}_{ARCH}.tar.gz"
PIPER_URL = "https://github.com/rhasspy/piper/releases/latest/download/"

asset_url = f"{PIPER_URL}{PIPER_ASSETNAME}"
asset_url = f"{PIPER_URL}{PIPER_ASSETNAME}" # Assign asset_url here

if OS == "windows":

asset_url = asset_url.replace(".tar.gz", ".zip")

# Download and extract Piper
urllib.request.urlretrieve(asset_url, os.path.join(PIPER_FOLDER_PATH, PIPER_ASSETNAME))

# Extract the downloaded file
if OS == "Windows":
import zipfile
if OS == "windows":
with zipfile.ZipFile(os.path.join(PIPER_FOLDER_PATH, PIPER_ASSETNAME), 'r') as zip_ref:
zip_ref.extractall(path=PIPER_FOLDER_PATH)
else:
with tarfile.open(os.path.join(PIPER_FOLDER_PATH, PIPER_ASSETNAME), 'r:gz') as tar:
tar.extractall(path=PIPER_FOLDER_PATH)

PIPER_VOICE_URL = os.getenv('PIPER_VOICE_URL',
'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/lessac/medium/')
PIPER_VOICE_NAME = os.getenv('PIPER_VOICE_NAME', 'en_US-lessac-medium.onnx')

# Download voice model and its json file
urllib.request.urlretrieve(f"{PIPER_VOICE_URL}{PIPER_VOICE_NAME}",
os.path.join(self.piper_directory, PIPER_VOICE_NAME))
urllib.request.urlretrieve(f"{PIPER_VOICE_URL}{PIPER_VOICE_NAME}.json",
os.path.join(self.piper_directory, f"{PIPER_VOICE_NAME}.json"))

# Additional setup for macOS
if OS == "macos":
if ARCH == "x64":
subprocess.run(['softwareupdate', '--install-rosetta', '--agree-to-license'])

PIPER_PHONEMIZE_ASSETNAME = f"piper-phonemize_{OS}_{ARCH}.tar.gz"
PIPER_PHONEMIZE_URL = "https://github.com/rhasspy/piper-phonemize/releases/latest/download/"
urllib.request.urlretrieve(f"{PIPER_PHONEMIZE_URL}{PIPER_PHONEMIZE_ASSETNAME}",
os.path.join(self.piper_directory, PIPER_PHONEMIZE_ASSETNAME))

with tarfile.open(os.path.join(self.piper_directory, PIPER_PHONEMIZE_ASSETNAME), 'r:gz') as tar:
tar.extractall(path=self.piper_directory)

PIPER_DIR = self.piper_directory
subprocess.run(['install_name_tool', '-change', '@rpath/libespeak-ng.1.dylib',
f"{PIPER_DIR}/piper-phonemize/lib/libespeak-ng.1.dylib", f"{PIPER_DIR}/piper"])
subprocess.run(['install_name_tool', '-change', '@rpath/libonnxruntime.1.14.1.dylib',
f"{PIPER_DIR}/piper-phonemize/lib/libonnxruntime.1.14.1.dylib", f"{PIPER_DIR}/piper"])
subprocess.run(['install_name_tool', '-change', '@rpath/libpiper_phonemize.1.dylib',
f"{PIPER_DIR}/piper-phonemize/lib/libpiper_phonemize.1.dylib", f"{PIPER_DIR}/piper"])

# Rest of the code remains unchanged
print("Piper setup completed.")
else:
print("Piper already set up. Skipping download.")