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

Setting default model providers #421

Merged
merged 14 commits into from
Jan 26, 2024
+168 −8
Merged

Setting default model providers #421

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
752e169
Setting default model providers
aws-khatria Oct 29, 2023
d198e11
Setting default model providers
aws-khatria Oct 29, 2023
8b1924e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 23, 2024
8ab53f3
Setting default model providers
aws-khatria Oct 29, 2023
f514ea4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 23, 2024
09a49b8
Added default_ prefix to new attributes
aws-khatria Jan 23, 2024
00f23aa
Added default_ prefix to docs as well
aws-khatria Jan 23, 2024
bad649a
Fix docs
aws-khatria Jan 23, 2024
ff73fac
Removed redundant code
aws-khatria Jan 23, 2024
4d57c31
Incorporated naming related comments
aws-khatria Jan 25, 2024
d5d4502
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 25, 2024
786a9bf
Removing unnecessary files
aws-khatria Jan 25, 2024
e7cec53
Merge branch 'jupyterlab:main' into default_model_provider_v1
aws-khatria Jan 25, 2024
50e038b
Corrected config names, simplified docs.
3coins Jan 26, 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
[pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
  • Loading branch information
@pre-commit-ci
pre-commit-ci[bot] committed Jan 23, 2024
commit f514ea4cc42c7b8038d15c5650b6a9f591c49552
43 changes: 31 additions & 12 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 @@ -47,7 +47,7 @@ def common_cm_kwargs(config_path, schema_path):
"embeddings_provider_id": None,
"api_keys": None,
"fields": None,
}
},
}


Expand Down Expand Up @@ -103,6 +103,7 @@ def cm_with_allowlists(common_cm_kwargs):
}
return ConfigManager(**kwargs)


def cm_with_defaults(cm_kargs_with_defaults):
"""The default ConfigManager instance, with an empty config and config schema."""
return ConfigManager(**cm_kargs_with_defaults)
Expand Down Expand Up @@ -226,8 +227,9 @@ def test_init_with_allowlists(cm: ConfigManager, common_cm_kwargs):
assert test_cm.lm_gid == None
assert test_cm.em_gid == None


def test_init_with_default_values(
cm_with_defaults: ConfigManager, config_path: str, schema_path: str
cm_with_defaults: ConfigManager, config_path: str, schema_path: str
):
"""
Test that the ConfigManager initializes with the expected default values.
Expand All @@ -238,18 +240,25 @@ def test_init_with_default_values(
schema_path (str): The path to the schema file.
"""
config_response = cm_with_defaults.get_config()
#assert config response
# assert config response
assert config_response.model_provider_id == "bedrock-chat:anthropic.claude-v1"
assert config_response.embeddings_provider_id == "bedrock:amazon.titan-embed-text-v1"
assert (
config_response.embeddings_provider_id == "bedrock:amazon.titan-embed-text-v1"
)
assert config_response.api_keys == ["OPENAI_API_KEY"]
assert config_response.fields == {"bedrock-chat:anthropic.claude-v1":{"credentials_profile_name": "default","region_name": "us-west-2"}}
assert config_response.fields == {
"bedrock-chat:anthropic.claude-v1": {
"credentials_profile_name": "default",
"region_name": "us-west-2",
}
}

del cm_with_defaults

log = logging.getLogger()
lm_providers = get_lm_providers()
em_providers = get_em_providers()
cm_with_defaults_override =ConfigManager(
cm_with_defaults_override = ConfigManager(
log=log,
lm_providers=lm_providers,
em_providers=em_providers,
Expand All @@ -261,7 +270,7 @@ def test_init_with_default_values(


def test_init_with_default_values(
cm_with_defaults: ConfigManager, config_path: str, schema_path: str
cm_with_defaults: ConfigManager, config_path: str, schema_path: str
):
"""
Test that the ConfigManager initializes with the expected default values.
Expand All @@ -272,18 +281,25 @@ def test_init_with_default_values(
schema_path (str): The path to the schema file.
"""
config_response = cm_with_defaults.get_config()
#assert config response
# assert config response
assert config_response.model_provider_id == "bedrock-chat:anthropic.claude-v1"
assert config_response.embeddings_provider_id == "bedrock:amazon.titan-embed-text-v1"
assert (
config_response.embeddings_provider_id == "bedrock:amazon.titan-embed-text-v1"
)
assert config_response.api_keys == ["OPENAI_API_KEY"]
assert config_response.fields == {"bedrock-chat:anthropic.claude-v1":{"credentials_profile_name": "default","region_name": "us-west-2"}}
assert config_response.fields == {
"bedrock-chat:anthropic.claude-v1": {
"credentials_profile_name": "default",
"region_name": "us-west-2",
}
}

del cm_with_defaults

log = logging.getLogger()
lm_providers = get_lm_providers()
em_providers = get_em_providers()
cm_with_defaults_override =ConfigManager(
cm_with_defaults_override = ConfigManager(
log=log,
lm_providers=lm_providers,
em_providers=em_providers,
Expand All @@ -293,7 +309,10 @@ def test_init_with_default_values(
provider_defaults={"model_provider_id": "bedrock-chat:anthropic.claude-v2"},
)

assert cm_with_defaults_override.get_config().model_provider_id == "bedrock-chat:anthropic.claude-v2"
assert (
cm_with_defaults_override.get_config().model_provider_id
== "bedrock-chat:anthropic.claude-v2"
)


def test_init_with_default_values(
Expand Down
Loading