Skip to content

Commit

Permalink
* cleanup api names
Browse files Browse the repository at this point in the history
* cleaned up typehints
* fixed stupid bug that would just overwrite color defaults on refresh
  • Loading branch information
Amorano committed Feb 22, 2025
1 parent 7b4b275 commit 1ac6014
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 20 deletions.
25 changes: 10 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ You can colorize nodes via their `title background`, `node body` or `title text`

## UPDATES

**2024/02/18** @1.7.25:
* nomenclature alignment for breakout repos
* better typehints
*

**2024/02/17** @1.7.20:
* changed to newer conversion logic on frontend 1.10.3+ -- `VECTOR` types will auto-switch to conversion logic based on version
* Fix for `VALUE NODE` to properly output vector data -- node in deprecation mode
Expand All @@ -106,6 +111,11 @@ You can colorize nodes via their `title background`, `node body` or `title text`
<img src="https://github.com/user-attachments/assets/4459855c-c4e6-4739-811e-a6c90aa5a90c" alt="TICK Node Batch Support Output" width="384"/>
</div>

**2024/02/22** @1.7.25:
* cleanup api names
* cleaned up typehints
* fixed stupid bug that would just overwrite color defaults on refresh

**2024/02/14** @1.7.17:
* cleaning up image support before split into Jovi_Comp

Expand All @@ -123,21 +133,6 @@ You can colorize nodes via their `title background`, `node body` or `title text`
* PyOpenGL-accelerate updated to 3.1.9
* better versioning in requirements around numpy
* cleaner
**2024/02/07** @1.7.08:
* `JOV_SCAN_DEVICES` reset to default off.

**2024/02/06** @1.7.06:
* `RESIZE_MATTE` option updated to allow transparent mattes

**2024/02/06** @1.7.05:
* updated `QUEUE` and `QUEUE TOO` progress while loading all images as "batch"

**2024/02/05** @1.7.02:
* polish on regex parsing for uniforms -- supports are much more lenient on spacing

**2024/02/05** @1.7.0:
* regex entries default to [5] fields
* [issue #4](https://github.com/Amorano/Jovi_GLSL/issues/4) value in uniforms for `GLSL nodes` were cancelling values being set

# INSTALLATION

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "jovimetrix"
description = "Integrates Webcam, MIDI, Spout and GLSL shader support. Animation via tick. Parameter manipulation with wave generator. Math operations with Unary and Binary support. Value conversion for all major types (int, string, list, dict, Image, Mask). Shape mask generation, image stacking and channel ops, batch splitting, merging and randomizing, load images and video from anywhere, dynamic bus routing with a single node, export support for GIPHY, save output anywhere! flatten, crop, transform; check colorblindness, make stereogram or stereoscopic images, or liner interpolate values and more."
version = "1.7.20"
version = "1.7.25"
license = { file = "LICENSE" }
readme = "README.md"
authors = [{ name = "Alexander G. Morano", email = "[email protected]" }]
Expand Down
9 changes: 5 additions & 4 deletions web/core/core_color.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const setting_theme = 'jovi.color.theme';

let PANEL_COLORIZE, NODE_LIST;

async function apiGet(url) {
async function api_get(url) {
var response = await api.fetchApi(url, { cache: "no-store" })
return await response.json()
}
Expand Down Expand Up @@ -582,7 +582,7 @@ app.registerExtension({
],
async setup() {

const all_nodes = await apiGet("/object_info");
const all_nodes = await api_get("/object_info");
NODE_LIST = Object.entries(all_nodes).sort((a, b) => {
const categoryA = a[1].category.toLowerCase();
const categoryB = b[1].category.toLowerCase();
Expand All @@ -596,7 +596,7 @@ app.registerExtension({
});
NODE_LIST = Object.fromEntries(NODE_LIST);

const CONFIG_CORE = await apiGet("/jovimetrix/config");
const CONFIG_CORE = await api_get("/jovimetrix/config");
let CONFIG_REGEX = app.extensionManager.setting.get(setting_regex);
if (!Array.isArray(CONFIG_REGEX)) {
CONFIG_REGEX = CONFIG_CORE?.user?.default?.color?.regex || [
Expand All @@ -612,7 +612,8 @@ app.registerExtension({
}
await app.extensionManager.setting.set(setting_regex, CONFIG_REGEX);

if (!Array.isArray(app.extensionManager.setting.get(setting_theme))) {
let CONFIG_THEME = app.extensionManager.setting.get(setting_theme);
if (Object.keys(CONFIG_THEME).length === 0) {
const CONFIG_THEME = CONFIG_CORE?.user?.default?.color?.theme || {
"JOVIMETRIX \ud83d\udd3a\ud83d\udfe9\ud83d\udd35": {
title: "#A23DA2"
Expand Down

0 comments on commit 1ac6014

Please sign in to comment.