From cae0621bac392959787af2764461bb403c617073 Mon Sep 17 00:00:00 2001 From: Michael Ekstrand Date: Tue, 7 Apr 2026 08:47:13 -0400 Subject: [PATCH 1/5] splitting: make holdout private --- src/lenskit/splitting/__init__.py | 2 +- src/lenskit/splitting/{holdout.py => _holdout.py} | 0 src/lenskit/splitting/users.py | 2 +- tests/splitting/test_split_holdout.py | 2 +- tests/splitting/test_split_users.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/lenskit/splitting/{holdout.py => _holdout.py} (100%) diff --git a/src/lenskit/splitting/__init__.py b/src/lenskit/splitting/__init__.py index 8c22d5abd..1381a7318 100644 --- a/src/lenskit/splitting/__init__.py +++ b/src/lenskit/splitting/__init__.py @@ -12,7 +12,7 @@ from lenskit.data import Dataset -from .holdout import HoldoutMethod, LastFrac, LastN, SampleFrac, SampleN +from ._holdout import HoldoutMethod, LastFrac, LastN, SampleFrac, SampleN from .records import crossfold_records, sample_records from .split import TTSplit from .temporal import split_global_time, split_temporal_fraction diff --git a/src/lenskit/splitting/holdout.py b/src/lenskit/splitting/_holdout.py similarity index 100% rename from src/lenskit/splitting/holdout.py rename to src/lenskit/splitting/_holdout.py diff --git a/src/lenskit/splitting/users.py b/src/lenskit/splitting/users.py index a1b205fea..3068581f9 100644 --- a/src/lenskit/splitting/users.py +++ b/src/lenskit/splitting/users.py @@ -17,7 +17,7 @@ from lenskit.logging import item_progress from lenskit.random import RNGInput, random_generator -from .holdout import HoldoutMethod +from ._holdout import HoldoutMethod from .split import TTSplit _log = logging.getLogger(__name__) diff --git a/tests/splitting/test_split_holdout.py b/tests/splitting/test_split_holdout.py index 7a01a7c2e..cef32e995 100644 --- a/tests/splitting/test_split_holdout.py +++ b/tests/splitting/test_split_holdout.py @@ -14,7 +14,7 @@ import pytest from lenskit.data import Dataset -from lenskit.splitting.holdout import LastFrac, LastN, SampleFrac, SampleN +from lenskit.splitting import LastFrac, LastN, SampleFrac, SampleN def test_sample_n(ml_ds: Dataset): diff --git a/tests/splitting/test_split_users.py b/tests/splitting/test_split_users.py index ed798810b..e7afbe477 100644 --- a/tests/splitting/test_split_users.py +++ b/tests/splitting/test_split_users.py @@ -14,7 +14,7 @@ import pytest from lenskit.data import Dataset, from_interactions_df -from lenskit.splitting.holdout import SampleFrac, SampleN +from lenskit.splitting import SampleFrac, SampleN from lenskit.splitting.users import crossfold_users, sample_users From 0f03e80d3caac5730bdb025d2ead092b1c42f56b Mon Sep 17 00:00:00 2001 From: Michael Ekstrand Date: Tue, 7 Apr 2026 08:47:36 -0400 Subject: [PATCH 2/5] splitting: make records private --- src/lenskit/splitting/__init__.py | 2 +- src/lenskit/splitting/{records.py => _records.py} | 0 tests/splitting/test_split_records.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/lenskit/splitting/{records.py => _records.py} (100%) diff --git a/src/lenskit/splitting/__init__.py b/src/lenskit/splitting/__init__.py index 1381a7318..f6562732c 100644 --- a/src/lenskit/splitting/__init__.py +++ b/src/lenskit/splitting/__init__.py @@ -13,7 +13,7 @@ from lenskit.data import Dataset from ._holdout import HoldoutMethod, LastFrac, LastN, SampleFrac, SampleN -from .records import crossfold_records, sample_records +from ._records import crossfold_records, sample_records from .split import TTSplit from .temporal import split_global_time, split_temporal_fraction from .users import crossfold_users, sample_users diff --git a/src/lenskit/splitting/records.py b/src/lenskit/splitting/_records.py similarity index 100% rename from src/lenskit/splitting/records.py rename to src/lenskit/splitting/_records.py diff --git a/tests/splitting/test_split_records.py b/tests/splitting/test_split_records.py index 953f8abfd..bee92babb 100644 --- a/tests/splitting/test_split_records.py +++ b/tests/splitting/test_split_records.py @@ -14,7 +14,7 @@ import pytest from lenskit.data import Dataset -from lenskit.splitting.records import crossfold_records, sample_records +from lenskit.splitting._records import crossfold_records, sample_records def test_crossfold_records(ml_ds: Dataset): From 65a2b6cf6f4e5669896c16a2d124bff7acca4ad7 Mon Sep 17 00:00:00 2001 From: Michael Ekstrand Date: Tue, 7 Apr 2026 08:48:10 -0400 Subject: [PATCH 3/5] splitting: make split private --- src/lenskit/splitting/__init__.py | 2 +- src/lenskit/splitting/_records.py | 2 +- src/lenskit/splitting/{split.py => _split.py} | 0 src/lenskit/splitting/users.py | 2 +- src/lenskit/tuning/_iterative.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/lenskit/splitting/{split.py => _split.py} (100%) diff --git a/src/lenskit/splitting/__init__.py b/src/lenskit/splitting/__init__.py index f6562732c..0524a0e15 100644 --- a/src/lenskit/splitting/__init__.py +++ b/src/lenskit/splitting/__init__.py @@ -14,7 +14,7 @@ from ._holdout import HoldoutMethod, LastFrac, LastN, SampleFrac, SampleN from ._records import crossfold_records, sample_records -from .split import TTSplit +from ._split import TTSplit from .temporal import split_global_time, split_temporal_fraction from .users import crossfold_users, sample_users diff --git a/src/lenskit/splitting/_records.py b/src/lenskit/splitting/_records.py index 57b18fa01..91d6e7ad5 100644 --- a/src/lenskit/splitting/_records.py +++ b/src/lenskit/splitting/_records.py @@ -15,7 +15,7 @@ from lenskit.data import Dataset, DatasetBuilder, ItemListCollection, UserIDKey from lenskit.random import RNGInput, random_generator -from .split import TTSplit +from ._split import TTSplit _log = logging.getLogger(__name__) diff --git a/src/lenskit/splitting/split.py b/src/lenskit/splitting/_split.py similarity index 100% rename from src/lenskit/splitting/split.py rename to src/lenskit/splitting/_split.py diff --git a/src/lenskit/splitting/users.py b/src/lenskit/splitting/users.py index 3068581f9..0d4bbc886 100644 --- a/src/lenskit/splitting/users.py +++ b/src/lenskit/splitting/users.py @@ -18,7 +18,7 @@ from lenskit.random import RNGInput, random_generator from ._holdout import HoldoutMethod -from .split import TTSplit +from ._split import TTSplit _log = logging.getLogger(__name__) diff --git a/src/lenskit/tuning/_iterative.py b/src/lenskit/tuning/_iterative.py index 72f0c7895..7b313dcb5 100644 --- a/src/lenskit/tuning/_iterative.py +++ b/src/lenskit/tuning/_iterative.py @@ -26,7 +26,7 @@ from lenskit.pipeline.components import Placeholder from lenskit.pipeline.nodes import ComponentConstructorNode, ComponentInstanceNode from lenskit.random import make_seed -from lenskit.splitting.split import TTSplit +from lenskit.splitting import TTSplit from lenskit.state import ParameterContainer from lenskit.training import ModelTrainer, TrainingOptions, UsesTrainer From e0c192a5901124abda6b4414e4601c5d3ff81def Mon Sep 17 00:00:00 2001 From: Michael Ekstrand Date: Tue, 7 Apr 2026 08:48:37 -0400 Subject: [PATCH 4/5] splitting: make temporal private --- src/lenskit/splitting/__init__.py | 2 +- src/lenskit/splitting/{temporal.py => _temporal.py} | 2 +- tests/batch/test_pipeline_profiling.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/lenskit/splitting/{temporal.py => _temporal.py} (99%) diff --git a/src/lenskit/splitting/__init__.py b/src/lenskit/splitting/__init__.py index 0524a0e15..e269036e0 100644 --- a/src/lenskit/splitting/__init__.py +++ b/src/lenskit/splitting/__init__.py @@ -15,7 +15,7 @@ from ._holdout import HoldoutMethod, LastFrac, LastN, SampleFrac, SampleN from ._records import crossfold_records, sample_records from ._split import TTSplit -from .temporal import split_global_time, split_temporal_fraction +from ._temporal import split_global_time, split_temporal_fraction from .users import crossfold_users, sample_users __all__ = [ diff --git a/src/lenskit/splitting/temporal.py b/src/lenskit/splitting/_temporal.py similarity index 99% rename from src/lenskit/splitting/temporal.py rename to src/lenskit/splitting/_temporal.py index 2a04b4d3e..a4710fe3c 100644 --- a/src/lenskit/splitting/temporal.py +++ b/src/lenskit/splitting/_temporal.py @@ -10,7 +10,7 @@ from lenskit.data import Dataset, DatasetBuilder, ItemListCollection from lenskit.logging import get_logger -from .split import TTSplit +from ._split import TTSplit _log = get_logger(__name__) diff --git a/tests/batch/test_pipeline_profiling.py b/tests/batch/test_pipeline_profiling.py index 99601e7a0..14f73a66b 100644 --- a/tests/batch/test_pipeline_profiling.py +++ b/tests/batch/test_pipeline_profiling.py @@ -13,7 +13,7 @@ from lenskit.basic import BiasScorer from lenskit.batch import BatchPipelineRunner from lenskit.pipeline import PipelineProfiler, topn_pipeline -from lenskit.splitting.split import TTSplit +from lenskit.splitting import TTSplit from .test_batch_pipeline import MLB, ml_split, mlb From 8b95fc95a396278250b885e804d28bf6ae829fcc Mon Sep 17 00:00:00 2001 From: Michael Ekstrand Date: Tue, 7 Apr 2026 08:49:14 -0400 Subject: [PATCH 5/5] splitting: make users private --- src/lenskit/splitting/__init__.py | 2 +- src/lenskit/splitting/{users.py => _users.py} | 0 tests/splitting/test_split_users.py | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) rename src/lenskit/splitting/{users.py => _users.py} (100%) diff --git a/src/lenskit/splitting/__init__.py b/src/lenskit/splitting/__init__.py index e269036e0..f96041d08 100644 --- a/src/lenskit/splitting/__init__.py +++ b/src/lenskit/splitting/__init__.py @@ -16,7 +16,7 @@ from ._records import crossfold_records, sample_records from ._split import TTSplit from ._temporal import split_global_time, split_temporal_fraction -from .users import crossfold_users, sample_users +from ._users import crossfold_users, sample_users __all__ = [ "TTSplit", diff --git a/src/lenskit/splitting/users.py b/src/lenskit/splitting/_users.py similarity index 100% rename from src/lenskit/splitting/users.py rename to src/lenskit/splitting/_users.py diff --git a/tests/splitting/test_split_users.py b/tests/splitting/test_split_users.py index e7afbe477..dc57c733f 100644 --- a/tests/splitting/test_split_users.py +++ b/tests/splitting/test_split_users.py @@ -14,8 +14,7 @@ import pytest from lenskit.data import Dataset, from_interactions_df -from lenskit.splitting import SampleFrac, SampleN -from lenskit.splitting.users import crossfold_users, sample_users +from lenskit.splitting import SampleFrac, SampleN, crossfold_users, sample_users def test_crossfold_users(ml_ds: Dataset):