reinstate aeneas for streching

Author: baxtree

.github/workflows/ci-pipeline.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.10]
 
     steps:
       - uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
           python -m mypy --follow-imports=normal subaligner
       - name: Linting
         run: |
-          pycodestyle subaligner tests examples misc bin/subaligner bin/subaligner_1pass bin/subaligner_2pass bin/subaligner_batch bin/subaligner_convert bin/subaligner_train  bin/subaligner_tune setup.py --ignore=E203,E501,E902,W503 --exclude="subaligner/lib"
+          pycodestyle subaligner tests examples misc bin/subaligner bin/subaligner_1pass bin/subaligner_2pass bin/subaligner_batch bin/subaligner_convert bin/subaligner_train  bin/subaligner_tune --ignore=E203,E501,E902,W503 --exclude="subaligner/lib"
       - name: Linting docstring
         run: |
           darglint -v 2 subaligner

README.md

@@ -70,11 +70,6 @@ Note that `subaligner[stretch]`, `subaligner[dev]` and `subaligner[harmony]` req
 <pre><code>apt-get install espeak libespeak1 libespeak-dev espeak-data</code></pre>
 <pre><code>brew install espeak</code></pre>
 </details>
-Also, if Python 3.12+ is used, you will need to install the following patch for those extras to fully function:
-<details>
-<summary>Install patched aeneas</summary>
-<pre><code>pip install git+https://github.com/baxtree/aeneas.git@v1.7.3.1#egg=aeneas</code></pre>
-</details>
 
 ## Container Support
 If you prefer using a containerised environment over installing everything locally:

pyproject.toml

@@ -139,7 +139,7 @@ dev = [
 docs = [
     "sphinx==6.2.1",
     "sphinx-rtd-theme==2.0.0",
-    "docutils<0.21",
+    "docutils<0.22",
 ]
 stretch = [
     "aeneas~=1.7.3.0; python_version < '3.12'",

subaligner/predictor.py

@@ -470,7 +470,7 @@ def _predict_in_multithreads(
             gc.collect()
 
             if stretch:
-                subs_new = self.__compress_and_stretch(subs_new, audio_file_path, stretch_in_lang, lock)
+                subs_new = self.__adjust_durations(subs_new, audio_file_path, stretch_in_lang, lock)
                 self.__LOGGER.info("[{}] Segment {} stretched".format(os.getpid(), segment_index))
             return subs_new
         except Exception as e: