Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mermaid render #6088

Merged
merged 7 commits into from
Jul 12, 2024
Merged

Fix mermaid render #6088

merged 7 commits into from
Jul 12, 2024

Conversation

jqhr
Copy link
Contributor

@jqhr jqhr commented Jul 9, 2024

Checklist:

Important

Please review the checklist below before submitting your pull request.

  • Please open an issue before creating a PR or link to an existing issue
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

Description

Close #6087

The bug reason is for check whether svg is empty.
But result in render pie. So I removed thoose code

Type of Change

Testing Instructions

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Test A
  • Test B

@dosubot dosubot bot added the size:XS This PR changes 0-9 lines, ignoring generated files. label Jul 9, 2024
crazywoola
crazywoola requested changes Jul 12, 2024
View reviewed changes
Copy link
Member

@crazywoola crazywoola left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removal of this part will cause the render process flicker. I think there might be a better way to solve it.

@jqhr
Copy link
Contributor Author

jqhr commented Jul 12, 2024

Ok. I will try other solutions.

fix: mermaid loading and flicker
085a146 
1. fix mermaid loading flicker
2. add error msg support for renderer
@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. and removed size:XS This PR changes 0-9 lines, ignoring generated files. labels Jul 12, 2024
@jqhr
Copy link
Contributor Author

jqhr commented Jul 12, 2024

See 085a146.
May helpful

crazywoola
crazywoola approved these changes Jul 12, 2024
View reviewed changes
Copy link
Member

@crazywoola crazywoola left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great to me.

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jul 12, 2024
@crazywoola crazywoola merged commit a7b33b5 into langgenius:main Jul 12, 2024
3 checks passed
laipz8200 pushed a commit that referenced this pull request Jul 15, 2024
@jqhr @laipz8200
Fix mermaid render (#6088)
f8ada21 
Co-authored-by: 靖谦 <jingqian@kaiwu.cloud>
Scorpion1221 added a commit to yybht155/dify that referenced this pull request Jul 22, 2024
@Scorpion1221
Merge commit 'eabfd84ceb704f8057b4f499578e24c2516250c4'
8c99d5b 
* commit 'eabfd84ceb704f8057b4f499578e24c2516250c4': (147 commits)
  bump to 0.6.14 (langgenius#6294)
  Feat/delete file when clean document (langgenius#5882)
  fix: zhipuai validate error when user's api key not support for chatglm_turbo in  issue langgenius#6289 (langgenius#6290)
  fix: validateColorHex: cannot read properties of undefined (reading 'length') (langgenius#6242)
  6282 i18n add support for Italian (langgenius#6288)
  Update bedrock.yaml (langgenius#6281)
  feat(frontend): workflow import dsl from url (langgenius#6286)
  feat(backend): support import DSL from URL (langgenius#6287)
  Update model provider configuration for Triton Inference Server and X… (langgenius#6274)
  fix: custom tool input number fail (langgenius#6200)
  Feat/add zhipu CogView 3 tool  (langgenius#6210)
  Fix mermaid render (langgenius#6088)
  fix: markdown proc will remove image (langgenius#5855)
  fix: remove the maximum length limit of "paragraph" variable (langgenius#6234)
  Update ernie_bot.py (langgenius#6236)
  fix: model-provider-card-style (langgenius#6246)
  refactor(api): switch to dify_config with Pydantic in controllers and schedule (langgenius#6237)
  Fix/firecrawl parameters issue (langgenius#6213)
  refactor(services/tasks): Swtich to dify_config witch Pydantic  (langgenius#6203)
  fix: differentiate prompts fields based on function_calling_type (langgenius#5880)
  ...

# Conflicts:
#	.github/workflows/build-push.yml
#	api/configs/app_config.py
#	api/configs/feature/__init__.py
#	api/poetry.lock
#	web/app/components/app/configuration/config-var/config-modal/index.tsx
#	web/yarn.lock
Scorpion1221 added a commit to yybht155/dify that referenced this pull request Jul 22, 2024
@Scorpion1221
Merge commit 'eabfd84ceb704f8057b4f499578e24c2516250c4'
ad1b1b8 
* commit 'eabfd84ceb704f8057b4f499578e24c2516250c4': (147 commits)
  bump to 0.6.14 (langgenius#6294)
  Feat/delete file when clean document (langgenius#5882)
  fix: zhipuai validate error when user's api key not support for chatglm_turbo in  issue langgenius#6289 (langgenius#6290)
  fix: validateColorHex: cannot read properties of undefined (reading 'length') (langgenius#6242)
  6282 i18n add support for Italian (langgenius#6288)
  Update bedrock.yaml (langgenius#6281)
  feat(frontend): workflow import dsl from url (langgenius#6286)
  feat(backend): support import DSL from URL (langgenius#6287)
  Update model provider configuration for Triton Inference Server and X… (langgenius#6274)
  fix: custom tool input number fail (langgenius#6200)
  Feat/add zhipu CogView 3 tool  (langgenius#6210)
  Fix mermaid render (langgenius#6088)
  fix: markdown proc will remove image (langgenius#5855)
  fix: remove the maximum length limit of "paragraph" variable (langgenius#6234)
  Update ernie_bot.py (langgenius#6236)
  fix: model-provider-card-style (langgenius#6246)
  refactor(api): switch to dify_config with Pydantic in controllers and schedule (langgenius#6237)
  Fix/firecrawl parameters issue (langgenius#6213)
  refactor(services/tasks): Swtich to dify_config witch Pydantic  (langgenius#6203)
  fix: differentiate prompts fields based on function_calling_type (langgenius#5880)
  ...

# Conflicts:
#	.github/workflows/build-push.yml
#	api/configs/app_config.py
#	api/configs/feature/__init__.py
#	api/poetry.lock
#	web/app/components/app/configuration/config-var/config-modal/index.tsx
#	web/yarn.lock
@michaelxu1107
Copy link

Hello, i am using dify version 0.6.14
I am using dify to generate mermaid pie chart, but it cannot show pie, i copied pie code to https://mermaid.live/edit, it does show pie chart, the process i do and error output is list as below:
1、input message
9a2888476948460206370bb8d811d42
2、click svg button to check mermaid code
2550a9e44849a762936b601aa657036
3、i added log in web/app/components/base/mermaid/index.tsx, it shown error msg as below
ReferenceError: structuredClone is not defined
c8da1283e00965a23917a1b5697d997

@jqhr
Copy link
Contributor Author

jqhr commented Jul 25, 2024

Hello, i am using dify version 0.6.14 I am using dify to generate mermaid pie chart, but it cannot show pie, i copied pie code to https://mermaid.live/edit, it does show pie chart, the process i do and error output is list as below: 1、input message 9a2888476948460206370bb8d811d42 2、click svg button to check mermaid code 2550a9e44849a762936b601aa657036 3、i added log in web/app/components/base/mermaid/index.tsx, it shown error msg as below ReferenceError: structuredClone is not defined c8da1283e00965a23917a1b5697d997

Your nodejs version is ?

@michaelxu1107
Copy link

michaelxu1107 commented Jul 26, 2024 via email

@jqhr
Copy link
Contributor Author

jqhr commented Jul 29, 2024

I cannot reproduce this bug.
Maybe your browser not support structuredClone. See StructuredClone MDN

@michaelxu1107
Copy link

michaelxu1107 commented Jul 29, 2024 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crazywoola crazywoola crazywoola approved these changes

Assignees
No one assigned
Labels
lgtm This PR has been approved by a maintainer size:M This PR changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[mermaid] fix pr #6004
3 participants
@jqhr @michaelxu1107 @crazywoola