batchalign 0.7.4__tar.gz → 0.7.5a2__tar.gz

{batchalign-0.7.4/batchalign.egg-info → batchalign-0.7.5a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchalign
-Version: 0.7.4
+Version: 0.7.5a2
 Summary: Python Speech Language Sample Analysis
 Author: Brian MacWhinney, Houjun Liu
 Author-email: macw@cmu.edu, houjun@cmu.edu
@@ -85,15 +85,15 @@ The TalkBank Project, of which Batchalign is a part, is supported by NIH grant H
 The following instructions provide a quick start to installing Batchalign. For most users aiming to process CHAT and audio with Batchalign, we recommend more detailed usage instructions: for [usage](https://talkbank.org/info/BA2-usage.pdf) and [human transcript cleanup](https://talkbank.org/info/BA2-cleanup.pdf). The following provides a quick start guide for the program.
 
 ### Get Python
-- We support Python versions 3.9, 3.10, and 3.11.  
-- **We do not support Python 3.12** (no PyTorch support)
+- We support Python versions 3.9, 3.10, 3.11 and 3.12.  
+- First, check to see if you have Python by running `python`. If it reports any of the versions above, skip the following step.
 - To install Python, follow the instructions...
     -  for macOS
         1. Install Brew: [visit this link](https://brew.sh/)
         2. Install Python: execute `brew install python@3.11`
     -  for Windows
         1.  Install Python 3.11: [via this link](https://www.python.org/ftp/python/3.11.7/python-3.11.7-amd64.exe) 
-        2.  If later commands report `pip module not found`, [this page may help](https://stackoverflow.com/a/15626784)
+        2.  If later commands report `pip module not found`, [this page may help](https://github.com/TalkBank/batchalign2/wiki/Troubleshooting-Tips#get-pip-on-windows)
     -  your distribution's instructions for Linux
 
 ### Install and Update the Package
@@ -156,7 +156,7 @@ batchalign morphotag ~/ba_input ~/ba_output
 #### forced alignment
 
 ```
-batchalign align --lang=eng ~/ba_input ~/ba_output
+batchalign align ~/ba_input ~/ba_output
 ```
 
 

{batchalign-0.7.4 → batchalign-0.7.5a2}/README.md

@@ -11,15 +11,15 @@ The TalkBank Project, of which Batchalign is a part, is supported by NIH grant H
 The following instructions provide a quick start to installing Batchalign. For most users aiming to process CHAT and audio with Batchalign, we recommend more detailed usage instructions: for [usage](https://talkbank.org/info/BA2-usage.pdf) and [human transcript cleanup](https://talkbank.org/info/BA2-cleanup.pdf). The following provides a quick start guide for the program.
 
 ### Get Python
-- We support Python versions 3.9, 3.10, and 3.11.  
-- **We do not support Python 3.12** (no PyTorch support)
+- We support Python versions 3.9, 3.10, 3.11 and 3.12.  
+- First, check to see if you have Python by running `python`. If it reports any of the versions above, skip the following step.
 - To install Python, follow the instructions...
     -  for macOS
         1. Install Brew: [visit this link](https://brew.sh/)
         2. Install Python: execute `brew install python@3.11`
     -  for Windows
         1.  Install Python 3.11: [via this link](https://www.python.org/ftp/python/3.11.7/python-3.11.7-amd64.exe) 
-        2.  If later commands report `pip module not found`, [this page may help](https://stackoverflow.com/a/15626784)
+        2.  If later commands report `pip module not found`, [this page may help](https://github.com/TalkBank/batchalign2/wiki/Troubleshooting-Tips#get-pip-on-windows)
     -  your distribution's instructions for Linux
 
 ### Install and Update the Package
@@ -82,7 +82,7 @@ batchalign morphotag ~/ba_input ~/ba_output
 #### forced alignment
 
 ```
-batchalign align --lang=eng ~/ba_input ~/ba_output
+batchalign align ~/ba_input ~/ba_output
 ```
 
 

{batchalign-0.7.4 → batchalign-0.7.5a2}/batchalign/cli/cli.py

@@ -49,15 +49,7 @@ def common_options(f):
         click.argument("in_dir",
                        type=click.Path(exists=True, file_okay=False)),
         click.argument("out_dir",
-                       type=click.Path(exists=True, file_okay=False)),
-        click.option("--lang",
-                     help="sample language in three-letter ISO 3166-1 alpha-3 code",
-                     show_default=True,
-                     default="eng",
-                     type=str),
-        click.option("-n", "--num_speakers", type=int,
-                     help="number of speakers in the language sample", default=2),
-        
+                       type=click.Path(exists=True, file_okay=False))
     ]
 
     options.reverse()
@@ -115,8 +107,9 @@ batchalign.add_command(train, "models")
 @common_options
 @click.option("--whisper/--rev",
               default=False, help="For utterance timing recovery, OpenAI Whisper (ASR) instead of Rev.AI (default).")
+
 @click.pass_context
-def align(ctx, in_dir, out_dir, lang, num_speakers, whisper, **kwargs):
+def align(ctx, in_dir, out_dir, whisper, **kwargs):
     """Align transcripts against corresponding media files."""
     def loader(file):
         return CHATFile(path=os.path.abspath(file)).doc
@@ -124,7 +117,7 @@ def align(ctx, in_dir, out_dir, lang, num_speakers, whisper, **kwargs):
     def writer(doc, output):
         CHATFile(doc=doc).write(output)
 
-    _dispatch("align", lang, num_speakers,
+    _dispatch("align", "eng", 1,
               ["cha"], ctx,
               in_dir, out_dir,
               loader, writer, C,
@@ -143,6 +136,12 @@ def align(ctx, in_dir, out_dir, lang, num_speakers, whisper, **kwargs):
               default=False, help="Perform speaker diarization (this flag is ignored with Rev.AI)")
 @click.option("--wor/--nowor",
               default=False, help="Should we write word level alignment line? Default to no.")
+@click.option("--lang",
+              help="sample language in three-letter ISO 3166-1 alpha-3 code",
+              show_default=True,
+              default="eng",
+              type=str)
+@click.option("-n", "--num_speakers", type=int, help="number of speakers in the language sample", default=2)
 @click.pass_context
 def transcribe(ctx, in_dir, out_dir, lang, num_speakers, **kwargs):
     """Create a transcript from audio files."""
@@ -189,7 +188,7 @@ def transcribe(ctx, in_dir, out_dir, lang, num_speakers, **kwargs):
                               file_okay=True, dir_okay=False),
               help="Comma seperated manual lexicon override")
 @click.pass_context
-def morphotag(ctx, in_dir, out_dir, lang, num_speakers, **kwargs):
+def morphotag(ctx, in_dir, out_dir, **kwargs):
     """Perform morphosyntactic analysis on transcripts."""
 
     def loader(file):
@@ -213,7 +212,7 @@ def morphotag(ctx, in_dir, out_dir, lang, num_speakers, **kwargs):
     def writer(doc, output):
         CHATFile(doc=doc, special_mor_=doc.ba_special_.get("special_mor_notation", False)).write(output)
 
-    _dispatch("morphotag", lang, num_speakers, ["cha"], ctx,
+    _dispatch("morphotag", "eng", 1, ["cha"], ctx,
               in_dir, out_dir,
               loader, writer, C)
 
@@ -222,6 +221,12 @@ def morphotag(ctx, in_dir, out_dir, lang, num_speakers, **kwargs):
 
 @batchalign.command()
 @common_options
+@click.option("--lang",
+              help="sample language in three-letter ISO 3166-1 alpha-3 code",
+              show_default=True,
+              default="eng",
+              type=str)
+@click.option("-n", "--num_speakers", type=int, help="number of speakers in the language sample", default=2)
 @click.pass_context
 def utseg(ctx, in_dir, out_dir, lang, num_speakers, **kwargs):
     """Perform morphosyntactic analysis on transcripts."""

{batchalign-0.7.4 → batchalign-0.7.5a2}/batchalign/formats/chat/utils.py

@@ -146,7 +146,7 @@ def annotation_clean(content, special=False):
     cleaned_word = cleaned_word.replace("~","").replace("&~","")
     cleaned_word = cleaned_word.replace(">","").replace("<","")
     cleaned_word = cleaned_word.replace("〕","").replace("//","").replace(";","")
-    cleaned_word = re.sub(r"@.", '', cleaned_word)
+    cleaned_word = re.sub(r"@[^abcefpoqs]", '', cleaned_word)
     cleaned_word = re.sub(r"&.", '', cleaned_word)
 
     return cleaned_word

{batchalign-0.7.4 → batchalign-0.7.5a2}/batchalign/pipelines/morphosyntax/ud.py

@@ -212,7 +212,7 @@ def handler__NOUN(word, lang=None):
 def handler__PROPN(word, lang=None):
     # code as noun
     parsed = handler__NOUN(word)
-    return parsed.replace("propn", "noun")
+    return parsed.replace("noun", "propn")
 
 def handler__VERB(word, lang=None):
     # get the features
@@ -635,7 +635,9 @@ def tokenizer_processor(tokenized, lang, sent):
             before,after = conform(i).split("'")
             res.append((f'{before}\'', False))
             res.append((after, False))
-        elif ("en" in lang) and matches_in(i, "'"):
+        elif (("en" in lang) and matches_in(i, "'") and
+              not (len(conform(i).split("'")) > 1 and
+                   conform(i).split("'")[0].strip() == "o")):
             res.append((conform(i), True))
         elif ("nl" in lang) and conform(i).endswith("'s"):
             res.append((conform(i), False))

batchalign-0.7.5a2/batchalign/version

@@ -0,0 +1,3 @@
+0.7.5-alpha.2
+September 3nd, 2024
+Some tagging modification

{batchalign-0.7.4 → batchalign-0.7.5a2/batchalign.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchalign
-Version: 0.7.4
+Version: 0.7.5a2
 Summary: Python Speech Language Sample Analysis
 Author: Brian MacWhinney, Houjun Liu
 Author-email: macw@cmu.edu, houjun@cmu.edu
@@ -85,15 +85,15 @@ The TalkBank Project, of which Batchalign is a part, is supported by NIH grant H
 The following instructions provide a quick start to installing Batchalign. For most users aiming to process CHAT and audio with Batchalign, we recommend more detailed usage instructions: for [usage](https://talkbank.org/info/BA2-usage.pdf) and [human transcript cleanup](https://talkbank.org/info/BA2-cleanup.pdf). The following provides a quick start guide for the program.
 
 ### Get Python
-- We support Python versions 3.9, 3.10, and 3.11.  
-- **We do not support Python 3.12** (no PyTorch support)
+- We support Python versions 3.9, 3.10, 3.11 and 3.12.  
+- First, check to see if you have Python by running `python`. If it reports any of the versions above, skip the following step.
 - To install Python, follow the instructions...
     -  for macOS
         1. Install Brew: [visit this link](https://brew.sh/)
         2. Install Python: execute `brew install python@3.11`
     -  for Windows
         1.  Install Python 3.11: [via this link](https://www.python.org/ftp/python/3.11.7/python-3.11.7-amd64.exe) 
-        2.  If later commands report `pip module not found`, [this page may help](https://stackoverflow.com/a/15626784)
+        2.  If later commands report `pip module not found`, [this page may help](https://github.com/TalkBank/batchalign2/wiki/Troubleshooting-Tips#get-pip-on-windows)
     -  your distribution's instructions for Linux
 
 ### Install and Update the Package
@@ -156,7 +156,7 @@ batchalign morphotag ~/ba_input ~/ba_output
 #### forced alignment
 
 ```
-batchalign align --lang=eng ~/ba_input ~/ba_output
+batchalign align ~/ba_input ~/ba_output
 ```
 
 

batchalign-0.7.4/batchalign/version

@@ -1,3 +0,0 @@
-0.7.4
-September 2nd, 2024
-Bumping BA Major + Python