Fix wrong node parameter widgets, attempt 3 at #2323 (#2334)

* WIP, for TrueDoctor to continue

* Expose first implementation type as default type in field metadata

* Cleanup

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Dennis Kobert 2025-03-01 22:26:21 +01:00 committed by GitHub
parent e41471c088
commit fd81d043a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 10 deletions

View File

@ -2697,7 +2697,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
.iter() .iter()
.zip(first_node_io.inputs.iter()) .zip(first_node_io.inputs.iter())
.enumerate() .enumerate()
.map(|(index, (field, ty))| { .map(|(index, (field, node_io_ty))| {
let ty = field.default_type.as_ref().unwrap_or(node_io_ty);
let exposed = if index == 0 { *ty != fn_type!(()) } else { field.exposed }; let exposed = if index == 0 { *ty != fn_type!(()) } else { field.exposed };
match field.value_source { match field.value_source {

View File

@ -6,6 +6,7 @@ use crate::messages::layout::utility_types::widget_prelude::*;
use crate::messages::portfolio::document::utility_types::network_interface::InputConnector; use crate::messages::portfolio::document::utility_types::network_interface::InputConnector;
use crate::messages::prelude::*; use crate::messages::prelude::*;
use dyn_any::DynAny;
use graph_craft::document::value::TaggedValue; use graph_craft::document::value::TaggedValue;
use graph_craft::document::{DocumentNode, DocumentNodeImplementation, NodeId, NodeInput}; use graph_craft::document::{DocumentNode, DocumentNodeImplementation, NodeId, NodeInput};
use graph_craft::imaginate_input::{ImaginateMaskStartingFill, ImaginateSamplingMethod}; use graph_craft::imaginate_input::{ImaginateMaskStartingFill, ImaginateSamplingMethod};
@ -2128,7 +2129,7 @@ pub(crate) fn generate_node_properties(node_id: NodeId, context: &mut NodeProper
let mut number_options = (None, None, None); let mut number_options = (None, None, None);
let input_type = match implementation { let input_type = match implementation {
DocumentNodeImplementation::ProtoNode(proto_node_identifier) => { DocumentNodeImplementation::ProtoNode(proto_node_identifier) => 'early_return: {
if let Some(field) = graphene_core::registry::NODE_METADATA if let Some(field) = graphene_core::registry::NODE_METADATA
.lock() .lock()
.unwrap() .unwrap()
@ -2136,16 +2137,22 @@ pub(crate) fn generate_node_properties(node_id: NodeId, context: &mut NodeProper
.and_then(|metadata| metadata.fields.get(input_index)) .and_then(|metadata| metadata.fields.get(input_index))
{ {
number_options = (field.number_min, field.number_max, field.number_mode_range); number_options = (field.number_min, field.number_max, field.number_mode_range);
if let Some(ref default) = field.default_type {
break 'early_return default.clone();
}
} }
let Some(implementations) = &interpreted_executor::node_registry::NODE_REGISTRY.get(proto_node_identifier) else { let Some(implementations) = &interpreted_executor::node_registry::NODE_REGISTRY.get(proto_node_identifier) else {
log::error!("Could not get implementation for protonode {proto_node_identifier:?}"); log::error!("Could not get implementation for protonode {proto_node_identifier:?}");
return Vec::new(); return Vec::new();
}; };
let proto_node_identifier = proto_node_identifier.clone(); let proto_node_identifier = proto_node_identifier.clone();
let input_type = implementations let mut input_types = implementations
.keys() .keys()
.filter_map(|item| item.inputs.get(input_index)) .filter_map(|item| item.inputs.get(input_index))
.find(|item| property_from_type(node_id, input_index, item, number_options, context).is_ok()); .filter(|ty| property_from_type(node_id, input_index, ty, number_options, context).is_ok())
.collect::<Vec<_>>();
input_types.sort_by_key(|ty| ty.type_name());
let input_type = input_types.first().cloned();
let Some(input_type) = input_type else { let Some(input_type) = input_type else {
log::error!("Could not get input type for protonode {proto_node_identifier:?} at index {input_index:?}"); log::error!("Could not get input type for protonode {proto_node_identifier:?} at index {input_index:?}");
return Vec::new(); return Vec::new();

View File

@ -1,14 +1,13 @@
use crate::transform::Footprint;
use crate::{NodeIO, NodeIOTypes, Type};
use dyn_any::DynAny;
use std::collections::HashMap; use std::collections::HashMap;
use std::ops::Deref; use std::ops::Deref;
use std::pin::Pin; use std::pin::Pin;
use std::sync::{LazyLock, Mutex}; use std::sync::{LazyLock, Mutex};
use dyn_any::DynAny;
use crate::transform::Footprint;
use crate::NodeIO;
use crate::NodeIOTypes;
pub mod types { pub mod types {
/// 0% - 100% /// 0% - 100%
pub type Percentage = f64; pub type Percentage = f64;
@ -47,6 +46,7 @@ pub struct FieldMetadata {
pub exposed: bool, pub exposed: bool,
pub widget_override: RegistryWidgetOverride, pub widget_override: RegistryWidgetOverride,
pub value_source: RegistryValueSource, pub value_source: RegistryValueSource,
pub default_type: Option<Type>,
pub number_min: Option<f64>, pub number_min: Option<f64>,
pub number_max: Option<f64>, pub number_max: Option<f64>,
pub number_mode_range: Option<(f64, f64)>, pub number_mode_range: Option<(f64, f64)>,

View File

@ -117,6 +117,17 @@ pub(crate) fn generate_node_code(parsed: &ParsedNodeFn) -> syn::Result<TokenStre
}) })
.collect(); .collect();
let default_types: Vec<_> = fields
.iter()
.map(|field| match field {
ParsedField::Regular { implementations, .. } => match implementations.first() {
Some(ty) => quote!(Some(concrete!(#ty))),
_ => quote!(None),
},
_ => quote!(None),
})
.collect();
let number_min_values: Vec<_> = fields let number_min_values: Vec<_> = fields
.iter() .iter()
.map(|field| match field { .map(|field| match field {
@ -292,6 +303,7 @@ pub(crate) fn generate_node_code(parsed: &ParsedNodeFn) -> syn::Result<TokenStre
description: #input_descriptions, description: #input_descriptions,
exposed: #exposed, exposed: #exposed,
value_source: #value_sources, value_source: #value_sources,
default_type: #default_types,
number_min: #number_min_values, number_min: #number_min_values,
number_max: #number_max_values, number_max: #number_max_values,
number_mode_range: #number_mode_range_values, number_mode_range: #number_mode_range_values,