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

Add default value to the logprobs parameter #1044

Merged
merged 11 commits into from
Dec 25, 2023
Merged

Add default value to the logprobs parameter #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c7e16d6
added default value to logprobs param
davorrunje Dec 22, 2023
88f7e89
Merge branch 'main' into add-default_value-to-logprobs
davorrunje Dec 22, 2023
0e21918
fixed to work withversions of openai below 1.5.0
davorrunje Dec 24, 2023
ff6328b
rebase
davorrunje Dec 24, 2023
6d37c90
Merge branch 'add-default_value-to-logprobs' of github.com:davorrunje…
davorrunje Dec 24, 2023
b20803b
Merge branch 'main' into add-default_value-to-logprobs
davorrunje Dec 24, 2023
df362ba
Merge branch 'main' into add-default_value-to-logprobs
davorrunje Dec 24, 2023
3859ccf
fixed openai version in comments
davorrunje Dec 25, 2023
c73c42a
polishing
davorrunje Dec 25, 2023
4c2f1f2
limit openai version to below 1.5.0
davorrunje Dec 25, 2023
d5e41f8
Merge branch 'main' into add-default_value-to-logprobs
ekzhu Dec 25, 2023
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
10 changes: 5 additions & 5 deletions autogen/oai/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
TOOL_ENABLED = False
try:
import openai
from openai import OpenAI, APIError
from openai import OpenAI, APIError, __version__ as OPENAIVERSION
from openai.types.chat import ChatCompletion
from openai.types.chat.chat_completion import ChatCompletionMessage, Choice
from openai.types.completion import Completion
Expand Down Expand Up @@ -330,8 +330,8 @@ def _completions_create(self, client, params):
),
)
for i in range(len(response_contents)):
try:
# OpenAI versions 0.1.5 and above
if OPENAIVERSION >= "1.5": # pragma: no cover
# OpenAI versions 1.5.0 and above
choice = Choice(
index=i,
finish_reason=finish_reasons[i],
Expand All @@ -340,8 +340,8 @@ def _completions_create(self, client, params):
),
logprobs=None,
)
except ValidationError:
# OpenAI version up to 0.1.4
else:
# OpenAI versions below 1.5.0
choice = Choice(
index=i,
finish_reason=finish_reasons[i],
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
__version__ = version["__version__"]

install_requires = [
"openai>=1,<1.5", # a temporary fix for breaking changes in 1.5
"openai>=1.3,<1.5",
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't we remove "<1.5" if the PR is supposed to support openai>=1.5?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Correct. Somehow this might have been a merge error

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, that's probably due to merge. I'll run tests again against the latest 1.6.1 and create a new PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

#1071 has been created by @ekzhu and merged.

"diskcache",
"termcolor",
"flaml",
Expand Down
Loading