scanpath-studio 0.31.2__tar.gz → 0.32.1__tar.gz

{scanpath_studio-0.31.2 → scanpath_studio-0.32.1}/MANIFEST.in

@@ -5,5 +5,5 @@ recursive-include scanpath_studio/sample_data *.csv
 recursive-include scanpath_studio/sample_data *.parquet
 recursive-include scanpath_studio/sample_data *.png
 # ENG-61: the suite needs the whole repository (streamlit_app.py, docs/,
-# CITATION.cff, tracker/), so a partial copy in the sdist could never run.
+# CITATION.cff), so a partial copy in the sdist could never run.
 prune tests

{scanpath_studio-0.31.2/scanpath_studio.egg-info → scanpath_studio-0.32.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scanpath-studio
-Version: 0.31.2
+Version: 0.32.1
 Summary: Interactive Streamlit workbench for visualizing eye-tracking-while-reading scanpaths, computing reading measures, and exporting figures and tabular data.
 Author: Keren Gruteke Klein, Maya Grossman, Ella Lion, Deborah N. Jakobi, David R. Reich, Lena Jäger, Yevgeni Berzak
 Author-email: Omer Shubi <lacclab.technion@gmail.com>
@@ -83,7 +83,7 @@ paper.
   ```
 
 - **As a desktop app:** [Windows](https://github.com/lacclab/scanpath-studio/releases/latest/download/ScanpathStudio-windows-x86_64.zip) ·
-  [macOS (Apple silicon)](https://github.com/lacclab/scanpath-studio/releases/latest/download/ScanpathStudio-macos-arm64.tar.gz) ·
+  [macOS (Apple silicon)](https://github.com/lacclab/scanpath-studio/releases/latest/download/ScanpathStudio-macos-arm64.dmg) ·
   [Linux](https://github.com/lacclab/scanpath-studio/releases/latest/download/ScanpathStudio-linux-x86_64.tar.gz).
 
 The pip and desktop installs keep your data on your own machine; the hosted demo
@@ -180,6 +180,9 @@ covers setup, the checks that gate CI, and how work is tracked in
 the architectural map. To preview the docs site locally, run
 `pip install -e ".[docs]"` and then `mkdocs serve`.
 
+Taking part means following the
+[Code of Conduct](https://github.com/lacclab/scanpath-studio/blob/main/CODE_OF_CONDUCT.md).
+
 ## Citation
 
 A paper is in preparation. Until then, cite the software by its DOI,

{scanpath_studio-0.31.2 → scanpath_studio-0.32.1}/README.md

@@ -29,7 +29,7 @@ paper.
   ```
 
 - **As a desktop app:** [Windows](https://github.com/lacclab/scanpath-studio/releases/latest/download/ScanpathStudio-windows-x86_64.zip) ·
-  [macOS (Apple silicon)](https://github.com/lacclab/scanpath-studio/releases/latest/download/ScanpathStudio-macos-arm64.tar.gz) ·
+  [macOS (Apple silicon)](https://github.com/lacclab/scanpath-studio/releases/latest/download/ScanpathStudio-macos-arm64.dmg) ·
   [Linux](https://github.com/lacclab/scanpath-studio/releases/latest/download/ScanpathStudio-linux-x86_64.tar.gz).
 
 The pip and desktop installs keep your data on your own machine; the hosted demo
@@ -126,6 +126,9 @@ covers setup, the checks that gate CI, and how work is tracked in
 the architectural map. To preview the docs site locally, run
 `pip install -e ".[docs]"` and then `mkdocs serve`.
 
+Taking part means following the
+[Code of Conduct](https://github.com/lacclab/scanpath-studio/blob/main/CODE_OF_CONDUCT.md).
+
 ## Citation
 
 A paper is in preparation. Until then, cite the software by its DOI,

{scanpath_studio-0.31.2 → scanpath_studio-0.32.1}/pyproject.toml

@@ -177,7 +177,7 @@ ignore = [
     # each already carrying a comment saying why the failure is ignorable.
     "S110", "S112",
     # Naive local timestamps are correct here: these stamp a local recovery
-    # cache and a local tracker, both single-machine by design. Making them
+    # cache, single-machine by design. Making them
     # tz-aware would imply a portability this data does not have.
     "DTZ005", "DTZ006",
     # Fires on scripts with a shebang that are run via `python <script>`; the

{scanpath_studio-0.31.2 → scanpath_studio-0.32.1}/scanpath_studio/__init__.py

@@ -40,7 +40,7 @@ __all__ = [
     "save_figure_layers",
     "trial_summary",
 ]
-__version__ = "0.31.2"
+__version__ = "0.32.1"
 
 # Public headless API (see api.py / datasets.py / eyegenbench.py). Resolved lazily so
 # `import scanpath_studio` stays cheap and doesn't pull in pandas/plotly/

{scanpath_studio-0.31.2 → scanpath_studio-0.32.1}/scanpath_studio/aggregation.py

@@ -1343,12 +1343,27 @@ def group_mask(frame: pd.DataFrame, spec: Mapping[str, Sequence]) -> pd.Series:
     (compared as strings). Unifies both group-definition modes: a *field split*
     is two specs over the same column with disjoint values, while *independent
     filter sets* are specs with several columns. An empty spec selects all rows.
+
+    A key may also be a **tuple of columns**, whose values are tuples: a
+    composite key the row must match as a whole (AN-31 — a trial-metadata
+    cohort is a set of ``(participant_id, trial_id)`` readings, which two
+    independent column constraints cannot express: reader p1's trial t1 and
+    reader p2's trial t2 are not p1's t2). Like a single column, a composite key
+    a frame does not fully carry constrains nothing on that frame.
     """
     if frame is None or frame.empty:
         return pd.Series([], dtype=bool)
     mask = pd.Series(True, index=frame.index)
     for col, vals in (spec or {}).items():
-        if col in frame.columns and vals:
+        if not vals:
+            continue
+        if isinstance(col, tuple):
+            if not set(col) <= set(frame.columns):
+                continue
+            allowed = {tuple(str(part) for part in v) for v in vals}
+            keys = pd.MultiIndex.from_arrays([frame[c].astype(str) for c in col])
+            mask &= keys.isin(allowed)
+        elif col in frame.columns:
             allowed = {str(v) for v in vals}
             mask &= frame[col].astype(str).isin(allowed)
     return mask