mhd-model 0.1.41__py3-none-any.whl → 0.1.43__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 (15) hide show
  1. mhd_model/__init__.py +1 -1
  2. mhd_model/convertors/announcement/v0_1/legacy/mhd2announce.py +2 -0
  3. mhd_model/convertors/announcement/v0_1/ms/mhd2announce.py +8 -3
  4. mhd_model/schemas/mhd/announcement-v0.1.legacy-profile.json +1 -1
  5. mhd_model/schemas/mhd/announcement-v0.1.ms-profile.json +1 -1
  6. mhd_model/schemas/mhd/announcement-v0.1.schema.json +1 -1
  7. mhd_model/schemas/mhd/common-data-model-v0.1.legacy-profile.json +1 -1
  8. mhd_model/schemas/mhd/common-data-model-v0.1.ms-profile.json +1 -1
  9. mhd_model/schemas/mhd/common-data-model-v0.1.schema.json +1 -1
  10. {mhd_model-0.1.41.dist-info → mhd_model-0.1.43.dist-info}/METADATA +2 -2
  11. {mhd_model-0.1.41.dist-info → mhd_model-0.1.43.dist-info}/RECORD +15 -15
  12. {mhd_model-0.1.41.dist-info → mhd_model-0.1.43.dist-info}/WHEEL +0 -0
  13. {mhd_model-0.1.41.dist-info → mhd_model-0.1.43.dist-info}/entry_points.txt +0 -0
  14. {mhd_model-0.1.41.dist-info → mhd_model-0.1.43.dist-info}/licenses/LICENSE +0 -0
  15. {mhd_model-0.1.41.dist-info → mhd_model-0.1.43.dist-info}/top_level.txt +0 -0
mhd_model/__init__.py CHANGED
@@ -1,7 +1,7 @@
1
1
  import pathlib
2
2
  import sys
3
3
 
4
- __version__ = "v0.1.41"
4
+ __version__ = "v0.1.43"
5
5
 
6
6
  application_root_path = pathlib.Path(__file__).parent.parent
7
7
 
mhd_model/convertors/announcement/v0_1/legacy/mhd2announce.py CHANGED
@@ -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/convertors/announcement/v0_1/ms/mhd2announce.py CHANGED
@@ -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 = {x.id_: x for x in mhd_dataset.graph.nodes}
265
- relationships_map = {x.id_: x for x in mhd_dataset.graph.relationships}
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.info("Study not found for in input file")
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
  )
mhd_model/schemas/mhd/announcement-v0.1.legacy-profile.json CHANGED
@@ -1287,4 +1287,4 @@
1287
1287
  ],
1288
1288
  "title": "AnnouncementLegacyProfile",
1289
1289
  "type": "object"
1290
- }
1290
+ }
mhd_model/schemas/mhd/announcement-v0.1.ms-profile.json CHANGED
@@ -1921,4 +1921,4 @@
1921
1921
  ],
1922
1922
  "title": "AnnouncementMsProfile",
1923
1923
  "type": "object"
1924
- }
1924
+ }
mhd_model/schemas/mhd/announcement-v0.1.schema.json CHANGED
@@ -1266,4 +1266,4 @@
1266
1266
  ],
1267
1267
  "title": "AnnouncementBaseProfile",
1268
1268
  "type": "object"
1269
- }
1269
+ }
mhd_model/schemas/mhd/common-data-model-v0.1.legacy-profile.json CHANGED
@@ -4373,4 +4373,4 @@
4373
4373
  ],
4374
4374
  "title": "MhDatasetLegacyProfile",
4375
4375
  "type": "object"
4376
- }
4376
+ }
mhd_model/schemas/mhd/common-data-model-v0.1.ms-profile.json CHANGED
@@ -4373,4 +4373,4 @@
4373
4373
  ],
4374
4374
  "title": "MhDatasetMsProfile",
4375
4375
  "type": "object"
4376
- }
4376
+ }
mhd_model/schemas/mhd/common-data-model-v0.1.schema.json CHANGED
@@ -4373,4 +4373,4 @@
4373
4373
  ],
4374
4374
  "title": "MhDatasetBaseProfile",
4375
4375
  "type": "object"
4376
- }
4376
+ }
{mhd_model-0.1.41.dist-info → mhd_model-0.1.43.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mhd-model
3
- Version: 0.1.41
3
+ Version: 0.1.43
4
4
  Summary: MetabolomicsHub Common Data Model
5
5
  Author-email: MetabolomicsHub Team <help@metabolomicshub.org>
6
6
  License-Expression: Apache-2.0
@@ -14,7 +14,7 @@ Requires-Dist: email-validator>=2.2.0
14
14
  Requires-Dist: httpx>=0.28.1
15
15
  Requires-Dist: jsonpath-ng>=1.7.0
16
16
  Requires-Dist: jsonschema>=4.24.0
17
- Requires-Dist: mkdocs-mermaid2-plugin>=1.2.2
17
+ Requires-Dist: pre-commit>=4.5.1
18
18
  Requires-Dist: pydantic>=2.11.7
19
19
  Requires-Dist: python-dateutil>=2.9.0.post0
20
20
  Requires-Dist: pytz>=2025.2
{mhd_model-0.1.41.dist-info → mhd_model-0.1.43.dist-info}/RECORD RENAMED
@@ -1,4 +1,4 @@
1
- mhd_model/__init__.py,sha256=sGa8dvY3_zxf6QUMUaZM_C2WHIwGbiJDPNih_yHGMGc,286
1
+ mhd_model/__init__.py,sha256=JepqBAzx1mZDn0TNtKiYDHUMGgKAoQICmD-tyV-AgGo,286
2
2
  mhd_model/domain_utils.py,sha256=DQ3qanzv-Chydrt2HIM_G1jATf0Uv6XMP8-MgeaZFDk,939
3
3
  mhd_model/log_utils.py,sha256=U3ZmSebJttjeszkZ3HPZzjkczxoD557albXHjPRV4Ro,880
4
4
  mhd_model/mhd_client.py,sha256=BETvOLNGzEHxr5RnRkJk0Rcq4XlQeqvdd1geW9j7gf8,6920
@@ -19,9 +19,9 @@ mhd_model/convertors/__init__.py,sha256=Vks7EtU2sNmt6IUWGbtIuVjmU2uNHLXf4_-6sUCW
19
19
  mhd_model/convertors/announcement/__init__.py,sha256=e95z9FteLeMQ18CGUswWwEihn5TpFK9Rj-iGJ69H4NA,19
20
20
  mhd_model/convertors/announcement/v0_1/__init__.py,sha256=E41K3F4V61F4MKSwp2ucrUN2BZFU5P-jw1fUn-KEwVk,27
21
21
  mhd_model/convertors/announcement/v0_1/legacy/__init__.py,sha256=b1Oil1GtNAviuvj5rZBg2NXtF3DjkbD0-07eD40XSl4,27
22
- mhd_model/convertors/announcement/v0_1/legacy/mhd2announce.py,sha256=zdwTabQiaaq9THrZ8YRdJx8Vvzp_2uziy99vkqLFXVY,23266
22
+ mhd_model/convertors/announcement/v0_1/legacy/mhd2announce.py,sha256=oJ8nuu7pFL3HD2hrjsLuyOavMagSMfBqcl1SvoKSz4s,23384
23
23
  mhd_model/convertors/announcement/v0_1/ms/__init__.py,sha256=da1PTClDMl-IBkrSvq6JC1lnS-K_BASzCvxVhNxN5Ls,13
24
- mhd_model/convertors/announcement/v0_1/ms/mhd2announce.py,sha256=K_2wfe6-zNBNzK0obK7u-n8dZobR4Euvl1EhTV2JA74,20452
24
+ mhd_model/convertors/announcement/v0_1/ms/mhd2announce.py,sha256=GsQL0NBgLElMEbDKv89uVzsYWUSo7Uc9erR_iSpiBdY,20586
25
25
  mhd_model/convertors/mhd/__init__.py,sha256=5wx_vLrBquQF3-1VucrL7RWNCL__l0QXbUEv2xoEPw4,24
26
26
  mhd_model/convertors/mhd/convertor.py,sha256=78h8nkr4SLt-bJyzVXFO7aLoS95gQhFyMsymXZzmdyw,612
27
27
  mhd_model/convertors/neo4j_enabled_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -76,12 +76,12 @@ mhd_model/model/v0_1/sdrf/__init__.py,sha256=fcsk8GEidn0gqm5iO23cR812OSNa-tkCLKn
76
76
  mhd_model/model/v0_1/sdrf/model.py,sha256=5_qsF6WuUy8ctcW-fcexiEZcxjzSESCMgOYyktheSXg,1461
77
77
  mhd_model/schemas/__init__.py,sha256=DrLraaFU_swK6sTXualuQ9TTlEm0FvnjLkFi83F9eaI,18
78
78
  mhd_model/schemas/mhd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
79
- mhd_model/schemas/mhd/announcement-v0.1.legacy-profile.json,sha256=7hGMERmYB79j7Xw1qiZoG0FqDM0KnM9tFJrBhpocjrY,27715
80
- mhd_model/schemas/mhd/announcement-v0.1.ms-profile.json,sha256=X-98VL2ngnr6CJdrQUc_eRnwlFa-dIP0WVd1E9kie1I,50290
81
- mhd_model/schemas/mhd/announcement-v0.1.schema.json,sha256=3czfW923IHSaUrCkYV5MCt6mR-M5JcRA5uVGU8dcEWg,26818
82
- mhd_model/schemas/mhd/common-data-model-v0.1.legacy-profile.json,sha256=EzRoiORYoLDvFeBpvvg3vPm2cQRv4cLsEUgE-Cw_31A,114904
83
- mhd_model/schemas/mhd/common-data-model-v0.1.ms-profile.json,sha256=WSspB6qGs0h2pJIWacNqC5O-Jb-G1oWAIZrURJiIbyM,114896
84
- mhd_model/schemas/mhd/common-data-model-v0.1.schema.json,sha256=hR0yM2cqhWh63RXKmJ3sCQ2prDnvVqbixPovvX9DsuA,114900
79
+ mhd_model/schemas/mhd/announcement-v0.1.legacy-profile.json,sha256=sZxp_MvAPAl7wEUKtNSi_wNicYsuu47xjowv6oaxZv4,27716
80
+ mhd_model/schemas/mhd/announcement-v0.1.ms-profile.json,sha256=Cw3lsXc57fiDIWkdflxWzbo3DGNfUT2HcRHCchjG-B0,50291
81
+ mhd_model/schemas/mhd/announcement-v0.1.schema.json,sha256=_y7iPAvqkItu7pZ7P2G7TqRP5wuQniuBtPBmicZSpZ0,26819
82
+ mhd_model/schemas/mhd/common-data-model-v0.1.legacy-profile.json,sha256=0CMfPVsIWmY_HonN-EB3nuQqlXiqz8qrhQOxQS00HlA,114905
83
+ mhd_model/schemas/mhd/common-data-model-v0.1.ms-profile.json,sha256=VCalpTsRPvR2BWuAgWO4zQU8af7O-2MCeDm3PVCRpVA,114897
84
+ mhd_model/schemas/mhd/common-data-model-v0.1.schema.json,sha256=Wzn7pTDtrxQcazbYcT0OVLg8qu7ZnwmwRdWt9J8hYv8,114901
85
85
  mhd_model/shared/__init__.py,sha256=bpx83kR69nkohpm-ww4Z97-jALGSjXxjkW9IVjdeV1Y,58
86
86
  mhd_model/shared/exceptions.py,sha256=uHbLOLZWzZeHDhM23gyo2oxi_KZ696FgyNGhkIUuKeY,161
87
87
  mhd_model/shared/fields.py,sha256=1S2oQxwFmMJI7AJ3RIUgXORqEFhQcoa6YRmQh74io5w,619
@@ -91,9 +91,9 @@ mhd_model/shared/validation/cv_term_helper.py,sha256=ilDYgh_0cMrRQqmnvAwifCphH4f
91
91
  mhd_model/shared/validation/definitions.py,sha256=ZBq8LsgflIOMrmZZJaKOEirSkoA7XOudngXO5jQnx6Y,5428
92
92
  mhd_model/shared/validation/registry.py,sha256=G90tSEkuS2CHrOjGdE7XQpUfAXzro1hfjFst_UoAkP0,1192
93
93
  mhd_model/shared/validation/validators.py,sha256=IhZe9SNP1x8uLf2Ux1XFp1ugQDO9pHHsZDKhkjQZB9M,29445
94
- mhd_model-0.1.41.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
95
- mhd_model-0.1.41.dist-info/METADATA,sha256=Kq3CF7ag5yy56RFgb8uE4flyyHXiHoXUu2i236i_9Ec,4186
96
- mhd_model-0.1.41.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
97
- mhd_model-0.1.41.dist-info/entry_points.txt,sha256=-F97t5JZgwWwzi15NZOAPaVvNDXR0KvTE_atG8ZYH4w,55
98
- mhd_model-0.1.41.dist-info/top_level.txt,sha256=_ZgHv-VuH4mrsT8J7_fZ8q0-iuOL4aAFu7xtzglEynI,10
99
- mhd_model-0.1.41.dist-info/RECORD,,
94
+ mhd_model-0.1.43.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
95
+ mhd_model-0.1.43.dist-info/METADATA,sha256=dRDp7TJ1W5HwycD4W0SQxLPdm4JLebUNWo-0dUSek8c,4174
96
+ mhd_model-0.1.43.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
97
+ mhd_model-0.1.43.dist-info/entry_points.txt,sha256=-F97t5JZgwWwzi15NZOAPaVvNDXR0KvTE_atG8ZYH4w,55
98
+ mhd_model-0.1.43.dist-info/top_level.txt,sha256=_ZgHv-VuH4mrsT8J7_fZ8q0-iuOL4aAFu7xtzglEynI,10
99
+ mhd_model-0.1.43.dist-info/RECORD,,