deriva-ml 1.13.3__py3-none-any.whl → 1.14.26__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. deriva_ml/__init__.py +25 -30
  2. deriva_ml/core/__init__.py +39 -0
  3. deriva_ml/core/base.py +1489 -0
  4. deriva_ml/core/constants.py +36 -0
  5. deriva_ml/core/definitions.py +74 -0
  6. deriva_ml/core/enums.py +222 -0
  7. deriva_ml/core/ermrest.py +288 -0
  8. deriva_ml/core/exceptions.py +28 -0
  9. deriva_ml/core/filespec.py +116 -0
  10. deriva_ml/dataset/__init__.py +4 -0
  11. deriva_ml/{dataset_aux_classes.py → dataset/aux_classes.py} +16 -12
  12. deriva_ml/{dataset.py → dataset/dataset.py} +408 -416
  13. deriva_ml/{dataset_bag.py → dataset/dataset_bag.py} +137 -97
  14. deriva_ml/{history.py → dataset/history.py} +52 -33
  15. deriva_ml/{upload.py → dataset/upload.py} +48 -70
  16. deriva_ml/demo_catalog.py +233 -183
  17. deriva_ml/execution/environment.py +290 -0
  18. deriva_ml/{execution.py → execution/execution.py} +365 -252
  19. deriva_ml/execution/execution_configuration.py +163 -0
  20. deriva_ml/{execution_configuration.py → execution/workflow.py} +206 -218
  21. deriva_ml/feature.py +83 -46
  22. deriva_ml/model/__init__.py +0 -0
  23. deriva_ml/{deriva_model.py → model/catalog.py} +113 -132
  24. deriva_ml/{database_model.py → model/database.py} +52 -74
  25. deriva_ml/model/sql_mapper.py +44 -0
  26. deriva_ml/run_notebook.py +19 -11
  27. deriva_ml/schema/__init__.py +3 -0
  28. deriva_ml/{schema_setup → schema}/annotations.py +31 -22
  29. deriva_ml/schema/check_schema.py +104 -0
  30. deriva_ml/{schema_setup → schema}/create_schema.py +151 -104
  31. deriva_ml/schema/deriva-ml-reference.json +8525 -0
  32. deriva_ml/schema/table_comments_utils.py +57 -0
  33. {deriva_ml-1.13.3.dist-info → deriva_ml-1.14.26.dist-info}/METADATA +5 -4
  34. deriva_ml-1.14.26.dist-info/RECORD +40 -0
  35. {deriva_ml-1.13.3.dist-info → deriva_ml-1.14.26.dist-info}/entry_points.txt +1 -0
  36. deriva_ml/deriva_definitions.py +0 -372
  37. deriva_ml/deriva_ml_base.py +0 -1046
  38. deriva_ml/execution_environment.py +0 -139
  39. deriva_ml/schema_setup/table_comments_utils.py +0 -56
  40. deriva_ml/test-files/execution-parameters.json +0 -1
  41. deriva_ml/test-files/notebook-parameters.json +0 -5
  42. deriva_ml/test_functions.py +0 -141
  43. deriva_ml/test_notebook.ipynb +0 -197
  44. deriva_ml-1.13.3.dist-info/RECORD +0 -31
  45. /deriva_ml/{schema_setup → execution}/__init__.py +0 -0
  46. /deriva_ml/{schema_setup → schema}/policy.json +0 -0
  47. {deriva_ml-1.13.3.dist-info → deriva_ml-1.14.26.dist-info}/WHEEL +0 -0
  48. {deriva_ml-1.13.3.dist-info → deriva_ml-1.14.26.dist-info}/licenses/LICENSE +0 -0
  49. {deriva_ml-1.13.3.dist-info → deriva_ml-1.14.26.dist-info}/top_level.txt +0 -0
deriva_ml/__init__.py CHANGED
@@ -1,50 +1,45 @@
1
1
  __all__ = [
2
2
  "DerivaML",
3
3
  "DerivaMLException",
4
- "FileUploadState",
5
- "FileSpec",
6
- "ExecutionConfiguration",
4
+ "DerivaMLInvalidTerm",
5
+ "DerivaMLTableTypeError",
7
6
  "Execution",
7
+ "ExecAssetType",
8
+ "ExecMetadataType",
8
9
  "Workflow",
9
10
  "DatasetBag",
10
11
  "DatasetVersion",
11
12
  "DatasetSpec",
12
- "ColumnDefinition",
13
- "TableDefinition",
13
+ "FileSpec",
14
+ "VersionPart",
15
+ "RID",
14
16
  "BuiltinTypes",
15
- "UploadState",
17
+ "ColumnDefinition",
16
18
  "MLVocab",
17
19
  "MLAsset",
18
- "ExecAssetType",
19
- "RID",
20
- "DerivaSystemColumns",
21
- "VersionPart",
20
+ "TableDefinition",
21
+ "ExecutionConfiguration",
22
22
  ]
23
23
 
24
- from .dataset_aux_classes import VersionPart, DatasetSpec, DatasetVersion
25
- from .dataset_bag import DatasetBag
26
- from .deriva_definitions import (
27
- ColumnDefinition,
28
- TableDefinition,
24
+ from importlib.metadata import PackageNotFoundError, version
25
+
26
+ from deriva_ml.core import (
27
+ RID,
29
28
  BuiltinTypes,
30
- UploadState,
31
- FileUploadState,
29
+ ColumnDefinition,
30
+ DerivaML,
31
+ ExecAssetType,
32
+ ExecMetadataType,
32
33
  FileSpec,
33
- RID,
34
- DerivaMLException,
35
- MLVocab,
36
34
  MLAsset,
37
- ExecAssetType,
38
- DerivaSystemColumns,
39
- )
40
- from .deriva_ml_base import DerivaML
41
- from .execution_configuration import (
42
- ExecutionConfiguration,
43
- Workflow,
35
+ MLVocab,
36
+ TableDefinition,
44
37
  )
45
- from .execution import Execution
46
-
47
- from importlib.metadata import version, PackageNotFoundError
38
+ from deriva_ml.core.exceptions import DerivaMLException, DerivaMLInvalidTerm, DerivaMLTableTypeError
39
+ from deriva_ml.dataset.aux_classes import DatasetSpec, DatasetVersion, VersionPart
40
+ from deriva_ml.dataset.dataset_bag import DatasetBag
41
+ from deriva_ml.execution.execution import Execution, ExecutionConfiguration
42
+ from deriva_ml.execution.workflow import Workflow
48
43
 
49
44
  try:
50
45
  __version__ = version("deriva_ml")
deriva_ml/core/__init__.py ADDED
@@ -0,0 +1,39 @@
1
+ from deriva_ml.core.base import DerivaML
2
+ from deriva_ml.core.definitions import (
3
+ RID,
4
+ BuiltinTypes,
5
+ ColumnDefinition,
6
+ DerivaSystemColumns,
7
+ ExecAssetType,
8
+ ExecMetadataType,
9
+ FileSpec,
10
+ FileUploadState,
11
+ MLAsset,
12
+ MLVocab,
13
+ TableDefinition,
14
+ UploadState,
15
+ )
16
+ from deriva_ml.core.exceptions import DerivaMLException, DerivaMLInvalidTerm, DerivaMLTableTypeError
17
+
18
+ __all__ = [
19
+ "DerivaML",
20
+
21
+ # Exceptions
22
+ "DerivaMLException",
23
+ "DerivaMLInvalidTerm",
24
+ "DerivaMLTableTypeError",
25
+
26
+ # Definitions
27
+ "RID",
28
+ "BuiltinTypes",
29
+ "ColumnDefinition",
30
+ "DerivaSystemColumns",
31
+ "ExecAssetType",
32
+ "ExecMetadataType",
33
+ "FileSpec",
34
+ "FileUploadState",
35
+ "MLAsset",
36
+ "MLVocab",
37
+ "TableDefinition",
38
+ "UploadState",
39
+ ]