Drop PythonDependencyExecutionContextView and unused PyProjectHelper helpers

Author: knutwannheden

rewrite-python/src/main/java/org/openrewrite/python/internal/PyProjectHelper.java

@@ -20,7 +20,6 @@
 import org.openrewrite.*;
 import org.openrewrite.json.JsonParser;
 import org.openrewrite.json.tree.Json;
-import org.openrewrite.marker.Markup;
 import org.openrewrite.python.PipfileParser;
 import org.openrewrite.python.marker.PythonResolutionResult;
 import org.openrewrite.python.marker.PythonResolutionResult.Dependency;
@@ -94,111 +93,6 @@ public static Path correspondingPipfilePath(Path pipfileLockPath) {
         return pipfileLockPath.resolveSibling("Pipfile");
     }
 
-    /**
-     * If {@code tree} is a Python lock file (uv.lock or Pipfile.lock), capture
-     * its current content into the shared {@link PythonDependencyExecutionContextView}
-     * so downstream recipes can seed regeneration from it.
-     *
-     * @return {@code true} when the tree was recognized as a lock file
-     */
-    /**
-     * @deprecated Tied to the old {@link PythonDependencyExecutionContextView}-based design;
-     * to be deleted in Task 8 of the Accumulator rework. New recipes should mirror
-     * {@code AddDependency} and capture lock content directly into their {@code Accumulator}.
-     */
-    @Deprecated
-    public static boolean captureExistingLockContent(SourceFile sourceFile, Tree tree, ExecutionContext ctx) {
-        Path sourcePath = sourceFile.getSourcePath();
-        if (tree instanceof Toml.Document && sourcePath.endsWith("uv.lock")) {
-            PythonDependencyExecutionContextView.view(ctx).getExistingLockContents().put(
-                    correspondingPyprojectPath(sourcePath),
-                    ((Toml.Document) tree).printAll());
-            return true;
-        }
-        if (tree instanceof Json.Document && sourcePath.endsWith("Pipfile.lock")) {
-            PythonDependencyExecutionContextView.view(ctx).getExistingLockContents().put(
-                    correspondingPipfilePath(sourcePath),
-                    ((Json.Document) tree).printAll());
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * If a previous visitor regenerated lock content for this file, replay it here.
-     * Returns the updated tree, or {@code null} if the tree is not a lock file or
-     * there is no pending update.
-     */
-    /**
-     * @deprecated See {@link #captureExistingLockContent}. Use the visitor lock-branch
-     * pattern in {@code AddDependency} instead.
-     */
-    @Deprecated
-    public static @Nullable Tree maybeReplayLockContent(Tree tree, ExecutionContext ctx) {
-        if (tree instanceof Toml.Document) {
-            Toml.Document doc = (Toml.Document) tree;
-            if (doc.getSourcePath().endsWith("uv.lock")) {
-                return maybeUpdateUvLock(doc, ctx);
-            }
-        }
-        if (tree instanceof Json.Document) {
-            Json.Document doc = (Json.Document) tree;
-            if (doc.getSourcePath().endsWith("Pipfile.lock")) {
-                return maybeUpdatePipfileLock(doc, ctx);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * If there is regenerated uv.lock content for this document, reparse the document
-     * from that content. Returns {@code null} when no update is needed (either no
-     * regenerated content exists, or the current document already matches).
-     * <p>
-     * After reparsing, the stored content is normalized to the printer output so that
-     * subsequent recipe cycles see identical content and do not trigger spurious changes.
-     */
-    /** @deprecated See {@link #captureExistingLockContent}. */
-    @Deprecated
-    public static Toml.@Nullable Document maybeUpdateUvLock(Toml.Document document, ExecutionContext ctx) {
-        PythonDependencyExecutionContextView view = PythonDependencyExecutionContextView.view(ctx);
-        Path pyprojectPath = correspondingPyprojectPath(document.getSourcePath());
-        String newContent = view.getUpdatedLockFiles().get(pyprojectPath);
-        if (newContent == null) {
-            return null;
-        }
-        Toml.Document reparsed = reparseToml(document, newContent);
-        String reparsedContent = reparsed.printAll();
-        if (reparsedContent.equals(document.printAll())) {
-            return null;
-        }
-        // Normalize stored content to printer output for round-trip stability
-        view.getUpdatedLockFiles().put(pyprojectPath, reparsedContent);
-        return reparsed;
-    }
-
-    /**
-     * If there is regenerated Pipfile.lock content for this document, reparse the
-     * document from that content. Returns {@code null} when no update is needed.
-     */
-    /** @deprecated See {@link #captureExistingLockContent}. */
-    @Deprecated
-    public static Json.@Nullable Document maybeUpdatePipfileLock(Json.Document document, ExecutionContext ctx) {
-        PythonDependencyExecutionContextView view = PythonDependencyExecutionContextView.view(ctx);
-        Path pipfilePath = correspondingPipfilePath(document.getSourcePath());
-        String newContent = view.getUpdatedLockFiles().get(pipfilePath);
-        if (newContent == null) {
-            return null;
-        }
-        Json.Document reparsed = reparseJson(document, newContent);
-        String reparsedContent = reparsed.printAll();
-        if (reparsedContent.equals(document.printAll())) {
-            return null;
-        }
-        view.getUpdatedLockFiles().put(pipfilePath, reparsedContent);
-        return reparsed;
-    }
-
     /**
      * Reparse a JSON document from new content while preserving the original document's
      * identity (id) and markers.
@@ -367,116 +261,6 @@ public static EditAndRegenerateResult changed(
         return regen.regenerate(depsFile.printAll(), capturedLockContent);
     }
 
-    /**
-     * After modifying a pyproject.toml document, regenerate the uv.lock file and
-     * refresh the {@link PythonResolutionResult} marker. Returns the updated document.
-     * <p>
-     * Lock file state is shared across all Python dependency recipes via the
-     * {@link ExecutionContext}, so sequential recipes in a composite correctly
-     * build on each other's lock regeneration results.
-     *
-     * @param updated the modified pyproject.toml document
-     * @param ctx     the execution context holding shared lock file state
-     * @return the document with refreshed marker (and possibly a warning markup)
-     */
-    /** @deprecated See {@link #captureExistingLockContent}. Use {@link #editAndRegenerate} from the Accumulator pattern. */
-    @Deprecated
-    public static Toml.Document regenerateLockAndRefreshMarker(
-            Toml.Document updated,
-            ExecutionContext ctx) {
-        PythonDependencyExecutionContextView view = PythonDependencyExecutionContextView.view(ctx);
-        Map<Path, String> updatedLockFiles = view.getUpdatedLockFiles();
-        Map<Path, String> existingLockContents = view.getExistingLockContents();
-
-        PythonResolutionResult marker = updated.getMarkers()
-                .findFirst(PythonResolutionResult.class).orElse(null);
-
-        Path sourcePath = updated.getSourcePath();
-
-        // Attempt lock regeneration when we know a uv.lock exists — either
-        // captured during scanning or already regenerated by a prior recipe
-        boolean lockKnown = existingLockContents.containsKey(sourcePath) ||
-                updatedLockFiles.containsKey(sourcePath) ||
-                (marker != null && !marker.getResolvedDependencies().isEmpty());
-
-        if (marker != null && lockKnown) {
-            String pyprojectContent = updated.printAll();
-            // Prefer the most recently regenerated lock; fall back to original
-            String seedLock = updatedLockFiles.getOrDefault(sourcePath,
-                    existingLockContents.get(sourcePath));
-
-            LockFileRegeneration.Result lockResult = LockFileRegeneration.UV.regenerate(pyprojectContent, seedLock);
-            if (lockResult.isSuccess()) {
-                updatedLockFiles.put(sourcePath, lockResult.getLockFileContent());
-                existingLockContents.put(sourcePath, lockResult.getLockFileContent());
-            } else {
-                updated = Markup.warn(updated, new RuntimeException(
-                        "uv lock regeneration failed: " + lockResult.getErrorMessage()));
-            }
-        }
-
-        if (marker != null) {
-            PythonResolutionResult newMarker = PythonDependencyParser.createMarker(updated, null);
-            if (newMarker != null) {
-                updated = updated.withMarkers(updated.getMarkers().setByType(newMarker.withId(marker.getId())));
-            }
-        }
-
-        return updated;
-    }
-
-    /**
-     * After modifying a Pipfile document, regenerate the Pipfile.lock file and
-     * refresh the {@link PythonResolutionResult} marker. Returns the updated document.
-     * <p>
-     * The {@code markerFactory} callback rebuilds the marker from the updated
-     * Pipfile contents — passed in to avoid coupling this internal class to the
-     * public {@code PipfileParser}.
-     */
-    /** @deprecated See {@link #regenerateLockAndRefreshMarker}. */
-    @Deprecated
-    public static Toml.Document regeneratePipfileLockAndRefreshMarker(
-            Toml.Document updated,
-            ExecutionContext ctx,
-            Function<Toml.Document, PythonResolutionResult> markerFactory) {
-        PythonDependencyExecutionContextView view = PythonDependencyExecutionContextView.view(ctx);
-        Map<Path, String> updatedLockFiles = view.getUpdatedLockFiles();
-        Map<Path, String> existingLockContents = view.getExistingLockContents();
-
-        PythonResolutionResult marker = updated.getMarkers()
-                .findFirst(PythonResolutionResult.class).orElse(null);
-
-        Path sourcePath = updated.getSourcePath();
-
-        boolean lockKnown = existingLockContents.containsKey(sourcePath) ||
-                updatedLockFiles.containsKey(sourcePath) ||
-                (marker != null && !marker.getResolvedDependencies().isEmpty());
-
-        if (marker != null && lockKnown) {
-            String pipfileContent = updated.printAll();
-            String seedLock = updatedLockFiles.getOrDefault(sourcePath,
-                    existingLockContents.get(sourcePath));
-
-            LockFileRegeneration.Result lockResult = LockFileRegeneration.PIPENV.regenerate(pipfileContent, seedLock);
-            if (lockResult.isSuccess()) {
-                updatedLockFiles.put(sourcePath, lockResult.getLockFileContent());
-                existingLockContents.put(sourcePath, lockResult.getLockFileContent());
-            } else {
-                updated = Markup.warn(updated, new RuntimeException(
-                        "pipenv lock regeneration failed: " + lockResult.getErrorMessage()));
-            }
-        }
-
-        if (marker != null) {
-            PythonResolutionResult newMarker = markerFactory.apply(updated);
-            if (newMarker != null) {
-                updated = updated.withMarkers(updated.getMarkers().setByType(newMarker.withId(marker.getId())));
-            }
-        }
-
-        return updated;
-    }
-
     /**
      * Check whether a cursor path represents a position inside
      * the {@code [project].dependencies} array in a pyproject.toml.