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

Feat/fix ops trace #5672

Merged
merged 78 commits into from
Jun 27, 2024
Merged

Feat/fix ops trace #5672

merged 78 commits into from
Jun 27, 2024

Conversation

ZhouhaoJiang
Copy link
Collaborator

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

Type of Change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update, included: Dify Document
  • Improvement, including but not limited to code refactoring, performance optimization, and UI/UX improvement
  • Dependency upgrade

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

  • TODO

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

@ZhouhaoJiang ZhouhaoJiang marked this pull request as ready for review June 27, 2024 15:54
@dosubot dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. 💪 enhancement New feature or request labels Jun 27, 2024
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jun 27, 2024
@takatost takatost merged commit e8b8f6c into main Jun 27, 2024
14 checks passed
@takatost takatost deleted the feat/fix_ops_trace branch June 27, 2024 16:24
ZhouhaoJiang added a commit that referenced this pull request Jun 28, 2024
* refs/heads/main: (45 commits)
  fix: do not remove (#5682)
  Feature/add qwen llm (#5659)
  Fix docker command (#5681)
  feature: Add presence_penalty and frequency_penalty parameters to the … (#5637)
  Feat/fix ops trace (#5672)
  feat: xxo enhancement. (#5671)
  chore: rearrange python dependencies in groups (#5603)
  chore: delete unused resource (#5667)
  fix: knowledge retrieval score threshold setting (#5658)
  feat: add jina new pre-defined rerankers, include: jina-reranker-v2 (#5657)
  fix: tool call message role according to credentials (#5625)
  fix: HTTP request header is overwritten when user set Content-Type (#5628)
  chore: apply flake8-comprehensions Ruff rules to improve collection comprehensions (#5652)
  fix(api): language list (#5649)
  fix(api/configs): Ignore empty environment variables when loading config. (#5647)
  fix: type error in config (#5643)
  fix: remove obsoleted 'version' elements in compose files (#5553)
  chore: add a secondary confirmation dialog when the user delete the tool (#5634)
  fix: ro-RO is not a valid language (#5635)
  FR: #4048 - Add color customization to the chatbot  (#4885)
  ...

# Conflicts:
#	api/config.py
#	web/app/components/datasets/settings/form/index.tsx
ZhouhaoJiang added a commit that referenced this pull request Jun 28, 2024
* refs/heads/feat/knowledge-admin-role: (26 commits)
  fix: do not remove (#5682)
  Feature/add qwen llm (#5659)
  Fix docker command (#5681)
  feature: Add presence_penalty and frequency_penalty parameters to the … (#5637)
  Feat/fix ops trace (#5672)
  feat: xxo enhancement. (#5671)
  chore: rearrange python dependencies in groups (#5603)
  chore: delete unused resource (#5667)
  feat: get datasets when permission is partial_members
  feat: update migrate file
  feat: add account is_non_owner_role
  add role
  feat: get dataset info add partial_member_list
  feat: update field name
  feat: add tenant account role DATASET_OPERATOR
  feat: add create and get part_users_list api
  feat: add dataset permission service
  feat: add table dataset_permissions
  feat: add dataset_operator_enabled env
  feat: add features dataset_operator_enabled
  ...

# Conflicts:
#	api/core/ops/ops_trace_manager.py
#	api/tasks/ops_trace_task.py
ZhouhaoJiang added a commit that referenced this pull request Jun 28, 2024
* refs/heads/main:
  Feat/add json process tool (#5555)
  fix: do not remove (#5682)
  Feature/add qwen llm (#5659)
  Fix docker command (#5681)
  feature: Add presence_penalty and frequency_penalty parameters to the … (#5637)
  Feat/fix ops trace (#5672)
  feat: xxo enhancement. (#5671)
  chore: rearrange python dependencies in groups (#5603)
  chore: delete unused resource (#5667)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💪 enhancement New feature or request lgtm This PR has been approved by a maintainer size:L This PR changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants