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.

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

fix: differentiate prompts fields based on function_calling_type #5880

Merged
merged 1 commit into from
Jul 12, 2024

Conversation

qiqizjl
Copy link
Contributor

@qiqizjl qiqizjl commented Jul 2, 2024

Description

When using function_call and tool_call, the corresponding parameters are different
#5625 Not completely repaired
image
image

Type of Change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

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

Suggested Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods
  • optional I have made corresponding changes to the documentation
  • optional I have added tests that prove my fix is effective or that my feature works
  • optional New and existing unit tests pass locally with my changes

@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. ⚙️ feat:model-runtime 🐞 bug Something isn't working labels Jul 2, 2024
@takatost takatost requested a review from laipz8200 July 5, 2024 10:42
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jul 12, 2024
@laipz8200 laipz8200 merged commit d7a6f25 into langgenius:main Jul 12, 2024
5 checks passed
Scorpion1221 added a commit to yybht155/dify that referenced this pull request Jul 22, 2024
* 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
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 bug Something isn't working ⚙️ feat:model-runtime lgtm This PR has been approved by a maintainer size:M This PR changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants