Skip to content

Commit

Permalink
Update Groq - remove one model they removed, and add a bunch more.
Browse files Browse the repository at this point in the history
  • Loading branch information
scosman committed Feb 4, 2025
1 parent 5965f92 commit f06c498
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 10 deletions.
22 changes: 18 additions & 4 deletions libs/core/kiln_ai/adapters/ml_model_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,6 @@ class KilnModel(BaseModel):
name=ModelName.llama_3_1_70b,
friendly_name="Llama 3.1 70B",
providers=[
KilnModelProvider(
name=ModelProviderName.groq,
provider_options={"model": "llama-3.1-70b-versatile"},
),
KilnModelProvider(
name=ModelProviderName.amazon_bedrock,
structured_output_mode=StructuredOutputMode.json_schema,
Expand Down Expand Up @@ -461,6 +457,11 @@ class KilnModel(BaseModel):
name=ModelName.llama_3_2_1b,
friendly_name="Llama 3.2 1B",
providers=[
KilnModelProvider(
name=ModelProviderName.groq,
provider_options={"model": "llama-3.2-1b-preview"},
supports_data_gen=False,
),
KilnModelProvider(
name=ModelProviderName.openrouter,
supports_structured_output=False,
Expand All @@ -482,6 +483,11 @@ class KilnModel(BaseModel):
name=ModelName.llama_3_2_3b,
friendly_name="Llama 3.2 3B",
providers=[
KilnModelProvider(
name=ModelProviderName.groq,
provider_options={"model": "llama-3.2-3b-preview"},
supports_data_gen=False,
),
KilnModelProvider(
name=ModelProviderName.openrouter,
supports_structured_output=False,
Expand Down Expand Up @@ -511,6 +517,10 @@ class KilnModel(BaseModel):
name=ModelName.llama_3_2_11b,
friendly_name="Llama 3.2 11B",
providers=[
KilnModelProvider(
name=ModelProviderName.groq,
provider_options={"model": "llama-3.2-11b-vision-preview"},
),
KilnModelProvider(
name=ModelProviderName.openrouter,
structured_output_mode=StructuredOutputMode.json_schema,
Expand All @@ -537,6 +547,10 @@ class KilnModel(BaseModel):
name=ModelName.llama_3_2_90b,
friendly_name="Llama 3.2 90B",
providers=[
KilnModelProvider(
name=ModelProviderName.groq,
provider_options={"model": "llama-3.2-90b-vision-preview"},
),
KilnModelProvider(
name=ModelProviderName.openrouter,
structured_output_mode=StructuredOutputMode.json_schema,
Expand Down
12 changes: 6 additions & 6 deletions libs/core/kiln_ai/adapters/test_provider_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,14 @@ def test_get_model_and_provider_valid_model_wrong_provider():
def test_get_model_and_provider_multiple_providers():
# Test with a model that has multiple providers
model, provider = get_model_and_provider(
ModelName.llama_3_1_70b, ModelProviderName.groq
ModelName.llama_3_3_70b, ModelProviderName.groq
)

assert model is not None
assert provider is not None
assert model.name == ModelName.llama_3_1_70b
assert model.name == ModelName.llama_3_3_70b
assert provider.name == ModelProviderName.groq
assert provider.provider_options["model"] == "llama-3.1-70b-versatile"
assert provider.provider_options["model"] == "llama-3.3-70b-versatile"


@pytest.mark.asyncio
Expand Down Expand Up @@ -421,12 +421,12 @@ async def test_builtin_model_from_valid_model_specific_provider(mock_config):
mock_config.return_value = "fake-api-key"

provider = builtin_model_from(
ModelName.llama_3_1_70b, provider_name=ModelProviderName.groq
ModelName.llama_3_3_70b, provider_name=ModelProviderName.groq
)

assert provider is not None
assert provider.name == ModelProviderName.groq
assert provider.provider_options["model"] == "llama-3.1-70b-versatile"
assert provider.provider_options["model"] == "llama-3.3-70b-versatile"


@pytest.mark.asyncio
Expand Down Expand Up @@ -465,7 +465,7 @@ async def test_builtin_model_from_provider_warning_check(mock_config):
mock_config.return_value = None

with pytest.raises(ValueError) as exc_info:
await builtin_model_from(ModelName.llama_3_1_70b, ModelProviderName.groq)
await builtin_model_from(ModelName.llama_3_3_70b, ModelProviderName.groq)

assert provider_warnings[ModelProviderName.groq].message in str(exc_info.value)

Expand Down

0 comments on commit f06c498

Please sign in to comment.