Test CI #2
Open
Test CI #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Backport of Comfy-Org#7623 Cherry-picked merge commit 2044d14 to cloud/1.35. **Conflicts resolved:** - `pnpm-lock.yaml` - regenerated with pnpm install ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7669-backport-cloud-1-35-Deps-Update-Playwright-2cf6d73d365081eba108c20eed45b685) by [Unito](https://www.unito.io) Co-authored-by: Alexander Brown <drjkl@comfy.org>
…omfy-Org#7671) Backport of Comfy-Org#7590 Cherry-picked merge commit db92922 to cloud/1.35. **Conflicts resolved:** - `pnpm-workspace.yaml` - kept target branch versions - `pnpm-lock.yaml` - regenerated with pnpm install This PR fixes vue-tsc compatibility issues with unused template refs. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7671-backport-cloud-1-35-Chore-Update-several-Developer-Dependencies-2cf6d73d3650811aa2bdd5ac80a24fdb) by [Unito](https://www.unito.io) Co-authored-by: Alexander Brown <drjkl@comfy.org>
## Summary Backport of Comfy-Org#7624 to cloud/1.35. Original PR: Comfy-Org#7624 🤖 Generated with [Claude Code](https://claude.com/claude-code) ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7673-backport-cloud-1-35-Tests-Golden-Updates-2cf6d73d365081e3b9e7df99442e5a91) by [Unito](https://www.unito.io) Co-authored-by: Alexander Brown <drjkl@comfy.org> Co-authored-by: github-actions <github-actions@github.com>
…erate (Comfy-Org#7663) Backport of Comfy-Org#7517 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7663-backport-cloud-1-35-Feat-Fixed-option-for-control-after-before-generate-2cf6d73d3650817e9bd9cfe4c05df3c4) by [Unito](https://www.unito.io) Co-authored-by: AustinMroz <austin@comfy.org>
…mfy-api@8034f18 (Comfy-Org#7661) Backport of Comfy-Org#7659 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7661-backport-cloud-1-35-chore-Update-Comfy-Registry-API-types-from-comfy-api-8034f18-2cf6d73d365081e1adf7d0e8f0c0bdbd) by [Unito](https://www.unito.io) Co-authored-by: huntcsg <6245448+huntcsg@users.noreply.github.com>
Backport of Comfy-Org#7539 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7676-backport-cloud-1-35-Fix-widget-reactivity-2cf6d73d365081948570c4517e1ad776) by [Unito](https://www.unito.io) --------- Co-authored-by: AustinMroz <austin@comfy.org> Co-authored-by: github-actions <github-actions@github.com>
…y-Org#7677) Backport of Comfy-Org#7645 Fixes a bug where swapping to a different workflow from the inside of a subgraph would cause nodes to be in an incorrect position after swapping back. in vue mode Prior to an unknown-but-recent PR, all nodes would would stack on the origin. This PR instead solves the remaining issue where having `ComfyEnableWorkflowViewRestore` would cause incorrect node positions. This is done by not delaying the fitView by a frame (which causes it to occur after the graph is no longer in the configuring state). In order to accomplish this, the code in LGraphNode has been updated to allow measuring node bounds without requiring a ctx argument. This arg is only used to ensure sufficient width for a node's title and is irrelevant when loading an existing graph. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7677-backport-cloud-1-35-Do-not-delay-fit-to-view-on-graph-restore-2cf6d73d365081b390b3ed6be968a12b) by [Unito](https://www.unito.io) Co-authored-by: AustinMroz <austin@comfy.org>
Backport of Comfy-Org#7546 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7681-backport-cloud-1-35-Make-node-inputs-reactive-in-vue-2cf6d73d36508197b6f0fd5683f07eec) by [Unito](https://www.unito.io) Co-authored-by: AustinMroz <austin@comfy.org>
… tiers (Comfy-Org#7679) ## Summary Backport of Comfy-Org#7596 to cloud/1.35 branch. **Original PR:** Comfy-Org#7596 ### Changes - Removes feature flag for subscription tiers - Removes legacy code for non-subscription tier logic ### Conflict Resolution - `src/renderer/extensions/vueNodes/components/NodeHeader.vue`: Took PR version (simplified icon without FF conditional) ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7679-backport-cloud-1-35-refactor-start-on-removing-FF-for-subscription-tiers-2cf6d73d365081a1ba41c135c84c2e7f) by [Unito](https://www.unito.io)
Backport of Comfy-Org#7550 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7683-backport-cloud-1-35-Fix-doubled-control-application-2cf6d73d365081e1b057fa21d9fa6e9d) by [Unito](https://www.unito.io) Co-authored-by: AustinMroz <austin@comfy.org>
Comfy-Org#7685) Backport of Comfy-Org#7627 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7685-backport-cloud-1-35-Fix-buttons-displayed-behind-images-in-litegraph-2cf6d73d3650819c9f0aeaaad05abd48) by [Unito](https://www.unito.io) Co-authored-by: AustinMroz <austin@comfy.org> Co-authored-by: github-actions <github-actions@github.com>
…mfy-api@ade7a7d (Comfy-Org#7703) Backport of Comfy-Org#7702 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7703-backport-cloud-1-35-chore-Update-Comfy-Registry-API-types-from-comfy-api-ade7a7d-2d16d73d3650819b9e38fd465a7cb7f8) by [Unito](https://www.unito.io) Co-authored-by: christian-byrne <72887196+christian-byrne@users.noreply.github.com>
Backport of Comfy-Org#7701 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7704-backport-cloud-1-35-Fix-cloud-pricing-annual-misc-2d16d73d365081868447db732608a2c7) by [Unito](https://www.unito.io) Co-authored-by: Simula_r <18093452+simula-r@users.noreply.github.com> Co-authored-by: bymyself <cbyrne@comfy.org>
…or annual subscribers (Comfy-Org#7708) Backport of Comfy-Org#7706 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7708-backport-cloud-1-35-fix-show-yearly-labels-in-subscription-panel-for-annual-subscriber-2d16d73d365081f1a7bdd65e24e604b0) by [Unito](https://www.unito.io) Co-authored-by: Christian Byrne <cbyrne@comfy.org>
Backport of Comfy-Org#7275 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7710-backport-cloud-1-35-Nesting-support-for-autogrow-2d16d73d365081559be8ee14b30a2d6d) by [Unito](https://www.unito.io) Co-authored-by: AustinMroz <austin@comfy.org>
…omfy-Org#7712) Backport of Comfy-Org#7508 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7712-backport-cloud-1-35-Fix-Extra-Scrollbars-in-Media-Assets-Sidebar-2d16d73d3650818ea979cba00847603e) by [Unito](https://www.unito.io) Co-authored-by: Alexander Brown <drjkl@comfy.org>
…dragging nodes in vueNodes mode (Comfy-Org#7713) Backport of Comfy-Org#7473 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7713-backport-cloud-1-35-fix-prevent-unrelated-groups-from-moving-when-dragging-nodes-in-vu-2d16d73d365081e082e8d9c49add871c) by [Unito](https://www.unito.io) Co-authored-by: Terry Jia <terryjia88@gmail.com>
…3D (Comfy-Org#7715) Backport of Comfy-Org#6828 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7715-backport-cloud-1-35-fix-api-nodes-pricing-adjust-prices-for-Tripo3D-2d16d73d365081949ce8cf3029d2d98d) by [Unito](https://www.unito.io) Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>
…omfy-Org#7716) ## Summary Backport of Comfy-Org#7541 to cloud/1.35. Fixed an inconsistency where nodes were resizable in Hand mode. Resizing is now restricted to Selection mode only to match standard LiteGraph behavior (Hand mode should only be for panning). ## Changes - Added guard clause to prevent resize in Hand mode (`shouldHandleNodePointerEvents` check) - Added `event.button !== 0` check for non-primary mouse buttons ## Original PR Comfy-Org#7541 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7716-backport-cloud-1-35-Fix-the-wrong-selection-under-the-hand-mode-2d16d73d365081c7b558f652952bb590) by [Unito](https://www.unito.io) --------- Co-authored-by: GitHub Action <action@github.com>
… "no results placeholder" (Comfy-Org#7718) Backport of Comfy-Org#7586 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7718-backport-cloud-1-35-fix-expand-assets-dropdown-body-to-show-entire-no-results-placeho-2d16d73d3650815b9639c4bfc977e552) by [Unito](https://www.unito.io) Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe>
…7722) Backport of Comfy-Org#7641 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7722-backport-cloud-1-35-add-pricing-badge-for-Flux2Max-node-2d16d73d3650819b8a17cb37ad9ee4c0) by [Unito](https://www.unito.io) Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>
Backport of Comfy-Org#7639 to cloud/1.35 ## Original PR Comfy-Org#7639 ## Conflicts resolved - All test snapshots: accepted PR version (all were changed in original PR) ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7724-backport-cloud-1-35-Fix-Minimap-rendering-2d16d73d365081999fd0dfa09501e2e0) by [Unito](https://www.unito.io) --------- Co-authored-by: github-actions <github-actions@github.com>
…bscription updates (Comfy-Org#7726) Backport of Comfy-Org#7692 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7726-backport-cloud-1-35-feat-pass-target-tier-to-billing-portal-for-subscription-updates-2d16d73d36508173acadf20aa6d97017) by [Unito](https://www.unito.io) Co-authored-by: Hunter <huntcsg@users.noreply.github.com> Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: GitHub Action <action@github.com>
…fy-Org#7730) ## Summary Backport of Comfy-Org#7540 to cloud/1.35 branch. - Adds HuggingFace as a model import source alongside CivitAI - Implements extensible import source handler pattern - UTF-8 filename decoding for international characters - Alphabetically sorted model types - Feature flag `huggingfaceModelImportEnabled` for gradual rollout ## Conflict Resolution - `src/platform/remoteConfig/types.ts`: Kept both target branch's stripe fields and added PR's huggingface field - `src/platform/assets/components/UploadModelFooter.vue`: Adapted `Button` component to `IconTextButton`/`TextButton` as the new Button component is not available in this branch Original PR: Comfy-Org#7540 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7730-backport-cloud-1-35-feat-Add-HuggingFace-model-import-support-2d16d73d36508140a804f8b22883a696) by [Unito](https://www.unito.io) Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: GitHub Action <action@github.com>
…7819) Backport of Comfy-Org#7813 to `cloud/1.35` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7819-backport-cloud-1-35-Guard-downgrades-via-billing-portal-2db6d73d365081d591e3fde9037164d6) by [Unito](https://www.unito.io) Co-authored-by: Christian Byrne <cbyrne@comfy.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Changes
Review Focus
Screenshots (if applicable)