Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 3 additions & 2 deletions apps/application/models/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from mptt.fields import TreeForeignKey
from mptt.models import MPTTModel

from common.encoder.encoder import SystemEncoder
from common.mixins.app_model_mixin import AppModelMixin
from knowledge.models import Knowledge
from models_provider.models import Model
Expand Down Expand Up @@ -75,7 +76,7 @@ class Application(AppModelMixin):
stt_model_params_setting = models.JSONField(verbose_name="STT模型参数相关设置", default=dict)
problem_optimization = models.BooleanField(verbose_name="问题优化", default=False)
icon = models.CharField(max_length=256, verbose_name="应用icon", default="./favicon.ico")
work_flow = models.JSONField(verbose_name="工作流数据", default=dict)
work_flow = models.JSONField(verbose_name="工作流数据", default=dict, encoder=SystemEncoder)
type = models.CharField(verbose_name="应用类型", choices=ApplicationTypeChoices.choices,
default=ApplicationTypeChoices.SIMPLE, max_length=256)
problem_optimization_prompt = models.CharField(verbose_name="问题优化提示词", max_length=102400, blank=True,
Expand Down Expand Up @@ -160,7 +161,7 @@ class ApplicationVersion(AppModelMixin):
stt_model_params_setting = models.JSONField(verbose_name="STT模型参数相关设置", default=dict)
problem_optimization = models.BooleanField(verbose_name="问题优化", default=False)
icon = models.CharField(max_length=256, verbose_name="应用icon", default="./favicon.ico")
work_flow = models.JSONField(verbose_name="工作流数据", default=dict)
work_flow = models.JSONField(verbose_name="工作流数据", default=dict, encoder=SystemEncoder)
type = models.CharField(verbose_name="应用类型", choices=ApplicationTypeChoices.choices,
default=ApplicationTypeChoices.SIMPLE, max_length=256)
problem_optimization_prompt = models.CharField(verbose_name="问题优化提示词", max_length=102400, blank=True,
Expand Down
4 changes: 2 additions & 2 deletions apps/application/models/application_chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ class ChatRecord(AppModelMixin):
ip_address = models.CharField(max_length=128, verbose_name="ip地址", default='')

def save(self, *args, **kwargs):
self.problem_text = self.problem_text.replace('\\u0000', '')
self.answer_text = self.answer_text.replace('\\u0000', '')
self.problem_text = self.problem_text.replace('\x00', '')
self.answer_text = self.answer_text.replace('\x00', '')
return super().save(*args, **kwargs)

def get_human_message(self):
Expand Down
19 changes: 16 additions & 3 deletions apps/common/encoder/encoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,25 @@
from django.core.files.uploadedfile import InMemoryUploadedFile, TemporaryUploadedFile


def strip_nul(obj):
if isinstance(obj, str):
return obj.replace('\x00', '') # 注意是 '\x00',真正的空字符
if isinstance(obj, dict):
return {k: strip_nul(v) for k, v in obj.items()}
if isinstance(obj, list):
return [strip_nul(x) for x in obj]
return obj


class SystemEncoder(json.JSONEncoder):
def encode(self, obj):
# 先序列化为字符串
json_str = super().encode(obj)
# 移除所有空字符
json_str = json_str.replace('\\u0000', '')
r = obj
try:
r = strip_nul(obj)
except:
pass
json_str = super().encode(strip_nul(r))
return json_str

def default(self, obj):
Expand Down
Loading