[PR #25633] fix: restore None guards for _environment_variables/_conversation_variables getters #31140

Closed
opened 2026-02-21 20:48:54 -05:00 by yindo · 0 comments
Owner

Original Pull Request: https://github.com/langgenius/dify/pull/25633

State: closed
Merged: Yes


Important

  1. Make sure you have read our contribution guidelines
  2. Ensure there is an associated issue and you have been assigned to it
  3. Use the correct syntax to link this PR: Fixes #<issue number>.

Summary

Fixes #25496
Refs #25281

This PR restores defensive None checks for two fields in the Workflow model(environment_variables/conversation_variables)

PR #25281 removed the None checks, assuming server_default="{}" guarantees non-NULL values.
In practice, legacy rows, intermediate migration states, or data written bypassing ORM can still yield NULL, causing json.loads(None) to raise an exception and crash workflow execution.

The scope is intentionally minimized to quickly unblock users; subsequent PRs can introduce appropriate initialization during model creation/loading.

Checklist

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods
**Original Pull Request:** https://github.com/langgenius/dify/pull/25633 **State:** closed **Merged:** Yes --- > [!IMPORTANT] > > 1. Make sure you have read our [contribution guidelines](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) > 1. Ensure there is an associated issue and you have been assigned to it > 1. Use the correct syntax to link this PR: `Fixes #<issue number>`. ## Summary Fixes #25496 Refs #25281 This PR restores defensive None checks for two fields in the Workflow model(`environment_variables`/`conversation_variables`) PR #25281 removed the None checks, assuming `server_default="{}"` guarantees non-NULL values. In practice, legacy rows, intermediate migration states, or data written bypassing ORM can still yield NULL, causing json.loads(None) to raise an exception and crash workflow execution. The scope is intentionally minimized to quickly unblock users; subsequent PRs can introduce appropriate initialization during model creation/loading. ## Checklist - [ ] This change requires a documentation update, included: [Dify Document](https://github.com/langgenius/dify-docs) - [x] I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!) - [x] I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change. - [x] I've updated the documentation accordingly. - [x] I ran `dev/reformat`(backend) and `cd web && npx lint-staged`(frontend) to appease the lint gods
yindo added the pull-request label 2026-02-21 20:48:54 -05:00
yindo closed this issue 2026-02-21 20:48:54 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: langgenius/dify#31140