github/AutoGPT
1
1
Fork 0
mirror of https://github.com/Significant-Gravitas/AutoGPT.git synced 2026-04-08 03:00:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
Zamil Majdy
2024-12-09 15:13:34 -06:00
parent 95b1beecaf
commit 2ff033aeb2
1 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
autogpt_platform/backend/backend/data/graph.py
View File

@@ -254,7 +254,7 @@ class GraphModel(Graph):
for link in self.links:
input_links[link.sink_id].append(link)
# Nodes: required fields are filled or or connected and dependencies are satisfied
# Nodes: required fields are filled or connected and dependencies are satisfied
for node in self.nodes:
block = get_block(node.block_id)
if block is None:
@@ -276,52 +276,36 @@ class GraphModel(Graph):
)
# Get input schema properties and check dependencies
input_schema = block.input_schema.model_json_schema()
properties = input_schema.get("properties", {})
required_fields = set(input_schema.get("required", []))
input_schema = block.input_schema.model_fields
required_fields = block.input_schema.get_required_fields()
def has_value(name):
return (
node is not None
and name in node.input_default
and node.input_default[name] is not None
and str(node.input_default[name]).strip() != ""
) or (name in input_schema and input_schema[name].default is not None)
# Validate dependencies between fields
for field_name, field_schema in properties.items():
if "depends_on" in field_schema:
dependencies = field_schema["depends_on"]
for field_name, field_info in input_schema.items():
# Check if dependent field has value in input_default
has_value = (
field_name in node.input_default
and node.input_default[field_name] is not None
and str(node.input_default[field_name]).strip() != ""
) or (
"default" in field_schema
and field_schema["default"] is not None
# Apply input dependency validation only on run & field with depends_on
json_schema_extra = field_info.json_schema_extra or {}
dependencies = json_schema_extra.get("depends_on", [])
if not for_run or not dependencies:
continue
# Check if dependent field has value in input_default
field_has_value = has_value(field_name)
field_is_required = field_name in required_fields
# Check for missing dependencies when dependent field is present
missing_deps = [dep for dep in dependencies if not has_value(dep)]
if missing_deps and (field_has_value or field_is_required):
raise ValueError(
f"Node {block.name} #{node.id}: Field `{field_name}` requires [{', '.join(missing_deps)}] to be set"
)
must_have_value = field_name in required_fields
# Check for missing dependencies when dependent field is present
missing_deps = [
dep
for dep in dependencies
if dep not in node.input_default
or not node.input_default[dep]
or str(node.input_default[dep]).strip() == ""
]
if (has_value or must_have_value) and missing_deps:
raise ValueError(
f"Node {block.name} #{node.id}: Field {field_name} requires {', '.join(missing_deps)} to be set"
)
# Check if field is required when dependencies are present
has_all_deps = all(
dep in node.input_default
and node.input_default[dep]
and str(node.input_default[dep]).strip() != ""
for dep in dependencies
)
if has_all_deps and not has_value:
raise ValueError(
f"Node {block.name} #{node.id}: {field_name} is required when {', '.join(dependencies)} are set"
)
node_map = {v.id: v for v in self.nodes}