mtbls-mhd-integration 0.0.8__py3-none-any.whl → 0.0.10__py3-none-any.whl

mtbls2mhd/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "v0.0.8"
+__version__ = "v0.0.10"
 
 import pathlib
 import sys

mtbls2mhd/v0_1/legacy/builder.py

@@ -1970,9 +1970,13 @@ class MhdLegacyDatasetBuilder:
                 study.public_release_date,
                 data.study_db_metadata.release_date,
             )
+        # actual or estimated
+        public_release_date_str = (
+            db_metadata.first_public_date or db_metadata.release_date or None
+        )
         public_release_date = (
-            datetime.datetime.strptime(db_metadata.first_public_date, "%Y-%m-%d")
-            if db_metadata and db_metadata.revision_date
+            datetime.datetime.strptime(public_release_date_str, "%Y-%m-%d")
+            if public_release_date_str
             else None
         )
         submission_date = (

mtbls2mhd/v0_1/legacy/db_metadata_collector.py

@@ -1,4 +1,3 @@
-import asyncio
 from datetime import datetime, timezone
 from functools import lru_cache
 from logging import getLogger
@@ -267,7 +266,7 @@ class DbMetadataCollector(AbstractDbMetadataCollector):
         study_db_metadata.first_private_date = self._get_date_string(
             study["first_private_date"]
         )
-        study_db_metadata.submission_date = study_db_metadata.first_private_date
+        study_db_metadata.submission_date = self.get_date(study["submissiondate"])
 
         study_db_metadata.curation_request = CurationRequest.get_from_int(
             study["curation_request"]
@@ -275,7 +274,7 @@ class DbMetadataCollector(AbstractDbMetadataCollector):
         study_db_metadata.first_public_date = self._get_date_string(
             study["first_public_date"]
         )
-        study_db_metadata.release_date = study_db_metadata.first_public_date
+        study_db_metadata.release_date = self.get_date(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)
@@ -349,9 +348,3 @@ class DbMetadataCollector(AbstractDbMetadataCollector):
         return datetime.fromtimestamp(
             date_value.timestamp(), tz=timezone.utc
         ).isoformat()
-
-
-if __name__ == "__main__":
-    db = DbMetadataCollector()
-    result = asyncio.run(db.get_all_public_study_ids_from_db())
-    logger.info(result)

{mtbls_mhd_integration-0.0.8.dist-info → mtbls_mhd_integration-0.0.10.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: mtbls-mhd-integration
-Version: 0.0.8
+Version: 0.0.10
 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.8.dist-info → mtbls_mhd_integration-0.0.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mtbls2mhd/__init__.py,sha256=mDjtHDCfE_3QFesBvBWtcw8EzAPGRTOVUGCQlzbCiW8,157
+mtbls2mhd/__init__.py,sha256=70_LUTTl8i1CruKiWdtW214TIydnLJWYFAoDrNNVhb0,158
 mtbls2mhd/config.py,sha256=BjOqAyfDhp9byoFjJz70xh4HRR8pu1yrm_5jweqygSI,2310
 mtbls2mhd/convertor_factory.py,sha256=4loatqIRIvIhcaeIS0cSonJNYJu47o56ZllX6593ypk,1133
 mtbls2mhd/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,16 +8,16 @@ mtbls2mhd/commands/create_mhd_file.py,sha256=0sDr-Cm0JhhEB5V1g66uoag3rlcaAnGP8Md
 mtbls2mhd/commands/validate.py,sha256=iwIKegviRxdH0r8scRXbDISlwQUzAq5uVoCHinU7x6Q,473
 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=DIV0v-fo-KnR1k4FSLdg2Mzy5m89b9my8vyAE17Irjo,85784
+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=4OyA_KD2X2zr7AHn8pQZJ0Y2_bW5r2_2wgTtQ93LM6A,13193
+mtbls2mhd/v0_1/legacy/db_metadata_collector.py,sha256=CgCA_7_GQPbbvrHBOW2SYtJhGU2BTR4s_IGHpWN0aLw,13032
 mtbls2mhd/v0_1/legacy/folder_metadata_collector.py,sha256=1lELGwTsr12nBGwTog_Z8qi9dLt4awma56vBYoI678k,7439
 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.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mtbls_mhd_integration-0.0.8.dist-info/METADATA,sha256=OGS4nZ2SvoDfRDP5EtYuq4cqxQHIImwyuClxsKFbPEI,682
-mtbls_mhd_integration-0.0.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-mtbls_mhd_integration-0.0.8.dist-info/entry_points.txt,sha256=WQjM4flaYMyvHyv9zGKjCVk1i1_FGdNlhTmFVGgLgxs,61
-mtbls_mhd_integration-0.0.8.dist-info/top_level.txt,sha256=b7pI95n6HIQMFXDD0yL1NwldiDc-XdeWql4Iw-uYygQ,10
-mtbls_mhd_integration-0.0.8.dist-info/RECORD,,
+mtbls_mhd_integration-0.0.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mtbls_mhd_integration-0.0.10.dist-info/METADATA,sha256=5bH9jtiEApCDeyjg20tG9deRHGJV7DZ73kDksmLPs6w,688
+mtbls_mhd_integration-0.0.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mtbls_mhd_integration-0.0.10.dist-info/entry_points.txt,sha256=WQjM4flaYMyvHyv9zGKjCVk1i1_FGdNlhTmFVGgLgxs,61
+mtbls_mhd_integration-0.0.10.dist-info/top_level.txt,sha256=b7pI95n6HIQMFXDD0yL1NwldiDc-XdeWql4Iw-uYygQ,10
+mtbls_mhd_integration-0.0.10.dist-info/RECORD,,