kinemotion 0.11.2__py3-none-any.whl → 0.11.3__py3-none-any.whl

kinemotion/api.py

@@ -689,7 +689,6 @@ def process_cmj_video(
     json_output: str | None = None,
     smoothing_window: int | None = None,
     velocity_threshold: float | None = None,
-    countermovement_threshold: float | None = None,
     min_contact_frames: int | None = None,
     visibility_threshold: float | None = None,
     detection_confidence: float | None = None,
@@ -710,7 +709,6 @@ def process_cmj_video(
         json_output: Optional path for JSON metrics output
         smoothing_window: Optional override for smoothing window
         velocity_threshold: Optional override for velocity threshold
-        countermovement_threshold: Optional override for countermovement threshold
         min_contact_frames: Optional override for minimum contact frames
         visibility_threshold: Optional override for visibility threshold
         detection_confidence: Optional override for pose detection confidence

kinemotion/cmj/cli.py

@@ -18,8 +18,12 @@ from ..core.auto_tuning import (
     analyze_video_sample,
     auto_tune_parameters,
 )
+from ..core.cli_utils import (
+    determine_initial_confidence,
+    smooth_landmark_sequence,
+    track_all_frames,
+)
 from ..core.pose import PoseTracker
-from ..core.smoothing import smooth_landmarks, smooth_landmarks_advanced
 from ..core.video_io import VideoProcessor
 from .analysis import detect_cmj_phases
 from .debug_overlay import CMJDebugOverlayRenderer
@@ -295,53 +299,6 @@ def cmj_analyze(  # NOSONAR(S107) - Click CLI requires individual parameters for
             sys.exit(1)
 
 
-def _determine_initial_confidence(
-    quality_preset: QualityPreset,
-    expert_params: AnalysisParameters,
-) -> tuple[float, float]:
-    """Determine initial detection and tracking confidence levels."""
-    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 expert_params.detection_confidence is not None:
-        initial_detection_conf = expert_params.detection_confidence
-    if expert_params.tracking_confidence is not None:
-        initial_tracking_conf = expert_params.tracking_confidence
-
-    return initial_detection_conf, initial_tracking_conf
-
-
-def _track_all_frames(video: VideoProcessor, tracker: PoseTracker) -> tuple[list, list]:
-    """Track pose landmarks in all video frames."""
-    click.echo("Tracking pose landmarks...", err=True)
-    landmarks_sequence = []
-    frames = []
-
-    bar: Any
-    with click.progressbar(length=video.frame_count, label="Processing frames") as bar:
-        while True:
-            frame = video.read_frame()
-            if frame is None:
-                break
-
-            frames.append(frame)
-            landmarks = tracker.process_frame(frame)
-            landmarks_sequence.append(landmarks)
-
-            bar.update(1)
-
-    tracker.close()
-    return frames, landmarks_sequence
-
-
 def _apply_expert_param_overrides(
     params: AutoTunedParams, expert_params: AnalysisParameters
 ) -> AutoTunedParams:
@@ -386,34 +343,6 @@ def _print_auto_tuned_params(
     click.echo("=" * 60 + "\n", err=True)
 
 
-def _smooth_landmark_sequence(
-    landmarks_sequence: list, params: AutoTunedParams
-) -> list:
-    """Apply smoothing to landmark sequence."""
-    if params.outlier_rejection or params.bilateral_filter:
-        if params.outlier_rejection:
-            click.echo("Smoothing landmarks with outlier rejection...", err=True)
-        if params.bilateral_filter:
-            click.echo(
-                "Using bilateral temporal filter for edge-preserving smoothing...",
-                err=True,
-            )
-        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:
-        click.echo("Smoothing landmarks...", err=True)
-        return smooth_landmarks(
-            landmarks_sequence,
-            window_length=params.smoothing_window,
-            polyorder=params.polyorder,
-        )
-
-
 def _get_foot_position(frame_landmarks: dict | None, last_position: float) -> float:
     """Extract average foot position from frame landmarks."""
     if not frame_landmarks:
@@ -470,7 +399,7 @@ def _process_single(
             )
 
             # Determine confidence levels
-            detection_conf, tracking_conf = _determine_initial_confidence(
+            detection_conf, tracking_conf = determine_initial_confidence(
                 quality_preset, expert_params
             )
 
@@ -479,7 +408,7 @@ def _process_single(
                 min_detection_confidence=detection_conf,
                 min_tracking_confidence=tracking_conf,
             )
-            frames, landmarks_sequence = _track_all_frames(video, tracker)
+            frames, landmarks_sequence = track_all_frames(video, tracker)
 
             if not landmarks_sequence:
                 click.echo("Error: No frames processed", err=True)
@@ -505,7 +434,7 @@ def _process_single(
                 )
 
             # Apply smoothing
-            smoothed_landmarks = _smooth_landmark_sequence(landmarks_sequence, params)
+            smoothed_landmarks = smooth_landmark_sequence(landmarks_sequence, params)
 
             # Extract foot positions
             vertical_positions, tracking_method = _extract_positions_from_landmarks(

kinemotion/core/cli_utils.py

@@ -0,0 +1,113 @@
+"""Shared CLI utilities for drop jump and CMJ analysis."""
+
+from typing import Any, Protocol
+
+import click
+
+from .auto_tuning import AutoTunedParams, QualityPreset
+from .pose import PoseTracker
+from .smoothing import smooth_landmarks, smooth_landmarks_advanced
+from .video_io import VideoProcessor
+
+
+class ExpertParameters(Protocol):
+    """Protocol for expert parameter overrides."""
+
+    detection_confidence: float | None
+    tracking_confidence: float | None
+
+
+def determine_initial_confidence(
+    quality_preset: QualityPreset,
+    expert_params: ExpertParameters,
+) -> tuple[float, float]:
+    """Determine initial detection and tracking confidence levels.
+
+    Args:
+        quality_preset: Quality preset enum
+        expert_params: Expert parameter overrides
+
+    Returns:
+        Tuple of (detection_confidence, tracking_confidence)
+    """
+    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 expert_params.detection_confidence is not None:
+        initial_detection_conf = expert_params.detection_confidence
+    if expert_params.tracking_confidence is not None:
+        initial_tracking_conf = expert_params.tracking_confidence
+
+    return initial_detection_conf, initial_tracking_conf
+
+
+def track_all_frames(video: VideoProcessor, tracker: PoseTracker) -> tuple[list, list]:
+    """Track pose landmarks in all video frames.
+
+    Args:
+        video: Video processor
+        tracker: Pose tracker
+
+    Returns:
+        Tuple of (frames, landmarks_sequence)
+    """
+    click.echo("Tracking pose landmarks...", err=True)
+    landmarks_sequence = []
+    frames = []
+
+    bar: Any
+    with click.progressbar(length=video.frame_count, label="Processing frames") as bar:
+        while True:
+            frame = video.read_frame()
+            if frame is None:
+                break
+
+            frames.append(frame)
+            landmarks = tracker.process_frame(frame)
+            landmarks_sequence.append(landmarks)
+            bar.update(1)
+
+    tracker.close()
+    return frames, landmarks_sequence
+
+
+def smooth_landmark_sequence(landmarks_sequence: list, params: AutoTunedParams) -> list:
+    """Apply smoothing to landmark sequence.
+
+    Args:
+        landmarks_sequence: Raw landmark sequence
+        params: Auto-tuned parameters
+
+    Returns:
+        Smoothed landmark sequence
+    """
+    if params.outlier_rejection or params.bilateral_filter:
+        if params.outlier_rejection:
+            click.echo("Smoothing landmarks with outlier rejection...", err=True)
+        if params.bilateral_filter:
+            click.echo(
+                "Using bilateral temporal filter for edge-preserving smoothing...",
+                err=True,
+            )
+        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:
+        click.echo("Smoothing landmarks...", err=True)
+        return smooth_landmarks(
+            landmarks_sequence,
+            window_length=params.smoothing_window,
+            polyorder=params.polyorder,
+        )

kinemotion/dropjump/cli.py

@@ -21,8 +21,12 @@ from ..core.auto_tuning import (
     analyze_video_sample,
     auto_tune_parameters,
 )
+from ..core.cli_utils import (
+    determine_initial_confidence,
+    smooth_landmark_sequence,
+    track_all_frames,
+)
 from ..core.pose import PoseTracker
-from ..core.smoothing import smooth_landmarks, smooth_landmarks_advanced
 from ..core.video_io import VideoProcessor
 from .analysis import (
     ContactState,
@@ -256,69 +260,6 @@ def dropjump_analyze(  # NOSONAR(S107) - Click CLI requires individual parameter
         )
 
 
-def _determine_initial_confidence(
-    quality_preset: QualityPreset,
-    expert_params: AnalysisParameters,
-) -> tuple[float, float]:
-    """Determine initial detection and tracking confidence levels.
-
-    Args:
-        quality_preset: Quality preset enum
-        expert_params: Expert parameter overrides
-
-    Returns:
-        Tuple of (detection_confidence, tracking_confidence)
-    """
-    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 expert_params.detection_confidence is not None:
-        initial_detection_conf = expert_params.detection_confidence
-    if expert_params.tracking_confidence is not None:
-        initial_tracking_conf = expert_params.tracking_confidence
-
-    return initial_detection_conf, initial_tracking_conf
-
-
-def _track_all_frames(video: VideoProcessor, tracker: PoseTracker) -> tuple[list, list]:
-    """Track pose landmarks in all video frames.
-
-    Args:
-        video: Video processor
-        tracker: Pose tracker
-
-    Returns:
-        Tuple of (frames, landmarks_sequence)
-    """
-    click.echo("Tracking pose landmarks...", err=True)
-    landmarks_sequence = []
-    frames = []
-
-    bar: Any
-    with click.progressbar(length=video.frame_count, label="Processing frames") as bar:
-        while True:
-            frame = video.read_frame()
-            if frame is None:
-                break
-
-            frames.append(frame)
-            landmarks = tracker.process_frame(frame)
-            landmarks_sequence.append(landmarks)
-
-            bar.update(1)
-
-    tracker.close()
-    return frames, landmarks_sequence
-
-
 def _apply_expert_param_overrides(
     params: AutoTunedParams, expert_params: AnalysisParameters
 ) -> AutoTunedParams:
@@ -380,42 +321,6 @@ def _print_auto_tuned_params(
     click.echo("=" * 60 + "\n", err=True)
 
 
-def _smooth_landmark_sequence(
-    landmarks_sequence: list, params: AutoTunedParams
-) -> list:
-    """Apply smoothing to landmark sequence.
-
-    Args:
-        landmarks_sequence: Raw landmark sequence
-        params: Auto-tuned parameters
-
-    Returns:
-        Smoothed landmarks
-    """
-    if params.outlier_rejection or params.bilateral_filter:
-        if params.outlier_rejection:
-            click.echo("Smoothing landmarks with outlier rejection...", err=True)
-        if params.bilateral_filter:
-            click.echo(
-                "Using bilateral temporal filter for edge-preserving smoothing...",
-                err=True,
-            )
-        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:
-        click.echo("Smoothing landmarks...", err=True)
-        return smooth_landmarks(
-            landmarks_sequence,
-            window_length=params.smoothing_window,
-            polyorder=params.polyorder,
-        )
-
-
 def _extract_positions_and_visibilities(
     smoothed_landmarks: list,
 ) -> tuple[np.ndarray, np.ndarray]:
@@ -533,7 +438,7 @@ def _process_single(
             )
 
             # Determine confidence levels
-            detection_conf, tracking_conf = _determine_initial_confidence(
+            detection_conf, tracking_conf = determine_initial_confidence(
                 quality_preset, expert_params
             )
 
@@ -542,7 +447,7 @@ def _process_single(
                 min_detection_confidence=detection_conf,
                 min_tracking_confidence=tracking_conf,
             )
-            frames, landmarks_sequence = _track_all_frames(video, tracker)
+            frames, landmarks_sequence = track_all_frames(video, tracker)
 
             if not landmarks_sequence:
                 click.echo("Error: No frames processed", err=True)
@@ -560,7 +465,7 @@ def _process_single(
                 _print_auto_tuned_params(video, characteristics, quality_preset, params)
 
             # Apply smoothing
-            smoothed_landmarks = _smooth_landmark_sequence(landmarks_sequence, params)
+            smoothed_landmarks = smooth_landmark_sequence(landmarks_sequence, params)
 
             # Extract positions
             vertical_positions, visibilities = _extract_positions_and_visibilities(

{kinemotion-0.11.2.dist-info → kinemotion-0.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinemotion
-Version: 0.11.2
+Version: 0.11.3
 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.11.2.dist-info → kinemotion-0.11.3.dist-info}/RECORD

@@ -1,26 +1,27 @@
 kinemotion/__init__.py,sha256=REBC9wrwYC_grvCS00qEOyign65Zc1sc-5buLpyqQxA,654
-kinemotion/api.py,sha256=Cm3DXuNcInecJ2BoRMYBLRUk1ImDSn3ZP82H31TU4Gw,31721
+kinemotion/api.py,sha256=10Rj_dqAa6KCcmCjlGEtQFZLoNyqeMzFLo7vGZcttWY,31586
 kinemotion/cli.py,sha256=cqYV_7URH0JUDy1VQ_EDLv63FmNO4Ns20m6s1XAjiP4,464
 kinemotion/cmj/__init__.py,sha256=Ynv0-Oco4I3Y1Ubj25m3h9h2XFqeNwpAewXmAYOmwfU,127
 kinemotion/cmj/analysis.py,sha256=4HYGn4VDIB6oExAees-VcPfpNgWOltpgwjyNTU7YAb4,18263
-kinemotion/cmj/cli.py,sha256=XcLlBPVyBWffI_UTQZN7wxlnm971LL9-ynkBoL3T37I,21567
+kinemotion/cmj/cli.py,sha256=lVVlh8teFHXbDzaFdDfq3xSwRf4kVwyYyd6FU8ta_Ec,19044
 kinemotion/cmj/debug_overlay.py,sha256=ELrSYQ9LmLV81bJS5w9i2c4VwRS0EYAUnMehMHU7VGc,18724
 kinemotion/cmj/joint_angles.py,sha256=8ucpDGPvbt4iX3tx9eVxJEUv0laTm2Y58_--VzJCogE,9113
 kinemotion/cmj/kinematics.py,sha256=Xl_PlC2OqMoA-zOc3SRB_GqI0AgLlJol5FTPe5J_qLc,7573
 kinemotion/core/__init__.py,sha256=3yzDhb5PekDNjydqrs8aWGneUGJBt-lB0SoB_Y2FXqU,1010
 kinemotion/core/auto_tuning.py,sha256=cvmxUI-CbahpOJQtR2r5jOx4Q6yKPe3DO1o15hOQIdw,10508
+kinemotion/core/cli_utils.py,sha256=hNf2-_LIbi-ntXAkovjqcuWifYLazikqJBzeTN9YmZc,3492
 kinemotion/core/filtering.py,sha256=f-m-aA59e4WqE6u-9MA51wssu7rI-Y_7n1cG8IWdeRQ,11241
 kinemotion/core/pose.py,sha256=Wfd1RR-2ZznYpWeQUbySwcV3mvReqn8n3XO6S7pGq4M,8390
 kinemotion/core/smoothing.py,sha256=FON4qKtsSp1-03GnJrDkEUAePaACn4QPMJF0eTIYqR0,12925
 kinemotion/core/video_io.py,sha256=z8Z0qbNaKbcdB40KnbNOBMzab3BbgnhBxp-mUBYeXgM,6577
 kinemotion/dropjump/__init__.py,sha256=yc1XiZ9vfo5h_n7PKVSiX2TTgaIfGL7Y7SkQtiDZj_E,838
 kinemotion/dropjump/analysis.py,sha256=HfJt2t9IsMBiBUz7apIzdxbRH9QqzlFnDVVWcKhU3ow,23291
-kinemotion/dropjump/cli.py,sha256=zo23qoYSpC_2BcScy-JOilcGcWGM0j3Xv0lpO0_n0wk,27975
+kinemotion/dropjump/cli.py,sha256=eXO-9H9z0g-EJUD1uIT37KIMgfyje4fPAO2FgZiEZzk,24985
 kinemotion/dropjump/debug_overlay.py,sha256=GMo-jCl5OPIv82uPxDbBVI7CsAMwATTvxZMeWfs8k8M,8701
 kinemotion/dropjump/kinematics.py,sha256=RM_O8Kdc6aEiPIu_99N4cu-4EhYSQxtBGASJF_dmQaU,19081
 kinemotion/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kinemotion-0.11.2.dist-info/METADATA,sha256=DrLLms6trTMJYlfaibiR0y49jDd7D-zuYQTblJTq44Q,18990
-kinemotion-0.11.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kinemotion-0.11.2.dist-info/entry_points.txt,sha256=zaqnAnjLvcdrk1Qvj5nvXZCZ2gp0prS7it1zTJygcIY,50
-kinemotion-0.11.2.dist-info/licenses/LICENSE,sha256=KZajvqsHw0NoOHOi2q0FZ4NBe9HdV6oey-IPYAtHXfg,1088
-kinemotion-0.11.2.dist-info/RECORD,,
+kinemotion-0.11.3.dist-info/METADATA,sha256=Yu4EP1FzusXr0Y0KRNIfywzuw0nNYeACUojxFhzrDuE,18990
+kinemotion-0.11.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kinemotion-0.11.3.dist-info/entry_points.txt,sha256=zaqnAnjLvcdrk1Qvj5nvXZCZ2gp0prS7it1zTJygcIY,50
+kinemotion-0.11.3.dist-info/licenses/LICENSE,sha256=KZajvqsHw0NoOHOi2q0FZ4NBe9HdV6oey-IPYAtHXfg,1088
+kinemotion-0.11.3.dist-info/RECORD,,