Bugfixes and added parameters for generation metadata

Author: andrecsilva

src/codemodder/codetf/v3/codetf.py

@@ -11,6 +11,7 @@
 from ..v2.codetf import AIMetadata as AIMetadatav2
 from ..v2.codetf import ChangeSet as v2ChangeSet
 from ..v2.codetf import CodeTF as CodeTFv2
+from ..v2.codetf import Finding as v2Finding
 from ..v2.codetf import Result
 from ..v2.codetf import Run as Runv2
 
@@ -151,31 +152,55 @@ def from_v2_aimetadata(ai_metadata: AIMetadatav2) -> AIMetadata:
     )
 
 
-def from_v2_result_per_finding(result: Result) -> FixResult | None:
+def from_v2_result_per_finding(
+    result: Result,
+    strategy: Strategy | None = None,
+    ai_metadata: AIMetadata | None = None,
+    provisional: bool | None = None,
+) -> FixResult | None:
     """
     This transformation assumes that the v2 result will only contain a single fixedFinding for all changesets.
     """
+
+    changeset: v2ChangeSet | None = None
+    finding: v2Finding | None = None
     # Find the changeset with a fixedFinding
-    try:
-        changeset: v2ChangeSet = next(cs for cs in result.changeset if cs.fixedFindings)
-    except StopIteration:
-        logger.debug("Either no changesets or no fixedFinding in the given Result")
+    for cs in result.changeset:
+        if cs.fixedFindings:
+            changeset = cs
+            finding = cs.fixedFindings[0]
+            break
+        else:
+            # check each individual change
+            for change in cs.changes:
+                if change.fixedFindings:
+                    changeset = cs
+                    finding = change.fixedFindings[0]
+                    break
+    if changeset is None or finding is None:
+        logger.debug("Either no changesets or fixed finding in the result")
         return None
 
-    assert changeset.fixedFindings
-    finding = changeset.fixedFindings[0]
-
     v3changesets = [
         ChangeSet(
             path=cs.path, diff=cs.diff, changes=[c.to_common() for c in cs.changes]
         )
         for cs in result.changeset
     ]
 
+    # Generate the GenerationMetadata from the changeset if not passed as a parameter
+    fix_result_strategy = strategy or (
+        Strategy.ai if changeset.ai else Strategy.deterministic
+    )
+    fix_result_ai_metadata = ai_metadata or (
+        from_v2_aimetadata(changeset.ai) if changeset.ai else None
+    )
+    fix_result_provisional = provisional or changeset.provisional or False
+
     generation_metadata = GenerationMetadata(
-        strategy=Strategy.ai if changeset.ai else Strategy.deterministic,
-        ai=from_v2_aimetadata(changeset.ai) if changeset.ai else None,
-        provisional=False,
+        strategy=fix_result_strategy,
+        ai=fix_result_ai_metadata,
+        provisional=fix_result_provisional,
     )
 
     fix_metadata = FixMetadata(

tests/test_codetf.py

@@ -23,9 +23,15 @@
     PackageResult,
     Strategy,
 )
+from codemodder.codetf.v3.codetf import (
+    AIMetadata,
+)
 from codemodder.codetf.v3.codetf import Finding as FindingV3
 from codemodder.codetf.v3.codetf import (
     FixStatusType,
+)
+from codemodder.codetf.v3.codetf import Strategy as StrategyV3
+from codemodder.codetf.v3.codetf import (
     from_v2,
     from_v2_result,
     from_v2_result_per_finding,
@@ -376,12 +382,24 @@ def test_v2_result_to_v3_per_finding():
         ],
         unfixedFindings=[],
     )
-    fix_result = from_v2_result_per_finding(result)
+    fix_result = from_v2_result_per_finding(
+        result,
+        strategy=StrategyV3.ai,
+        provisional=True,
+        ai_metadata=AIMetadata(provider="pixee"),
+    )
     assert fix_result
     assert len(fix_result.changeSets) == 3
     all_paths = {cs.path for cs in fix_result.changeSets}
     assert "app/pom.xml" in all_paths
     assert "pom.xml" in all_paths
+    assert fix_result.fixMetadata
+    # Assert that the metadata complies with the passed parameters
+    assert fix_result.fixMetadata.generation.strategy == StrategyV3.ai
+    assert fix_result.fixMetadata.generation.provisional
+    assert fix_result.fixMetadata.generation.ai
+    assert fix_result.fixMetadata.generation.ai.provider
+    assert fix_result.fixMetadata.generation.ai.provider == "pixee"
 
 
 def test_v2_to_v3_conversion():