Remove comment and workspace functions from workspace module

Signed-off-by: vikram@dagger.io <Vikram Vaswani>

Author: vikram@dagger.io

.dagger/src/book/main.py

@@ -98,8 +98,9 @@ async def fix(
         ref: Annotated[str, Doc("Git ref")] | None = None,
         token: Annotated[Secret, Doc("GitHub API token")] | None = None,
     ) -> Result:
+        """Diagnoses the test failures in the source directory and fixes them. If repository, ref and token are provided, opens a PR with the fixes and posts a comment with the changes"""
         if repository and ref and token:
-            fsummary = await self.fix_ci(source, repository, ref, token)
+            fsummary = await self.fix_github(source, repository, ref, token)
             fdirectory = None
         else:
             fdirectory = await self.fix_local(source)
@@ -130,14 +131,14 @@ async def fix_local(
         return await work.env().output("after").as_workspace().container().directory("/app")
 
     @function
-    async def fix_ci(
+    async def fix_github(
         self,
         source: Annotated[dagger.Directory, DefaultPath("/")],
         repository: Annotated[str, Doc("Owner and repository name")],
         ref: Annotated[str, Doc("Git ref")],
         token: Annotated[Secret, Doc("GitHub API token")],
     ) -> str:
-        """Diagnoses the test failures in the source directory and opens a PR with the fixes"""
+        """Diagnoses the test failures in the source repository, opens a PR with the fixes and posts a comment with the changes"""
         environment = (
             dag.env(privileged=True)
             .with_workspace_input("before", dag.workspace(source=source), "the workspace to use for code and tests")
@@ -172,16 +173,13 @@ async def fix_ci(
             .file("/tmp/a.diff")
         )
 
-        #pr_url = await dag.workspace(source=source, token=token).open_pr(repository, ref, diff_file)
+        # open PR with changes
         pr_url = await dag.github_api().create_pr(repository, ref, diff_file, token)
 
-        diff = await diff_file.contents()
-
         # post comment with changes
+        diff = await diff_file.contents()
         comment_body = f"{summary}\n\nDiff:\n\n```{diff}```"
         comment_body += f"\n\nPR with fixes: {pr_url}"
-
-        #comment_url = await dag.workspace(source=source, token=token).comment(repository, ref, comment_body)
         comment_url = await dag.github_api().create_comment(repository, ref, comment_body, token)
 
         return f"Comment posted: {comment_url}"

.dagger/workspace/src/workspace/main.py

@@ -10,13 +10,11 @@
 class Workspace:
     ctr: Container
     source: Directory
-    token: Secret | None = None
 
     @classmethod
     async def create(
         cls,
         source: Annotated[Directory, Doc("The context for the workspace"), DefaultPath("/")],
-        token: Annotated[Secret | None, Doc("GitHub API token")],
     ):
         ctr = (
             dag
@@ -27,7 +25,7 @@ async def create(
             .with_mounted_cache("/root/.cache/pip", dag.cache_volume("python-pip"))
             .with_exec(["pip", "install", "-r", "requirements.txt"])
         )
-        return cls(ctr=ctr, source=source, token=token)
+        return cls(ctr=ctr, source=source)
 
     @function
     async def read_file(
@@ -80,100 +78,6 @@ async def test(self) -> str:
             raise Exception(f"Tests failed. \nError: {stderr} \nOutput: {stdout}")
         return await cmd.stdout()
 
-    @function
-    async def comment(
-        self,
-        repository: Annotated[str, Doc("The owner and repository name")],
-        ref: Annotated[str, Doc("The ref name")],
-        body: Annotated[str, Doc("The comment body")],
-    ) -> str:
-        """Adds a comment to the PR"""
-        #repository_url = f"https://github.com/{repository}"
-        pr_number = int(re.search(r"(\d+)", ref).group(1))
-        plaintext = await self.token.plaintext()
-
-        url = f"https://api.github.com/repos/{repository}/issues/{pr_number}/comments"
-        headers = {
-            "Authorization": f"Bearer {plaintext}",
-            "Accept": "application/vnd.github+json"
-        }
-        data = {
-            "body": body
-        }
-        response = requests.post(url, headers=headers, json=data)
-
-        if response.status_code == 201:
-            return f"{response.json()['html_url']}"
-        else:
-            raise Exception(f"Failed to post comment: {response.status_code} - {response.text}")
-
-
-    @function
-    async def open_pr(
-        self,
-        repository: Annotated[str, Doc("The owner and repository name")],
-        ref: Annotated[str, Doc("The ref name")],
-        diff_file: Annotated[File, Doc("The diff file")],
-    ) -> str:
-        """Creates a new PR with the changes"""
-        plaintext = await self.token.plaintext()
-        pr_number = int(re.search(r"(\d+)", ref).group(1))
-        new_branch = f"patch-from-pr-{pr_number}"
-        remote_url = f"https://${{GITHUB_TOKEN}}@github.com/{repository}.git"
-        diff = await diff_file.contents()
-
-        await (
-            dag
-            .container()
-            .from_("alpine/git")
-            .with_new_file("/tmp/a.diff", f"{diff}")
-            .with_workdir("/app")
-            .with_env_variable("GITHUB_TOKEN", plaintext)
-            .with_exec(["git", "init"])
-            .with_exec(["git", "config", "user.name", "Dagger Agent"])
-            .with_exec(["git", "config", "user.email", "vikram@dagger.io"])
-            .with_exec(["sh", "-c", "git remote add origin " + remote_url])
-            .with_exec(["git", "fetch", "origin", f"pull/{pr_number}/head:{new_branch}"])
-            .with_exec(["git", "checkout", new_branch])
-            .with_exec(["git", "apply", "/tmp/a.diff"])
-            .with_exec(["git", "add", "."])
-            .with_exec(["git", "commit", "-m", f"Fixes PR #{pr_number}"])
-            .with_exec(["git", "push", "--set-upstream", "origin", new_branch])
-            .stdout()
-        )
-
-        headers = {
-            "Authorization": f"Bearer {plaintext}",
-            "Accept": "application/vnd.github+json"
-        }
-        pr_url = f"https://api.github.com/repos/{repository}/pulls/{pr_number}"
-        pr_response = requests.get(pr_url, headers=headers)
-
-        if pr_response.status_code != 200:
-            raise Exception(f"Failed to fetch original PR: {pr_response.text}")
-
-        pr_data = pr_response.json()
-        base_branch = pr_data["head"]["ref"]
-
-        create_pr_url = f"https://api.github.com/repos/{repository}/pulls"
-        head_user = repository.split("/")[0]
-        head = f"{head_user}:{new_branch}"
-
-        payload = {
-            "title": f"Automated follow-up to PR #{pr_number}",
-            "body": f"This PR fixes PR #{pr_number} using `{new_branch}`.",
-            "head": head,
-            "base": base_branch
-        }
-
-        create_response = requests.post(create_pr_url, headers=headers, json=payload)
-        if create_response.status_code != 201:
-            raise Exception(f"Failed to create new PR: {create_response.text}")
-
-        new_pr = create_response.json()
-        return f"{new_pr['html_url']}"
-
-
     @function
     def container(
         self

.github/workflows/dagger.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           version: "0.18.16"
           verb: call
-          args: fix-ci --repository=$GITHUB_REPOSITORY --ref=$GITHUB_REF_NAME --token=env://GITHUB_API_TOKEN
+          args: fix --repository=$GITHUB_REPOSITORY --ref=$GITHUB_REF_NAME --token=env://GITHUB_API_TOKEN
           cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}