comfy-pr 0.2.17 → 0.2.18

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.2.18](https://github.com/drip-art/Comfy-Registry-PR/compare/v0.2.17...v0.2.18) (2024-06-27)
+
+### Bug Fixes
+
+- **follow-rules:** add matcher fields into follow-rule ([4d7bbe7](https://github.com/drip-art/Comfy-Registry-PR/commit/4d7bbe7b941242cbb8edcd73ead6df61d26824df))
+- **is-already-sent-totals-today:** notify if today is not already noti ([33cec0a](https://github.com/drip-art/Comfy-Registry-PR/commit/33cec0adde44612ca66213ce989d0d25f7549aec))
+- **main:** env file tips ([02636f3](https://github.com/drip-art/Comfy-Registry-PR/commit/02636f3beb2efddcb2de69b3dece02816f542b49))
+- **main:** update follow up rule matcher ([57302c3](https://github.com/drip-art/Comfy-Registry-PR/commit/57302c30a119f3275c4626d4f09123f6ac2d7aed))
+- **toml-template-v3:** update template ts file ([24df794](https://github.com/drip-art/Comfy-Registry-PR/commit/24df794851cc6b7190bc0fb3c75ef02a76fed926))
+
 ### [0.2.17](https://github.com/drip-art/Comfy-Registry-PR/compare/v0.2.8...v0.2.17) (2024-06-24)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "comfy-pr",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "Make PRs that publishes ComfyUI Custom Nodes to [ComfyUI Registry]( https://www.comfyregistry.org/ ).",
   "keywords": [],
   "license": "ISC",

package/src/analyzePullsStatus.ts

@@ -13,12 +13,15 @@ import type { zPullStatus } from "./zod/zPullsStatus";
 export const DashboardDetails = db.collection<any>("DashboardDetails");
 if (import.meta.main) {
   const r = peekYaml(await analyzePullsStatus());
+  
   // await mkdir(".cache").catch(() => null);
   // await writeFile(".cache/dump.yaml", YAML.stringify(r));
   // await writeFile(".cache/dump.csv", csvFormat(r));
   // console.log("done");
   // generate zod schema
   // await writeFile("src/zPullsStatus.ts", jsonToZod(await analyzePullsStatus({ limit: 1 }), "zPullsStatus", true));
+
+  // analyzePullsStatusPipeline
 }
 
 export type PullStatus = z.infer<typeof zPullStatus>;
@@ -75,6 +78,7 @@ export function analyzePullsStatusPipeline() {
         ownername: "$base.user.login",
         head: { $concat: ["$user.login", ":", "$type"] },
         comments: { $size: "$comments" },
+        comments_authors: "$comments.user.login",
         lastwords: { $arrayElemAt: ["$comments", -1] },
         latest_comment_at: { $toDate: "$latest_comment_at" },
         actived_at: 1,
@@ -94,19 +98,20 @@ export function analyzePullsStatusPipeline() {
       .sort({ OPEN: -1, MERGED: -1, CLOSED: -1, updated_at: 1 })
       .unset(["CLOSED", "MERGED", "OPEN"])
       .as<{
-        updated_at: Date;
-        created_at: Date;
         actived_at: Date;
-        repository: string;
         author_email: string;
-        ownername: string;
-        on_registry: boolean;
+        comments: number;
+        created_at: Date;
+        head: string;
+        lastwords: string;
         on_registry_at: Date;
+        on_registry: boolean;
+        comments_authors: string;
+        ownername: string;
+        repository: string;
         state: "OPEN" | "MERGED" | "CLOSED";
+        updated_at: Date;
         url: string;
-        head: string;
-        comments: number;
-        lastwords: string;
       }>()
     // .stage({ ...(!!skip && { $skip: skip }) })
     // .stage({ ...(!!limit && { $limit: limit }) })

package/src/followRuleSchema.ts

@@ -34,12 +34,17 @@ const zFollowUpRule = z.object({
   name: z.string(),
   $match: z
     .object({
-      state: z.enum(["OPEN", "CLOSED", "MERGED"]),
+      actived_at: mDate,
+      author_email: mString,
+      comments: mNumber,
+      created_at: mDate,
+      head: mString,
+      lastwords: mString,
       on_registry: z.boolean(),
+      ownername: mString,
+      state: z.enum(["OPEN", "CLOSED", "MERGED"]),
       updated_at: mDate,
-      lastwords: mString,
-      head: mString,
-      comments: mNumber,
+      url: mString,
     })
     .strict()
     .partial(),

package/src/updateComfyTotals.ts

@@ -11,6 +11,7 @@ if (import.meta.main) {
 }
 
 export async function updateComfyTotals({ notify = true, fresh = "30m" } = {}) {
+  await Totals.createIndex({today: 1, "totals.mtime": 1, "totals.state": 1})
   const today = new Date().toISOString().split("T")[0];
   const cached = await Totals.findOne($filaten({ today, totals: { mtime: $fresh(fresh), ...$OK } }));
   if (cached?.totals?.state === "ok")
@@ -21,8 +22,9 @@ export async function updateComfyTotals({ notify = true, fresh = "30m" } = {}) {
     ].flatMap((e) => (e ? [e] : []));
   const totals = await analyzeTotals().then(TaskOK).catch(TaskError);
 
-  // notify
+  // notify if today is not already notify
   if (notify) {
+    if(!await Totals.findOne($filaten({ today, totals: { mtime: $fresh('0.9d'), ...$OK } }))) 
     // ignore today
     await match(totals)
       .with($OK, async (totals) => {

package/src/updateOutdatedPullsTemplates.ts

@@ -20,9 +20,28 @@ export async function updateOutdatedPullsTemplates() {
   const pyproject = await readTemplate("add-toml.md");
   const publishcr = await readTemplate("add-action.md");
   const outdated_pyproject = await readTemplate("outdated/add-toml.md");
-  const outdated_pyproject_v2 = await readTemplate("outdated/add-toml-v2.md");
   const outdated_publishcr = await readTemplate("outdated/add-action.md");
+  const outdated_pyproject_v2 = await readTemplate("outdated/add-toml-v2.md");
   const outdated_publishcr_v2 = await readTemplate("outdated/add-action-v2.md");
+  const outdated_pyproject_v3 = await readTemplate("outdated/add-toml-v3.md");
+  const outdated_publishcr_v3 = await readTemplate("outdated/add-action-v3.md");
+  const outdateTitles = [
+    outdated_pyproject.title,
+    outdated_publishcr.title,
+    outdated_pyproject_v2.title,
+    outdated_publishcr_v2.title,
+    outdated_pyproject_v3.title,
+    outdated_publishcr_v3.title,
+  ];
+  const outdateBodies = [
+    outdated_pyproject.body,
+    outdated_publishcr.body,
+    outdated_pyproject_v2.body,
+    outdated_publishcr_v2.body,
+    outdated_pyproject_v3.body,
+    outdated_publishcr_v3.body,
+  ];
+
   // const templateOutdate = new Date("2024-06-13T09:02:56.630Z");
 
   await CNRepos.createIndex({
@@ -47,22 +66,8 @@ export async function updateOutdatedPullsTemplates() {
             },
             pull: {
               user: { login: ghUser.login },
-              title: {
-                $in: [
-                  outdated_pyproject.title,
-                  outdated_pyproject_v2.title,
-                  outdated_publishcr.title,
-                  outdated_publishcr_v2.title,
-                ],
-              },
-              body: {
-                $in: [
-                  outdated_pyproject.body,
-                  outdated_pyproject_v2.body,
-                  outdated_publishcr.body,
-                  outdated_publishcr_v2.body,
-                ],
-              },
+              title: { $in: outdateTitles },
+              body: { $in: outdateBodies },
             },
           }),
         },
@@ -99,12 +104,14 @@ export async function updateOutdatedPullsTemplates() {
           const { number } = pull;
           if (pull.user.login !== ghUser.login) DIE("not editable");
           const replacement = match(pull)
-            .with(pyproject, () => DIE("is already latest template"))
-            .with(publishcr, () => DIE("is already latest template"))
+            .with(pyproject, () => DIE("Is already latest, should never happen here"))
+            .with(publishcr, () => DIE("Is already latest, should never happen here"))
             .with(outdated_pyproject, () => pyproject)
             .with(outdated_pyproject_v2, () => pyproject)
+            .with(outdated_pyproject_v3, () => pyproject)
             .with(outdated_publishcr, () => publishcr)
             .with(outdated_publishcr_v2, () => publishcr)
+            .with(outdated_publishcr_v3, () => publishcr)
             // in case author clicked some task as completed, body will be different, may cause template mismatch
             .otherwise(() => DIE("Template not found: " + pull.title));
           if (!replacement) return { ...data, edited: TaskError("Template mismatch") };