Commit Graph
113 Commits
Author SHA1 Message Date
Antonio Cordero Balcazar 9cb0415e48 * Use of pathlib everywhere.
* Fix in a1111 script.
2026-05-15 22:21:09 +02:00
Antonio Cordero Balcazar 6693c6147d * Support for getting the class of the model from the file.
* Improved documentation and instructions for it.
2026-05-15 11:16:06 +02:00
Antonio Cordero Balcazar 03e7e9b445 * ComfyUI: Support for setting the model information from the prompt. 2026-05-14 22:03:43 +02:00
Antonio Cordero Balcazar 81cc81c8f9 * VSCode settings and debug options moved to the workspace file.
* ComfyUI: fix model input as optional.
2026-05-14 10:40:56 +02:00
Antonio Cordero Balcazar 40f7ff85c1 * ComfyUI: improved node documentation. 2026-05-13 19:10:07 +02:00
Antonio Cordero Balcazar 4f571aa656 * ComfyUI: added refresh button to wildcard concat node. 2026-05-11 19:21:38 +02:00
Antonio Cordero Balcazar 5667317531 * ComfyUI: node improvements
* Docs: improvements
2026-05-11 17:09:10 +02:00
Antonio Cordero Balcazar 4b78939cc4 * Fix wildcard defaults filters not resetting on each generation. 2026-05-11 17:04:59 +02:00
Antonio Cordero Balcazar 83e88e41e9 * Fix in container processing. v3.1.1 2026-05-07 21:50:28 +02:00
Antonio Cordero BalcazarandCopilot db68347bcd * Support for attention merge at the wildcard/choice boundary.
Co-authored-by: Copilot <copilot@github.com>
v3.1.0
2026-05-05 16:29:21 +02:00
Antonio Cordero Balcazar b03a522ed4 * Added container property to wildcard definitions. 2026-05-05 16:29:21 +02:00
Antonio Cordero Balcazar fcf577ea50 * Wildcard and ENmapping folder list support specific files. 2026-05-05 16:29:21 +02:00
Antonio Cordero Balcazar c43b601ee0 * Improved test logging. 2026-05-05 16:29:21 +02:00
Antonio Cordero Balcazar ccafbb7e0a * Options as system variables
* Additional tests
2026-05-05 16:29:21 +02:00
Antonio Cordero Balcazar a8914c5f29 * Update version number. 2026-05-05 16:29:03 +02:00
Antonio Cordero Balcazar b4ddd74414 * Fixed AND in wildcard filters. #34
* Added support for specifying a variable with the whole wildcard filter.
2026-05-05 09:23:33 +02:00
Antonio Cordero Balcazar f1a4e2fc62 * Better logging.
* Refactored tests.
v3.0.0
2026-05-03 17:06:57 +02:00
Antonio Cordero Balcazar 73996b1609 * Doc fix. 2026-05-03 00:13:59 +02:00
Antonio Cordero BalcazarandCopilot 0970afb018 * Support for the cyclical sampler ("@").
* Support for attention merging wheen sending to negative prompt.

Co-authored-by: Copilot <copilot@github.com>
2026-05-02 17:18:44 +02:00
Antonio Cordero BalcazarandCopilot 8e38265b04 * Improved documentation.
Co-authored-by: Copilot <copilot@github.com>
2026-05-02 14:31:56 +02:00
Antonio Cordero BalcazarandCopilot 04119b169e * Improved combinatorial limit warning.
* Added combinatorial shuffle.
* A1111: Improved combinatorial with hiresfix.
* Some refactoring.
* Update of AI test instructions.

Co-authored-by: Copilot <copilot@github.com>
2026-05-02 13:40:06 +02:00
Antonio Cordero Balcazar 37bf9f38d5 * Fix in commandext.
* Improved tests.
2026-05-02 09:25:33 +02:00
Antonio Cordero BalcazarandCopilot a31070b986 * Added combinatorial generation.
* Updated pylint settings.
* Fixed a bug with wildcard or extranetwork mappings folders in a different drive than the extension.

Co-authored-by: Copilot <copilot@github.com>
2026-05-01 23:02:57 +02:00
Antonio Cordero Balcazar ad5cad30ff * Process positive and negative prompts together. 2026-04-30 21:09:39 +02:00
Antonio Cordero BalcazarandCopilot b2a5c38f30 * Unify variables in their own object.
Co-authored-by: Copilot <copilot@github.com>
2026-04-30 11:32:05 +02:00
Antonio Cordero Balcazar ea93669a82 * Support comparisons between floats and ints. 2026-04-30 10:18:14 +02:00
Antonio Cordero BalcazarandCopilot 9de5d69272 * Change format for separator specifier in array vars.
Co-authored-by: Copilot <copilot@github.com>
2026-04-29 16:59:40 +02:00
Antonio Cordero BalcazarandCopilot 563c071a65 * Support for reading array variable length.
* Support for additional operators: any_in and contains_any.
* Support for starred initialization in the set command.
* New option to set strict operations for some operators.
* Fixes detecting integers and added float support.
* Fixed echoing system variables.
* A1111: fixed prompt processing when there are more than 500 prompts.

Co-authored-by: Copilot <copilot@github.com>
2026-04-29 11:55:07 +02:00
Antonio Cordero BalcazarandCopilot aa4ea000b5 * Use pydantic for the configuration checks.
* Improved variable tests and documentation.

Co-authored-by: Copilot <copilot@github.com>
2026-04-27 13:31:53 +02:00
Antonio Cordero Balcazar c4582b30cd * Merged tests for variables and commands in the same file.
* Added support for array variables.
* Support for exception logging.
2026-04-26 17:32:15 +02:00
Antonio Cordero Balcazar 1fc60e55d8 * Added formatted parameter to log function for conditional message formatting.
* Added a new test for comparing two variables with the `lt` command.
2026-04-13 23:21:08 +02:00
Antonio Cordero Balcazar fdd2f5ba51 * Added result checks for special character sequences and unmatched parentheses/brackets. 2026-04-09 16:47:55 +02:00
Antonio Cordero Balcazar 62939f4416 * Refactor logging.
* Update option names in PromptPostProcessor.
2026-04-09 10:39:04 +02:00
Antonio Cordero Balcazar 932bce32f5 * Massive refactoring to decouple classes and improve configuration and state handling.
* Wildcard descriptions used in concat node.
2026-04-07 22:55:59 +02:00
Antonio Cordero Balcazar b1a01cb71c * Added description to wildcard definition options.
* Refactoring of grammar and token reading.
2026-04-07 11:53:02 +02:00
Antonio Cordero Balcazar 6e732e6e65 * Updated reforge detection classes for multiple models in ppp_config.yaml.defaults 2026-04-06 13:59:38 +02:00
Antonio Cordero Balcazar 12d5d40440 * Added Wildcard Concat node for selecting and concatenating wildcards.
* Refactor functions to resolve wildcard and extra-network mapping folder paths.
2026-04-06 13:32:35 +02:00
Antonio Cordero Balcazar b460565605 * Support for ranges in wildcard positional filters
* Some Copilot instructions.
2026-04-06 10:44:25 +02:00
Antonio Cordero Balcazar 4176559166 * Improved preprocessing of grammar file.
* Added cookbook.
* Support for variables in wildcard filters.
* Fix support for empty echoed variables.
2026-04-05 21:36:51 +02:00
Antonio Cordero Balcazar 47375db1ba * Escape quotes on log messages
* Separated tests in multiple files.
* Added pydantic validation for configuration.
* Improved backup/restore on visit of nodes.
* Echoing of variables with default no longer visits the default when not used (and no longer creates variables that were not actually used).
2026-04-04 19:04:46 +02:00
Antonio Cordero Balcazar 6ceb23b84b * Moved known models and their detection to the configuration file.
* Updated `ppp_config.yaml.defaults` to enhance documentation and structure for model detection and configuration.
* Improved validation of configuration files.
* Added a new `tests` application in `SUPPORTED_APPS` for testing purposes.
* Support for variables in list of values comparisons.
2026-04-03 15:53:10 +02:00
Antonio Cordero Balcazar acdf337354 * Added minimum value constraint for seed input in PromptPostProcessorComfyUINode. 2026-03-28 16:39:29 +01:00
Antonio Cordero Balcazar 78631d4adc * Support for more base models.
* Enhanced the processing of "BREAK" and "AND" constructs to support replacing with a comma. Set both to comma as default in ComfyUI.
* Added a new command `setwcdeffilter` to set default filters for a wildcard.
* Fixed bug with echoed variables.
* ComfyUI: Individual help documentation for the nodes.
* Can now test for output variables.
* Improved documentation.
2026-03-28 16:39:29 +01:00
Antonio Cordero Balcazar dc8b4b6631 * Added option to cleanup output variables. 2026-03-28 16:39:29 +01:00
Antonio Cordero Balcazar 87d12ca53f * Added new configuration options in ppp_config.yaml.defaults (and ppp_config.yaml) for host applications and models.
* Implemented handling for attention, scheduling, alternation, AND, and BREAK operators in the new configuration file.
* Moved variant definitions to the new configuration file.
* Improved tests speed by creating the needed PPP object in the process method.
2026-03-28 16:38:53 +01:00
Antonio Cordero Balcazar 39d6008f6f * Update version to 3.0.0 because of breaking changes for ComfyUI nodes.
* Refactor PromptPostProcessor class to use the same default values for options
* Add new nodes for the different option groups
2026-03-28 16:34:12 +01:00
Antonio Cordero Balcazar 1b781cb8b8 Allow variables in RHS of if expressions (#28)
# Pull Request

## Description

Allows variables in the RHS of expressions (e.g. `<ppp:if tagsSeen
contains tag>`) for more complex logic

## Type of change

Please delete options that are not relevant.

- [x] New feature (non-breaking change which adds functionality)
- [x] This change requires a documentation update

## How Has This Been Tested?

Added additional tests to the existing test suite.

## Checklist

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] Any dependent changes have been merged and published in downstream
modules
- [x] I have checked my code and corrected any misspellings
2026-03-28 16:24:42 +01:00
Antonio Cordero Balcazar 9cc10cd3f6 Merge branch 'main' into feature/var-vs-var-comparison 2026-03-28 16:09:08 +01:00
Antonio Cordero Balcazar 66422490eb support warn mode when var value cannot be converted to integer (#29)
# Pull Request

## Description

When a variable cannot be converted to integer (because it is undefined, or it is a string that cannot convert) then either warn or fail with proper error message (instead of current behavior which just sort of crashes with no useful information).

`<ppp:if undefinedVar gt 1>` or `{var=hello}<ppp:if var gt 1>` will no longer crash but will warn or stop.


## Type of change

Please delete options that are not relevant.

- [x] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [x] This change requires a documentation update

## How Has This Been Tested?

Additional unit tests added to the test suite.

## Checklist

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
- [x] Any dependent changes have been merged and published in downstream modules
- [x] I have checked my code and corrected any misspellings
2026-03-28 15:51:29 +01:00
Brandon Wallace 1fdf71c76e fix: add warn_or_stop for undefined variables in __resolve_cond_value
Align RHS variable resolution with LHS behavior in __eval_basiccondition
so undefined system/user variables honor the on_warning setting.
2026-03-19 23:59:41 -05:00