kinemotion 0.12.2__tar.gz → 0.12.3__tar.gz

{kinemotion-0.12.2 → kinemotion-0.12.3}/CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- version list -->
 
+## v0.12.3 (2025-11-06)
+
+### Bug Fixes
+
+- Resolve SonarCloud cognitive complexity violations
+  ([`5b20c48`](https://github.com/feniix/kinemotion/commit/5b20c488e058ac3628b0e20847d3fe2539a687c4))
+
+### Refactoring
+
+- **core**: Reduce cognitive complexity in video_io and auto_tuning
+  ([`14076fe`](https://github.com/feniix/kinemotion/commit/14076fe9d1f9b41ef2ff9bd643b17cf566e18654))
+
+- **dropjump**: Add shared utility for foot position extraction
+  ([`5222cc4`](https://github.com/feniix/kinemotion/commit/5222cc471b9f4406116de0b7fc193f07d21cd88a))
+
+- **dropjump**: Reduce cognitive complexity in CLI functions
+  ([`6fc887f`](https://github.com/feniix/kinemotion/commit/6fc887f6288e870a306aa1e3ffc7b8a46c21c3fc))
+
+- **examples**: Simplify programmatic usage with shared utility
+  ([`5e1bc19`](https://github.com/feniix/kinemotion/commit/5e1bc194f5784a24cfcbc7e6372ebd26a95225aa))
+
+
 ## v0.12.2 (2025-11-06)
 
 ### Bug Fixes

{kinemotion-0.12.2 → kinemotion-0.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinemotion
-Version: 0.12.2
+Version: 0.12.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.12.2 → kinemotion-0.12.3}/examples/programmatic_usage.py

@@ -2,14 +2,12 @@
 
 from typing import Any
 
-import numpy as np
-
 from kinemotion.core.pose import PoseTracker
 from kinemotion.core.smoothing import smooth_landmarks
 from kinemotion.core.video_io import VideoProcessor
 from kinemotion.dropjump.analysis import (
-    compute_average_foot_position,
     detect_ground_contact,
+    extract_foot_positions_and_visibilities,
 )
 from kinemotion.dropjump.kinematics import calculate_drop_jump_metrics
 
@@ -48,29 +46,8 @@ def analyze_video(video_path: str) -> dict[str, Any]:
     # Smooth landmarks
     smoothed = smooth_landmarks(landmarks_sequence, window_length=5)
 
-    # Extract foot positions
-    foot_positions_list: list[float] = []
-    visibilities_list: list[float] = []
-
-    for frame_landmarks in smoothed:
-        if frame_landmarks:
-            _, foot_y = compute_average_foot_position(frame_landmarks)
-            foot_positions_list.append(foot_y)
-
-            # Average foot visibility
-            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:
-            foot_positions_list.append(
-                foot_positions_list[-1] if foot_positions_list else 0.5
-            )
-            visibilities_list.append(0.0)
-
-    foot_positions: np.ndarray[Any, Any] = np.array(foot_positions_list)
-    visibilities: np.ndarray[Any, Any] = np.array(visibilities_list)
+    # Extract foot positions and visibilities using shared utility
+    foot_positions, visibilities = extract_foot_positions_and_visibilities(smoothed)
 
     # Detect contact
     contact_states = detect_ground_contact(

{kinemotion-0.12.2 → kinemotion-0.12.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kinemotion"
-version = "0.12.2"
+version = "0.12.3"
 description = "Video-based kinematic analysis for athletic performance"
 readme = "README.md"
 requires-python = ">=3.10,<3.13"

{kinemotion-0.12.2 → kinemotion-0.12.3}/src/kinemotion/core/auto_tuning.py

@@ -216,6 +216,59 @@ def auto_tune_parameters(
     )
 
 
+def _collect_foot_visibility_and_positions(
+    frame_landmarks: dict[str, tuple[float, float, float]],
+) -> tuple[list[float], list[float]]:
+    """
+    Collect visibility scores and Y positions from foot landmarks.
+
+    Args:
+        frame_landmarks: Landmarks for a single frame
+
+    Returns:
+        Tuple of (visibility_scores, y_positions)
+    """
+    foot_keys = [
+        "left_ankle",
+        "right_ankle",
+        "left_heel",
+        "right_heel",
+        "left_foot_index",
+        "right_foot_index",
+    ]
+
+    frame_vis = []
+    frame_y_positions = []
+
+    for key in foot_keys:
+        if key in frame_landmarks:
+            _, y, vis = frame_landmarks[key]  # x not needed for analysis
+            frame_vis.append(vis)
+            frame_y_positions.append(y)
+
+    return frame_vis, frame_y_positions
+
+
+def _check_stable_period(positions: list[float]) -> bool:
+    """
+    Check if video has a stable period at the start.
+
+    A stable period (low variance in first 30 frames) indicates
+    the subject is standing on an elevated platform before jumping.
+
+    Args:
+        positions: List of average Y positions per frame
+
+    Returns:
+        True if stable period detected, False otherwise
+    """
+    if len(positions) < 30:
+        return False
+
+    first_30_std = float(np.std(positions[:30]))
+    return first_30_std < 0.01  # Very stable = on platform
+
+
 def analyze_video_sample(
     landmarks_sequence: list[dict[str, tuple[float, float, float]] | None],
     fps: float,
@@ -235,35 +288,22 @@ def analyze_video_sample(
     Returns:
         VideoCharacteristics with analyzed properties
     """
-    # Calculate average landmark visibility
     visibilities = []
     positions = []
 
+    # Collect visibility and position data from all frames
     for frame_landmarks in landmarks_sequence:
-        if frame_landmarks:
-            # Collect visibility scores from foot landmarks
-            foot_keys = [
-                "left_ankle",
-                "right_ankle",
-                "left_heel",
-                "right_heel",
-                "left_foot_index",
-                "right_foot_index",
-            ]
-
-            frame_vis = []
-            frame_y_positions = []
-
-            for key in foot_keys:
-                if key in frame_landmarks:
-                    _, y, vis = frame_landmarks[key]  # x not needed for analysis
-                    frame_vis.append(vis)
-                    frame_y_positions.append(y)
-
-            if frame_vis:
-                visibilities.append(float(np.mean(frame_vis)))
-            if frame_y_positions:
-                positions.append(float(np.mean(frame_y_positions)))
+        if not frame_landmarks:
+            continue
+
+        frame_vis, frame_y_positions = _collect_foot_visibility_and_positions(
+            frame_landmarks
+        )
+
+        if frame_vis:
+            visibilities.append(float(np.mean(frame_vis)))
+        if frame_y_positions:
+            positions.append(float(np.mean(frame_y_positions)))
 
     # Compute metrics
     avg_visibility = float(np.mean(visibilities)) if visibilities else 0.5
@@ -273,11 +313,7 @@ def analyze_video_sample(
     tracking_quality = analyze_tracking_quality(avg_visibility)
 
     # Check for stable period (indicates drop jump from elevated platform)
-    # Simple check: do first 30 frames have low variance?
-    has_stable_period = False
-    if len(positions) >= 30:
-        first_30_std = float(np.std(positions[:30]))
-        has_stable_period = first_30_std < 0.01  # Very stable = on platform
+    has_stable_period = _check_stable_period(positions)
 
     return VideoCharacteristics(
         fps=fps,

{kinemotion-0.12.2 → kinemotion-0.12.3}/src/kinemotion/core/video_io.py

@@ -65,6 +65,43 @@ class VideoProcessor:
                 self.display_width,
             )
 
+    def _parse_sample_aspect_ratio(self, sar_str: str) -> None:
+        """
+        Parse SAR string and update display dimensions.
+
+        Args:
+            sar_str: SAR string in format "width:height" (e.g., "270:473")
+        """
+        if not sar_str or ":" not in sar_str:
+            return
+
+        sar_parts = sar_str.split(":")
+        sar_width = int(sar_parts[0])
+        sar_height = int(sar_parts[1])
+
+        # Calculate display dimensions if pixels are non-square
+        # DAR = (width * SAR_width) / (height * SAR_height)
+        if sar_width != sar_height:
+            self.display_width = int(self.width * sar_width / sar_height)
+            self.display_height = self.height
+
+    def _extract_rotation_from_stream(self, stream: dict) -> int:  # type: ignore[type-arg]
+        """
+        Extract rotation metadata from video stream.
+
+        Args:
+            stream: ffprobe stream dictionary
+
+        Returns:
+            Rotation angle in degrees (0, 90, -90, 180)
+        """
+        side_data_list = stream.get("side_data_list", [])
+        for side_data in side_data_list:
+            if side_data.get("side_data_type") == "Display Matrix":
+                rotation = side_data.get("rotation", 0)
+                return int(rotation)
+        return 0
+
     def _extract_video_metadata(self) -> None:
         """
         Extract video metadata including SAR and rotation using ffprobe.
@@ -94,35 +131,22 @@ class VideoProcessor:
                 timeout=5,
             )
 
-            if result.returncode == 0:
-                data = json.loads(result.stdout)
-                if "streams" in data and len(data["streams"]) > 0:
-                    stream = data["streams"][0]
-
-                    # Extract SAR (Sample Aspect Ratio)
-                    sar_str = stream.get("sample_aspect_ratio", "1:1")
-
-                    # Parse SAR (e.g., "270:473")
-                    if sar_str and ":" in sar_str:
-                        sar_parts = sar_str.split(":")
-                        sar_width = int(sar_parts[0])
-                        sar_height = int(sar_parts[1])
-
-                        # Calculate display dimensions
-                        # DAR = (width * SAR_width) / (height * SAR_height)
-                        if sar_width != sar_height:
-                            self.display_width = int(
-                                self.width * sar_width / sar_height
-                            )
-                            self.display_height = self.height
-
-                    # Extract rotation from side_data_list (common for iPhone videos)
-                    side_data_list = stream.get("side_data_list", [])
-                    for side_data in side_data_list:
-                        if side_data.get("side_data_type") == "Display Matrix":
-                            rotation = side_data.get("rotation", 0)
-                            # Convert to int and normalize to 0, 90, -90, 180
-                            self.rotation = int(rotation)
+            if result.returncode != 0:
+                return
+
+            data = json.loads(result.stdout)
+            if "streams" not in data or len(data["streams"]) == 0:
+                return
+
+            stream = data["streams"][0]
+
+            # Extract and parse SAR (Sample Aspect Ratio)
+            sar_str = stream.get("sample_aspect_ratio", "1:1")
+            self._parse_sample_aspect_ratio(sar_str)
+
+            # Extract rotation from side_data_list (common for iPhone videos)
+            self.rotation = self._extract_rotation_from_stream(stream)
+
         except (subprocess.TimeoutExpired, FileNotFoundError, json.JSONDecodeError):
             # If ffprobe fails, keep original dimensions (square pixels)
             pass

{kinemotion-0.12.2 → kinemotion-0.12.3}/src/kinemotion/dropjump/analysis.py

@@ -752,3 +752,39 @@ def compute_average_foot_position(
         return (0.5, 0.5)  # Default to center if no visible feet
 
     return (float(np.mean(x_positions)), float(np.mean(y_positions)))
+
+
+def extract_foot_positions_and_visibilities(
+    smoothed_landmarks: list[dict[str, tuple[float, float, float]] | None],
+) -> tuple[np.ndarray, np.ndarray]:
+    """
+    Extract vertical positions and average visibilities from smoothed landmarks.
+
+    This utility function eliminates code duplication between CLI and programmatic usage.
+
+    Args:
+        smoothed_landmarks: Smoothed landmark sequence from tracking
+
+    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:
+            # Fill missing frames with last known position or default
+            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)

{kinemotion-0.12.2 → kinemotion-0.12.3}/src/kinemotion/dropjump/cli.py

@@ -28,8 +28,8 @@ from ..core.pose import PoseTracker
 from ..core.video_io import VideoProcessor
 from .analysis import (
     ContactState,
-    compute_average_foot_position,
     detect_ground_contact,
+    extract_foot_positions_and_visibilities,
 )
 from .debug_overlay import DebugOverlayRenderer
 from .kinematics import DropJumpMetrics, calculate_drop_jump_metrics
@@ -258,26 +258,7 @@ def _extract_positions_and_visibilities(
         Tuple of (vertical_positions, visibilities)
     """
     click.echo("Extracting foot positions...", err=True)
-
-    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)
+    return extract_foot_positions_and_visibilities(smoothed_landmarks)
 
 
 def _create_debug_video(
@@ -567,6 +548,63 @@ def _compute_batch_statistics(results: list[VideoResult]) -> None:
             )
 
 
+def _format_time_metric(value: float | None, multiplier: float = 1000.0) -> str:
+    """Format time metric for CSV output.
+
+    Args:
+        value: Time value in seconds
+        multiplier: Multiplier to convert to milliseconds (default: 1000.0)
+
+    Returns:
+        Formatted string or "N/A" if value is None
+    """
+    return f"{value * multiplier:.1f}" if value is not None else "N/A"
+
+
+def _format_distance_metric(value: float | None) -> str:
+    """Format distance metric for CSV output.
+
+    Args:
+        value: Distance value in meters
+
+    Returns:
+        Formatted string or "N/A" if value is None
+    """
+    return f"{value:.3f}" if value is not None else "N/A"
+
+
+def _create_csv_row_from_result(result: VideoResult) -> list[str]:
+    """Create CSV row from video processing result.
+
+    Args:
+        result: Video processing result
+
+    Returns:
+        List of formatted values for CSV row
+    """
+    video_name = Path(result.video_path).name
+    processing_time = f"{result.processing_time:.2f}"
+
+    if result.success and result.metrics:
+        return [
+            video_name,
+            _format_time_metric(result.metrics.ground_contact_time),
+            _format_time_metric(result.metrics.flight_time),
+            _format_distance_metric(result.metrics.jump_height),
+            processing_time,
+            "Success",
+        ]
+    else:
+        return [
+            video_name,
+            "N/A",
+            "N/A",
+            "N/A",
+            processing_time,
+            f"Failed: {result.error}",
+        ]
+
+
 def _write_csv_summary(
     csv_summary: str | None, results: list[VideoResult], successful: list[VideoResult]
 ) -> None:
@@ -600,40 +638,7 @@ def _write_csv_summary(
 
         # Data rows
         for result in results:
-            if result.success and result.metrics:
-                writer.writerow(
-                    [
-                        Path(result.video_path).name,
-                        (
-                            f"{result.metrics.ground_contact_time * 1000:.1f}"
-                            if result.metrics.ground_contact_time
-                            else "N/A"
-                        ),
-                        (
-                            f"{result.metrics.flight_time * 1000:.1f}"
-                            if result.metrics.flight_time
-                            else "N/A"
-                        ),
-                        (
-                            f"{result.metrics.jump_height:.3f}"
-                            if result.metrics.jump_height
-                            else "N/A"
-                        ),
-                        f"{result.processing_time:.2f}",
-                        "Success",
-                    ]
-                )
-            else:
-                writer.writerow(
-                    [
-                        Path(result.video_path).name,
-                        "N/A",
-                        "N/A",
-                        "N/A",
-                        f"{result.processing_time:.2f}",
-                        f"Failed: {result.error}",
-                    ]
-                )
+            writer.writerow(_create_csv_row_from_result(result))
 
     click.echo("CSV summary written successfully", err=True)
 

{kinemotion-0.12.2 → kinemotion-0.12.3}/uv.lock

@@ -603,7 +603,7 @@ wheels = [
 
 [[package]]
 name = "kinemotion"
-version = "0.12.2"
+version = "0.12.3"
 source = { editable = "." }
 dependencies = [
     { name = "click" },