Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions config/runtime.exs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ cond do
llm_config: %{
# The CURRENT_LLM_MODEL_CONFIG_PROVIDER_ID must match an existing ModelConfigProvider record in the database
model_config_provider_id: System.fetch_env!("CURRENT_LLM_MODEL_CONFIG_PROVIDER_ID"),
system_prompt_id: System.fetch_env!("CURRENT_LLM_SYSTEM_PROMPT_ID"),
generation_prompt_id: System.fetch_env!("CURRENT_RAG_GENERATION_PROMPT_ID")
}

Expand All @@ -106,7 +105,6 @@ cond do
# Points to the Ollama dev config set in the seeds
llm_config: %{
model_config_provider_id: "1f0e49ff-a985-4c03-a89b-fa443842fa95",
system_prompt_id: "c49195b4-daca-42af-835d-bdb928986d5c",
generation_prompt_id: "3ef5b20b-bb71-467d-8364-898df9926a95"
}

Expand All @@ -116,7 +114,6 @@ cond do
llm_config: %{
# Random IDs that is used in the tests!
model_config_provider_id: "9a21bfd3-cb0a-433c-a9b3-826143782c81",
system_prompt_id: "96123e4b-7d0a-4e14-82d4-63d68562e8f1",
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can also get rid of the use of test_system_prompt_id() in the tests then, right? ✂️

Copy link
Member Author

Choose a reason for hiding this comment

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

Sweet! Done that 🗑️

generation_prompt_id: "a6dd3ab3-d57e-43d9-a39a-d1ce58a43cc0"
}
end
Expand Down
4 changes: 2 additions & 2 deletions test/exmeralda/chats_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ defmodule Exmeralda.ChatsTest do
id: test_model_config_provider_id()
)

system_prompt = insert(:system_prompt, id: test_system_prompt_id(), active: true)
system_prompt = insert(:system_prompt, active: true)
generation_prompt = insert(:generation_prompt, id: test_generation_prompt_id())

%{
Expand Down Expand Up @@ -302,7 +302,7 @@ defmodule Exmeralda.ChatsTest do
id: test_model_config_provider_id()
)

system_prompt = insert(:system_prompt, id: test_system_prompt_id(), active: true)
system_prompt = insert(:system_prompt, active: true)
generation_prompt = insert(:generation_prompt, id: test_generation_prompt_id())

%{
Expand Down
6 changes: 3 additions & 3 deletions test/exmeralda/regenerations_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ defmodule Exmeralda.RegenerationsTest do
id: test_model_config_provider_id()
)

system_prompt = insert(:system_prompt, id: test_system_prompt_id())
system_prompt = insert(:system_prompt, active: true)
generation_prompt = insert(:generation_prompt, id: test_generation_prompt_id())

generation_environment =
Expand Down Expand Up @@ -460,7 +460,7 @@ defmodule Exmeralda.RegenerationsTest do
id: test_model_config_provider_id()
)

system_prompt = insert(:system_prompt, id: test_system_prompt_id())
system_prompt = insert(:system_prompt, active: true)
generation_prompt = insert(:generation_prompt, id: test_generation_prompt_id())

generation_environment =
Expand Down Expand Up @@ -676,7 +676,7 @@ defmodule Exmeralda.RegenerationsTest do
id: test_model_config_provider_id()
)

system_prompt = insert(:system_prompt, id: test_system_prompt_id())
system_prompt = insert(:system_prompt, active: true)
generation_prompt = insert(:generation_prompt, id: test_generation_prompt_id())

generation_environment =
Expand Down
2 changes: 1 addition & 1 deletion test/exmeralda_web/live/chat_live_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ defmodule ExmeraldaWeb.ChatLiveTest do
id: test_model_config_provider_id()
)

insert(:system_prompt, id: test_system_prompt_id(), active: true)
insert(:system_prompt, active: true)
insert(:generation_prompt, id: test_generation_prompt_id())

:ok
Expand Down
1 change: 0 additions & 1 deletion test/support/conn_case.ex
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,5 @@ defmodule ExmeraldaWeb.ConnCase do
end

def test_model_config_provider_id, do: "9a21bfd3-cb0a-433c-a9b3-826143782c81"
def test_system_prompt_id, do: "96123e4b-7d0a-4e14-82d4-63d68562e8f1"
def test_generation_prompt_id, do: "a6dd3ab3-d57e-43d9-a39a-d1ce58a43cc0"
end
1 change: 0 additions & 1 deletion test/support/data_case.ex
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ defmodule Exmeralda.DataCase do
end

def test_model_config_provider_id, do: "9a21bfd3-cb0a-433c-a9b3-826143782c81"
def test_system_prompt_id, do: "96123e4b-7d0a-4e14-82d4-63d68562e8f1"
def test_generation_prompt_id, do: "a6dd3ab3-d57e-43d9-a39a-d1ce58a43cc0"

def retry_job do
Expand Down
Loading