kinemotion 0.11.4__py3-none-any.whl → 0.11.5__py3-none-any.whl

kinemotion/cmj/cli.py

@@ -10,16 +10,15 @@ from typing import Any
 import click
 import numpy as np
 
-from ..core.auto_tuning import (
-    AnalysisParameters as AutoTunedParams,
-)
 from ..core.auto_tuning import (
     QualityPreset,
     analyze_video_sample,
     auto_tune_parameters,
 )
 from ..core.cli_utils import (
+    apply_expert_param_overrides,
     determine_initial_confidence,
+    print_auto_tuned_params,
     smooth_landmark_sequence,
     track_all_frames,
 )
@@ -299,50 +298,6 @@ def cmj_analyze(  # NOSONAR(S107) - Click CLI requires individual parameters for
             sys.exit(1)
 
 
-def _apply_expert_param_overrides(
-    params: AutoTunedParams, expert_params: AnalysisParameters
-) -> AutoTunedParams:
-    """Apply expert parameter overrides to auto-tuned parameters."""
-    if expert_params.smoothing_window is not None:
-        params.smoothing_window = expert_params.smoothing_window
-    if expert_params.velocity_threshold is not None:
-        params.velocity_threshold = expert_params.velocity_threshold
-    if expert_params.min_contact_frames is not None:
-        params.min_contact_frames = expert_params.min_contact_frames
-    if expert_params.visibility_threshold is not None:
-        params.visibility_threshold = expert_params.visibility_threshold
-    return params
-
-
-def _print_auto_tuned_params(
-    video: VideoProcessor,
-    quality_preset: QualityPreset,
-    params: AutoTunedParams,
-    countermovement_threshold: float,
-) -> None:
-    """Print auto-tuned parameters in verbose mode."""
-    click.echo("\n" + "=" * 60, err=True)
-    click.echo("AUTO-TUNED PARAMETERS", err=True)
-    click.echo("=" * 60, err=True)
-    click.echo(f"Video FPS: {video.fps:.2f}", err=True)
-    click.echo(f"Quality preset: {quality_preset.value}", err=True)
-    click.echo("\nSelected parameters:", err=True)
-    click.echo(f"  smoothing_window: {params.smoothing_window}", err=True)
-    click.echo(f"  polyorder: {params.polyorder}", err=True)
-    click.echo(f"  velocity_threshold: {params.velocity_threshold:.4f}", err=True)
-    click.echo(
-        f"  countermovement_threshold: {countermovement_threshold:.4f}", err=True
-    )
-    click.echo(f"  min_contact_frames: {params.min_contact_frames}", err=True)
-    click.echo(f"  visibility_threshold: {params.visibility_threshold}", err=True)
-    click.echo(f"  detection_confidence: {params.detection_confidence}", err=True)
-    click.echo(f"  tracking_confidence: {params.tracking_confidence}", err=True)
-    click.echo(f"  outlier_rejection: {params.outlier_rejection}", err=True)
-    click.echo(f"  bilateral_filter: {params.bilateral_filter}", err=True)
-    click.echo(f"  use_curvature: {params.use_curvature}", err=True)
-    click.echo("=" * 60 + "\n", err=True)
-
-
 def _get_foot_position(frame_landmarks: dict | None, last_position: float) -> float:
     """Extract average foot position from frame landmarks."""
     if not frame_landmarks:
@@ -419,7 +374,7 @@ def _process_single(
                 landmarks_sequence, video.fps, video.frame_count
             )
             params = auto_tune_parameters(characteristics, quality_preset)
-            params = _apply_expert_param_overrides(params, expert_params)
+            params = apply_expert_param_overrides(params, expert_params)
 
             # Calculate countermovement threshold (FPS-adjusted)
             # Base: +0.015 at 30fps (POSITIVE for downward motion in normalized coords)
@@ -429,8 +384,13 @@ def _process_single(
 
             # Show parameters if verbose
             if verbose:
-                _print_auto_tuned_params(
-                    video, quality_preset, params, countermovement_threshold
+                print_auto_tuned_params(
+                    video,
+                    quality_preset,
+                    params,
+                    extra_params={
+                        "countermovement_threshold": countermovement_threshold
+                    },
                 )
 
             # Apply smoothing

kinemotion/core/cli_utils.py

@@ -4,7 +4,7 @@ from typing import Any, Protocol
 
 import click
 
-from .auto_tuning import AutoTunedParams, QualityPreset
+from .auto_tuning import AutoTunedParams, QualityPreset, VideoCharacteristics
 from .pose import PoseTracker
 from .smoothing import smooth_landmarks, smooth_landmarks_advanced
 from .video_io import VideoProcessor
@@ -15,6 +15,10 @@ class ExpertParameters(Protocol):
 
     detection_confidence: float | None
     tracking_confidence: float | None
+    smoothing_window: int | None
+    velocity_threshold: float | None
+    min_contact_frames: int | None
+    visibility_threshold: float | None
 
 
 def determine_initial_confidence(
@@ -79,6 +83,81 @@ def track_all_frames(video: VideoProcessor, tracker: PoseTracker) -> tuple[list,
     return frames, landmarks_sequence
 
 
+def apply_expert_param_overrides(
+    params: AutoTunedParams, expert_params: ExpertParameters
+) -> AutoTunedParams:
+    """Apply expert parameter overrides to auto-tuned parameters.
+
+    Args:
+        params: Auto-tuned parameters
+        expert_params: Expert overrides
+
+    Returns:
+        Modified params object (mutated in place)
+    """
+    if expert_params.smoothing_window is not None:
+        params.smoothing_window = expert_params.smoothing_window
+    if expert_params.velocity_threshold is not None:
+        params.velocity_threshold = expert_params.velocity_threshold
+    if expert_params.min_contact_frames is not None:
+        params.min_contact_frames = expert_params.min_contact_frames
+    if expert_params.visibility_threshold is not None:
+        params.visibility_threshold = expert_params.visibility_threshold
+    return params
+
+
+def print_auto_tuned_params(
+    video: VideoProcessor,
+    quality_preset: QualityPreset,
+    params: AutoTunedParams,
+    characteristics: VideoCharacteristics | None = None,
+    extra_params: dict[str, Any] | None = None,
+) -> None:
+    """Print auto-tuned parameters in verbose mode.
+
+    Args:
+        video: Video processor
+        quality_preset: Quality preset
+        params: Auto-tuned parameters
+        characteristics: Optional video characteristics (for tracking quality display)
+        extra_params: Optional extra parameters to display (e.g., countermovement_threshold)
+    """
+    click.echo("\n" + "=" * 60, err=True)
+    click.echo("AUTO-TUNED PARAMETERS", err=True)
+    click.echo("=" * 60, err=True)
+    click.echo(f"Video FPS: {video.fps:.2f}", err=True)
+
+    if characteristics:
+        click.echo(
+            f"Tracking quality: {characteristics.tracking_quality} "
+            f"(avg visibility: {characteristics.avg_visibility:.2f})",
+            err=True,
+        )
+
+    click.echo(f"Quality preset: {quality_preset.value}", err=True)
+    click.echo("\nSelected parameters:", err=True)
+    click.echo(f"  smoothing_window: {params.smoothing_window}", err=True)
+    click.echo(f"  polyorder: {params.polyorder}", err=True)
+    click.echo(f"  velocity_threshold: {params.velocity_threshold:.4f}", err=True)
+
+    # Print extra parameters if provided
+    if extra_params:
+        for key, value in extra_params.items():
+            if isinstance(value, float):
+                click.echo(f"  {key}: {value:.4f}", err=True)
+            else:
+                click.echo(f"  {key}: {value}", err=True)
+
+    click.echo(f"  min_contact_frames: {params.min_contact_frames}", err=True)
+    click.echo(f"  visibility_threshold: {params.visibility_threshold}", err=True)
+    click.echo(f"  detection_confidence: {params.detection_confidence}", err=True)
+    click.echo(f"  tracking_confidence: {params.tracking_confidence}", err=True)
+    click.echo(f"  outlier_rejection: {params.outlier_rejection}", err=True)
+    click.echo(f"  bilateral_filter: {params.bilateral_filter}", err=True)
+    click.echo(f"  use_curvature: {params.use_curvature}", err=True)
+    click.echo("=" * 60 + "\n", err=True)
+
+
 def smooth_landmark_sequence(landmarks_sequence: list, params: AutoTunedParams) -> list:
     """Apply smoothing to landmark sequence.
 

kinemotion/dropjump/cli.py

@@ -12,17 +12,15 @@ import click
 import numpy as np
 
 from ..api import VideoConfig, VideoResult, process_videos_bulk
-from ..core.auto_tuning import (
-    AnalysisParameters as AutoTunedParams,
-)
 from ..core.auto_tuning import (
     QualityPreset,
-    VideoCharacteristics,
     analyze_video_sample,
     auto_tune_parameters,
 )
 from ..core.cli_utils import (
+    apply_expert_param_overrides,
     determine_initial_confidence,
+    print_auto_tuned_params,
     smooth_landmark_sequence,
     track_all_frames,
 )
@@ -260,67 +258,6 @@ def dropjump_analyze(  # NOSONAR(S107) - Click CLI requires individual parameter
         )
 
 
-def _apply_expert_param_overrides(
-    params: AutoTunedParams, expert_params: AnalysisParameters
-) -> AutoTunedParams:
-    """Apply expert parameter overrides to auto-tuned parameters.
-
-    Args:
-        params: Auto-tuned parameters
-        expert_params: Expert overrides
-
-    Returns:
-        Modified params object (mutated in place)
-    """
-    if expert_params.smoothing_window is not None:
-        params.smoothing_window = expert_params.smoothing_window
-    if expert_params.velocity_threshold is not None:
-        params.velocity_threshold = expert_params.velocity_threshold
-    if expert_params.min_contact_frames is not None:
-        params.min_contact_frames = expert_params.min_contact_frames
-    if expert_params.visibility_threshold is not None:
-        params.visibility_threshold = expert_params.visibility_threshold
-    return params
-
-
-def _print_auto_tuned_params(
-    video: VideoProcessor,
-    characteristics: VideoCharacteristics,
-    quality_preset: QualityPreset,
-    params: AutoTunedParams,
-) -> None:
-    """Print auto-tuned parameters in verbose mode.
-
-    Args:
-        video: Video processor
-        characteristics: Video characteristics
-        quality_preset: Quality preset
-        params: Auto-tuned parameters
-    """
-    click.echo("\n" + "=" * 60, err=True)
-    click.echo("AUTO-TUNED PARAMETERS", err=True)
-    click.echo("=" * 60, err=True)
-    click.echo(f"Video FPS: {video.fps:.2f}", err=True)
-    click.echo(
-        f"Tracking quality: {characteristics.tracking_quality} "
-        f"(avg visibility: {characteristics.avg_visibility:.2f})",
-        err=True,
-    )
-    click.echo(f"Quality preset: {quality_preset.value}", err=True)
-    click.echo("\nSelected parameters:", err=True)
-    click.echo(f"  smoothing_window: {params.smoothing_window}", err=True)
-    click.echo(f"  polyorder: {params.polyorder}", err=True)
-    click.echo(f"  velocity_threshold: {params.velocity_threshold:.4f}", err=True)
-    click.echo(f"  min_contact_frames: {params.min_contact_frames}", err=True)
-    click.echo(f"  visibility_threshold: {params.visibility_threshold}", err=True)
-    click.echo(f"  detection_confidence: {params.detection_confidence}", err=True)
-    click.echo(f"  tracking_confidence: {params.tracking_confidence}", err=True)
-    click.echo(f"  outlier_rejection: {params.outlier_rejection}", err=True)
-    click.echo(f"  bilateral_filter: {params.bilateral_filter}", err=True)
-    click.echo(f"  use_curvature: {params.use_curvature}", err=True)
-    click.echo("=" * 60 + "\n", err=True)
-
-
 def _extract_positions_and_visibilities(
     smoothed_landmarks: list,
 ) -> tuple[np.ndarray, np.ndarray]:
@@ -458,11 +395,11 @@ def _process_single(
                 landmarks_sequence, video.fps, video.frame_count
             )
             params = auto_tune_parameters(characteristics, quality_preset)
-            params = _apply_expert_param_overrides(params, expert_params)
+            params = apply_expert_param_overrides(params, expert_params)
 
             # Show parameters if verbose
             if verbose:
-                _print_auto_tuned_params(video, characteristics, quality_preset, params)
+                print_auto_tuned_params(video, quality_preset, params, characteristics)
 
             # Apply smoothing
             smoothed_landmarks = smooth_landmark_sequence(landmarks_sequence, params)

{kinemotion-0.11.4.dist-info → kinemotion-0.11.5.dist-info}/METADATA

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

@@ -3,25 +3,25 @@ kinemotion/api.py,sha256=M6KqzdspOvtJ9Wl555HGe3ITzvRFhPK4xeqcX7IA98s,31463
 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=lVVlh8teFHXbDzaFdDfq3xSwRf4kVwyYyd6FU8ta_Ec,19044
+kinemotion/cmj/cli.py,sha256=3CQPJOC3N00dFz_mrEgSHq9pIA-RyOynZoNUIk8RzD0,17040
 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/cli_utils.py,sha256=iI1bHZxgbzxW5-2X3tTHEy2mqR49o3oIlwFptZ6gCco,6726
 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=eXO-9H9z0g-EJUD1uIT37KIMgfyje4fPAO2FgZiEZzk,24985
+kinemotion/dropjump/cli.py,sha256=-iBgHNwW_dijHe6_JIEGSBUzvFb6tZV0aopbPd-9jC8,22402
 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.4.dist-info/METADATA,sha256=0NPASGHoBcuSIKGlfsKsflT7j6o0DiHzMqhBm2-k2EM,18990
-kinemotion-0.11.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kinemotion-0.11.4.dist-info/entry_points.txt,sha256=zaqnAnjLvcdrk1Qvj5nvXZCZ2gp0prS7it1zTJygcIY,50
-kinemotion-0.11.4.dist-info/licenses/LICENSE,sha256=KZajvqsHw0NoOHOi2q0FZ4NBe9HdV6oey-IPYAtHXfg,1088
-kinemotion-0.11.4.dist-info/RECORD,,
+kinemotion-0.11.5.dist-info/METADATA,sha256=gsLG_2Z3qbeG2UpWqp7mfyqWDXj2SpwrsXG5cgh8oEo,18990
+kinemotion-0.11.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kinemotion-0.11.5.dist-info/entry_points.txt,sha256=zaqnAnjLvcdrk1Qvj5nvXZCZ2gp0prS7it1zTJygcIY,50
+kinemotion-0.11.5.dist-info/licenses/LICENSE,sha256=KZajvqsHw0NoOHOi2q0FZ4NBe9HdV6oey-IPYAtHXfg,1088
+kinemotion-0.11.5.dist-info/RECORD,,