mhd-model 0.1.41__tar.gz → 0.1.42__tar.gz
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.
- {mhd_model-0.1.41 → mhd_model-0.1.42}/PKG-INFO +1 -1
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/__init__.py +1 -1
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/announcement/v0_1/legacy/mhd2announce.py +2 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/announcement/v0_1/ms/mhd2announce.py +8 -3
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/schemas/mhd/announcement-v0.1.legacy-profile.json +1 -1
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/schemas/mhd/announcement-v0.1.ms-profile.json +1 -1
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/schemas/mhd/announcement-v0.1.schema.json +1 -1
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/schemas/mhd/common-data-model-v0.1.legacy-profile.json +1 -1
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/schemas/mhd/common-data-model-v0.1.ms-profile.json +1 -1
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/schemas/mhd/common-data-model-v0.1.schema.json +1 -1
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model.egg-info/PKG-INFO +1 -1
- {mhd_model-0.1.41 → mhd_model-0.1.42}/pyproject.toml +2 -2
- {mhd_model-0.1.41 → mhd_model-0.1.42}/LICENSE +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/README.md +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/cli.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/create/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/create/announcement.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/create/create.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/create/neo4j_input.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/create/sdrf.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/validate/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/validate/announcement.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/validate/mhd_file.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/commands/validate/validate.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/announcement/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/announcement/v0_1/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/announcement/v0_1/legacy/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/announcement/v0_1/ms/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/mhd/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/mhd/convertor.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/neo4j_enabled_data/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/neo4j_enabled_data/v0_1/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/neo4j_enabled_data/v0_1/legacy/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/neo4j_enabled_data/v0_1/legacy/convertor.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/sdrf/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/sdrf/mhd2sdrf.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/domain_utils.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/log_utils.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/mhd_client.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/definitions.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/base/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/base/profile.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/legacy/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/legacy/profile.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/ms/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/ms/fields.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/ms/profile.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/validation/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/validation/base.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/validation/definitions.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/validation/validator.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/base.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/dataset_builder.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/graph_nodes.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/graph_validation.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/profile.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/relationships.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/legacy/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/legacy/graph_validation.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/legacy/profile.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/ms/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/ms/graph_validation.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/ms/profile.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/base.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/profile/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/profile/base.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/profile/definition.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/utils.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/validator.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/rules/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/rules/cv_definitions.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/rules/managed_cv_terms.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/rules/predefined_cv_terms.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/sdrf/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/sdrf/model.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/schema_utils.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/schemas/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/schemas/mhd/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/shared/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/shared/exceptions.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/shared/fields.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/shared/model.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/shared/validation/__init__.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/shared/validation/cv_term_helper.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/shared/validation/definitions.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/shared/validation/registry.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/shared/validation/validators.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/utils.py +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model.egg-info/SOURCES.txt +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model.egg-info/dependency_links.txt +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model.egg-info/entry_points.txt +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model.egg-info/requires.txt +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model.egg-info/top_level.txt +0 -0
- {mhd_model-0.1.41 → mhd_model-0.1.42}/setup.cfg +0 -0
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/announcement/v0_1/legacy/mhd2announce.py
RENAMED
|
@@ -349,6 +349,8 @@ def create_announcement_file(
|
|
|
349
349
|
repository_identifier=study.repository_identifier,
|
|
350
350
|
schema_name=announcement_schema_name,
|
|
351
351
|
profile_uri=announcement_profile_uri,
|
|
352
|
+
revision=mhd_dataset.repository_revision,
|
|
353
|
+
revision_datetime=mhd_dataset.repository_revision_datetime,
|
|
352
354
|
mhd_metadata_file_url=AnyUrl(mhd_file_url),
|
|
353
355
|
dataset_url_list=dataset_url_list,
|
|
354
356
|
license=study.license,
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/announcement/v0_1/ms/mhd2announce.py
RENAMED
|
@@ -261,8 +261,12 @@ def create_announcement_file(
|
|
|
261
261
|
announcement_profile_uri=ANNOUNCEMENT_FILE_V0_1_LEGACY_PROFILE_NAME,
|
|
262
262
|
):
|
|
263
263
|
mhd_dataset = MhDatasetMsProfile.model_validate(mhd_file)
|
|
264
|
-
nodes_map
|
|
265
|
-
|
|
264
|
+
nodes_map: dict[str, IdentifiableMhdModel] = {
|
|
265
|
+
x.id_: x for x in mhd_dataset.graph.nodes
|
|
266
|
+
}
|
|
267
|
+
relationships_map: dict[str, BaseMhdRelationship] = {
|
|
268
|
+
x.id_: x for x in mhd_dataset.graph.relationships
|
|
269
|
+
}
|
|
266
270
|
|
|
267
271
|
all_nodes_map: dict[str, BaseMhdModel] = {}
|
|
268
272
|
type_map: dict[str, dict[str, BaseMhdModel]] = {}
|
|
@@ -279,7 +283,7 @@ def create_announcement_file(
|
|
|
279
283
|
relationship_name_map[rel.relationship_name][rel.id_] = rel
|
|
280
284
|
|
|
281
285
|
if "study" not in type_map:
|
|
282
|
-
logger.
|
|
286
|
+
logger.error("Study not found for in the input file")
|
|
283
287
|
return
|
|
284
288
|
study: graph_nodes.Study = list(type_map["study"].values())[0]
|
|
285
289
|
|
|
@@ -293,6 +297,7 @@ def create_announcement_file(
|
|
|
293
297
|
type_map["publication"].values()
|
|
294
298
|
)
|
|
295
299
|
for node in graph_publications:
|
|
300
|
+
relationships_map.get()
|
|
296
301
|
item = AnnouncementPublication.model_validate(
|
|
297
302
|
node.model_dump(by_alias=True)
|
|
298
303
|
)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "mhd-model"
|
|
3
|
-
version = "0.1.
|
|
3
|
+
version = "0.1.42"
|
|
4
4
|
description = "MetabolomicsHub Common Data Model"
|
|
5
5
|
authors = [{"name"="MetabolomicsHub Team", "email"="help@metabolomicshub.org"}]
|
|
6
6
|
license = "Apache-2.0"
|
|
@@ -62,7 +62,7 @@ test = [
|
|
|
62
62
|
[tool.commitizen]
|
|
63
63
|
name = "cz_conventional_commits"
|
|
64
64
|
version_provider = "uv"
|
|
65
|
-
version = "0.1.
|
|
65
|
+
version = "0.1.42"
|
|
66
66
|
tag_format = "v$major.$minor.$patch"
|
|
67
67
|
version_files = [
|
|
68
68
|
"pyproject.toml:version",
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/announcement/v0_1/legacy/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/convertors/neo4j_enabled_data/v0_1/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/__init__.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/base/__init__.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/base/profile.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/legacy/__init__.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/legacy/profile.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/ms/__init__.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/ms/fields.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/profiles/ms/profile.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/validation/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/validation/definitions.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/announcement/validation/validator.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/dataset_builder.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/graph_nodes.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/graph_validation.py
RENAMED
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/base/relationships.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/legacy/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/legacy/profile.py
RENAMED
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/profiles/ms/graph_validation.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/profile/__init__.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/profile/base.py
RENAMED
|
File without changes
|
{mhd_model-0.1.41 → mhd_model-0.1.42}/mhd_model/model/v0_1/dataset/validation/profile/definition.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|