Merge pull request #393 from DSD-DBS/t4c-commit-mapping

feat: Map TeamForCapella commits 1:1 to Git commits

Author: MoritzWeber0

cli/cdi/jupyter/build.py

@@ -34,6 +34,7 @@ def jupyter(
     base_image_tag = base_image_tag.format(
         cdi_revision=git.get_current_cdi_revision()
     )
+    image_tag = image_tag.format(cdi_revision=git.get_current_cdi_revision())
 
     if not skip_base_image:
         base_build.command(

cli/cdi/jupyter/run.py

@@ -6,7 +6,7 @@
 
 import typer
 
-from cdi import args, docker, helpers
+from cdi import args, docker, git, helpers
 from cdi import logging as _logging
 from cdi.base import args as base_args
 from cdi.jupyter import build as jupyter_builder
@@ -40,6 +40,7 @@ def jupyter(
     _verbose: _logging.VerboseOption = False,
 ) -> None:
     helpers.print_cli_options(locals(), "running Jupyter")
+    image_tag = image_tag.format(cdi_revision=git.get_current_cdi_revision())
 
     if not skip_build:
         jupyter_builder.jupyter(

cli/cdi/syncer/args.py

@@ -156,3 +156,24 @@ class FileHandler(str, enum.Enum):
         dir_okay=True,
     ),
 ]
+
+
+class CommitMapping(str, enum.Enum):
+    EXACT = "exact"
+    GROUPED = "grouped"
+
+
+CommitMappingOption = t.Annotated[
+    CommitMapping,
+    typer.Option(
+        "--commit-mapping",
+        help=(
+            "Specify the commit mapping of T4C to Git commits."
+            " With the 'exact' option, every TeamForCapella commit is mapped to an individual Git commit."
+            " The 'exact' option is limited to 20 commits. If there are more than 20 T4C commits since the last run,"
+            " it falls back to the 'grouped' option. The 'grouped' option creates one Git commit with all T4C changes since"
+            " the last commit."
+        ),
+        rich_help_panel="Importer Options",
+    ),
+]

cli/cdi/syncer/run.py

@@ -218,6 +218,7 @@ def t4c2git(
     t4c_server_port: syncer_args.T4CServerPortOption = 2036,
     t4c_username: syncer_args.T4CUsername = "admin",
     t4c_password: syncer_args.T4CPassword = None,
+    commit_mapping: syncer_args.CommitMappingOption = syncer_args.CommitMapping.EXACT,
     _verbose: _logging.VerboseOption = False,
 ) -> None:
     helpers.print_cli_options(locals(), "running T4C Importer")
@@ -320,6 +321,8 @@ def t4c2git(
     environment["T4C_USERNAME"] = t4c_username
     environment["T4C_PASSWORD"] = t4c_password
 
+    environment["CDI_COMMIT_MAPPING"] = commit_mapping.value
+
     if debug:
         volumes[pathlib.Path("./t4c/t4c_cli")] = pathlib.PurePosixPath(
             "/opt/.venv/lib/python3.11/site-packages/t4c_cli"

cli/pyproject.toml

@@ -50,10 +50,6 @@ exclude_also = [
 ]
 skip_covered = true
 
-[tool.docformatter]
-wrap-descriptions = 72
-wrap-summaries = 79
-
 [tool.mypy]
 check_untyped_defs = true
 disallow_incomplete_defs = true