WIP Renaming

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",
+]

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

solidago/src/solidago/_generative_model/_assessment/base.py → 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):

solidago/src/solidago/_generative_model/_assessment/normal.py → 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
 
 

solidago/src/solidago/_generative_model/base.py → 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(),

solidago/src/solidago/_generative_model/_comparison/base.py → 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):

solidago/src/solidago/_generative_model/_comparison/thurston.py → 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
 
 

solidago/src/solidago/_generative_model/_engagement/base.py → 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):

solidago/src/solidago/_generative_model/_engagement/simple.py → 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
 
 

solidago/src/solidago/_generative_model/_entity/base.py → 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):

solidago/src/solidago/_generative_model/_entity/vector.py → 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
 
 

solidago/src/solidago/_generative_model/_user/base.py → 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):

solidago/src/solidago/_generative_model/_user/normal.py → 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
 
 

solidago/src/solidago/_generative_model/_vouch/base.py → 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):

solidago/src/solidago/_generative_model/_vouch/erdos_renyi.py → 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
 
 

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 *
+

solidago/src/solidago/_pipeline/_aggregation/average.py → 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):

solidago/src/solidago/_pipeline/_aggregation/entitywise_qr_quantile.py → 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):

solidago/src/solidago/_pipeline/base.py → 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()

solidago/src/solidago/_pipeline/identity.py → 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
 
 

solidago/src/solidago/_pipeline/_post_process/squash.py → 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):

solidago/src/solidago/_pipeline/_preference_learning/base.py → 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):

solidago/src/solidago/_pipeline/_preference_learning/generalized_bradley_terry.py → 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
 
 

solidago/src/solidago/_pipeline/_preference_learning/lbfgs_generalized_bradley_terry.py → 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
 

solidago/src/solidago/_pipeline/_preference_learning/numba_generalized_bradley_terry.py → 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
 

solidago/src/solidago/_pipeline/_scaling/lipschitz_quantile_shift.py → 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):

solidago/src/solidago/_pipeline/_scaling/lipschitz_standardize.py → 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):

solidago/src/solidago/_pipeline/_scaling/mehestan.py → 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):

solidago/src/solidago/_pipeline/sequential.py → 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__