mtbls-mhd-integration 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

mtbls2mhd/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "v0.0.9"
+__version__ = "v0.0.11"
 
 import pathlib
 import sys

mtbls2mhd/v0_1/legacy/db_metadata_collector.py

@@ -266,7 +266,9 @@ class DbMetadataCollector(AbstractDbMetadataCollector):
         study_db_metadata.first_private_date = self._get_date_string(
             study["first_private_date"]
         )
-        study_db_metadata.submission_date = study["created_at"]
+        study_db_metadata.submission_date = self._get_date_string(
+            study["submissiondate"]
+        )
 
         study_db_metadata.curation_request = CurationRequest.get_from_int(
             study["curation_request"]
@@ -274,7 +276,7 @@ class DbMetadataCollector(AbstractDbMetadataCollector):
         study_db_metadata.first_public_date = self._get_date_string(
             study["first_public_date"]
         )
-        study_db_metadata.release_date = study["releasedate"]
+        study_db_metadata.release_date = self._get_date_string(study["releasedate"])
         study_db_metadata.update_date = self._get_date_time_string(study["updatedate"])
         study_db_metadata.status_date = self._get_date_time_string(study["status_date"])
         study_db_metadata.submitters = self._create_submitters(submitters)
@@ -294,6 +296,7 @@ class DbMetadataCollector(AbstractDbMetadataCollector):
                 study_db_metadata.dataset_license_version.upper(),
             ),
         )
+
         study_db_metadata.study_category = StudyCategory(study["study_category"])
         study_db_metadata.mhd_model_version = study["mhd_model_version"]
         study_db_metadata.reserved_mhd_accession = study["mhd_accession"] or ""

mtbls2mhd/v0_1/legacy/folder_metadata_collector.py

@@ -118,6 +118,8 @@ class LocalFolderMetadataCollector(AbstractFolderMetadataCollector):
         study_path,
         calculate_data_folder_size: bool = False,
         calculate_metadata_size: bool = False,
+        data_files_path: str = "FILES",
+        data_files_mapping_folder_name: None | str = None,
     ) -> Tuple[Union[None, StudyFolderMetadata], List[GenericMessage]]:
         messages: List[GenericMessage] = []
         study_folder_metadata = StudyFolderMetadata()

{mtbls_mhd_integration-0.0.9.dist-info → mtbls_mhd_integration-0.0.11.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: mtbls-mhd-integration
-Version: 0.0.9
+Version: 0.0.11
 Summary: MetaboLights - MetabolomicsHub Integration
 Author-email: MetaboLights Team <metabolights-help@ebi.ac.uk>
 License-Expression: Apache-2.0
-Requires-Python: >=3.12
+Requires-Python: <4.0,>=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: asyncpg>=0.30.0

{mtbls_mhd_integration-0.0.9.dist-info → mtbls_mhd_integration-0.0.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mtbls2mhd/__init__.py,sha256=KvfDsAinEvq3HDtZ3WLc8EYRuaErlTOyTNo-J1Rp-Ak,157
+mtbls2mhd/__init__.py,sha256=0BFPsjHigJ2_UsW5db4g-LyFf8QbDFBUqvXv4BwGiFw,158
 mtbls2mhd/config.py,sha256=BjOqAyfDhp9byoFjJz70xh4HRR8pu1yrm_5jweqygSI,2310
 mtbls2mhd/convertor_factory.py,sha256=4loatqIRIvIhcaeIS0cSonJNYJu47o56ZllX6593ypk,1133
 mtbls2mhd/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,14 +10,14 @@ mtbls2mhd/v0_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mtbls2mhd/v0_1/legacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mtbls2mhd/v0_1/legacy/builder.py,sha256=IN3z8I3VsDkmLv_XMeDaLVkq88d9yl6hRWilNtNKo-U,85914
 mtbls2mhd/v0_1/legacy/convertor.py,sha256=M4-3NB56C0DN8H5vmM0yC0J_qW87ZImjjL1vzDEBc5s,2208
-mtbls2mhd/v0_1/legacy/db_metadata_collector.py,sha256=h3LbgxLw-ct3qK1uSKjSP2PEpJGMWi7tFmuzgY4eCgc,12998
-mtbls2mhd/v0_1/legacy/folder_metadata_collector.py,sha256=1lELGwTsr12nBGwTog_Z8qi9dLt4awma56vBYoI678k,7439
+mtbls2mhd/v0_1/legacy/db_metadata_collector.py,sha256=UGk1AeST1NQ9lWwy_sYZxaaWs0ajgaKELDJtXJ4-Uco,13071
+mtbls2mhd/v0_1/legacy/folder_metadata_collector.py,sha256=QwtXI9rBvdh6pxILQDHymIwYDqzGuMxqdOcqtdAObME,7538
 mtbls2mhd/v0_1/legacy/mtbls_study_schema.py,sha256=gUTbRmI8GfHI5leLiw8dxsmWnV3NnWw5RPX_LQWRFRQ,3162
 mtbls2mhd/v0_1/ms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mtbls2mhd/v0_1/ms/convertor.py,sha256=kLIUpxOrH6hcs2Y9Bq1D0Mdvypg40pLyEJpHtGj6H_g,89
-mtbls_mhd_integration-0.0.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mtbls_mhd_integration-0.0.9.dist-info/METADATA,sha256=l9_3sTkkbbal1hXD6R3cQJg5HZbfElLIDydwdzo0-t0,682
-mtbls_mhd_integration-0.0.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-mtbls_mhd_integration-0.0.9.dist-info/entry_points.txt,sha256=WQjM4flaYMyvHyv9zGKjCVk1i1_FGdNlhTmFVGgLgxs,61
-mtbls_mhd_integration-0.0.9.dist-info/top_level.txt,sha256=b7pI95n6HIQMFXDD0yL1NwldiDc-XdeWql4Iw-uYygQ,10
-mtbls_mhd_integration-0.0.9.dist-info/RECORD,,
+mtbls_mhd_integration-0.0.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mtbls_mhd_integration-0.0.11.dist-info/METADATA,sha256=e8AHuzd119EKD4I_3au3GbJ2zPNGzQ4e6MZhB5HLsz4,688
+mtbls_mhd_integration-0.0.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mtbls_mhd_integration-0.0.11.dist-info/entry_points.txt,sha256=WQjM4flaYMyvHyv9zGKjCVk1i1_FGdNlhTmFVGgLgxs,61
+mtbls_mhd_integration-0.0.11.dist-info/top_level.txt,sha256=b7pI95n6HIQMFXDD0yL1NwldiDc-XdeWql4Iw-uYygQ,10
+mtbls_mhd_integration-0.0.11.dist-info/RECORD,,