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

Upgrades openai to version 1, removes openai history in magics #551

Merged
merged 12 commits into from
Jan 5, 2024
Merged

Upgrades openai to version 1, removes openai history in magics #551

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
807b9aa
Upgrades openai versions
JasonWeill Dec 27, 2023
1034108
Migration per openai migrate
JasonWeill Dec 27, 2023
0a59130
WIP: Upgrades openai, merges in "new" provider
JasonWeill Dec 28, 2023
2e07888
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 28, 2023
7c90aa7
No longer suppress openai-chat
JasonWeill Dec 29, 2023
ace5c88
Removes "new" openai-chat provider from commands.ipynb
JasonWeill Dec 29, 2023
2b809e4
Suppress warning re custom exception handler
JasonWeill Dec 29, 2023
b8575e0
Changes param name to prefix_messages
JasonWeill Dec 29, 2023
5c1845b
Renames openai-chat-new model in tests
JasonWeill Jan 4, 2024
ce35c9d
Removes hard dependency from jupyter-ai on openai, updates magics TOML
JasonWeill Jan 4, 2024
4397341
Removes "reset" option, copy edits in docs, updates sample file
JasonWeill Jan 4, 2024
5fe7667
Removes append_exchange function
JasonWeill Jan 5, 2024
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
Prev Previous commit
Next Next commit
Renames openai-chat-new model in tests
  • Loading branch information
@JasonWeill
JasonWeill committed Jan 4, 2024
commit 5c1845b33d270287d3cc69d0fd1b46761f4aaf0b
8 changes: 4 additions & 4 deletions packages/jupyter-ai/jupyter_ai/tests/test_config_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def configure_to_cohere(cm: ConfigManager):
def configure_to_openai(cm: ConfigManager):
"""Configures the ConfigManager to use OpenAI language and embedding models
with the API key set. Returns a 3-tuple of the keyword arguments used."""
LM_GID = "openai-chat-new:gpt-3.5-turbo"
LM_GID = "openai-chat:gpt-3.5-turbo"
EM_GID = "openai:text-embedding-ada-002"
API_KEYS = {"OPENAI_API_KEY": "foobar"}
LM_LID = "gpt-3.5-turbo"
Expand Down Expand Up @@ -157,7 +157,7 @@ def test_init_with_blocklists(cm: ConfigManager, common_cm_kwargs):
del cm

blocked_providers = ["openai"] # blocks EM
blocked_models = ["openai-chat-new:gpt-3.5-turbo"] # blocks LM
blocked_models = ["openai-chat:gpt-3.5-turbo"] # blocks LM
kwargs = {
**common_cm_kwargs,
"blocked_providers": blocked_providers,
Expand Down Expand Up @@ -278,14 +278,14 @@ def test_forbid_write_write_conflict(cm: ConfigManager):

# call UpdateConfig separately after DescribeConfig with `last_read` unset
# to force a write
cm.update_config(UpdateConfigRequest(model_provider_id="openai-chat-new:gpt-4"))
cm.update_config(UpdateConfigRequest(model_provider_id="openai-chat:gpt-4"))

# this update should fail, as this generates a write-write conflict (where
# the second update clobbers the first update).
with pytest.raises(WriteConflictError):
cm.update_config(
UpdateConfigRequest(
model_provider_id="openai-chat-new:gpt-4-32k", last_read=last_read
model_provider_id="openai-chat:gpt-4-32k", last_read=last_read
)
)

Expand Down
Loading