From 0e81ec3c58ee5017c8ae259ab6fb2a4a46216119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=AA=20Nguy=C3=AAn=20Hoang?= Date: Wed, 22 Jan 2025 10:07:56 +0100 Subject: [PATCH] WIP Renaming --- solidago/src/solidago/__init__.py | 26 +++++++++++++--- .../solidago/_generative_model/__init__.py | 8 ----- solidago/src/solidago/_pipeline/__init__.py | 10 ------- solidago/src/solidago/_state/__init__.py | 13 -------- solidago/src/solidago/generators/__init__.py | 8 +++++ .../assessment}/__init__.py | 0 .../assessment}/base.py | 4 +-- .../assessment}/normal.py | 2 +- .../{_generative_model => generators}/base.py | 18 +++++------ .../comparison}/__init__.py | 0 .../comparison}/base.py | 4 +-- .../comparison}/thurston.py | 2 +- .../engagement}/__init__.py | 0 .../engagement}/base.py | 4 +-- .../engagement}/simple.py | 2 +- .../_entity => generators/entity}/__init__.py | 0 .../_entity => generators/entity}/base.py | 4 +-- .../_entity => generators/entity}/vector.py | 2 +- .../_user => generators/user}/__init__.py | 0 .../_user => generators/user}/base.py | 4 +-- .../_user => generators/user}/normal.py | 2 +- .../_vouch => generators/vouch}/__init__.py | 0 .../_vouch => generators/vouch}/base.py | 4 +-- .../vouch}/erdos_renyi.py | 2 +- solidago/src/solidago/modules/__init__.py | 11 +++++++ .../aggregation}/__init__.py | 0 .../aggregation}/average.py | 4 +-- .../aggregation}/entitywise_qr_quantile.py | 4 +-- .../solidago/{_pipeline => modules}/base.py | 8 ++--- .../{_pipeline => modules}/identity.py | 2 +- .../{_pipeline => modules}/old_default.py | 0 .../post_process}/__init__.py | 0 .../post_process}/squash.py | 4 +-- .../preference_learning}/__init__.py | 0 .../preference_learning}/base.py | 4 +-- .../generalized_bradley_terry.py | 2 +- .../lbfgs_generalized_bradley_terry.py | 2 +- .../numba_generalized_bradley_terry.py | 2 +- .../_scaling => modules/scaling}/__init__.py | 0 .../scaling}/lipschitz_quantile_shift.py | 4 +-- .../scaling}/lipschitz_standardize.py | 4 +-- .../_scaling => modules/scaling}/mehestan.py | 4 +-- .../{_pipeline => modules}/sequential.py | 10 +++---- .../tournesol_full.json | 0 .../tournesol_online_update.json | 0 .../trust_propagation}/__init__.py | 0 .../trust_propagation}/lipschitrust.py | 4 +-- .../no_trust_propagation.py | 4 +-- .../trust_propagation}/trust_all.py | 4 +-- .../voting_rights}/__init__.py | 0 .../voting_rights}/affine_overtrust.py | 4 +-- .../voting_rights}/is_trust.py | 4 +-- .../datastructure/nested_dict_of_row_lists.py | 2 +- solidago/src/solidago/state/__init__.py | 30 +++++++++++++++++++ .../assessments}/__init__.py | 0 .../assessments}/base.py | 0 .../src/solidago/{_state => state}/base.py | 18 +++++------ .../comparisons}/__init__.py | 0 .../comparisons}/base.py | 0 .../_entities => state/entities}/__init__.py | 0 .../_entities => state/entities}/base.py | 0 .../_entities => state/entities}/vector.py | 0 .../made_public}/__init__.py | 0 .../made_public}/all_public.py | 0 .../made_public}/base.py | 0 .../_models => state/models}/__init__.py | 0 .../{_state/_models => state/models}/base.py | 0 .../_models => state/models}/direct.py | 0 .../models}/post_processed.py | 0 .../_models => state/models}/scaled.py | 0 .../{_state/_models => state/models}/score.py | 0 .../_models => state/models}/user_models.py | 0 .../solidago/{_state => state}/tournesol.py | 0 .../_users => state/users}/__init__.py | 0 .../{_state/_users => state/users}/base.py | 0 .../{_state/_users => state/users}/vector.py | 0 .../voting_rights}/__init__.py | 0 .../voting_rights}/base.py | 0 .../_vouches => state/vouches}/__init__.py | 0 .../_vouches => state/vouches}/base.py | 0 80 files changed, 145 insertions(+), 109 deletions(-) delete mode 100644 solidago/src/solidago/_generative_model/__init__.py delete mode 100644 solidago/src/solidago/_pipeline/__init__.py delete mode 100644 solidago/src/solidago/_state/__init__.py create mode 100644 solidago/src/solidago/generators/__init__.py rename solidago/src/solidago/{_generative_model/_assessment => generators/assessment}/__init__.py (100%) rename solidago/src/solidago/{_generative_model/_assessment => generators/assessment}/base.py (93%) rename solidago/src/solidago/{_generative_model/_assessment => generators/assessment}/normal.py (96%) rename solidago/src/solidago/{_generative_model => generators}/base.py (87%) rename solidago/src/solidago/{_generative_model/_comparison => generators/comparison}/__init__.py (100%) rename solidago/src/solidago/{_generative_model/_comparison => generators/comparison}/base.py (94%) rename solidago/src/solidago/{_generative_model/_comparison => generators/comparison}/thurston.py (99%) rename solidago/src/solidago/{_generative_model/_engagement => generators/engagement}/__init__.py (100%) rename solidago/src/solidago/{_generative_model/_engagement => generators/engagement}/base.py (96%) rename solidago/src/solidago/{_generative_model/_engagement => generators/engagement}/simple.py (98%) rename solidago/src/solidago/{_generative_model/_entity => generators/entity}/__init__.py (100%) rename solidago/src/solidago/{_generative_model/_entity => generators/entity}/base.py (86%) rename solidago/src/solidago/{_generative_model/_entity => generators/entity}/vector.py (96%) rename solidago/src/solidago/{_generative_model/_user => generators/user}/__init__.py (100%) rename solidago/src/solidago/{_generative_model/_user => generators/user}/base.py (87%) rename solidago/src/solidago/{_generative_model/_user => generators/user}/normal.py (99%) rename solidago/src/solidago/{_generative_model/_vouch => generators/vouch}/__init__.py (100%) rename solidago/src/solidago/{_generative_model/_vouch => generators/vouch}/base.py (60%) rename solidago/src/solidago/{_generative_model/_vouch => generators/vouch}/erdos_renyi.py (97%) create mode 100644 solidago/src/solidago/modules/__init__.py rename solidago/src/solidago/{_pipeline/_aggregation => modules/aggregation}/__init__.py (100%) rename solidago/src/solidago/{_pipeline/_aggregation => modules/aggregation}/average.py (93%) rename solidago/src/solidago/{_pipeline/_aggregation => modules/aggregation}/entitywise_qr_quantile.py (96%) rename solidago/src/solidago/{_pipeline => modules}/base.py (95%) rename solidago/src/solidago/{_pipeline => modules}/identity.py (87%) rename solidago/src/solidago/{_pipeline => modules}/old_default.py (100%) rename solidago/src/solidago/{_pipeline/_post_process => modules/post_process}/__init__.py (100%) rename solidago/src/solidago/{_pipeline/_post_process => modules/post_process}/squash.py (91%) rename solidago/src/solidago/{_pipeline/_preference_learning => modules/preference_learning}/__init__.py (100%) rename solidago/src/solidago/{_pipeline/_preference_learning => modules/preference_learning}/base.py (94%) rename solidago/src/solidago/{_pipeline/_preference_learning => modules/preference_learning}/generalized_bradley_terry.py (99%) rename solidago/src/solidago/{_pipeline/_preference_learning => modules/preference_learning}/lbfgs_generalized_bradley_terry.py (99%) rename solidago/src/solidago/{_pipeline/_preference_learning => modules/preference_learning}/numba_generalized_bradley_terry.py (99%) rename solidago/src/solidago/{_pipeline/_scaling => modules/scaling}/__init__.py (100%) rename solidago/src/solidago/{_pipeline/_scaling => modules/scaling}/lipschitz_quantile_shift.py (96%) rename solidago/src/solidago/{_pipeline/_scaling => modules/scaling}/lipschitz_standardize.py (95%) rename solidago/src/solidago/{_pipeline/_scaling => modules/scaling}/mehestan.py (99%) rename solidago/src/solidago/{_pipeline => modules}/sequential.py (90%) rename solidago/src/solidago/{_pipeline => modules}/tournesol_full.json (100%) rename solidago/src/solidago/{_pipeline => modules}/tournesol_online_update.json (100%) rename solidago/src/solidago/{_pipeline/_trust_propagation => modules/trust_propagation}/__init__.py (100%) rename solidago/src/solidago/{_pipeline/_trust_propagation => modules/trust_propagation}/lipschitrust.py (98%) rename solidago/src/solidago/{_pipeline/_trust_propagation => modules/trust_propagation}/no_trust_propagation.py (84%) rename solidago/src/solidago/{_pipeline/_trust_propagation => modules/trust_propagation}/trust_all.py (75%) rename solidago/src/solidago/{_pipeline/_voting_rights => modules/voting_rights}/__init__.py (100%) rename solidago/src/solidago/{_pipeline/_voting_rights => modules/voting_rights}/affine_overtrust.py (98%) rename solidago/src/solidago/{_pipeline/_voting_rights => modules/voting_rights}/is_trust.py (93%) create mode 100644 solidago/src/solidago/state/__init__.py rename solidago/src/solidago/{_state/_assessments => state/assessments}/__init__.py (100%) rename solidago/src/solidago/{_state/_assessments => state/assessments}/base.py (100%) rename solidago/src/solidago/{_state => state}/base.py (91%) rename solidago/src/solidago/{_state/_comparisons => state/comparisons}/__init__.py (100%) rename solidago/src/solidago/{_state/_comparisons => state/comparisons}/base.py (100%) rename solidago/src/solidago/{_state/_entities => state/entities}/__init__.py (100%) rename solidago/src/solidago/{_state/_entities => state/entities}/base.py (100%) rename solidago/src/solidago/{_state/_entities => state/entities}/vector.py (100%) rename solidago/src/solidago/{_state/_made_public => state/made_public}/__init__.py (100%) rename solidago/src/solidago/{_state/_made_public => state/made_public}/all_public.py (100%) rename solidago/src/solidago/{_state/_made_public => state/made_public}/base.py (100%) rename solidago/src/solidago/{_state/_models => state/models}/__init__.py (100%) rename solidago/src/solidago/{_state/_models => state/models}/base.py (100%) rename solidago/src/solidago/{_state/_models => state/models}/direct.py (100%) rename solidago/src/solidago/{_state/_models => state/models}/post_processed.py (100%) rename solidago/src/solidago/{_state/_models => state/models}/scaled.py (100%) rename solidago/src/solidago/{_state/_models => state/models}/score.py (100%) rename solidago/src/solidago/{_state/_models => state/models}/user_models.py (100%) rename solidago/src/solidago/{_state => state}/tournesol.py (100%) rename solidago/src/solidago/{_state/_users => state/users}/__init__.py (100%) rename solidago/src/solidago/{_state/_users => state/users}/base.py (100%) rename solidago/src/solidago/{_state/_users => state/users}/vector.py (100%) rename solidago/src/solidago/{_state/_voting_rights => state/voting_rights}/__init__.py (100%) rename solidago/src/solidago/{_state/_voting_rights => state/voting_rights}/base.py (100%) rename solidago/src/solidago/{_state/_vouches => state/vouches}/__init__.py (100%) rename solidago/src/solidago/{_state/_vouches => state/vouches}/base.py (100%) diff --git a/solidago/src/solidago/__init__.py b/solidago/src/solidago/__init__.py index 4973a1310b..d3ff06ed83 100644 --- a/solidago/src/solidago/__init__.py +++ b/solidago/src/solidago/__init__.py @@ -2,7 +2,25 @@ from .__version__ import __version__ -import solidago.primitives as primitives -from solidago._state import * -from solidago._generative_model import * -from solidago._pipeline import * +from solidago.primitives import * +from solidago.state import * +from solidago.modules import * +from solidago.generators import * + +__all__ = [ + "User", "Users", "VectorUser", "VectorUsers", + "Vouches", + "Entity", "Entities", "VectorEntity", "VectorEntities", + "MadePublic", "AllPublic", + "Assessment", "Assessments", + "Comparison", "Comparisons", + "VotingRights", + "Score", "MultiScore", + "ScoringModel", "BaseModel", + "UserModels", + "DirectScoring", + "ScaleDict", "ScaledModel", + "PostProcessedModel", "SquashedModel", + "State", "TournesolExport", + "primitives", "modules", "generators", +] diff --git a/solidago/src/solidago/_generative_model/__init__.py b/solidago/src/solidago/_generative_model/__init__.py deleted file mode 100644 index ca077b0e6c..0000000000 --- a/solidago/src/solidago/_generative_model/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from ._user import * -from ._vouch import * -from ._entity import * -from ._engagement import * -from ._assessment import * -from ._comparison import * - -from .base import * diff --git a/solidago/src/solidago/_pipeline/__init__.py b/solidago/src/solidago/_pipeline/__init__.py deleted file mode 100644 index e56f125041..0000000000 --- a/solidago/src/solidago/_pipeline/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -from ._trust_propagation import * -from ._preference_learning import * -from ._voting_rights import * -from ._scaling import * -from ._aggregation import * -from ._post_process import * - -from .base import * -from .sequential import * -from .identity import * diff --git a/solidago/src/solidago/_state/__init__.py b/solidago/src/solidago/_state/__init__.py deleted file mode 100644 index 219a45983d..0000000000 --- a/solidago/src/solidago/_state/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -""" This defines the class State, which contains all updatable information by the pipeline. """ - -from ._users import * -from ._vouches import * -from ._entities import * -from ._made_public import * -from ._assessments import * -from ._comparisons import * -from ._voting_rights import * -from ._models import * - -from .base import State -from .tournesol import TournesolExport diff --git a/solidago/src/solidago/generators/__init__.py b/solidago/src/solidago/generators/__init__.py new file mode 100644 index 0000000000..ef3bf4d831 --- /dev/null +++ b/solidago/src/solidago/generators/__init__.py @@ -0,0 +1,8 @@ +from .base import Generator + +import solidago.generators.user +import solidago.generators.vouch +import solidago.generators.entity +import solidago.generators.engagement +import solidago.generators.assessment +import solidago.generators.comparison diff --git a/solidago/src/solidago/_generative_model/_assessment/__init__.py b/solidago/src/solidago/generators/assessment/__init__.py similarity index 100% rename from solidago/src/solidago/_generative_model/_assessment/__init__.py rename to solidago/src/solidago/generators/assessment/__init__.py diff --git a/solidago/src/solidago/_generative_model/_assessment/base.py b/solidago/src/solidago/generators/assessment/base.py similarity index 93% rename from solidago/src/solidago/_generative_model/_assessment/base.py rename to solidago/src/solidago/generators/assessment/base.py index f0c41298d5..b59f5c9370 100644 --- a/solidago/src/solidago/_generative_model/_assessment/base.py +++ b/solidago/src/solidago/generators/assessment/base.py @@ -1,7 +1,7 @@ import numpy as np -from solidago._state import * -from solidago._pipeline import StateFunction +from solidago.state import * +from solidago.modules import StateFunction class AssessmentGenerator(StateFunction): diff --git a/solidago/src/solidago/_generative_model/_assessment/normal.py b/solidago/src/solidago/generators/assessment/normal.py similarity index 96% rename from solidago/src/solidago/_generative_model/_assessment/normal.py rename to solidago/src/solidago/generators/assessment/normal.py index b489f39d6b..eec6c2a15a 100644 --- a/solidago/src/solidago/_generative_model/_assessment/normal.py +++ b/solidago/src/solidago/generators/assessment/normal.py @@ -1,7 +1,7 @@ from numpy import sqrt from numpy.random import normal -from solidago._state import * +from solidago.state import * from .base import AssessmentGenerator diff --git a/solidago/src/solidago/_generative_model/base.py b/solidago/src/solidago/generators/base.py similarity index 87% rename from solidago/src/solidago/_generative_model/base.py rename to solidago/src/solidago/generators/base.py index 623b0a49f8..2ad8cc448b 100644 --- a/solidago/src/solidago/_generative_model/base.py +++ b/solidago/src/solidago/generators/base.py @@ -5,20 +5,20 @@ import logging import json -from solidago._state import * -from solidago._pipeline import Sequential +from solidago.state import * +from solidago.modules import Sequential -from ._user import UserGenerator -from ._vouch import VouchGenerator -from ._entity import EntityGenerator -from ._engagement import EngagementGenerator -from ._assessment import AssessmentGenerator -from ._comparison import ComparisonGenerator +from .user import UserGenerator +from .vouch import VouchGenerator +from .entity import EntityGenerator +from .engagement import EngagementGenerator +from .assessment import AssessmentGenerator +from .comparison import ComparisonGenerator logger = logging.getLogger(__name__) -class GenerativeModel(Sequential): +class Generator(Sequential): def __init__(self, user_gen: UserGenerator = UserGenerator(), entity_gen: EntityGenerator = EntityGenerator(), diff --git a/solidago/src/solidago/_generative_model/_comparison/__init__.py b/solidago/src/solidago/generators/comparison/__init__.py similarity index 100% rename from solidago/src/solidago/_generative_model/_comparison/__init__.py rename to solidago/src/solidago/generators/comparison/__init__.py diff --git a/solidago/src/solidago/_generative_model/_comparison/base.py b/solidago/src/solidago/generators/comparison/base.py similarity index 94% rename from solidago/src/solidago/_generative_model/_comparison/base.py rename to solidago/src/solidago/generators/comparison/base.py index e985ba5ac1..a52d5067db 100644 --- a/solidago/src/solidago/_generative_model/_comparison/base.py +++ b/solidago/src/solidago/generators/comparison/base.py @@ -2,8 +2,8 @@ import numpy as np -from solidago._state import * -from solidago._pipeline import StateFunction +from solidago.state import * +from solidago.modules import StateFunction class ComparisonGenerator(StateFunction): diff --git a/solidago/src/solidago/_generative_model/_comparison/thurston.py b/solidago/src/solidago/generators/comparison/thurston.py similarity index 99% rename from solidago/src/solidago/_generative_model/_comparison/thurston.py rename to solidago/src/solidago/generators/comparison/thurston.py index 07beb6952c..31a569ab59 100644 --- a/solidago/src/solidago/_generative_model/_comparison/thurston.py +++ b/solidago/src/solidago/generators/comparison/thurston.py @@ -4,7 +4,7 @@ import pandas as pd import numpy as np -from solidago._state import * +from solidago.state import * from .base import ComparisonGenerator diff --git a/solidago/src/solidago/_generative_model/_engagement/__init__.py b/solidago/src/solidago/generators/engagement/__init__.py similarity index 100% rename from solidago/src/solidago/_generative_model/_engagement/__init__.py rename to solidago/src/solidago/generators/engagement/__init__.py diff --git a/solidago/src/solidago/_generative_model/_engagement/base.py b/solidago/src/solidago/generators/engagement/base.py similarity index 96% rename from solidago/src/solidago/_generative_model/_engagement/base.py rename to solidago/src/solidago/generators/engagement/base.py index 0a703fbd20..85d27a3603 100644 --- a/solidago/src/solidago/_generative_model/_engagement/base.py +++ b/solidago/src/solidago/generators/engagement/base.py @@ -1,7 +1,7 @@ from numpy.random import random -from solidago._state import * -from solidago._pipeline import StateFunction +from solidago.state import * +from solidago.modules import StateFunction class EngagementGenerator(StateFunction): diff --git a/solidago/src/solidago/_generative_model/_engagement/simple.py b/solidago/src/solidago/generators/engagement/simple.py similarity index 98% rename from solidago/src/solidago/_generative_model/_engagement/simple.py rename to solidago/src/solidago/generators/engagement/simple.py index 9b7a007d8c..1fb84d462e 100644 --- a/solidago/src/solidago/_generative_model/_engagement/simple.py +++ b/solidago/src/solidago/generators/engagement/simple.py @@ -4,7 +4,7 @@ import pandas as pd import numpy as np -from solidago._state import * +from solidago.state import * from .base import EngagementGenerator diff --git a/solidago/src/solidago/_generative_model/_entity/__init__.py b/solidago/src/solidago/generators/entity/__init__.py similarity index 100% rename from solidago/src/solidago/_generative_model/_entity/__init__.py rename to solidago/src/solidago/generators/entity/__init__.py diff --git a/solidago/src/solidago/_generative_model/_entity/base.py b/solidago/src/solidago/generators/entity/base.py similarity index 86% rename from solidago/src/solidago/_generative_model/_entity/base.py rename to solidago/src/solidago/generators/entity/base.py index 92282507eb..74468c8134 100644 --- a/solidago/src/solidago/_generative_model/_entity/base.py +++ b/solidago/src/solidago/generators/entity/base.py @@ -1,7 +1,7 @@ import pandas as pd -from solidago._state import * -from solidago._pipeline import StateFunction +from solidago.state import * +from solidago.modules import StateFunction class EntityGenerator(StateFunction): diff --git a/solidago/src/solidago/_generative_model/_entity/vector.py b/solidago/src/solidago/generators/entity/vector.py similarity index 96% rename from solidago/src/solidago/_generative_model/_entity/vector.py rename to solidago/src/solidago/generators/entity/vector.py index ce3116f87b..cdfca81416 100644 --- a/solidago/src/solidago/_generative_model/_entity/vector.py +++ b/solidago/src/solidago/generators/entity/vector.py @@ -4,7 +4,7 @@ import numpy as np from typing import Optional, Callable -from solidago._state import VectorEntity, VectorEntities +from solidago.state import VectorEntity, VectorEntities from .base import EntityGenerator diff --git a/solidago/src/solidago/_generative_model/_user/__init__.py b/solidago/src/solidago/generators/user/__init__.py similarity index 100% rename from solidago/src/solidago/_generative_model/_user/__init__.py rename to solidago/src/solidago/generators/user/__init__.py diff --git a/solidago/src/solidago/_generative_model/_user/base.py b/solidago/src/solidago/generators/user/base.py similarity index 87% rename from solidago/src/solidago/_generative_model/_user/base.py rename to solidago/src/solidago/generators/user/base.py index 46f24308ef..3f96e0f04f 100644 --- a/solidago/src/solidago/_generative_model/_user/base.py +++ b/solidago/src/solidago/generators/user/base.py @@ -2,8 +2,8 @@ import pandas as pd -from solidago._state import * -from solidago._pipeline import StateFunction +from solidago.state import * +from solidago.modules import StateFunction class UserGenerator(StateFunction): diff --git a/solidago/src/solidago/_generative_model/_user/normal.py b/solidago/src/solidago/generators/user/normal.py similarity index 99% rename from solidago/src/solidago/_generative_model/_user/normal.py rename to solidago/src/solidago/generators/user/normal.py index 2efb4d178e..5ecf2a2b50 100644 --- a/solidago/src/solidago/_generative_model/_user/normal.py +++ b/solidago/src/solidago/generators/user/normal.py @@ -3,7 +3,7 @@ import numpy as np -from solidago._state import * +from solidago.state import * from .base import UserGenerator diff --git a/solidago/src/solidago/_generative_model/_vouch/__init__.py b/solidago/src/solidago/generators/vouch/__init__.py similarity index 100% rename from solidago/src/solidago/_generative_model/_vouch/__init__.py rename to solidago/src/solidago/generators/vouch/__init__.py diff --git a/solidago/src/solidago/_generative_model/_vouch/base.py b/solidago/src/solidago/generators/vouch/base.py similarity index 60% rename from solidago/src/solidago/_generative_model/_vouch/base.py rename to solidago/src/solidago/generators/vouch/base.py index 96a254a980..77bb53ae7c 100644 --- a/solidago/src/solidago/_generative_model/_vouch/base.py +++ b/solidago/src/solidago/generators/vouch/base.py @@ -1,5 +1,5 @@ -from solidago._state import * -from solidago._pipeline import StateFunction +from solidago.state import * +from solidago.modules import StateFunction class VouchGenerator(StateFunction): diff --git a/solidago/src/solidago/_generative_model/_vouch/erdos_renyi.py b/solidago/src/solidago/generators/vouch/erdos_renyi.py similarity index 97% rename from solidago/src/solidago/_generative_model/_vouch/erdos_renyi.py rename to solidago/src/solidago/generators/vouch/erdos_renyi.py index e65fbd1458..4251113453 100644 --- a/solidago/src/solidago/_generative_model/_vouch/erdos_renyi.py +++ b/solidago/src/solidago/generators/vouch/erdos_renyi.py @@ -1,6 +1,6 @@ from numpy.random import random -from solidago._state import Users, Vouches +from solidago.state import Users, Vouches from .base import VouchGenerator diff --git a/solidago/src/solidago/modules/__init__.py b/solidago/src/solidago/modules/__init__.py new file mode 100644 index 0000000000..7577385319 --- /dev/null +++ b/solidago/src/solidago/modules/__init__.py @@ -0,0 +1,11 @@ +from .base import StateFunction +from .sequential import Sequential +from .identity import Identity + +from .trust_propagation import * +from .preference_learning import * +from .voting_rights import * +from .scaling import * +from .aggregation import * +from .post_process import * + diff --git a/solidago/src/solidago/_pipeline/_aggregation/__init__.py b/solidago/src/solidago/modules/aggregation/__init__.py similarity index 100% rename from solidago/src/solidago/_pipeline/_aggregation/__init__.py rename to solidago/src/solidago/modules/aggregation/__init__.py diff --git a/solidago/src/solidago/_pipeline/_aggregation/average.py b/solidago/src/solidago/modules/aggregation/average.py similarity index 93% rename from solidago/src/solidago/_pipeline/_aggregation/average.py rename to solidago/src/solidago/modules/aggregation/average.py index 044051509e..6e5d5e42da 100644 --- a/solidago/src/solidago/_pipeline/_aggregation/average.py +++ b/solidago/src/solidago/modules/aggregation/average.py @@ -1,7 +1,7 @@ import pandas as pd -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class Average(StateFunction): diff --git a/solidago/src/solidago/_pipeline/_aggregation/entitywise_qr_quantile.py b/solidago/src/solidago/modules/aggregation/entitywise_qr_quantile.py similarity index 96% rename from solidago/src/solidago/_pipeline/_aggregation/entitywise_qr_quantile.py rename to solidago/src/solidago/modules/aggregation/entitywise_qr_quantile.py index 36ba2697af..502af87998 100644 --- a/solidago/src/solidago/_pipeline/_aggregation/entitywise_qr_quantile.py +++ b/solidago/src/solidago/modules/aggregation/entitywise_qr_quantile.py @@ -2,8 +2,8 @@ import numpy as np from solidago.primitives.lipschitz import qr_quantile, qr_uncertainty -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class EntitywiseQrQuantile(StateFunction): diff --git a/solidago/src/solidago/_pipeline/base.py b/solidago/src/solidago/modules/base.py similarity index 95% rename from solidago/src/solidago/_pipeline/base.py rename to solidago/src/solidago/modules/base.py index 65d6887b70..ef0dbde146 100644 --- a/solidago/src/solidago/_pipeline/base.py +++ b/solidago/src/solidago/modules/base.py @@ -2,7 +2,7 @@ from typing import Union, Optional, Any from pathlib import Path -from solidago._state import * +from solidago.state import * class StateFunction: @@ -88,12 +88,12 @@ def load(cls, filename: Optional[Union[str, Path, list, dict]]=None) -> "StateFu args = json.load(f) else: args = filename - import solidago._pipeline as pipeline + import solidago.modules as modules if isinstance(args, list): - return cls(*[ getattr(pipeline, m[0])(m[1]) for m in args ]) + return cls(*[ getattr(modules, m[0])(m[1]) for m in args ]) else: assert isinstance(args, dict) - return cls(**{ key: getattr(pipeline, m[0])(m[1]) for key, m in args.items() }) + return cls(**{ key: getattr(modules, m[0])(m[1]) for key, m in args.items() }) def save(self, filename: Optional[Union[str, Path]]=None) -> tuple[str, Optional[Union[dict, list]]]: j = type(self).__name__, self.args_save() diff --git a/solidago/src/solidago/_pipeline/identity.py b/solidago/src/solidago/modules/identity.py similarity index 87% rename from solidago/src/solidago/_pipeline/identity.py rename to solidago/src/solidago/modules/identity.py index 379218bd02..0efaa8b96c 100644 --- a/solidago/src/solidago/_pipeline/identity.py +++ b/solidago/src/solidago/modules/identity.py @@ -1,7 +1,7 @@ from typing import Union, Optional from pathlib import Path -from solidago._state import * +from solidago.state import * from .base import StateFunction diff --git a/solidago/src/solidago/_pipeline/old_default.py b/solidago/src/solidago/modules/old_default.py similarity index 100% rename from solidago/src/solidago/_pipeline/old_default.py rename to solidago/src/solidago/modules/old_default.py diff --git a/solidago/src/solidago/_pipeline/_post_process/__init__.py b/solidago/src/solidago/modules/post_process/__init__.py similarity index 100% rename from solidago/src/solidago/_pipeline/_post_process/__init__.py rename to solidago/src/solidago/modules/post_process/__init__.py diff --git a/solidago/src/solidago/_pipeline/_post_process/squash.py b/solidago/src/solidago/modules/post_process/squash.py similarity index 91% rename from solidago/src/solidago/_pipeline/_post_process/squash.py rename to solidago/src/solidago/modules/post_process/squash.py index 1530db1fc6..96f0cdf08c 100644 --- a/solidago/src/solidago/_pipeline/_post_process/squash.py +++ b/solidago/src/solidago/modules/post_process/squash.py @@ -3,8 +3,8 @@ import numpy as np import pandas as pd -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class Squash(StateFunction): diff --git a/solidago/src/solidago/_pipeline/_preference_learning/__init__.py b/solidago/src/solidago/modules/preference_learning/__init__.py similarity index 100% rename from solidago/src/solidago/_pipeline/_preference_learning/__init__.py rename to solidago/src/solidago/modules/preference_learning/__init__.py diff --git a/solidago/src/solidago/_pipeline/_preference_learning/base.py b/solidago/src/solidago/modules/preference_learning/base.py similarity index 94% rename from solidago/src/solidago/_pipeline/_preference_learning/base.py rename to solidago/src/solidago/modules/preference_learning/base.py index 385b633592..7cd703f947 100644 --- a/solidago/src/solidago/_pipeline/_preference_learning/base.py +++ b/solidago/src/solidago/modules/preference_learning/base.py @@ -6,8 +6,8 @@ logger = logging.getLogger("preference_learning") -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class PreferenceLearning(StateFunction, ABC): diff --git a/solidago/src/solidago/_pipeline/_preference_learning/generalized_bradley_terry.py b/solidago/src/solidago/modules/preference_learning/generalized_bradley_terry.py similarity index 99% rename from solidago/src/solidago/_pipeline/_preference_learning/generalized_bradley_terry.py rename to solidago/src/solidago/modules/preference_learning/generalized_bradley_terry.py index 3897b4efad..aa771d0478 100644 --- a/solidago/src/solidago/_pipeline/_preference_learning/generalized_bradley_terry.py +++ b/solidago/src/solidago/modules/preference_learning/generalized_bradley_terry.py @@ -8,7 +8,7 @@ import solidago.primitives.dichotomy as dichotomy -from solidago._state import * +from solidago.state import * from .base import PreferenceLearning diff --git a/solidago/src/solidago/_pipeline/_preference_learning/lbfgs_generalized_bradley_terry.py b/solidago/src/solidago/modules/preference_learning/lbfgs_generalized_bradley_terry.py similarity index 99% rename from solidago/src/solidago/_pipeline/_preference_learning/lbfgs_generalized_bradley_terry.py rename to solidago/src/solidago/modules/preference_learning/lbfgs_generalized_bradley_terry.py index 51e1b1eb90..66c4e686d6 100644 --- a/solidago/src/solidago/_pipeline/_preference_learning/lbfgs_generalized_bradley_terry.py +++ b/solidago/src/solidago/modules/preference_learning/lbfgs_generalized_bradley_terry.py @@ -13,7 +13,7 @@ "Install 'solidago[torch]' to get the optional dependencies." ) from exc -from solidago._state import * +from solidago.state import * from solidago.primitives import dichotomy from .generalized_bradley_terry import GeneralizedBradleyTerry, UniformGBT diff --git a/solidago/src/solidago/_pipeline/_preference_learning/numba_generalized_bradley_terry.py b/solidago/src/solidago/modules/preference_learning/numba_generalized_bradley_terry.py similarity index 99% rename from solidago/src/solidago/_pipeline/_preference_learning/numba_generalized_bradley_terry.py rename to solidago/src/solidago/modules/preference_learning/numba_generalized_bradley_terry.py index 49710e0386..b9f2639791 100644 --- a/solidago/src/solidago/_pipeline/_preference_learning/numba_generalized_bradley_terry.py +++ b/solidago/src/solidago/modules/preference_learning/numba_generalized_bradley_terry.py @@ -7,7 +7,7 @@ import numpy.typing as npt from numba import njit -from solidago._state import * +from solidago.state import * from solidago.primitives.optimize import coordinate_descent, njit_brentq from .generalized_bradley_terry import GeneralizedBradleyTerry, UniformGBT diff --git a/solidago/src/solidago/_pipeline/_scaling/__init__.py b/solidago/src/solidago/modules/scaling/__init__.py similarity index 100% rename from solidago/src/solidago/_pipeline/_scaling/__init__.py rename to solidago/src/solidago/modules/scaling/__init__.py diff --git a/solidago/src/solidago/_pipeline/_scaling/lipschitz_quantile_shift.py b/solidago/src/solidago/modules/scaling/lipschitz_quantile_shift.py similarity index 96% rename from solidago/src/solidago/_pipeline/_scaling/lipschitz_quantile_shift.py rename to solidago/src/solidago/modules/scaling/lipschitz_quantile_shift.py index 56eaa67259..04959e6d37 100644 --- a/solidago/src/solidago/_pipeline/_scaling/lipschitz_quantile_shift.py +++ b/solidago/src/solidago/modules/scaling/lipschitz_quantile_shift.py @@ -4,8 +4,8 @@ import numpy as np from solidago.primitives import qr_quantile -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class LipschitzQuantileShift(StateFunction): diff --git a/solidago/src/solidago/_pipeline/_scaling/lipschitz_standardize.py b/solidago/src/solidago/modules/scaling/lipschitz_standardize.py similarity index 95% rename from solidago/src/solidago/_pipeline/_scaling/lipschitz_standardize.py rename to solidago/src/solidago/modules/scaling/lipschitz_standardize.py index ea3d0a2b6f..2b7277b274 100644 --- a/solidago/src/solidago/_pipeline/_scaling/lipschitz_standardize.py +++ b/solidago/src/solidago/modules/scaling/lipschitz_standardize.py @@ -1,8 +1,8 @@ import pandas as pd from solidago.primitives import qr_standard_deviation -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class LipschitzStandardize(StateFunction): diff --git a/solidago/src/solidago/_pipeline/_scaling/mehestan.py b/solidago/src/solidago/modules/scaling/mehestan.py similarity index 99% rename from solidago/src/solidago/_pipeline/_scaling/mehestan.py rename to solidago/src/solidago/modules/scaling/mehestan.py index 6208230240..b47fde3920 100644 --- a/solidago/src/solidago/_pipeline/_scaling/mehestan.py +++ b/solidago/src/solidago/modules/scaling/mehestan.py @@ -10,8 +10,8 @@ from solidago.primitives.lipschitz import qr_median, qr_uncertainty, lipschitz_resilient_mean from solidago.primitives.pairs import UnorderedPairs from solidago.primitives.datastructure import NestedDictOfItems, NestedDictOfRowLists -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class Mehestan(StateFunction): diff --git a/solidago/src/solidago/_pipeline/sequential.py b/solidago/src/solidago/modules/sequential.py similarity index 90% rename from solidago/src/solidago/_pipeline/sequential.py rename to solidago/src/solidago/modules/sequential.py index 60337f3385..314edf750c 100644 --- a/solidago/src/solidago/_pipeline/sequential.py +++ b/solidago/src/solidago/modules/sequential.py @@ -8,7 +8,7 @@ logger = logging.getLogger(__name__) -from solidago._state import State +from solidago.state import * from .base import StateFunction @@ -20,8 +20,8 @@ def __init__(self, name: Optional[str]=None, **kwargs): if isinstance(value, StateFunction): setattr(self, key, value) elif isinstance(value, (list, tuple)) and len(value) == 2: - import solidago._pipeline as pipeline - setattr(self, key, getattr(pipeline, value[0])(**value[1])) + import solidago.modules as modules + setattr(self, key, getattr(modules, value[0])(**value[1])) else: print(f"Sequential.__init__: Got unhandled input key={key}, type(value)={type(value).__name__}") @@ -55,9 +55,9 @@ def load(cls, d: Union[dict, str]) -> "Sequential": if isinstance(d, str): with open(d) as f: d = json.load(f) - import solidago._pipeline as pipeline + import solidago.modules as modules return cls(**{ - key: getattr(pipeline, value[0])(**value[1]) + key: getattr(modules, value[0])(**value[1]) for key, value in d.items() if key not in Sequential.__init__.__annotations__ }, **{ key: value for key, value in d.items() if key in Sequential.__init__.__annotations__ diff --git a/solidago/src/solidago/_pipeline/tournesol_full.json b/solidago/src/solidago/modules/tournesol_full.json similarity index 100% rename from solidago/src/solidago/_pipeline/tournesol_full.json rename to solidago/src/solidago/modules/tournesol_full.json diff --git a/solidago/src/solidago/_pipeline/tournesol_online_update.json b/solidago/src/solidago/modules/tournesol_online_update.json similarity index 100% rename from solidago/src/solidago/_pipeline/tournesol_online_update.json rename to solidago/src/solidago/modules/tournesol_online_update.json diff --git a/solidago/src/solidago/_pipeline/_trust_propagation/__init__.py b/solidago/src/solidago/modules/trust_propagation/__init__.py similarity index 100% rename from solidago/src/solidago/_pipeline/_trust_propagation/__init__.py rename to solidago/src/solidago/modules/trust_propagation/__init__.py diff --git a/solidago/src/solidago/_pipeline/_trust_propagation/lipschitrust.py b/solidago/src/solidago/modules/trust_propagation/lipschitrust.py similarity index 98% rename from solidago/src/solidago/_pipeline/_trust_propagation/lipschitrust.py rename to solidago/src/solidago/modules/trust_propagation/lipschitrust.py index 21c5428e31..a50d42d2c2 100644 --- a/solidago/src/solidago/_pipeline/_trust_propagation/lipschitrust.py +++ b/solidago/src/solidago/modules/trust_propagation/lipschitrust.py @@ -6,8 +6,8 @@ import numpy as np from solidago.primitives.datastructure import NestedDictOfItems -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class LipschiTrust(StateFunction): diff --git a/solidago/src/solidago/_pipeline/_trust_propagation/no_trust_propagation.py b/solidago/src/solidago/modules/trust_propagation/no_trust_propagation.py similarity index 84% rename from solidago/src/solidago/_pipeline/_trust_propagation/no_trust_propagation.py rename to solidago/src/solidago/modules/trust_propagation/no_trust_propagation.py index b32ab37fca..fe16dbf76c 100644 --- a/solidago/src/solidago/_pipeline/_trust_propagation/no_trust_propagation.py +++ b/solidago/src/solidago/modules/trust_propagation/no_trust_propagation.py @@ -1,5 +1,5 @@ -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class NoTrustPropagation(StateFunction): diff --git a/solidago/src/solidago/_pipeline/_trust_propagation/trust_all.py b/solidago/src/solidago/modules/trust_propagation/trust_all.py similarity index 75% rename from solidago/src/solidago/_pipeline/_trust_propagation/trust_all.py rename to solidago/src/solidago/modules/trust_propagation/trust_all.py index 3ba0713fd3..59c854bde0 100644 --- a/solidago/src/solidago/_pipeline/_trust_propagation/trust_all.py +++ b/solidago/src/solidago/modules/trust_propagation/trust_all.py @@ -1,5 +1,5 @@ -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class TrustAll(StateFunction): diff --git a/solidago/src/solidago/_pipeline/_voting_rights/__init__.py b/solidago/src/solidago/modules/voting_rights/__init__.py similarity index 100% rename from solidago/src/solidago/_pipeline/_voting_rights/__init__.py rename to solidago/src/solidago/modules/voting_rights/__init__.py diff --git a/solidago/src/solidago/_pipeline/_voting_rights/affine_overtrust.py b/solidago/src/solidago/modules/voting_rights/affine_overtrust.py similarity index 98% rename from solidago/src/solidago/_pipeline/_voting_rights/affine_overtrust.py rename to solidago/src/solidago/modules/voting_rights/affine_overtrust.py index f219d63aab..23f15da420 100644 --- a/solidago/src/solidago/_pipeline/_voting_rights/affine_overtrust.py +++ b/solidago/src/solidago/modules/voting_rights/affine_overtrust.py @@ -4,8 +4,8 @@ import pandas as pd from solidago.primitives.dichotomy import solve -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class AffineOvertrust(StateFunction): diff --git a/solidago/src/solidago/_pipeline/_voting_rights/is_trust.py b/solidago/src/solidago/modules/voting_rights/is_trust.py similarity index 93% rename from solidago/src/solidago/_pipeline/_voting_rights/is_trust.py rename to solidago/src/solidago/modules/voting_rights/is_trust.py index 61da46ff24..fc27468434 100644 --- a/solidago/src/solidago/_pipeline/_voting_rights/is_trust.py +++ b/solidago/src/solidago/modules/voting_rights/is_trust.py @@ -1,5 +1,5 @@ -from solidago._state import * -from solidago._pipeline.base import StateFunction +from solidago.state import * +from solidago.modules.base import StateFunction class Trust2VotingRights(StateFunction): diff --git a/solidago/src/solidago/primitives/datastructure/nested_dict_of_row_lists.py b/solidago/src/solidago/primitives/datastructure/nested_dict_of_row_lists.py index 5ca713dabb..a62816a855 100644 --- a/solidago/src/solidago/primitives/datastructure/nested_dict_of_row_lists.py +++ b/solidago/src/solidago/primitives/datastructure/nested_dict_of_row_lists.py @@ -67,7 +67,7 @@ def to_rows(self, row_kwargs: Optional[dict]=None, last_row_only: bool=False) -> row_kwargs = dict() returns = "last_row" if last_row_only else "rows" def to_dict(row): - from solidago._state import Score + from solidago.state import Score if isinstance(row, (dict, Series)): return dict(row) elif isinstance(row, Score): diff --git a/solidago/src/solidago/state/__init__.py b/solidago/src/solidago/state/__init__.py new file mode 100644 index 0000000000..f01f47efa9 --- /dev/null +++ b/solidago/src/solidago/state/__init__.py @@ -0,0 +1,30 @@ +""" This defines the class State, which contains all updatable information by the pipeline. """ + +from .users import * +from .vouches import * +from .entities import * +from .made_public import * +from .assessments import * +from .comparisons import * +from .voting_rights import * +from .models import * + +from .base import State +from .tournesol import TournesolExport + +__all__ = [ + "User", "Users", "VectorUser", "VectorUsers", + "Vouches", + "Entity", "Entities", "VectorEntity", "VectorEntities", + "MadePublic", "AllPublic", + "Assessment", "Assessments", + "Comparison", "Comparisons", + "VotingRights", + "Score", "MultiScore", + "ScoringModel", "BaseModel", + "UserModels", + "DirectScoring", + "ScaleDict", "ScaledModel", + "PostProcessedModel", "SquashedModel", + "State", "TournesolExport", +] diff --git a/solidago/src/solidago/_state/_assessments/__init__.py b/solidago/src/solidago/state/assessments/__init__.py similarity index 100% rename from solidago/src/solidago/_state/_assessments/__init__.py rename to solidago/src/solidago/state/assessments/__init__.py diff --git a/solidago/src/solidago/_state/_assessments/base.py b/solidago/src/solidago/state/assessments/base.py similarity index 100% rename from solidago/src/solidago/_state/_assessments/base.py rename to solidago/src/solidago/state/assessments/base.py diff --git a/solidago/src/solidago/_state/base.py b/solidago/src/solidago/state/base.py similarity index 91% rename from solidago/src/solidago/_state/base.py rename to solidago/src/solidago/state/base.py index f4c03403a9..fa4f563ad5 100644 --- a/solidago/src/solidago/_state/base.py +++ b/solidago/src/solidago/state/base.py @@ -7,15 +7,15 @@ import json import pandas as pd -from ._users.base import Users -from ._vouches.base import Vouches -from ._entities.base import Entities -from ._made_public.base import MadePublic -from ._assessments.base import Assessments -from ._comparisons.base import Comparisons -from ._voting_rights.base import VotingRights -from ._models.direct import ScoringModel, DirectScoring -from ._models.user_models import UserModels +from .users.base import Users +from .vouches.base import Vouches +from .entities.base import Entities +from .made_public.base import MadePublic +from .assessments.base import Assessments +from .comparisons.base import Comparisons +from .voting_rights.base import VotingRights +from .models.direct import ScoringModel, DirectScoring +from .models.user_models import UserModels class State: diff --git a/solidago/src/solidago/_state/_comparisons/__init__.py b/solidago/src/solidago/state/comparisons/__init__.py similarity index 100% rename from solidago/src/solidago/_state/_comparisons/__init__.py rename to solidago/src/solidago/state/comparisons/__init__.py diff --git a/solidago/src/solidago/_state/_comparisons/base.py b/solidago/src/solidago/state/comparisons/base.py similarity index 100% rename from solidago/src/solidago/_state/_comparisons/base.py rename to solidago/src/solidago/state/comparisons/base.py diff --git a/solidago/src/solidago/_state/_entities/__init__.py b/solidago/src/solidago/state/entities/__init__.py similarity index 100% rename from solidago/src/solidago/_state/_entities/__init__.py rename to solidago/src/solidago/state/entities/__init__.py diff --git a/solidago/src/solidago/_state/_entities/base.py b/solidago/src/solidago/state/entities/base.py similarity index 100% rename from solidago/src/solidago/_state/_entities/base.py rename to solidago/src/solidago/state/entities/base.py diff --git a/solidago/src/solidago/_state/_entities/vector.py b/solidago/src/solidago/state/entities/vector.py similarity index 100% rename from solidago/src/solidago/_state/_entities/vector.py rename to solidago/src/solidago/state/entities/vector.py diff --git a/solidago/src/solidago/_state/_made_public/__init__.py b/solidago/src/solidago/state/made_public/__init__.py similarity index 100% rename from solidago/src/solidago/_state/_made_public/__init__.py rename to solidago/src/solidago/state/made_public/__init__.py diff --git a/solidago/src/solidago/_state/_made_public/all_public.py b/solidago/src/solidago/state/made_public/all_public.py similarity index 100% rename from solidago/src/solidago/_state/_made_public/all_public.py rename to solidago/src/solidago/state/made_public/all_public.py diff --git a/solidago/src/solidago/_state/_made_public/base.py b/solidago/src/solidago/state/made_public/base.py similarity index 100% rename from solidago/src/solidago/_state/_made_public/base.py rename to solidago/src/solidago/state/made_public/base.py diff --git a/solidago/src/solidago/_state/_models/__init__.py b/solidago/src/solidago/state/models/__init__.py similarity index 100% rename from solidago/src/solidago/_state/_models/__init__.py rename to solidago/src/solidago/state/models/__init__.py diff --git a/solidago/src/solidago/_state/_models/base.py b/solidago/src/solidago/state/models/base.py similarity index 100% rename from solidago/src/solidago/_state/_models/base.py rename to solidago/src/solidago/state/models/base.py diff --git a/solidago/src/solidago/_state/_models/direct.py b/solidago/src/solidago/state/models/direct.py similarity index 100% rename from solidago/src/solidago/_state/_models/direct.py rename to solidago/src/solidago/state/models/direct.py diff --git a/solidago/src/solidago/_state/_models/post_processed.py b/solidago/src/solidago/state/models/post_processed.py similarity index 100% rename from solidago/src/solidago/_state/_models/post_processed.py rename to solidago/src/solidago/state/models/post_processed.py diff --git a/solidago/src/solidago/_state/_models/scaled.py b/solidago/src/solidago/state/models/scaled.py similarity index 100% rename from solidago/src/solidago/_state/_models/scaled.py rename to solidago/src/solidago/state/models/scaled.py diff --git a/solidago/src/solidago/_state/_models/score.py b/solidago/src/solidago/state/models/score.py similarity index 100% rename from solidago/src/solidago/_state/_models/score.py rename to solidago/src/solidago/state/models/score.py diff --git a/solidago/src/solidago/_state/_models/user_models.py b/solidago/src/solidago/state/models/user_models.py similarity index 100% rename from solidago/src/solidago/_state/_models/user_models.py rename to solidago/src/solidago/state/models/user_models.py diff --git a/solidago/src/solidago/_state/tournesol.py b/solidago/src/solidago/state/tournesol.py similarity index 100% rename from solidago/src/solidago/_state/tournesol.py rename to solidago/src/solidago/state/tournesol.py diff --git a/solidago/src/solidago/_state/_users/__init__.py b/solidago/src/solidago/state/users/__init__.py similarity index 100% rename from solidago/src/solidago/_state/_users/__init__.py rename to solidago/src/solidago/state/users/__init__.py diff --git a/solidago/src/solidago/_state/_users/base.py b/solidago/src/solidago/state/users/base.py similarity index 100% rename from solidago/src/solidago/_state/_users/base.py rename to solidago/src/solidago/state/users/base.py diff --git a/solidago/src/solidago/_state/_users/vector.py b/solidago/src/solidago/state/users/vector.py similarity index 100% rename from solidago/src/solidago/_state/_users/vector.py rename to solidago/src/solidago/state/users/vector.py diff --git a/solidago/src/solidago/_state/_voting_rights/__init__.py b/solidago/src/solidago/state/voting_rights/__init__.py similarity index 100% rename from solidago/src/solidago/_state/_voting_rights/__init__.py rename to solidago/src/solidago/state/voting_rights/__init__.py diff --git a/solidago/src/solidago/_state/_voting_rights/base.py b/solidago/src/solidago/state/voting_rights/base.py similarity index 100% rename from solidago/src/solidago/_state/_voting_rights/base.py rename to solidago/src/solidago/state/voting_rights/base.py diff --git a/solidago/src/solidago/_state/_vouches/__init__.py b/solidago/src/solidago/state/vouches/__init__.py similarity index 100% rename from solidago/src/solidago/_state/_vouches/__init__.py rename to solidago/src/solidago/state/vouches/__init__.py diff --git a/solidago/src/solidago/_state/_vouches/base.py b/solidago/src/solidago/state/vouches/base.py similarity index 100% rename from solidago/src/solidago/_state/_vouches/base.py rename to solidago/src/solidago/state/vouches/base.py