bump and record outputs

Author: CTY-git

patchwork/app.py

@@ -238,9 +238,10 @@ def cli(
             if not disable_telemetry:
                 patched.send_public_telemetry(patchflow_name, inputs)
 
-            with patched.patched_telemetry(patchflow_name, {}):
+            with patched.patched_telemetry(patchflow_name, {}) as output_dict:
                 patchflow_instance = patchflow_class(inputs)
-                patchflow_instance.run()
+                patchflow_output = patchflow_instance.run()
+                output_dict.update(patchflow_output)
         except Exception as e:
             logger.debug(traceback.format_exc())
             logger.error(f"Error running patchflow {patchflow}: {e}")

patchwork/common/client/patched.py

@@ -76,6 +76,10 @@ class PatchedClient(click.ParamType):
     ALLOWED_TELEMETRY_KEYS = {
         "model",
     }
+    ALLOWED_TELEMETRY_OUTPUT_KEYS = {
+        "pr_url",
+        "issue_url",
+    }
 
     def __init__(self, access_token: str, url: str = DEFAULT_PATCH_URL):
         self.access_token = access_token
@@ -140,6 +144,15 @@ def __handle_telemetry_inputs(self, inputs: dict[str, Any]) -> dict:
 
         return inputs_copy
 
+    def __handle_telemetry_outputs(self, outputs: dict[str, Any]) -> dict:
+        diff_keys = set(outputs.keys()).difference(self.ALLOWED_TELEMETRY_KEYS)
+
+        outputs_copy = outputs.copy()
+        for key in diff_keys:
+            del outputs_copy[key]
+
+        return outputs_copy
+
     async def _public_telemetry(self, patchflow: str, inputs: dict[str, Any]):
         user_config = get_user_config()
         requests.post(
@@ -169,38 +182,42 @@ def send_public_telemetry(self, patchflow: str, inputs: dict):
 
     @contextlib.contextmanager
     def patched_telemetry(self, patchflow: str, inputs: dict):
+        outputs = dict()
+
         if not self.access_token:
-            yield
+            yield outputs
             return
 
         try:
             is_valid_client = self.test_token()
         except Exception as e:
             logger.error(f"Access Token test failed: {e}")
-            yield
+            yield outputs
             return
 
         if not is_valid_client:
-            yield
+            yield outputs
             return
 
         try:
             repo = Repo(Path.cwd(), search_parent_directories=True)
             patchflow_run_id = self.record_patchflow_run(patchflow, repo, self.__handle_telemetry_inputs(inputs))
         except Exception as e:
             logger.error(f"Failed to record patchflow run: {e}")
-            yield
+            yield outputs
             return
 
         if patchflow_run_id is None:
-            yield
+            yield outputs
             return
 
         try:
-            yield
+            yield outputs
         finally:
             try:
-                self.finish_record_patchflow_run(patchflow_run_id, patchflow, repo)
+                self.finish_record_patchflow_run(
+                    patchflow_run_id, patchflow, repo, self.__handle_telemetry_outputs(outputs)
+                )
             except Exception as e:
                 logger.error(f"Failed to finish patchflow run: {e}")
 
@@ -222,16 +239,17 @@ def record_patchflow_run(self, patchflow: str, repo: Repo, inputs: dict) -> int
             return None
 
         logger.debug(f"Patchflow run recorded for {patchflow}")
-        return response.json()["id"]
+        return response.json().get("id")
 
-    def finish_record_patchflow_run(self, id: int, patchflow: str, repo: Repo) -> None:
+    def finish_record_patchflow_run(self, id: int, patchflow: str, repo: Repo, outputs: dict) -> None:
         response = self._post(
             url=self.url + "/v1/patchwork/",
             headers={"Authorization": f"Bearer {self.access_token}"},
             json={
                 "id": id,
                 "url": repo.remotes.origin.url,
                 "patchflow": patchflow,
+                "outputs": outputs
             },
         )
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "patchwork-cli"
-version = "0.0.84.dev1"
+version = "0.0.84.dev2"
 description = ""
 authors = ["patched.codes"]
 license = "AGPL"