pyfaceau 1.3.10__tar.gz → 1.3.11__tar.gz

{pyfaceau-1.3.10/pyfaceau.egg-info → pyfaceau-1.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfaceau
-Version: 1.3.10
+Version: 1.3.11
 Summary: Pure Python OpenFace 2.2 AU extraction with CLNF landmark refinement
 Home-page: https://github.com/johnwilsoniv/face-analysis
 Author: John Wilson
@@ -32,6 +32,7 @@ Requires-Dist: scipy>=1.7.0
 Requires-Dist: scikit-learn>=1.0.0
 Requires-Dist: tqdm>=4.62.0
 Requires-Dist: numba>=0.56.0
+Requires-Dist: torch>=2.0.0
 Requires-Dist: pyfhog>=0.1.0
 Requires-Dist: pyclnf>=0.2.0
 Requires-Dist: pymtcnn>=0.1.0

{pyfaceau-1.3.10 → pyfaceau-1.3.11}/pyfaceau/__init__.py

@@ -5,7 +5,7 @@ A complete Python implementation of OpenFace 2.2's AU extraction pipeline
 with high-performance parallel processing support and CLNF landmark refinement.
 """
 
-__version__ = "1.3.10"
+__version__ = "1.3.11"
 
 # Weight management functions can be imported without heavy dependencies
 from .download_weights import (

pyfaceau-1.3.11/pyfaceau/download_weights.py

@@ -0,0 +1,270 @@
+#!/usr/bin/env python3
+"""
+Download model weights for PyFaceAU
+
+Usage:
+    python -m pyfaceau.download_weights
+
+Or programmatically:
+    from pyfaceau.download_weights import ensure_weights
+    weights_dir = ensure_weights()
+"""
+
+import os
+import sys
+import urllib.request
+import zipfile
+import tempfile
+from pathlib import Path
+
+# Try to import tqdm, fall back to simple progress if not available
+try:
+    from tqdm import tqdm
+    TQDM_AVAILABLE = True
+except ImportError:
+    TQDM_AVAILABLE = False
+
+
+# GitHub release URL for weights zip (~1.6MB compressed)
+WEIGHTS_ZIP_URL = "https://github.com/johnwilsoniv/pyfaceau/releases/download/weights-v1.0/pyfaceau-weights-v1.0.zip"
+
+# Required files to verify successful download
+REQUIRED_FILES = [
+    "In-the-wild_aligned_PDM_68.txt",
+    "svr_patches_0.25_general.txt",
+    "tris_68_full.txt",
+    "AU_predictors/AU_all_best.txt",
+    "AU_predictors/svr_combined/AU_1_dynamic_intensity_comb.dat",
+]
+
+
+if TQDM_AVAILABLE:
+    class DownloadProgressBar(tqdm):
+        """Progress bar for downloads"""
+        def update_to(self, b=1, bsize=1, tsize=None):
+            if tsize is not None:
+                self.total = tsize
+            self.update(b * bsize - self.n)
+
+
+def download_file(url, output_path, desc=None):
+    """Download a file with progress bar"""
+    if TQDM_AVAILABLE:
+        with DownloadProgressBar(unit='B', unit_scale=True, miniters=1, desc=desc) as t:
+            urllib.request.urlretrieve(url, filename=output_path, reporthook=t.update_to)
+    else:
+        print(f"  Downloading {desc or url}...")
+        urllib.request.urlretrieve(url, filename=output_path)
+
+
+def get_user_weights_dir():
+    """
+    Get user-writable weights directory.
+
+    Priority:
+    1. PYFACEAU_WEIGHTS_DIR environment variable
+    2. ~/.pyfaceau/weights/
+    """
+    env_dir = os.environ.get('PYFACEAU_WEIGHTS_DIR')
+    if env_dir:
+        weights_dir = Path(env_dir)
+    else:
+        weights_dir = Path.home() / ".pyfaceau" / "weights"
+
+    weights_dir.mkdir(parents=True, exist_ok=True)
+    return weights_dir
+
+
+def get_weights_dir():
+    """
+    Get weights directory, checking multiple locations.
+
+    Priority:
+    1. PYFACEAU_WEIGHTS_DIR environment variable
+    2. Sibling 'weights' directory (for development installs)
+    3. User home directory ~/.pyfaceau/weights/
+
+    Returns:
+        Path to weights directory (may not exist if weights not downloaded)
+    """
+    # Check environment variable first
+    env_dir = os.environ.get('PYFACEAU_WEIGHTS_DIR')
+    if env_dir and Path(env_dir).exists():
+        if weights_exist(Path(env_dir)):
+            return Path(env_dir)
+
+    # Check sibling weights directory (for development/editable installs)
+    try:
+        pkg_dir = Path(__file__).parent.parent  # pyfaceau package parent
+        dev_weights = pkg_dir / "weights"
+        if dev_weights.exists() and weights_exist(dev_weights):
+            return dev_weights
+    except Exception:
+        pass
+
+    # Check user home directory
+    user_weights = Path.home() / ".pyfaceau" / "weights"
+    if user_weights.exists() and weights_exist(user_weights):
+        return user_weights
+
+    # Return user weights dir (will need download)
+    return user_weights
+
+
+def weights_exist(weights_dir=None):
+    """Check if required weights exist"""
+    if weights_dir is None:
+        weights_dir = get_weights_dir()
+    weights_dir = Path(weights_dir)
+
+    # Check main PDM file
+    pdm_file = weights_dir / "In-the-wild_aligned_PDM_68.txt"
+    if not pdm_file.exists():
+        return False
+
+    # Check at least one AU model
+    au_model = weights_dir / "AU_predictors" / "svr_combined" / "AU_1_dynamic_intensity_comb.dat"
+    if not au_model.exists():
+        return False
+
+    return True
+
+
+def ensure_weights(auto_download=True, verbose=True):
+    """
+    Ensure weights are available, downloading if necessary.
+
+    Args:
+        auto_download: If True, automatically download missing weights
+        verbose: If True, print progress messages
+
+    Returns:
+        Path to weights directory
+
+    Raises:
+        FileNotFoundError: If weights are missing and auto_download is False
+    """
+    weights_dir = get_weights_dir()
+
+    if weights_exist(weights_dir):
+        return weights_dir
+
+    if not auto_download:
+        raise FileNotFoundError(
+            f"PyFaceAU weights not found.\n"
+            f"Expected location: {weights_dir}\n"
+            f"\n"
+            f"To download weights, run:\n"
+            f"  python -m pyfaceau.download_weights\n"
+            f"\n"
+            f"Or set PYFACEAU_WEIGHTS_DIR environment variable to your weights directory."
+        )
+
+    if verbose:
+        print("PyFaceAU weights not found. Downloading (~1.6MB)...")
+
+    # Download to user weights directory
+    download_dir = get_user_weights_dir()
+    result = download_weights(download_dir, verbose=verbose)
+
+    if result != 0:
+        raise RuntimeError("Failed to download PyFaceAU weights")
+
+    return download_dir
+
+
+def download_weights(weights_dir=None, verbose=True):
+    """
+    Download all required weights.
+
+    Args:
+        weights_dir: Directory to download weights to (default: ~/.pyfaceau/weights/)
+        verbose: If True, print progress messages
+
+    Returns:
+        0 on success, 1 on failure
+    """
+    if weights_dir is None:
+        weights_dir = get_user_weights_dir()
+    weights_dir = Path(weights_dir)
+
+    if verbose:
+        print("PyFaceAU Weight Downloader")
+        print("=" * 60)
+        print(f"Downloading weights to: {weights_dir}")
+        print()
+
+    # Create directory
+    weights_dir.mkdir(parents=True, exist_ok=True)
+
+    # Download zip file to temp location
+    try:
+        with tempfile.NamedTemporaryFile(suffix='.zip', delete=False) as tmp_file:
+            tmp_path = tmp_file.name
+
+        if verbose:
+            print(f"Downloading weights from GitHub release...")
+            print(f"  URL: {WEIGHTS_ZIP_URL}")
+
+        download_file(WEIGHTS_ZIP_URL, tmp_path, desc="pyfaceau-weights.zip")
+
+        if verbose:
+            print(f"\nExtracting weights...")
+
+        # Extract zip
+        with zipfile.ZipFile(tmp_path, 'r') as zip_ref:
+            zip_ref.extractall(weights_dir)
+
+        if verbose:
+            print(f"  Extracted to: {weights_dir}")
+
+        # Verify extraction
+        missing = []
+        for req_file in REQUIRED_FILES:
+            if not (weights_dir / req_file).exists():
+                missing.append(req_file)
+
+        if missing:
+            print(f"\n[WARNING] Some files missing after extraction:")
+            for f in missing:
+                print(f"  - {f}")
+            return 1
+
+        if verbose:
+            print("\n" + "=" * 60)
+            print("[OK] All weights downloaded successfully!")
+            print(f"Weights location: {weights_dir}")
+            print("\nYou can now use PyFaceAU:")
+            print("  from pyfaceau import OpenFaceProcessor")
+            print("  processor = OpenFaceProcessor()")
+
+        return 0
+
+    except urllib.error.URLError as e:
+        print(f"\n[ERROR] Failed to download weights: {e}")
+        print("\nPlease check your internet connection and try again.")
+        print("Or download manually from:")
+        print(f"  {WEIGHTS_ZIP_URL}")
+        print(f"And extract to: {weights_dir}")
+        return 1
+
+    except Exception as e:
+        print(f"\n[ERROR] Unexpected error: {e}")
+        return 1
+
+    finally:
+        # Clean up temp file
+        try:
+            if 'tmp_path' in locals():
+                os.unlink(tmp_path)
+        except Exception:
+            pass
+
+
+def main():
+    """Command-line entry point for weight download"""
+    return download_weights(verbose=True)
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{pyfaceau-1.3.10 → pyfaceau-1.3.11/pyfaceau.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfaceau
-Version: 1.3.10
+Version: 1.3.11
 Summary: Pure Python OpenFace 2.2 AU extraction with CLNF landmark refinement
 Home-page: https://github.com/johnwilsoniv/face-analysis
 Author: John Wilson
@@ -32,6 +32,7 @@ Requires-Dist: scipy>=1.7.0
 Requires-Dist: scikit-learn>=1.0.0
 Requires-Dist: tqdm>=4.62.0
 Requires-Dist: numba>=0.56.0
+Requires-Dist: torch>=2.0.0
 Requires-Dist: pyfhog>=0.1.0
 Requires-Dist: pyclnf>=0.2.0
 Requires-Dist: pymtcnn>=0.1.0

{pyfaceau-1.3.10 → pyfaceau-1.3.11}/pyfaceau.egg-info/requires.txt

@@ -6,6 +6,7 @@ scipy>=1.7.0
 scikit-learn>=1.0.0
 tqdm>=4.62.0
 numba>=0.56.0
+torch>=2.0.0
 pyfhog>=0.1.0
 pyclnf>=0.2.0
 pymtcnn>=0.1.0

{pyfaceau-1.3.10 → pyfaceau-1.3.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyfaceau"
-version = "1.3.10"
+version = "1.3.11"
 description = "Pure Python OpenFace 2.2 AU extraction with CLNF landmark refinement"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -35,6 +35,7 @@ dependencies = [
     "scikit-learn>=1.0.0",
     "tqdm>=4.62.0",
     "numba>=0.56.0",
+    "torch>=2.0.0",  # Required for pyclnf GPU acceleration
     "pyfhog>=0.1.0",
     "pyclnf>=0.2.0",
     "pymtcnn>=0.1.0",

{pyfaceau-1.3.10 → pyfaceau-1.3.11}/setup.py

@@ -11,7 +11,7 @@ long_description = (this_directory / "README.md").read_text()
 
 setup(
     name="pyfaceau",
-    version="1.3.10",
+    version="1.3.11",
     author="John Wilson",
     author_email="",  # Add email if desired
     description="Pure Python OpenFace 2.2 AU extraction with PyMTCNN face detection and CLNF refinement",

pyfaceau-1.3.10/pyfaceau/download_weights.py

@@ -1,343 +0,0 @@
-#!/usr/bin/env python3
-"""
-Download model weights for PyFaceAU
-
-Usage:
-    python -m pyfaceau.download_weights
-
-Or programmatically:
-    from pyfaceau.download_weights import ensure_weights
-    weights_dir = ensure_weights()
-"""
-
-import os
-import sys
-import urllib.request
-from pathlib import Path
-
-# Try to import tqdm, fall back to simple progress if not available
-try:
-    from tqdm import tqdm
-    TQDM_AVAILABLE = True
-except ImportError:
-    TQDM_AVAILABLE = False
-
-
-# GitHub release URL for weights (use releases for large files, not raw repo)
-# Create a release at: https://github.com/johnwilsoniv/pyfaceau/releases with weights.zip
-WEIGHTS_BASE_URL = "https://github.com/johnwilsoniv/pyfaceau/releases/download/weights-v1.0/"
-
-# Fallback: Raw GitHub URL (for smaller text files)
-# Note: Binary .dat files may need LFS or release hosting
-WEIGHTS_FALLBACK_URL = "https://raw.githubusercontent.com/johnwilsoniv/pyfaceau/main/weights/"
-
-REQUIRED_WEIGHTS = {
-    # Note: Face detection uses PyMTCNN (installed separately)
-    # Note: Landmark detection uses CLNF (Constrained Local Neural Fields)
-    "In-the-wild_aligned_PDM_68.txt": "67KB - PDM shape model",
-    "svr_patches_0.25_general.txt": "1.1MB - CLNF patch experts",
-    "tris_68_full.txt": "1KB - Triangulation data",
-}
-
-# AU predictor files stored in AU_predictors/svr_combined/ subdirectory
-AU_PREDICTOR_FILES = [
-    "svr_combined/AU_1_dynamic_intensity_comb.dat",
-    "svr_combined/AU_2_dynamic_intensity_comb.dat",
-    "svr_combined/AU_4_static_intensity_comb.dat",
-    "svr_combined/AU_5_dynamic_intensity_comb.dat",
-    "svr_combined/AU_6_static_intensity_comb.dat",
-    "svr_combined/AU_7_static_intensity_comb.dat",
-    "svr_combined/AU_9_dynamic_intensity_comb.dat",
-    "svr_combined/AU_10_static_intensity_comb.dat",
-    "svr_combined/AU_12_static_intensity_comb.dat",
-    "svr_combined/AU_14_static_intensity_comb.dat",
-    "svr_combined/AU_15_dynamic_intensity_comb.dat",
-    "svr_combined/AU_17_dynamic_intensity_comb.dat",
-    "svr_combined/AU_20_dynamic_intensity_comb.dat",
-    "svr_combined/AU_23_dynamic_intensity_comb.dat",
-    "svr_combined/AU_25_dynamic_intensity_comb.dat",
-    "svr_combined/AU_26_dynamic_intensity_comb.dat",
-    "svr_combined/AU_45_dynamic_intensity_comb.dat",
-]
-
-# AU predictor config files
-AU_CONFIG_FILES = [
-    "AU_all_best.txt",
-    "main_dynamic_svms.txt",
-]
-
-
-if TQDM_AVAILABLE:
-    class DownloadProgressBar(tqdm):
-        """Progress bar for downloads"""
-        def update_to(self, b=1, bsize=1, tsize=None):
-            if tsize is not None:
-                self.total = tsize
-            self.update(b * bsize - self.n)
-
-
-def download_file(url, output_path, desc=None):
-    """Download a file with progress bar"""
-    os.makedirs(os.path.dirname(output_path), exist_ok=True)
-
-    if TQDM_AVAILABLE:
-        with DownloadProgressBar(unit='B', unit_scale=True, miniters=1, desc=desc) as t:
-            urllib.request.urlretrieve(url, filename=output_path, reporthook=t.update_to)
-    else:
-        # Simple fallback without progress bar
-        print(f"  Downloading {desc or url}...")
-        urllib.request.urlretrieve(url, filename=output_path)
-
-
-def get_user_weights_dir():
-    """
-    Get user-writable weights directory.
-
-    Priority:
-    1. PYFACEAU_WEIGHTS_DIR environment variable
-    2. ~/.pyfaceau/weights/
-    """
-    # Check environment variable first
-    env_dir = os.environ.get('PYFACEAU_WEIGHTS_DIR')
-    if env_dir:
-        weights_dir = Path(env_dir)
-    else:
-        # Default to user home directory
-        weights_dir = Path.home() / ".pyfaceau" / "weights"
-
-    weights_dir.mkdir(parents=True, exist_ok=True)
-    return weights_dir
-
-
-def get_weights_dir():
-    """
-    Get weights directory, checking multiple locations.
-
-    Priority:
-    1. PYFACEAU_WEIGHTS_DIR environment variable
-    2. Sibling 'weights' directory (for development installs)
-    3. User home directory ~/.pyfaceau/weights/
-
-    Returns:
-        Path to weights directory (may not exist if weights not downloaded)
-    """
-    # Check environment variable first
-    env_dir = os.environ.get('PYFACEAU_WEIGHTS_DIR')
-    if env_dir and Path(env_dir).exists():
-        return Path(env_dir)
-
-    # Check sibling weights directory (for development/editable installs)
-    try:
-        pkg_dir = Path(__file__).parent.parent  # pyfaceau package parent
-        dev_weights = pkg_dir / "weights"
-        if dev_weights.exists() and (dev_weights / "In-the-wild_aligned_PDM_68.txt").exists():
-            return dev_weights
-    except Exception:
-        pass
-
-    # Check user home directory
-    user_weights = Path.home() / ".pyfaceau" / "weights"
-    if user_weights.exists() and (user_weights / "In-the-wild_aligned_PDM_68.txt").exists():
-        return user_weights
-
-    # Return user weights dir (will need download)
-    return user_weights
-
-
-def weights_exist(weights_dir=None):
-    """Check if required weights exist"""
-    if weights_dir is None:
-        weights_dir = get_weights_dir()
-    weights_dir = Path(weights_dir)
-
-    # Check main PDM file
-    pdm_file = weights_dir / "In-the-wild_aligned_PDM_68.txt"
-    if not pdm_file.exists():
-        return False
-
-    # Check at least one AU model
-    au_dir = weights_dir / "AU_predictors" / "svr_combined"
-    if not au_dir.exists():
-        return False
-
-    return True
-
-
-def ensure_weights(auto_download=True, verbose=True):
-    """
-    Ensure weights are available, downloading if necessary.
-
-    Args:
-        auto_download: If True, automatically download missing weights
-        verbose: If True, print progress messages
-
-    Returns:
-        Path to weights directory
-
-    Raises:
-        FileNotFoundError: If weights are missing and auto_download is False
-    """
-    weights_dir = get_weights_dir()
-
-    if weights_exist(weights_dir):
-        return weights_dir
-
-    if not auto_download:
-        raise FileNotFoundError(
-            f"PyFaceAU weights not found.\n"
-            f"Expected location: {weights_dir}\n"
-            f"\n"
-            f"To download weights, run:\n"
-            f"  python -m pyfaceau.download_weights\n"
-            f"\n"
-            f"Or set PYFACEAU_WEIGHTS_DIR environment variable to your weights directory."
-        )
-
-    if verbose:
-        print("PyFaceAU weights not found. Downloading...")
-
-    # Download to user weights directory
-    download_dir = get_user_weights_dir()
-    result = download_weights(download_dir, verbose=verbose)
-
-    if result != 0:
-        raise RuntimeError("Failed to download PyFaceAU weights")
-
-    return download_dir
-
-
-def download_weights(weights_dir=None, verbose=True):
-    """
-    Download all required weights.
-
-    Args:
-        weights_dir: Directory to download weights to (default: ~/.pyfaceau/weights/)
-        verbose: If True, print progress messages
-
-    Returns:
-        0 on success, 1 on failure
-    """
-    if weights_dir is None:
-        weights_dir = get_user_weights_dir()
-    weights_dir = Path(weights_dir)
-
-    if verbose:
-        print("PyFaceAU Weight Downloader")
-        print("=" * 60)
-        print(f"Downloading weights to: {weights_dir}")
-        print()
-
-    # Create directory structure
-    weights_dir.mkdir(parents=True, exist_ok=True)
-    (weights_dir / "AU_predictors" / "svr_combined").mkdir(parents=True, exist_ok=True)
-
-    # Try primary URL first, fall back to secondary
-    base_urls = [WEIGHTS_BASE_URL, WEIGHTS_FALLBACK_URL]
-
-    # Download main weights
-    if verbose:
-        print("Downloading main model weights...")
-
-    for filename, description in REQUIRED_WEIGHTS.items():
-        output_path = weights_dir / filename
-
-        if output_path.exists():
-            if verbose:
-                print(f"[OK] {filename} (already exists)")
-            continue
-
-        downloaded = False
-        for base_url in base_urls:
-            url = base_url + filename
-            try:
-                download_file(url, str(output_path), desc=f"{filename} ({description})")
-                if verbose:
-                    print(f"[OK] Downloaded {filename}")
-                downloaded = True
-                break
-            except Exception as e:
-                if verbose:
-                    print(f"  (trying fallback URL...)")
-                continue
-
-        if not downloaded:
-            print(f"[FAILED] Failed to download {filename}")
-            print(f"  Please download manually from GitHub and place in: {output_path}")
-            return 1
-
-    # Download AU predictor config files
-    if verbose:
-        print("\nDownloading AU predictor config files...")
-
-    au_dir = weights_dir / "AU_predictors"
-    for filename in AU_CONFIG_FILES:
-        output_path = au_dir / filename
-
-        if output_path.exists():
-            if verbose:
-                print(f"[OK] {filename} (already exists)")
-            continue
-
-        downloaded = False
-        for base_url in base_urls:
-            url = base_url + "AU_predictors/" + filename
-            try:
-                download_file(url, str(output_path), desc=filename)
-                if verbose:
-                    print(f"[OK] Downloaded {filename}")
-                downloaded = True
-                break
-            except Exception:
-                continue
-
-        if not downloaded:
-            print(f"[FAILED] Failed to download {filename}")
-            return 1
-
-    # Download AU predictor models
-    if verbose:
-        print("\nDownloading AU predictor models (SVR weights)...")
-
-    for filename in AU_PREDICTOR_FILES:
-        output_path = au_dir / filename
-
-        if output_path.exists():
-            if verbose:
-                print(f"[OK] {filename} (already exists)")
-            continue
-
-        downloaded = False
-        for base_url in base_urls:
-            url = base_url + "AU_predictors/" + filename
-            try:
-                download_file(url, str(output_path), desc=filename.split('/')[-1])
-                if verbose:
-                    print(f"[OK] Downloaded {filename}")
-                downloaded = True
-                break
-            except Exception:
-                continue
-
-        if not downloaded:
-            print(f"[FAILED] Failed to download {filename}")
-            print(f"  Please download manually from GitHub and place in: {output_path}")
-            return 1
-
-    if verbose:
-        print("\n" + "=" * 60)
-        print("[OK] All weights downloaded successfully!")
-        print(f"Weights location: {weights_dir}")
-        print("\nYou can now use PyFaceAU:")
-        print("  from pyfaceau import OpenFaceProcessor")
-        print("  processor = OpenFaceProcessor()")
-
-    return 0
-
-
-def main():
-    """Command-line entry point for weight download"""
-    return download_weights(verbose=True)
-
-
-if __name__ == "__main__":
-    sys.exit(main())