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: improve merge token logic to account for nested dicts #3825

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

darrelhong
Copy link

Description

This PR fixes #3806 as it appears the the tokens object may contain nested objects. Added a function to handle merging nested dicts

All Promptflow Contribution checklist:

  • The pull request does not introduce [breaking changes].
  • CHANGELOG is updated for new features, bug fixes or other significant changes.
  • I have read the contribution guidelines.
  • I confirm that all new dependencies are compatible with the MIT license.
  • Create an issue and link to the pull request to get dedicated review from promptflow team. Learn more: suggested workflow.

General Guidelines and Best Practices

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

@darrelhong
Copy link
Author

@microsoft-github-policy-service agree

@chanedwin
Copy link

this might solve issues - #3834 and #3806
facing this issue as well

2024-11-03 21:55:24 +0800   30919 execution          ERROR    1/1 flow run failed, indexes: [0], exception of index 0: Execution failure in 'generate_creative_rewrites': (TypeError) unsupported operand type(s) for +: 'dict' and 'dict'

using promptflow==1.16.1 and openai ==1.44.1

Copy link

Hi, thank you for your interest in helping to improve the prompt flow experience and for your contribution. We've noticed that there hasn't been recent engagement on this pull request. If this is still an active work stream, please let us know by pushing some changes or leaving a comment.

@github-actions github-actions bot added the no-recent-activity There has been no recent activity on this issue/pull request label Nov 17, 2024
Copy link

SDK CLI Global Config Test Result fix/merge-tokens

0 tests   0 ✅  0s ⏱️
0 suites  0 💤
0 files    0 ❌

Results for commit 8727276.

Copy link

Executor E2E Test Result fix/merge-tokens

0 tests   0 ✅  0s ⏱️
0 suites  0 💤
0 files    0 ❌

Results for commit 8727276.

Copy link

Executor Unit Test Result fix/merge-tokens

0 tests   0 ✅  0s ⏱️
0 suites  0 💤
0 files    0 ❌

Results for commit 8727276.

@github-actions github-actions bot removed the no-recent-activity There has been no recent activity on this issue/pull request label Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants