deriva-ml 1.17.15__py3-none-any.whl → 1.17.16__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 (53) hide show
  1. deriva_ml/__init__.py +2 -2
  2. deriva_ml/asset/asset.py +0 -4
  3. deriva_ml/catalog/__init__.py +6 -0
  4. deriva_ml/catalog/clone.py +1513 -22
  5. deriva_ml/catalog/localize.py +66 -29
  6. deriva_ml/core/base.py +12 -9
  7. deriva_ml/core/definitions.py +13 -12
  8. deriva_ml/core/ermrest.py +11 -12
  9. deriva_ml/core/mixins/annotation.py +2 -2
  10. deriva_ml/core/mixins/asset.py +3 -3
  11. deriva_ml/core/mixins/dataset.py +3 -3
  12. deriva_ml/core/mixins/execution.py +1 -0
  13. deriva_ml/core/mixins/feature.py +2 -2
  14. deriva_ml/core/mixins/file.py +2 -2
  15. deriva_ml/core/mixins/path_builder.py +2 -2
  16. deriva_ml/core/mixins/rid_resolution.py +2 -2
  17. deriva_ml/core/mixins/vocabulary.py +2 -2
  18. deriva_ml/core/mixins/workflow.py +3 -3
  19. deriva_ml/dataset/catalog_graph.py +3 -4
  20. deriva_ml/dataset/dataset.py +5 -3
  21. deriva_ml/dataset/dataset_bag.py +0 -2
  22. deriva_ml/dataset/upload.py +2 -2
  23. deriva_ml/demo_catalog.py +0 -1
  24. deriva_ml/execution/__init__.py +8 -8
  25. deriva_ml/execution/base_config.py +2 -2
  26. deriva_ml/execution/execution.py +5 -3
  27. deriva_ml/execution/execution_record.py +0 -1
  28. deriva_ml/execution/model_protocol.py +1 -1
  29. deriva_ml/execution/multirun_config.py +0 -1
  30. deriva_ml/execution/runner.py +3 -3
  31. deriva_ml/experiment/experiment.py +3 -3
  32. deriva_ml/feature.py +2 -2
  33. deriva_ml/interfaces.py +2 -2
  34. deriva_ml/model/__init__.py +45 -24
  35. deriva_ml/model/annotations.py +0 -1
  36. deriva_ml/model/catalog.py +3 -2
  37. deriva_ml/model/data_loader.py +330 -0
  38. deriva_ml/model/data_sources.py +439 -0
  39. deriva_ml/model/database.py +216 -32
  40. deriva_ml/model/fk_orderer.py +379 -0
  41. deriva_ml/model/handles.py +1 -1
  42. deriva_ml/model/schema_builder.py +816 -0
  43. deriva_ml/run_model.py +3 -3
  44. deriva_ml/schema/annotations.py +2 -1
  45. deriva_ml/schema/create_schema.py +1 -1
  46. deriva_ml/schema/validation.py +1 -1
  47. {deriva_ml-1.17.15.dist-info → deriva_ml-1.17.16.dist-info}/METADATA +1 -1
  48. deriva_ml-1.17.16.dist-info/RECORD +81 -0
  49. deriva_ml-1.17.15.dist-info/RECORD +0 -77
  50. {deriva_ml-1.17.15.dist-info → deriva_ml-1.17.16.dist-info}/WHEEL +0 -0
  51. {deriva_ml-1.17.15.dist-info → deriva_ml-1.17.16.dist-info}/entry_points.txt +0 -0
  52. {deriva_ml-1.17.15.dist-info → deriva_ml-1.17.16.dist-info}/licenses/LICENSE +0 -0
  53. {deriva_ml-1.17.15.dist-info → deriva_ml-1.17.16.dist-info}/top_level.txt +0 -0
deriva_ml/__init__.py CHANGED
@@ -3,11 +3,11 @@
3
3
  # IMPORTANT: Import deriva package first to prevent shadowing by local 'deriva.py' files.
4
4
  # This ensures 'deriva' is cached in sys.modules before any other imports that might
5
5
  # add directories containing a 'deriva.py' file to sys.path.
6
- import deriva.core # noqa: F401
7
-
8
6
  from importlib.metadata import PackageNotFoundError, version
9
7
  from typing import TYPE_CHECKING
10
8
 
9
+ import deriva.core # noqa: F401
10
+
11
11
  # Safe imports - no circular dependencies
12
12
  from deriva_ml.core.config import DerivaMLConfig
13
13
  from deriva_ml.core.definitions import (
deriva_ml/asset/asset.py CHANGED
@@ -31,12 +31,9 @@ import logging
31
31
  from pathlib import Path
32
32
  from typing import TYPE_CHECKING, Any
33
33
 
34
- from pydantic import ConfigDict, SkipValidation, validate_call
35
-
36
34
  from deriva_ml.core.definitions import RID
37
35
 
38
36
  if TYPE_CHECKING:
39
- from deriva_ml.execution.execution import Execution
40
37
  from deriva_ml.execution.execution_record import ExecutionRecord
41
38
  from deriva_ml.feature import Feature, FeatureRecord
42
39
  from deriva_ml.interfaces import DerivaMLCatalog
@@ -309,7 +306,6 @@ class Asset:
309
306
  >>> local_path = asset.download(Path("/tmp/assets"))
310
307
  >>> print(f"Downloaded to: {local_path}")
311
308
  """
312
- from deriva_ml.execution.execution import Execution
313
309
 
314
310
  # Use hatrac to download the file
315
311
  dest_dir = Path(dest_dir)
@@ -7,8 +7,11 @@ from deriva_ml.catalog.clone import (
7
7
  CatalogProvenance,
8
8
  CloneCatalogResult,
9
9
  CloneDetails,
10
+ CloneReport,
11
+ CloneReportSummary,
10
12
  OrphanStrategy,
11
13
  clone_catalog,
14
+ clone_subset_catalog,
12
15
  get_catalog_provenance,
13
16
  set_catalog_provenance,
14
17
  )
@@ -24,9 +27,12 @@ __all__ = [
24
27
  "CatalogProvenance",
25
28
  "CloneCatalogResult",
26
29
  "CloneDetails",
30
+ "CloneReport",
31
+ "CloneReportSummary",
27
32
  "LocalizeResult",
28
33
  "OrphanStrategy",
29
34
  "clone_catalog",
35
+ "clone_subset_catalog",
30
36
  "get_catalog_provenance",
31
37
  "localize_assets",
32
38
  "set_catalog_provenance",