Removed ParamModel, ParamDataset and the like. Reimplemented with new…

… solution. All tests now pass!
fairtracks · Sep 13, 2024 · 02af71d · 02af71d
1 parent 36b8188
commit 02af71d
Show file tree

Hide file tree

Showing 16 changed files with 379 additions and 824 deletions.
diff --git a/scripts/param.py b/scripts/param.py
diff --git a/scripts/param_new.py b/scripts/param_new.py
diff --git a/src/omnipy/__init__.py b/src/omnipy/__init__.py
@@ -9,8 +9,8 @@
                                  LinearFlow,
                                  LinearFlowTemplate)
 from omnipy.compute.task import Task, TaskTemplate
-from omnipy.data.dataset import Dataset, ListOfParamModelDataset, MultiModelDataset, ParamDataset
-from omnipy.data.model import ListOfParamModel, Model, ParamModel
+from omnipy.data.dataset import Dataset, MultiModelDataset
+from omnipy.data.model import Model
 from omnipy.data.param import bind_adjust_dataset_func, bind_adjust_model_func, ParamsBase
 from omnipy.hub.runtime import runtime
 from omnipy.modules.general.models import (Chain2,
@@ -119,9 +119,7 @@
                                        JoinItemsModel,
                                        JoinLinesModel,
                                        SplitLinesToColumnsModel,
-                                       SplitLinesToColumnsModelNew,
                                        SplitToItemsModel,
-                                       SplitToItemsModelNew,
                                        SplitToLinesModel,
                                        StrModel)
 from omnipy.modules.raw.tasks import (concat_all,
@@ -143,8 +141,6 @@
                                          transpose_columns_with_data_files)
 from omnipy.util.contexts import print_exception
 
-# if typing.TYPE_CHECKING:
-
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 __all__ = [
@@ -158,12 +154,8 @@
     'Task',
     'TaskTemplate',
     'Dataset',
-    'ParamDataset',
-    'ListOfParamModelDataset',
     'MultiModelDataset',
     'Model',
-    'ParamModel',
-    'ListOfParamModel',
     'FlattenedIsaJsonDataset',
     'FlattenedIsaJsonModel',
     'IsaJsonModel',
@@ -250,10 +242,8 @@
     'SplitToLinesModel',
     'JoinLinesModel',
     'SplitToItemsModel',
-    'SplitToItemsModelNew',
     'JoinItemsModel',
     'SplitLinesToColumnsModel',
-    'SplitLinesToColumnsModelNew',
     'JoinColumnsToLinesModel',
     'StrModel',
     'TableOfPydanticRecordsDataset',

diff --git a/src/omnipy/_dynamic_all.py b/src/omnipy/_dynamic_all.py
@@ -39,8 +39,8 @@
                                LinearFlowTemplate)
     from .compute.job import JobTemplateMixin
     from .compute.task import Task, TaskTemplate
-    from .data.dataset import Dataset, ListOfParamModelDataset, MultiModelDataset, ParamDataset
-    from .data.model import ListOfParamModel, Model, ParamModel
+    from .data.dataset import Dataset, MultiModelDataset
+    from .data.model import Model
     from .data.param import bind_adjust_dataset_func, bind_adjust_model_func, ParamsBase
     from .hub.runtime import runtime
     from .util.contexts import print_exception
@@ -57,15 +57,11 @@
         'Task',
         'TaskTemplate',
         'Dataset',
-        'ParamDataset',
-        'ListOfParamModelDataset',
         'MultiModelDataset',
         'ParamsBase',
         'bind_adjust_model_func',
         'bind_adjust_dataset_func',
         'Model',
-        'ParamModel',
-        'ListOfParamModel',
         'print_exception',
     ]
     _all_element_names = set(__all__)