Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions manager/src/django/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,33 @@ def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['scene'].required = False

# Added validation to ensure all models in camerachain exist in model_config
def clean_camerachain(self):
camerachain = self.cleaned_data.get('camerachain', '').strip()
if not camerachain:
return camerachain

from pathlib import Path
from manager.ppl_generator.model_chain import parse_model_chain
from manager.ppl_generator import PipelineGenerationValueError, PipelineGenerationNotImplementedError

model_config_path = Path(os.environ.get('MODEL_CONFIGS_FOLDER', '/models/model_configs')) / 'model_config.json'
if not model_config_path.is_file():
raise ValidationError(f"Model config file not found at {model_config_path}")

try:
with open(model_config_path, 'r') as f:
model_config = json.load(f)
Comment on lines +199 to +205
except (json.JSONDecodeError, IOError) as e:
raise ValidationError(f"Error reading model config: {str(e)}")

try:
parse_model_chain(camerachain, settings.MODEL_ROOT, model_config)
except (PipelineGenerationValueError, PipelineGenerationNotImplementedError) as e:
raise ValidationError(str(e))

return camerachain

class ChildSceneForm(forms.ModelForm):
class Meta:
model = ChildScene
Expand Down
4 changes: 4 additions & 0 deletions manager/src/django/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,10 @@ def form_valid(self, form):
form.instance.type = 'camera'
return super(CamCreateView, self).form_valid(form)

# Return 400 Bad Request when form validation fails
def form_invalid(self, form):
return self.render_to_response(self.get_context_data(form=form), status=400)

def get_success_url(self):
if self.object.scene is not None:
scene_id = self.object.scene.id
Expand Down
Loading