sync codemeta with Codemeta class

Author: mustafasoylu

src/somesy/codemeta/__init__.py

@@ -1,66 +1,4 @@
 """Integration with codemetapy (to re-generate codemeta as part of somesy sync)."""
-import contextlib
-import logging
-from pathlib import Path
+from .create import Codemeta
 
-from ..core.models import SomesyConfig
-from .exec import gen_codemeta
-from .utils import cff_codemeta_tempfile, update_codemeta_file
-
-log = logging.getLogger("somesy")
-
-
-def collect_cm_sources(conf: SomesyConfig):
-    """Assemble list of inputs for codemetapy based on somesy config.
-
-    Returns files that are supported by both somesy and codemetapy and are enabled for somesy.
-    """
-    cm_sources = []
-    if (
-        not conf.no_sync_pyproject
-        and conf.pyproject_file is not None
-        and conf.pyproject_file.is_file()
-    ):
-        cm_sources.append(conf.pyproject_file)
-    # NOTE: we don't add CFF directly, because it must be handled separately
-    # NOTE: add other suitable somesy targets / codemeta sources (except CFF and codemeta) here
-    if (
-        conf.no_sync_package_json
-        and conf.package_json_file is not None
-        and conf.package_json_file.is_file()
-    ):
-        cm_sources.append(conf.package_json_file)
-    return cm_sources
-
-
-def update_codemeta(conf: SomesyConfig):
-    """Generate or update codemeta file based on sources that somesy supports.
-
-    Returns True if file has been written, False if it was up to date.
-    """
-    cm_sources = collect_cm_sources(conf)
-
-    # if cff file is given, convert it to codemeta tempfile and pass as extra input
-    temp_cff_cm = contextlib.nullcontext(None)
-    if not conf.no_sync_cff and conf.cff_file is not None:
-        temp_cff_cm = cff_codemeta_tempfile(conf.cff_file)
-        cm_sources.append(Path(temp_cff_cm.name))
-
-    # run codemetapy
-    with temp_cff_cm:
-        cm_harvest = gen_codemeta(cm_sources)
-
-    # NOTE: once codemetapy is fixed (still broken with 2.5.1), we should not need
-    # update_codemeta_file + codemeta context dump + most of utils.py + their tests anymore
-    # we'll first disable the workaround and see for a while if everything works
-    # as expected, and if it does, the cleanup can be completed.
-    #
-    # save to file with same settings as used by codemetapy
-    # with open(conf.codemeta_file, "w") as f:
-    #     f.write(json.dumps(cm_harvest, indent=4, ensure_ascii=False, sort_keys=True))
-
-    # check output and write file if needed (with workaround checking graph equivalence)
-    return update_codemeta_file(conf.codemeta_file, cm_harvest)
-
-
-__all__ = ["update_codemeta"]
+__all__ = ["Codemeta"]

src/somesy/commands/sync.py

@@ -5,8 +5,8 @@
 from rich.pretty import pretty_repr
 
 from somesy.cff.writer import CFF
-from somesy.codemeta import update_codemeta
-from somesy.core.models import ProjectMetadata, SomesyConfig, SomesyInput
+from somesy.codemeta import Codemeta
+from somesy.core.models import ProjectMetadata, SomesyInput
 from somesy.package_json.writer import PackageJSON
 from somesy.pyproject.writer import Pyproject
 
@@ -30,13 +30,11 @@ def sync(somesy_input: SomesyInput):
         _sync_package_json(metadata, conf.package_json_file)
 
     # create these by default if they are missing:
-
     if not conf.no_sync_cff:
         _sync_cff(metadata, conf.cff_file)
 
-    # NOTE: codemeta should always be last, it uses (some of) the other targets
     if not conf.no_sync_codemeta:
-        _sync_codemeta(conf)
+        _sync_codemeta(metadata, conf.codemeta_file)
 
 
 def _sync_python(
@@ -93,9 +91,19 @@ def _sync_package_json(
     logger.verbose("Saved synced package.json file.\n")
 
 
-def _sync_codemeta(conf: SomesyConfig):
-    logger.verbose("Updating codemeta.json file.")
-    if update_codemeta(conf):
-        logger.verbose(f"New codemeta graph written to {conf.codemeta_file}.")
-    else:
-        logger.verbose(f"Codemeta graph unchanged, keeping old {conf.codemeta_file}.")
+def _sync_codemeta(
+    metadata: ProjectMetadata,
+    codemeta_file: Path,
+):
+    """Sync package.json file using project metadata.
+
+    Args:
+        metadata (ProjectMetadata): project metadata to sync pyproject.toml file.
+        codemeta_file (Path, optional): codemeta.json file path if wanted to be synced. Defaults to None.
+    """
+    logger.verbose("Creating codemeta.json file.")
+    cm = Codemeta(codemeta_file)
+    logger.verbose("Syncing codemeta.json file.")
+    cm.sync(metadata)
+    cm.save()
+    logger.verbose(f"New codemeta graph written to {codemeta_file}.")