74 task write linesegment class in trails utils (#75)

* created trail_utils file

* wrote LineSegment in config, updated venv with pandas

* Update test.yaml

Trying to remove the --only-dev that seems to be causing issues in ruff and mypy

* Bump shapely version

* Trying to limit to 3.11-3.13

* Update pyproject.toml

* 77 task write circletarget class in config (#78)

* wrote class and method

* wrote 4 unit tests

* Move LineSegment and CircleTarget from config to models

* Move unit tests from test_config to test_models

* editing docstrings

* parameterized 3 tests into 1

---------

Co-authored-by: Adam Santorelli <148909356+Asanto32@users.noreply.github.com>

Author: cgmaiorano

.github/workflows/test.yaml

@@ -78,7 +78,7 @@ jobs:
       with:
         python-version-file: pyproject.toml
     - name: Install the project
-      run: uv sync --only-dev
+      run: uv sync 
     - name: Ruff format
       run: uv run ruff format --check
     - name: Ruff check
@@ -97,6 +97,6 @@ jobs:
       with:
         python-version-file: pyproject.toml
     - name: Install the project
-      run: uv sync --only-dev
+      run: uv sync 
     - run: |
         uv run mypy .

pyproject.toml

@@ -8,18 +8,19 @@ authors = [
   {name = "Iktae Kim", email = "iktae.kim@childmind.org"},
   {name = "Adam Santorelli", email = "adam.santorelli@childmind.org"}
 ]
-license = "LGPL-2.1"
+license = "LGPL-2.1-only"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.11,<3.14"
+
 dependencies = [
   "pandas>=2.2.3",
   "pydantic>=2.11.1",
   "scipy>=1.15.2",
-  "shapely>=2.1.0",
+  "shapely>=2.1.2",
   "tqdm>=4.66.0",
   "typer>=0.12.0",
   "matplotlib>=3.10.0",
-  "seaborn>=0.13.0"
+  "seaborn>=0.13.0",
 ]
 
 [project.scripts]

src/graphomotor/core/models.py

@@ -1,5 +1,6 @@
 """Internal data class for spiral drawing data."""
 
+import dataclasses
 import datetime
 import typing
 
@@ -116,3 +117,82 @@ def get_extractors(
                 spiral, reference_spiral
             ),
         }
+
+
+@dataclasses.dataclass
+class LineSegment:
+    """Represents a line drawn between two circles.
+
+    Attributes:
+        start_label: Label of the starting circle.
+        end_label: Label of the ending circle.
+        points: DataFrame containing the points in the line segment.
+        is_error: Whether the line segment is an error (missed target).
+        line_number: The line number of the segment.
+
+        Calculated features:
+        ink_time: Time spent drawing the line segment.
+        think_time: Time spent thinking before drawing the line segment.
+        think_circle_label: Label of the circle associated with think time.
+        distance: Total distance drawn outside circles.
+        mean_speed: Mean speed of drawing the line segment.
+        speed_variance: Variance of speed during the line segment.
+        path_optimality: Ratio of actual path length to optimal path length.
+        smoothness: Smoothness of the line segment based on curvature changes.
+        hesitation_count: Number of hesitations during the line segment.
+        hesitation_duration: Total duration of hesitations during the line segment.
+        velocities: List of velocities at each point in the line segment.
+        accelerations: List of accelerations at each point in the line segment.
+    """
+
+    start_label: str
+    end_label: str
+    points: pd.DataFrame
+    is_error: bool
+    line_number: int
+
+    ink_time: float = 0.0
+    think_time: float = 0.0
+    think_circle_label: str = ""
+    distance: float = 0.0
+    mean_speed: float = 0.0
+    speed_variance: float = 0.0
+    path_optimality: float = 0.0
+    smoothness: float = 0.0
+    hesitation_count: int = 0
+    hesitation_duration: float = 0.0
+    velocities: typing.List[float] = dataclasses.field(default_factory=list)
+    accelerations: typing.List[float] = dataclasses.field(default_factory=list)
+
+
+@dataclasses.dataclass
+class CircleTarget:
+    """Represents a target circle in the drawing task.
+
+    Attributes:
+        order: The order of the circle in the sequence.
+        label: The label of the circle.
+        center_x: The x-coordinate of the circle's center.
+        center_y: The y-coordinate of the circle's center.
+        radius: The radius of the circle.
+    """
+
+    order: int
+    label: str
+    center_x: float
+    center_y: float
+    radius: float
+
+    def contains_point(self, x: float, y: float, tolerance: float = 1.5) -> bool:
+        """Check if a point is within the circle (with tolerance multiplier).
+
+        Args:
+            x: X coordinate of the point.
+            y: Y coordinate of the point.
+            tolerance: Multiplier for the radius to define tolerance boundary.
+
+        Returns:
+            True if the point is within the circle (with tolerance), False otherwise.
+        """
+        distance = np.sqrt((x - self.center_x) ** 2 + (y - self.center_y) ** 2)
+        return distance <= (self.radius * tolerance)

src/graphomotor/utils/trails_utils.py

@@ -0,0 +1 @@
+"""Utility functions for trails management."""

tests/unit/test_models.py

@@ -59,3 +59,39 @@ def test_invalid_metadata_values(
         models.Drawing(
             data=valid_spiral_data, task_name="spiral", metadata=invalid_metadata
         )
+
+
+@pytest.fixture
+def circle() -> models.CircleTarget:
+    """Create a standard circle at origin with radius 10."""
+    return models.CircleTarget(
+        order=1, label="test_circle", center_x=0.0, center_y=0.0, radius=10.0
+    )
+
+
+@pytest.mark.parametrize(
+    "x,y,description",
+    [
+        (0.0, 0.0, "center"),
+        (10.0, 0.0, "right edge"),
+        (0.0, 10.0, "top edge"),
+        (-10.0, 0.0, "left edge"),
+        (0.0, -10.0, "bottom edge"),
+        (5.0, 0.0, "inside horizontally"),
+        (0.0, 5.0, "inside vertically"),
+    ],
+)
+def test_point_inside_circle(
+    circle: models.CircleTarget,
+    x: float,
+    y: float,
+    description: str,
+) -> None:
+    """Point at center, on edge, or just inside should be contained."""
+    assert circle.contains_point(x, y)
+
+
+def test_point_outside_with_default_tolerance(circle: models.CircleTarget) -> None:
+    """Point outside default tolerance boundary should not be contained."""
+    assert not circle.contains_point(16.0, 0.0)
+    assert not circle.contains_point(0.0, 16.0)