commonmeta-py 0.61__py3-none-any.whl → 0.63__py3-none-any.whl

commonmeta/__init__.py

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.61"
+__version__ = "0.63"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

commonmeta/constants.py

@@ -408,11 +408,32 @@ SO_TO_CM_TRANSLATIONS = {
     "DigitalDocument": "Document",
     "Dissertation": "Dissertation",
     "Instrument": "Instrument",
+    "MusicRecording": "Audiovisual",
+    "MusicAlbum": "Audiovisual",
     "NewsArticle": "Article",
     "Legislation": "LegalDocument",
+    "ProfilePage": "WebPage",
     "Report": "Report",
     "ScholarlyArticle": "JournalArticle",
     "SoftwareSourceCode": "Software",
+    "Video": "Audiovisual",
+    "WebSite": "WebPage",
+}
+
+# OpenGraph to schema.org mapping
+OG_TO_SO_TRANSLATIONS = {
+    "music.song": "MusicRecording",
+    "music.album": "MusicAlbum",
+    "music.playlist": "MusicPlaylist",
+    "music.radio_station": "RadioStation",
+    "video.movie": "Video",
+    "video.episode": "Video",
+    "video.tv_show": "Video",
+    "video.other": "Video",
+    "article": "Article",
+    "book": "Book",
+    "profile": "ProfilePage",
+    "website": "WebSite",
 }
 
 CM_TO_SO_TRANSLATIONS = {

commonmeta/readers/schema_org_reader.py

@@ -36,6 +36,7 @@ from ..constants import (
     SO_TO_CM_TRANSLATIONS,
     SO_TO_DC_RELATION_TYPES,
     SO_TO_DC_REVERSE_RELATION_TYPES,
+    OG_TO_SO_TRANSLATIONS,
     Commonmeta,
 )
 
@@ -59,7 +60,6 @@ def get_schema_org(pid: str, **kwargs) -> dict:
             "via": "schema_org",
             "errors": [str(error)],
         }
-
     if response.status_code >= 400:
         if response.status_code in [404, 410]:
             state = "not_found"
@@ -105,7 +105,7 @@ def get_schema_org(pid: str, **kwargs) -> dict:
 
     # load html meta tags
     data = get_html_meta(soup)
-
+    print(data)
     # load site-specific metadata
     data |= web_translator(soup, url)
 
@@ -119,6 +119,7 @@ def get_schema_org(pid: str, **kwargs) -> dict:
         None,
     )
     if json_ld is not None:
+        print(json_ld)
         data |= json_ld
 
     # if @id is a DOI, get metadata from Crossref or DataCite
@@ -136,7 +137,7 @@ def get_schema_org(pid: str, **kwargs) -> dict:
     # author and creator are synonyms
     if data.get("author", None) is None and data.get("creator", None) is not None:
         data["author"] = data["creator"]
-
+    print(data)
     return data | {"via": "schema_org", "state": "findable"}
 
 
@@ -412,11 +413,13 @@ def get_html_meta(soup):
         data["@id"] = normalize_id(pid)
 
     _type = (
-        soup.select_one("meta[property='og:type']")
-        or soup.select_one("meta[name='dc.type']")
+        soup.select_one("meta[name='dc.type']")
         or soup.select_one("meta[name='DC.type']")
     )
     data["@type"] = _type["content"].capitalize() if _type else None
+    if _type is None:
+        _type = soup.select_one("meta[property='og:type']")
+        data["@type"] = OG_TO_SO_TRANSLATIONS.get(_type["content"]) if _type else None
 
     url = soup.select_one("meta[property='og:url']") or soup.select_one(
         "meta[name='twitter:url']"
@@ -431,6 +434,7 @@ def get_html_meta(soup):
         or soup.select_one("meta[name='DC.title']")
         or soup.select_one("meta[property='og:title']")
         or soup.select_one("meta[name='twitter:title']")
+        or soup.select_one("meta[name='title']")
     )
     data["name"] = title["content"] if title else None
 
@@ -441,6 +445,7 @@ def get_html_meta(soup):
         "meta[name='dc.description']"
         or soup.select_one("meta[property='og:description']")
         or soup.select_one("meta[name='twitter:description']")
+        or soup.select_one("meta[name='description']")
     )
     data["description"] = description["content"] if description else None
 

commonmeta/writers/csl_writer.py

@@ -33,6 +33,8 @@ def write_csl_item(metadata) -> Optional[dict]:
 
     container = metadata.container or {}
     publisher = metadata.publisher or {}
+    date = metadata.date or {}
+
     return compact(
         {
             "type": _type,
@@ -47,14 +49,14 @@ def write_csl_item(metadata) -> Optional[dict]:
             "language": metadata.language,
             "author": author,
             # "contributor": to_csl(wrap(metadata.contributors)),
-            "issued": get_date_parts(metadata.date.get("published"))
-            if metadata.date.get("published", None)
+            "issued": get_date_parts(date.get("published"))
+            if date.get("published", None)
             else None,
-            "submitted": get_date_parts(metadata.date.get("submitted"))
-            if metadata.date.get("submitted", None)
+            "submitted": get_date_parts(date.get("submitted"))
+            if date.get("submitted", None)
             else None,
-            "accessed": get_date_parts(metadata.date.get("accessed"))
-            if metadata.date.get("accessed", None)
+            "accessed": get_date_parts(date.get("accessed"))
+            if date.get("accessed", None)
             else None,
             "abstract": parse_attributes(
                 metadata.descriptions, content="description", first=True

{commonmeta_py-0.61.dist-info → commonmeta_py-0.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.61
+Version: 0.63
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Home-page: https://python.commonmeta.org
 License: MIT

{commonmeta_py-0.61.dist-info → commonmeta_py-0.63.dist-info}/RECORD

@@ -1,9 +1,9 @@
-commonmeta/__init__.py,sha256=mpMVDsuOZKg_uoM4S0GKd7huJDFJqyJmX4ER-SIp1wc,1795
+commonmeta/__init__.py,sha256=Vn41OSNVhIRsKaPeFCbK6z9ms3fO0VD2e_p8lSoBe90,1795
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=zBIPTgP5n7Zx57xomJ2h7x0dvC0AV8gJ2gPoYeDy5Lo,8348
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
 commonmeta/cli.py,sha256=sOI9BJTePnljVcXcZ95N7TKXDT283XpjUaak7bMnbr0,6076
-commonmeta/constants.py,sha256=VfjXLkwoV4A5uztH3vgDJ_qrt7PaWGO6QtHbAt4r03c,17501
+commonmeta/constants.py,sha256=AFm8gSo4WGnTdJOm1SOGLK602BctcQbaWU_tKCkgn_4,18087
 commonmeta/crossref_utils.py,sha256=qJlTZtfKR2shAXQDm8VBYUujKFkTtZTUz19GuMUANaI,22198
 commonmeta/date_utils.py,sha256=rJRV4YmWKQWU__iAV8www3cqwaefC0iRKyHwvxrr_XY,6316
 commonmeta/doi_utils.py,sha256=xlYQq-qkqhz07CLKpL_WfxZBT8maXgB9-TvQHlL2ZoY,9266
@@ -22,7 +22,7 @@ commonmeta/readers/inveniordm_reader.py,sha256=jzv0rXzT8OCdPD_MShBXTnlwD-F9tpTX7
 commonmeta/readers/json_feed_reader.py,sha256=ctlASyxByjXDVgREzdeYOCZezn9aFFv3yKogDFd8WNs,14174
 commonmeta/readers/kbase_reader.py,sha256=ehKXQsJyPCtaq2FmBxNb2Jb5Nktpx8pNscpmEM6N0A4,6763
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
-commonmeta/readers/schema_org_reader.py,sha256=xyWzO2XAWlI2pYVl2EbVRsUmfiWXEwP64CHRBQNRN-M,16835
+commonmeta/readers/schema_org_reader.py,sha256=udvRBeEnsyRmy5UOIk523f7x08RRLvxqTCMMS736oFs,17132
 commonmeta/resources/cff_v1.2.0.json,sha256=MpfjDYgX7fN9PLiG54ISZ2uu9WItNqfh-yaRuTf6Ptg,46691
 commonmeta/resources/commonmeta_v0.12.json,sha256=HUSNReXh2JN3Q6YWSt7CE69js8dh50OlpMYGTyU98oU,16762
 commonmeta/resources/commonmeta_v0.13.json,sha256=2-WSZGijR13zVu97S_YHXr-cyeLW7hzHXYMlr6nIjdw,15787
@@ -64,13 +64,13 @@ commonmeta/writers/bibtex_writer.py,sha256=s3hIJIgWvSG7TAriZMRQEAyuitw6ebwWSI1Yc
 commonmeta/writers/citation_writer.py,sha256=RjaNh9EALxq6gfODLRWVJxGxPArGd6ZiHUlkYnCT6MA,2355
 commonmeta/writers/commonmeta_writer.py,sha256=2qlttCfYpGhfVjrYkjzbIra7AywssRLT30FlxEWgXGw,1844
 commonmeta/writers/crossref_xml_writer.py,sha256=0Ds494RnXfdfjWw5CLX1kwV2zP7gqffdVqO-X74Uc6c,492
-commonmeta/writers/csl_writer.py,sha256=rlCeShkvC6ui9By0yVfNCMay_JfaZ4AooUPOPg-g-2M,2819
+commonmeta/writers/csl_writer.py,sha256=6N-93R1emcOsZrUTIhPBVd_Fv1C8Z5EAFYI0mYjoYaY,2797
 commonmeta/writers/datacite_writer.py,sha256=G7Lr0aZ4sAEdbfXe3dG4Y6AyGUKA9UWr_iiaQRDnV24,6233
 commonmeta/writers/inveniordm_writer.py,sha256=oVcXdHYtuugbfDgKO8JwTRXmP7AK2U96uK4YF0eKXAY,11399
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.61.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.61.dist-info/METADATA,sha256=y-HIlL_4UrT-S2JKmeR88cqbEvQHkYA4petMmujIoCw,8279
-commonmeta_py-0.61.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-commonmeta_py-0.61.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.61.dist-info/RECORD,,
+commonmeta_py-0.63.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.63.dist-info/METADATA,sha256=RQXKld5RnUdijPEzxt4KFE8qoZ9i0MkWTB3hmk2f12k,8279
+commonmeta_py-0.63.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+commonmeta_py-0.63.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.63.dist-info/RECORD,,