kinemotion 0.10.3__py3-none-any.whl → 0.10.4__py3-none-any.whl

kinemotion/api.py

@@ -9,18 +9,315 @@ from pathlib import Path
 import numpy as np
 
 from .core.auto_tuning import (
+    AnalysisParameters,
     QualityPreset,
+    VideoCharacteristics,
     analyze_video_sample,
     auto_tune_parameters,
 )
 from .core.pose import PoseTracker
 from .core.smoothing import smooth_landmarks, smooth_landmarks_advanced
 from .core.video_io import VideoProcessor
-from .dropjump.analysis import compute_average_foot_position, detect_ground_contact
+from .dropjump.analysis import (
+    ContactState,
+    compute_average_foot_position,
+    detect_ground_contact,
+)
 from .dropjump.debug_overlay import DebugOverlayRenderer
 from .dropjump.kinematics import DropJumpMetrics, calculate_drop_jump_metrics
 
 
+def _parse_quality_preset(quality: str) -> QualityPreset:
+    """Parse and validate quality preset string.
+
+    Args:
+        quality: Quality preset string ('fast', 'balanced', or 'accurate')
+
+    Returns:
+        QualityPreset enum value
+
+    Raises:
+        ValueError: If quality preset is invalid
+    """
+    try:
+        return QualityPreset(quality.lower())
+    except ValueError as e:
+        raise ValueError(
+            f"Invalid quality preset: {quality}. Must be 'fast', 'balanced', or 'accurate'"
+        ) from e
+
+
+def _determine_confidence_levels(
+    quality_preset: QualityPreset,
+    detection_confidence: float | None,
+    tracking_confidence: float | None,
+) -> tuple[float, float]:
+    """Determine detection and tracking confidence levels.
+
+    Confidence levels are set based on quality preset and can be overridden
+    by expert parameters.
+
+    Args:
+        quality_preset: Quality preset enum
+        detection_confidence: Optional expert override for detection confidence
+        tracking_confidence: Optional expert override for tracking confidence
+
+    Returns:
+        Tuple of (detection_confidence, tracking_confidence)
+    """
+    # Set initial confidence from quality preset
+    initial_detection_conf = 0.5
+    initial_tracking_conf = 0.5
+
+    if quality_preset == QualityPreset.FAST:
+        initial_detection_conf = 0.3
+        initial_tracking_conf = 0.3
+    elif quality_preset == QualityPreset.ACCURATE:
+        initial_detection_conf = 0.6
+        initial_tracking_conf = 0.6
+
+    # Override with expert values if provided
+    if detection_confidence is not None:
+        initial_detection_conf = detection_confidence
+    if tracking_confidence is not None:
+        initial_tracking_conf = tracking_confidence
+
+    return initial_detection_conf, initial_tracking_conf
+
+
+def _apply_expert_overrides(
+    params: AnalysisParameters,
+    smoothing_window: int | None,
+    velocity_threshold: float | None,
+    min_contact_frames: int | None,
+    visibility_threshold: float | None,
+) -> AnalysisParameters:
+    """Apply expert parameter overrides to auto-tuned parameters.
+
+    Args:
+        params: Auto-tuned parameters object
+        smoothing_window: Optional override for smoothing window
+        velocity_threshold: Optional override for velocity threshold
+        min_contact_frames: Optional override for minimum contact frames
+        visibility_threshold: Optional override for visibility threshold
+
+    Returns:
+        Modified params object (mutated in place)
+    """
+    if smoothing_window is not None:
+        params.smoothing_window = smoothing_window
+    if velocity_threshold is not None:
+        params.velocity_threshold = velocity_threshold
+    if min_contact_frames is not None:
+        params.min_contact_frames = min_contact_frames
+    if visibility_threshold is not None:
+        params.visibility_threshold = visibility_threshold
+    return params
+
+
+def _print_verbose_parameters(
+    video: VideoProcessor,
+    characteristics: VideoCharacteristics,
+    quality_preset: QualityPreset,
+    params: AnalysisParameters,
+) -> None:
+    """Print auto-tuned parameters in verbose mode.
+
+    Args:
+        video: Video processor with fps and dimensions
+        characteristics: Video analysis characteristics
+        quality_preset: Selected quality preset
+        params: Auto-tuned parameters
+    """
+    print("\n" + "=" * 60)
+    print("AUTO-TUNED PARAMETERS")
+    print("=" * 60)
+    print(f"Video FPS: {video.fps:.2f}")
+    print(
+        f"Tracking quality: {characteristics.tracking_quality} "
+        f"(avg visibility: {characteristics.avg_visibility:.2f})"
+    )
+    print(f"Quality preset: {quality_preset.value}")
+    print("\nSelected parameters:")
+    print(f"  smoothing_window: {params.smoothing_window}")
+    print(f"  polyorder: {params.polyorder}")
+    print(f"  velocity_threshold: {params.velocity_threshold:.4f}")
+    print(f"  min_contact_frames: {params.min_contact_frames}")
+    print(f"  visibility_threshold: {params.visibility_threshold}")
+    print(f"  detection_confidence: {params.detection_confidence}")
+    print(f"  tracking_confidence: {params.tracking_confidence}")
+    print(f"  outlier_rejection: {params.outlier_rejection}")
+    print(f"  bilateral_filter: {params.bilateral_filter}")
+    print(f"  use_curvature: {params.use_curvature}")
+    print("=" * 60 + "\n")
+
+
+def _process_all_frames(
+    video: VideoProcessor, tracker: PoseTracker, verbose: bool
+) -> tuple[list, list]:
+    """Process all frames from video and extract pose landmarks.
+
+    Args:
+        video: Video processor to read frames from
+        tracker: Pose tracker for landmark detection
+        verbose: Print progress messages
+
+    Returns:
+        Tuple of (frames, landmarks_sequence)
+
+    Raises:
+        ValueError: If no frames could be processed
+    """
+    if verbose:
+        print("Tracking pose landmarks...")
+
+    landmarks_sequence = []
+    frames = []
+
+    while True:
+        frame = video.read_frame()
+        if frame is None:
+            break
+
+        frames.append(frame)
+        landmarks = tracker.process_frame(frame)
+        landmarks_sequence.append(landmarks)
+
+    tracker.close()
+
+    if not landmarks_sequence:
+        raise ValueError("No frames could be processed from video")
+
+    return frames, landmarks_sequence
+
+
+def _apply_smoothing(
+    landmarks_sequence: list, params: AnalysisParameters, verbose: bool
+) -> list:
+    """Apply smoothing to landmark sequence with auto-tuned parameters.
+
+    Args:
+        landmarks_sequence: Sequence of landmarks from all frames
+        params: Auto-tuned parameters containing smoothing settings
+        verbose: Print progress messages
+
+    Returns:
+        Smoothed landmarks sequence
+    """
+    if params.outlier_rejection or params.bilateral_filter:
+        if verbose:
+            if params.outlier_rejection:
+                print("Smoothing landmarks with outlier rejection...")
+            if params.bilateral_filter:
+                print("Using bilateral temporal filter...")
+        return smooth_landmarks_advanced(
+            landmarks_sequence,
+            window_length=params.smoothing_window,
+            polyorder=params.polyorder,
+            use_outlier_rejection=params.outlier_rejection,
+            use_bilateral=params.bilateral_filter,
+        )
+    else:
+        if verbose:
+            print("Smoothing landmarks...")
+        return smooth_landmarks(
+            landmarks_sequence,
+            window_length=params.smoothing_window,
+            polyorder=params.polyorder,
+        )
+
+
+def _extract_vertical_positions(
+    smoothed_landmarks: list,
+) -> tuple[np.ndarray, np.ndarray]:
+    """Extract vertical foot positions and visibilities from smoothed landmarks.
+
+    Args:
+        smoothed_landmarks: Smoothed landmark sequence
+
+    Returns:
+        Tuple of (vertical_positions, visibilities) as numpy arrays
+    """
+    position_list: list[float] = []
+    visibilities_list: list[float] = []
+
+    for frame_landmarks in smoothed_landmarks:
+        if frame_landmarks:
+            _, foot_y = compute_average_foot_position(frame_landmarks)
+            position_list.append(foot_y)
+
+            # Average visibility of foot landmarks
+            foot_vis = []
+            for key in ["left_ankle", "right_ankle", "left_heel", "right_heel"]:
+                if key in frame_landmarks:
+                    foot_vis.append(frame_landmarks[key][2])
+            visibilities_list.append(float(np.mean(foot_vis)) if foot_vis else 0.0)
+        else:
+            position_list.append(position_list[-1] if position_list else 0.5)
+            visibilities_list.append(0.0)
+
+    return np.array(position_list), np.array(visibilities_list)
+
+
+def _generate_outputs(
+    metrics: DropJumpMetrics,
+    json_output: str | None,
+    output_video: str | None,
+    frames: list,
+    smoothed_landmarks: list,
+    contact_states: list[ContactState],
+    video: VideoProcessor,
+    verbose: bool,
+) -> None:
+    """Generate JSON and debug video outputs if requested.
+
+    Args:
+        metrics: Calculated drop jump metrics
+        json_output: Optional path for JSON output
+        output_video: Optional path for debug video
+        frames: List of video frames
+        smoothed_landmarks: Smoothed landmark sequence
+        contact_states: Ground contact state for each frame
+        video: Video processor with dimensions and fps
+        verbose: Print progress messages
+    """
+    # Save JSON if requested
+    if json_output:
+        import json
+
+        output_path = Path(json_output)
+        output_path.write_text(json.dumps(metrics.to_dict(), indent=2))
+        if verbose:
+            print(f"Metrics written to: {json_output}")
+
+    # Generate debug video if requested
+    if output_video:
+        if verbose:
+            print(f"Generating debug video: {output_video}")
+
+        with DebugOverlayRenderer(
+            output_video,
+            video.width,
+            video.height,
+            video.display_width,
+            video.display_height,
+            video.fps,
+        ) as renderer:
+            for i, frame in enumerate(frames):
+                annotated = renderer.render_frame(
+                    frame,
+                    smoothed_landmarks[i],
+                    contact_states[i],
+                    i,
+                    metrics,
+                    use_com=False,
+                )
+                renderer.write_frame(annotated)
+
+        if verbose:
+            print(f"Debug video saved: {output_video}")
+
+
 @dataclass
 class VideoResult:
     """Result of processing a single video."""
@@ -94,12 +391,7 @@ def process_video(
         raise FileNotFoundError(f"Video file not found: {video_path}")
 
     # Convert quality string to enum
-    try:
-        quality_preset = QualityPreset(quality.lower())
-    except ValueError as e:
-        raise ValueError(
-            f"Invalid quality preset: {quality}. Must be 'fast', 'balanced', or 'accurate'"
-        ) from e
+    quality_preset = _parse_quality_preset(quality)
 
     # Initialize video processor
     with VideoProcessor(video_path) as video:
@@ -109,138 +401,46 @@ def process_video(
                 f"{video.frame_count} frames"
             )
 
-        # Determine initial detection/tracking confidence from quality preset
-        initial_detection_conf = 0.5
-        initial_tracking_conf = 0.5
-
-        if quality_preset == QualityPreset.FAST:
-            initial_detection_conf = 0.3
-            initial_tracking_conf = 0.3
-        elif quality_preset == QualityPreset.ACCURATE:
-            initial_detection_conf = 0.6
-            initial_tracking_conf = 0.6
-
-        # Override with expert values if provided
-        if detection_confidence is not None:
-            initial_detection_conf = detection_confidence
-        if tracking_confidence is not None:
-            initial_tracking_conf = tracking_confidence
+        # Determine detection/tracking confidence levels
+        detection_conf, tracking_conf = _determine_confidence_levels(
+            quality_preset, detection_confidence, tracking_confidence
+        )
 
-        # Initialize pose tracker
+        # Process all frames with pose tracking
         tracker = PoseTracker(
-            min_detection_confidence=initial_detection_conf,
-            min_tracking_confidence=initial_tracking_conf,
+            min_detection_confidence=detection_conf,
+            min_tracking_confidence=tracking_conf,
         )
-
-        # Process all frames
-        if verbose:
-            print("Tracking pose landmarks...")
-
-        landmarks_sequence = []
-        frames = []
-
-        while True:
-            frame = video.read_frame()
-            if frame is None:
-                break
-
-            frames.append(frame)
-            landmarks = tracker.process_frame(frame)
-            landmarks_sequence.append(landmarks)
-
-        tracker.close()
-
-        if not landmarks_sequence:
-            raise ValueError("No frames could be processed from video")
+        frames, landmarks_sequence = _process_all_frames(video, tracker, verbose)
 
         # Analyze video characteristics and auto-tune parameters
         characteristics = analyze_video_sample(
             landmarks_sequence, video.fps, video.frame_count
         )
-
         params = auto_tune_parameters(characteristics, quality_preset)
 
         # Apply expert overrides if provided
-        if smoothing_window is not None:
-            params.smoothing_window = smoothing_window
-        if velocity_threshold is not None:
-            params.velocity_threshold = velocity_threshold
-        if min_contact_frames is not None:
-            params.min_contact_frames = min_contact_frames
-        if visibility_threshold is not None:
-            params.visibility_threshold = visibility_threshold
+        params = _apply_expert_overrides(
+            params,
+            smoothing_window,
+            velocity_threshold,
+            min_contact_frames,
+            visibility_threshold,
+        )
 
         # Show selected parameters if verbose
         if verbose:
-            print("\n" + "=" * 60)
-            print("AUTO-TUNED PARAMETERS")
-            print("=" * 60)
-            print(f"Video FPS: {video.fps:.2f}")
-            print(
-                f"Tracking quality: {characteristics.tracking_quality} "
-                f"(avg visibility: {characteristics.avg_visibility:.2f})"
-            )
-            print(f"Quality preset: {quality_preset.value}")
-            print("\nSelected parameters:")
-            print(f"  smoothing_window: {params.smoothing_window}")
-            print(f"  polyorder: {params.polyorder}")
-            print(f"  velocity_threshold: {params.velocity_threshold:.4f}")
-            print(f"  min_contact_frames: {params.min_contact_frames}")
-            print(f"  visibility_threshold: {params.visibility_threshold}")
-            print(f"  detection_confidence: {params.detection_confidence}")
-            print(f"  tracking_confidence: {params.tracking_confidence}")
-            print(f"  outlier_rejection: {params.outlier_rejection}")
-            print(f"  bilateral_filter: {params.bilateral_filter}")
-            print(f"  use_curvature: {params.use_curvature}")
-            print("=" * 60 + "\n")
+            _print_verbose_parameters(video, characteristics, quality_preset, params)
 
         # Apply smoothing with auto-tuned parameters
-        if params.outlier_rejection or params.bilateral_filter:
-            if verbose:
-                if params.outlier_rejection:
-                    print("Smoothing landmarks with outlier rejection...")
-                if params.bilateral_filter:
-                    print("Using bilateral temporal filter...")
-            smoothed_landmarks = smooth_landmarks_advanced(
-                landmarks_sequence,
-                window_length=params.smoothing_window,
-                polyorder=params.polyorder,
-                use_outlier_rejection=params.outlier_rejection,
-                use_bilateral=params.bilateral_filter,
-            )
-        else:
-            if verbose:
-                print("Smoothing landmarks...")
-            smoothed_landmarks = smooth_landmarks(
-                landmarks_sequence,
-                window_length=params.smoothing_window,
-                polyorder=params.polyorder,
-            )
+        smoothed_landmarks = _apply_smoothing(landmarks_sequence, params, verbose)
 
         # Extract vertical positions from feet
         if verbose:
             print("Extracting foot positions...")
-
-        position_list: list[float] = []
-        visibilities_list: list[float] = []
-
-        for frame_landmarks in smoothed_landmarks:
-            if frame_landmarks:
-                _, foot_y = compute_average_foot_position(frame_landmarks)
-                position_list.append(foot_y)
-
-                # Average visibility of foot landmarks
-                foot_vis = []
-                for key in ["left_ankle", "right_ankle", "left_heel", "right_heel"]:
-                    if key in frame_landmarks:
-                        foot_vis.append(frame_landmarks[key][2])
-                visibilities_list.append(float(np.mean(foot_vis)) if foot_vis else 0.0)
-            else:
-                position_list.append(position_list[-1] if position_list else 0.5)
-                visibilities_list.append(0.0)
-
-        vertical_positions: np.ndarray = np.array(position_list)
-        visibilities: np.ndarray = np.array(visibilities_list)
+        vertical_positions, visibilities = _extract_vertical_positions(
+            smoothed_landmarks
+        )
 
         # Detect ground contact
         contact_states = detect_ground_contact(
@@ -273,41 +473,17 @@ def process_video(
             kinematic_correction_factor=1.0,
         )
 
-        # Save JSON if requested
-        if json_output:
-            import json
-
-            output_path = Path(json_output)
-            output_path.write_text(json.dumps(metrics.to_dict(), indent=2))
-            if verbose:
-                print(f"Metrics written to: {json_output}")
-
-        # Generate debug video if requested
-        if output_video:
-            if verbose:
-                print(f"Generating debug video: {output_video}")
-
-            with DebugOverlayRenderer(
-                output_video,
-                video.width,
-                video.height,
-                video.display_width,
-                video.display_height,
-                video.fps,
-            ) as renderer:
-                for i, frame in enumerate(frames):
-                    annotated = renderer.render_frame(
-                        frame,
-                        smoothed_landmarks[i],
-                        contact_states[i],
-                        i,
-                        metrics,
-                        use_com=False,
-                    )
-                    renderer.write_frame(annotated)
-
-            if verbose:
-                print(f"Debug video saved: {output_video}")
+        # Generate outputs (JSON and debug video)
+        _generate_outputs(
+            metrics,
+            json_output,
+            output_video,
+            frames,
+            smoothed_landmarks,
+            contact_states,
+            video,
+            verbose,
+        )
 
         if verbose:
             print("Analysis complete!")

{kinemotion-0.10.3.dist-info → kinemotion-0.10.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinemotion
-Version: 0.10.3
+Version: 0.10.4
 Summary: Video-based kinematic analysis for athletic performance
 Project-URL: Homepage, https://github.com/feniix/kinemotion
 Project-URL: Repository, https://github.com/feniix/kinemotion

{kinemotion-0.10.3.dist-info → kinemotion-0.10.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 kinemotion/__init__.py,sha256=Z85xg29NA-r4IjrSbAkJpMFigyxACFGUb-37AiMp6YY,350
-kinemotion/api.py,sha256=3Hswx5lfyWc-EanS6iV-4MPUa_uB5t8BpGe4EB4gIIQ,15453
+kinemotion/api.py,sha256=2MsiHsmmxfpvhHIbDXcZpvsCLROKi4MV8LQpKu2r_a8,20078
 kinemotion/cli.py,sha256=2IFA2_TE9a5zBtmGVzv5SnX39w7yPuBlw42dL7ca25U,402
 kinemotion/core/__init__.py,sha256=3yzDhb5PekDNjydqrs8aWGneUGJBt-lB0SoB_Y2FXqU,1010
 kinemotion/core/auto_tuning.py,sha256=cvmxUI-CbahpOJQtR2r5jOx4Q6yKPe3DO1o15hOQIdw,10508
@@ -13,8 +13,8 @@ kinemotion/dropjump/cli.py,sha256=C6v6E3g1W-KNFc0xUzSjg4wKve1WsPxKvUBJV7LiMNI,26
 kinemotion/dropjump/debug_overlay.py,sha256=GMo-jCl5OPIv82uPxDbBVI7CsAMwATTvxZMeWfs8k8M,8701
 kinemotion/dropjump/kinematics.py,sha256=4G_7_KWnXiT09G9BduQNIgFtxvwjo2RyH1sP9SU3hSE,17949
 kinemotion/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kinemotion-0.10.3.dist-info/METADATA,sha256=dZnaZxwMdOWr1eVeJI45_jCm6W6Mjm0_TvvHQZt3YBo,20333
-kinemotion-0.10.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kinemotion-0.10.3.dist-info/entry_points.txt,sha256=zaqnAnjLvcdrk1Qvj5nvXZCZ2gp0prS7it1zTJygcIY,50
-kinemotion-0.10.3.dist-info/licenses/LICENSE,sha256=KZajvqsHw0NoOHOi2q0FZ4NBe9HdV6oey-IPYAtHXfg,1088
-kinemotion-0.10.3.dist-info/RECORD,,
+kinemotion-0.10.4.dist-info/METADATA,sha256=ExH8OJR5HuQYGhZc7S7lKVJiOtQ03-gWdkkz-zf5Gh4,20333
+kinemotion-0.10.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kinemotion-0.10.4.dist-info/entry_points.txt,sha256=zaqnAnjLvcdrk1Qvj5nvXZCZ2gp0prS7it1zTJygcIY,50
+kinemotion-0.10.4.dist-info/licenses/LICENSE,sha256=KZajvqsHw0NoOHOi2q0FZ4NBe9HdV6oey-IPYAtHXfg,1088
+kinemotion-0.10.4.dist-info/RECORD,,