From 32e0affaf40bf830b864009f78eb111c1372b5dd Mon Sep 17 00:00:00 2001 From: Steph Herbers Date: Mon, 9 Sep 2024 14:05:31 -0400 Subject: [PATCH 01/17] add details button view to versions table with button to set the version to default version --- apps/experiments/tables.py | 3 +++ apps/experiments/urls.py | 1 + apps/experiments/views/__init__.py | 1 + apps/experiments/views/experiment.py | 12 ++++++++++++ .../experiment_version_details_button.html | 19 +++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 templates/experiments/components/experiment_version_details_button.html diff --git a/apps/experiments/tables.py b/apps/experiments/tables.py index 9761ad61b..25d203397 100644 --- a/apps/experiments/tables.py +++ b/apps/experiments/tables.py @@ -167,6 +167,9 @@ class ExperimentVersionsTable(tables.Table): {% endif %}""", verbose_name="Default Version", ) + details = columns.TemplateColumn( + template_name="experiments/components/experiment_version_details_button.html", + ) class Meta: model = Experiment diff --git a/apps/experiments/urls.py b/apps/experiments/urls.py index 0cb7309f9..5713821e4 100644 --- a/apps/experiments/urls.py +++ b/apps/experiments/urls.py @@ -44,6 +44,7 @@ path("e//", views.single_experiment_home, name="single_experiment_home"), path("e//sessions-table/", views.ExperimentSessionsTableView.as_view(), name="sessions-list"), path("e//versions/", views.ExperimentVersionsTableView.as_view(), name="versions-list"), + path("e//versions/set_default", views.set_default_experiment, name="set-default-experiment"), path("e//versions/create", views.CreateExperimentVersion.as_view(), name="create_version"), path("e//edit/", views.EditExperiment.as_view(), name="edit"), path("e//delete/", views.delete_experiment, name="delete"), diff --git a/apps/experiments/views/__init__.py b/apps/experiments/views/__init__.py index b0f8c28c5..80de58837 100644 --- a/apps/experiments/views/__init__.py +++ b/apps/experiments/views/__init__.py @@ -34,6 +34,7 @@ get_message_response, poll_messages, send_invitation, + set_default_experiment, single_experiment_home, start_authed_web_session, start_session_from_invite, diff --git a/apps/experiments/views/experiment.py b/apps/experiments/views/experiment.py index 56c3fc301..bbe6e5bbc 100644 --- a/apps/experiments/views/experiment.py +++ b/apps/experiments/views/experiment.py @@ -1158,3 +1158,15 @@ def download_file(request, team_slug: str, session_id: int, pk: int): return FileResponse(file, as_attachment=True, filename=resource.file.name) except FileNotFoundError: raise Http404() + + +@require_POST +@transaction.atomic +@login_and_team_required +def set_default_experiment(request, team_slug: str, pk: int): + experiment = get_object_or_404(Experiment, id=pk) + Experiment.objects.exclude(pk=experiment.pk).update(is_default_version=False) + experiment.is_default_version = True + experiment.save() + + return redirect("experiments:versions-list", team_slug=request.team.slug) diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html new file mode 100644 index 000000000..5243b0bbe --- /dev/null +++ b/templates/experiments/components/experiment_version_details_button.html @@ -0,0 +1,19 @@ + + + +
+

Details for {{ record.version_number }}

+

{{ record.description }}

+ {% url 'experiments:set-default-experiment' record.id as form_action_url %} +
+ {% csrf_token %} + +
+
+ +
+
+ From e2f410b4921a71b3769aaa3ba2fc8cf80d6c841e Mon Sep 17 00:00:00 2001 From: Steph Herbers Date: Mon, 9 Sep 2024 14:28:31 -0400 Subject: [PATCH 02/17] add content to version detial body and move defualt button to footer --- .../experiment_version_details_button.html | 60 ++++++++++++++++--- 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html index 5243b0bbe..d3159b337 100644 --- a/templates/experiments/components/experiment_version_details_button.html +++ b/templates/experiments/components/experiment_version_details_button.html @@ -5,14 +5,60 @@
-

Details for {{ record.version_number }}

-

{{ record.description }}

- {% url 'experiments:set-default-experiment' record.id as form_action_url %} -
- {% csrf_token %} - -
+

Details for {{ record.name }} (Version {{ record.version_number }})

+

Description: {{ record.description }}

+ +

LLM Model: {{ record.llm }}

+ + {% if record.llm_provider %} +

LLM Provider: {{ record.llm_provider.name }}

+ {% endif %} + + {% if record.assistant %} +

Assistant: {{ record.assistant.name }}

+ {% endif %} + + {% if record.pipeline %} +

Pipeline: {{ record.pipeline.name }}

+ {% endif %} + +

Temperature: {{ record.temperature }}

+ + {% if record.source_material %} +

Source Material: {{ record.source_material.name }}

+ {% endif %} + + {% if record.pre_survey %} +

Pre-Survey: {{ record.pre_survey.name }}

+ {% endif %} + + {% if record.post_survey %} +

Post-Survey: {{ record.post_survey.name }}

+ {% endif %} + + {% if record.safety_violation_notification_emails %} +

Safety Violation Notification Emails: {{ record.safety_violation_notification_emails|join:", " }}

+ {% endif %} + +

Max Token Limit: {{ record.max_token_limit }}

+ +

Voice Response Behaviour: {{ record.get_voice_response_behaviour_display }}

+ + {% if record.trace_provider %} +

Trace Provider: {{ record.trace_provider.name }}

+ {% endif %} + +

Consent Form: {{ record.consent_form.name }}

+ +

Conversational Consent Enabled: {{ record.conversational_consent_enabled|yesno:"Yes,No" }}

+ +

Echo Transcript: {{ record.echo_transcript|yesno:"Yes,No" }}

+ {% url 'experiments:set-default-experiment' record.id as form_action_url %} +
+ {% csrf_token %} + +
From 223dfe28dc6678847edb345033fc93c68219e099 Mon Sep 17 00:00:00 2001 From: Steph Herbers Date: Mon, 9 Sep 2024 14:36:31 -0400 Subject: [PATCH 03/17] formatting of modal details --- .../experiment_version_details_button.html | 83 ++++++++----------- 1 file changed, 35 insertions(+), 48 deletions(-) diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html index d3159b337..05a57ff4d 100644 --- a/templates/experiments/components/experiment_version_details_button.html +++ b/templates/experiments/components/experiment_version_details_button.html @@ -5,54 +5,41 @@
-

Details for {{ record.name }} (Version {{ record.version_number }})

-

Description: {{ record.description }}

- -

LLM Model: {{ record.llm }}

- - {% if record.llm_provider %} -

LLM Provider: {{ record.llm_provider.name }}

- {% endif %} - - {% if record.assistant %} -

Assistant: {{ record.assistant.name }}

- {% endif %} - - {% if record.pipeline %} -

Pipeline: {{ record.pipeline.name }}

- {% endif %} - -

Temperature: {{ record.temperature }}

- - {% if record.source_material %} -

Source Material: {{ record.source_material.name }}

- {% endif %} - - {% if record.pre_survey %} -

Pre-Survey: {{ record.pre_survey.name }}

- {% endif %} - - {% if record.post_survey %} -

Post-Survey: {{ record.post_survey.name }}

- {% endif %} - - {% if record.safety_violation_notification_emails %} -

Safety Violation Notification Emails: {{ record.safety_violation_notification_emails|join:", " }}

- {% endif %} - -

Max Token Limit: {{ record.max_token_limit }}

- -

Voice Response Behaviour: {{ record.get_voice_response_behaviour_display }}

- - {% if record.trace_provider %} -

Trace Provider: {{ record.trace_provider.name }}

- {% endif %} - -

Consent Form: {{ record.consent_form.name }}

- -

Conversational Consent Enabled: {{ record.conversational_consent_enabled|yesno:"Yes,No" }}

- -

Echo Transcript: {{ record.echo_transcript|yesno:"Yes,No" }}

+

Details for {{ record.name }} (Version {{ record.version_number }})

+
+

Description: {{ record.description }}

+

LLM Model: {{ record.llm }}

+ {% if record.llm_provider %} +

LLM Provider: {{ record.llm_provider.name }}

+ {% endif %} + {% if record.assistant %} +

Assistant: {{ record.assistant.name }}

+ {% endif %} + {% if record.pipeline %} +

Pipeline: {{ record.pipeline.name }}

+ {% endif %} +

Temperature: {{ record.temperature }}

+ {% if record.source_material %} +

Source Material: {{ record.source_material.name }}

+ {% endif %} + {% if record.pre_survey %} +

Pre-Survey: {{ record.pre_survey.name }}

+ {% endif %} + {% if record.post_survey %} +

Post-Survey: {{ record.post_survey.name }}

+ {% endif %} + {% if record.safety_violation_notification_emails %} +

Safety Violation Notification Emails: {{ record.safety_violation_notification_emails|join:", " }}

+ {% endif %} +

Max Token Limit: {{ record.max_token_limit }}

+

Voice Response Behaviour: {{ record.get_voice_response_behaviour_display }}

+ {% if record.trace_provider %} +

Trace Provider: {{ record.trace_provider.name }}

+ {% endif %} +

Consent Form: {{ record.consent_form.name }}

+

Conversational Consent Enabled: {{ record.conversational_consent_enabled|yesno:"Yes,No" }}

+

Echo Transcript: {{ record.echo_transcript|yesno:"Yes,No" }}

+
{% url 'experiments:set-default-experiment' record.id as form_action_url %}
From 4c4a2528d9e21b1bb3229d0ecb6747908f0e1a6f Mon Sep 17 00:00:00 2001 From: Steph <36681924+stephherbers@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:44:12 -0400 Subject: [PATCH 04/17] add team slug Co-authored-by: Simon Kelly --- .../components/experiment_version_details_button.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html index 05a57ff4d..5a502c459 100644 --- a/templates/experiments/components/experiment_version_details_button.html +++ b/templates/experiments/components/experiment_version_details_button.html @@ -41,7 +41,7 @@

Details for {{ record.name }} (Version {{ rec

Echo Transcript: {{ record.echo_transcript|yesno:"Yes,No" }}

- {% url 'experiments:set-default-experiment' record.id as form_action_url %} + {% url 'experiments:set-default-experiment' request.team.slug record.id as form_action_url %} {% csrf_token %} From 76a31a0f165b16b8f0dc999e9c69657514dbeb09 Mon Sep 17 00:00:00 2001 From: Steph Herbers Date: Wed, 18 Sep 2024 12:02:10 -0400 Subject: [PATCH 05/17] switch to htmx for details button --- .zed/settings.json | 14 +++++ .zprofile | 0 .zshrc | 2 + apps/experiments/urls.py | 1 + apps/experiments/views/__init__.py | 1 + apps/experiments/views/experiment.py | 8 ++- .../experiment_version_details_button.html | 54 ++----------------- .../experiment_version_details_content.html | 48 +++++++++++++++++ .../experiments/experiment_version_table.html | 13 +++++ 9 files changed, 91 insertions(+), 50 deletions(-) create mode 100644 .zed/settings.json create mode 100644 .zprofile create mode 100644 .zshrc create mode 100644 templates/experiments/components/experiment_version_details_content.html create mode 100644 templates/experiments/experiment_version_table.html diff --git a/.zed/settings.json b/.zed/settings.json new file mode 100644 index 000000000..b5a4b0f40 --- /dev/null +++ b/.zed/settings.json @@ -0,0 +1,14 @@ +// Folder-specific settings +// +// For a full list of overridable settings, and general information on folder-specific settings, +// see the documentation: https://zed.dev/docs/configuring-zed#folder-specific-settings +{ + "autosave": "on_focus_change", + "git_diff": true, + "hard_tabs": true, + "tabs": { + "close_position": "right", + "git_status": true + }, + "format_on_save": "off" +} diff --git a/.zprofile b/.zprofile new file mode 100644 index 000000000..e69de29bb diff --git a/.zshrc b/.zshrc new file mode 100644 index 000000000..8e6c91612 --- /dev/null +++ b/.zshrc @@ -0,0 +1,2 @@ +eval "$(pyenv init -)" +eval "$(pyenv virtualenv-init -)" diff --git a/apps/experiments/urls.py b/apps/experiments/urls.py index 5713821e4..0f6a528cc 100644 --- a/apps/experiments/urls.py +++ b/apps/experiments/urls.py @@ -44,6 +44,7 @@ path("e//", views.single_experiment_home, name="single_experiment_home"), path("e//sessions-table/", views.ExperimentSessionsTableView.as_view(), name="sessions-list"), path("e//versions/", views.ExperimentVersionsTableView.as_view(), name="versions-list"), + path("e//versions/details/", views.experiment_version_details, name="experiment-version-details"), path("e//versions/set_default", views.set_default_experiment, name="set-default-experiment"), path("e//versions/create", views.CreateExperimentVersion.as_view(), name="create_version"), path("e//edit/", views.EditExperiment.as_view(), name="edit"), diff --git a/apps/experiments/views/__init__.py b/apps/experiments/views/__init__.py index 80de58837..3be00d3db 100644 --- a/apps/experiments/views/__init__.py +++ b/apps/experiments/views/__init__.py @@ -30,6 +30,7 @@ experiment_session_details_view, experiment_session_message, experiment_session_pagination_view, + experiment_version_details, experiments_home, get_message_response, poll_messages, diff --git a/apps/experiments/views/experiment.py b/apps/experiments/views/experiment.py index bbe6e5bbc..a9ec067b5 100644 --- a/apps/experiments/views/experiment.py +++ b/apps/experiments/views/experiment.py @@ -142,7 +142,7 @@ class ExperimentVersionsTableView(SingleTableView, PermissionRequiredMixin): model = Experiment paginate_by = 25 table_class = ExperimentVersionsTable - template_name = "table/single_table.html" + template_name = "experiments/experiment_version_table.html" permission_required = "experiments.view_experiment" def get_queryset(self): @@ -1170,3 +1170,9 @@ def set_default_experiment(request, team_slug: str, pk: int): experiment.save() return redirect("experiments:versions-list", team_slug=request.team.slug) + + +@login_and_team_required +def experiment_version_details(request, team_slug: str, pk: int): + record = get_object_or_404(Experiment, pk=pk) + return render(request, "experiments/experiment_version_details_content.html", {"record": record}) diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html index 5a502c459..34ceb679d 100644 --- a/templates/experiments/components/experiment_version_details_button.html +++ b/templates/experiments/components/experiment_version_details_button.html @@ -1,52 +1,8 @@ - - -
-

Details for {{ record.name }} (Version {{ record.version_number }})

-
-

Description: {{ record.description }}

-

LLM Model: {{ record.llm }}

- {% if record.llm_provider %} -

LLM Provider: {{ record.llm_provider.name }}

- {% endif %} - {% if record.assistant %} -

Assistant: {{ record.assistant.name }}

- {% endif %} - {% if record.pipeline %} -

Pipeline: {{ record.pipeline.name }}

- {% endif %} -

Temperature: {{ record.temperature }}

- {% if record.source_material %} -

Source Material: {{ record.source_material.name }}

- {% endif %} - {% if record.pre_survey %} -

Pre-Survey: {{ record.pre_survey.name }}

- {% endif %} - {% if record.post_survey %} -

Post-Survey: {{ record.post_survey.name }}

- {% endif %} - {% if record.safety_violation_notification_emails %} -

Safety Violation Notification Emails: {{ record.safety_violation_notification_emails|join:", " }}

- {% endif %} -

Max Token Limit: {{ record.max_token_limit }}

-

Voice Response Behaviour: {{ record.get_voice_response_behaviour_display }}

- {% if record.trace_provider %} -

Trace Provider: {{ record.trace_provider.name }}

- {% endif %} -

Consent Form: {{ record.consent_form.name }}

-

Conversational Consent Enabled: {{ record.conversational_consent_enabled|yesno:"Yes,No" }}

-

Echo Transcript: {{ record.echo_transcript|yesno:"Yes,No" }}

-
-
- {% url 'experiments:set-default-experiment' request.team.slug record.id as form_action_url %} - - {% csrf_token %} - - - -
-
- diff --git a/templates/experiments/components/experiment_version_details_content.html b/templates/experiments/components/experiment_version_details_content.html new file mode 100644 index 000000000..082a17a3f --- /dev/null +++ b/templates/experiments/components/experiment_version_details_content.html @@ -0,0 +1,48 @@ +
+ + +
+
+
+

Description: {{ record.description }}

+

LLM Model: {{ record.llm }}

+ {% if record.llm_provider %} +

LLM Provider: {{ record.llm_provider.name }}

+ {% endif %} + {% if record.assistant %} +

Assistant: {{ record.assistant.name }}

+ {% endif %} + {% if record.pipeline %} +

Pipeline: {{ record.pipeline.name }}

+ {% endif %} +

Temperature: {{ record.temperature }}

+ {% if record.source_material %} +

Source Material: {{ record.source_material.name }}

+ {% endif %} + {% if record.pre_survey %} +

Pre-Survey: {{ record.pre_survey.name }}

+ {% endif %} + {% if record.post_survey %} +

Post-Survey: {{ record.post_survey.name }}

+ {% endif %} + {% if record.safety_violation_notification_emails %} +

Safety Violation Notification Emails: {{ record.safety_violation_notification_emails|join:", " }}

+ {% endif %} +

Max Token Limit: {{ record.max_token_limit }}

+

Voice Response Behaviour: {{ record.get_voice_response_behaviour_display }}

+ {% if record.trace_provider %} +

Trace Provider: {{ record.trace_provider.name }}

+ {% endif %} +

Consent Form: {{ record.consent_form.name }}

+

Conversational Consent Enabled: {{ record.conversational_consent_enabled|yesno:"Yes,No" }}

+

Echo Transcript: {{ record.echo_transcript|yesno:"Yes,No" }}

+
+
+
+ {% url 'experiments:set-default-experiment' record.id as form_action_url %} +
+ {% csrf_token %} + +
+ +
diff --git a/templates/experiments/experiment_version_table.html b/templates/experiments/experiment_version_table.html new file mode 100644 index 000000000..78034890a --- /dev/null +++ b/templates/experiments/experiment_version_table.html @@ -0,0 +1,13 @@ +{% extends "table/single_table.html" %} + +{% block content %} + {{ block.super }} + + +{% endblock %} From 2ac5afb5fc6d87ae59fb4e1d75a0d84dbcbd4c38 Mon Sep 17 00:00:00 2001 From: Steph Herbers Date: Wed, 18 Sep 2024 12:34:11 -0400 Subject: [PATCH 06/17] correct url --- apps/experiments/urls.py | 6 +++++- apps/experiments/views/experiment.py | 6 +++--- .../components/experiment_version_details_button.html | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/experiments/urls.py b/apps/experiments/urls.py index 0f6a528cc..056e15f6c 100644 --- a/apps/experiments/urls.py +++ b/apps/experiments/urls.py @@ -44,7 +44,11 @@ path("e//", views.single_experiment_home, name="single_experiment_home"), path("e//sessions-table/", views.ExperimentSessionsTableView.as_view(), name="sessions-list"), path("e//versions/", views.ExperimentVersionsTableView.as_view(), name="versions-list"), - path("e//versions/details/", views.experiment_version_details, name="experiment-version-details"), + path( + "e//versions/details//", + views.experiment_version_details, + name="experiment-version-details", + ), path("e//versions/set_default", views.set_default_experiment, name="set-default-experiment"), path("e//versions/create", views.CreateExperimentVersion.as_view(), name="create_version"), path("e//edit/", views.EditExperiment.as_view(), name="edit"), diff --git a/apps/experiments/views/experiment.py b/apps/experiments/views/experiment.py index a9ec067b5..056ec89f4 100644 --- a/apps/experiments/views/experiment.py +++ b/apps/experiments/views/experiment.py @@ -1173,6 +1173,6 @@ def set_default_experiment(request, team_slug: str, pk: int): @login_and_team_required -def experiment_version_details(request, team_slug: str, pk: int): - record = get_object_or_404(Experiment, pk=pk) - return render(request, "experiments/experiment_version_details_content.html", {"record": record}) +def experiment_version_details(request, team_slug: str, experiment_id: int, pk: int): + record = get_object_or_404(Experiment, working_version_id=experiment_id, version_number=pk, team=request.team) + return render(request, "experiments/components/experiment_version_details_content.html", {"record": record}) diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html index 34ceb679d..12b510471 100644 --- a/templates/experiments/components/experiment_version_details_button.html +++ b/templates/experiments/components/experiment_version_details_button.html @@ -1,5 +1,5 @@
- {% url 'experiments:set-default-experiment' record.id as form_action_url %} + {% url 'experiments:set-default-experiment' team_slug=team.slug experiment_id=record.working_version_id pk=record.version_number as form_action_url %}
{% csrf_token %} From e92d5d0c3110d9525022a6ad8afa40aaa9cd44d2 Mon Sep 17 00:00:00 2001 From: Steph Herbers Date: Wed, 18 Sep 2024 14:07:03 -0400 Subject: [PATCH 08/17] ordering --- templates/experiments/experiment_version_table.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/experiments/experiment_version_table.html b/templates/experiments/experiment_version_table.html index 78034890a..a0b28c71c 100644 --- a/templates/experiments/experiment_version_table.html +++ b/templates/experiments/experiment_version_table.html @@ -1,13 +1,12 @@ {% extends "table/single_table.html" %} {% block content %} - {{ block.super }} - + {{ block.super }} {% endblock %} From 8d5488d93d9441880bfe45c2a49e43952a996cf4 Mon Sep 17 00:00:00 2001 From: Steph Herbers Date: Wed, 18 Sep 2024 14:07:37 -0400 Subject: [PATCH 09/17] fix html details --- .../experiment_version_details_button.html | 16 ++++++++++++---- .../experiment_version_details_content.html | 7 ++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html index 12b510471..d92d3baba 100644 --- a/templates/experiments/components/experiment_version_details_button.html +++ b/templates/experiments/components/experiment_version_details_button.html @@ -1,8 +1,16 @@ + + +
+ + + +
+
+ diff --git a/templates/experiments/components/experiment_version_details_content.html b/templates/experiments/components/experiment_version_details_content.html index 06cca1dc2..6961affd8 100644 --- a/templates/experiments/components/experiment_version_details_content.html +++ b/templates/experiments/components/experiment_version_details_content.html @@ -1,7 +1,9 @@
- - +
+

Description: {{ record.description }}

@@ -44,5 +46,4 @@
From 8b5f327ff195af5937d023feb32f94005504e4f7 Mon Sep 17 00:00:00 2001 From: Steph Herbers Date: Wed, 18 Sep 2024 14:11:44 -0400 Subject: [PATCH 10/17] details column aesthetic changes: remove column heading and make a more clear button name --- apps/experiments/tables.py | 1 + .../components/experiment_version_details_button.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/experiments/tables.py b/apps/experiments/tables.py index 25d203397..6caac5433 100644 --- a/apps/experiments/tables.py +++ b/apps/experiments/tables.py @@ -169,6 +169,7 @@ class ExperimentVersionsTable(tables.Table): ) details = columns.TemplateColumn( template_name="experiments/components/experiment_version_details_button.html", + verbose_name="", ) class Meta: diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html index d92d3baba..42ba86aad 100644 --- a/templates/experiments/components/experiment_version_details_button.html +++ b/templates/experiments/components/experiment_version_details_button.html @@ -3,7 +3,7 @@ hx-target="#details_modal_content" hx-trigger="click" onclick="document.querySelector('#details_modal').showModal();"> - Details + View Details From 97ed1bce686f7a0ad460b4c3ddf6c491950948ed Mon Sep 17 00:00:00 2001 From: Chris Smit Date: Thu, 19 Sep 2024 08:37:07 +0200 Subject: [PATCH 11/17] gitignore editor settings files and remove shell specific ones --- .gitignore | 3 +++ .zprofile | 0 .zshrc | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 .zprofile delete mode 100644 .zshrc diff --git a/.gitignore b/.gitignore index 080a57b02..1aecaa712 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ static/css/ static/js/ .git-backup tmp_schema.yml + +# Editor config files +.zed/ \ No newline at end of file diff --git a/.zprofile b/.zprofile deleted file mode 100644 index e69de29bb..000000000 diff --git a/.zshrc b/.zshrc deleted file mode 100644 index 8e6c91612..000000000 --- a/.zshrc +++ /dev/null @@ -1,2 +0,0 @@ -eval "$(pyenv init -)" -eval "$(pyenv virtualenv-init -)" From 40ecbb3d3bd445e10d12b5b2d50cbeb6af0fb076 Mon Sep 17 00:00:00 2001 From: Chris Smit Date: Thu, 19 Sep 2024 10:26:58 +0200 Subject: [PATCH 12/17] Rename pk param to version_number and fix redirect url for setting the default version --- apps/experiments/urls.py | 4 +-- apps/experiments/views/experiment.py | 29 ++++++++++++++----- .../experiment_version_details_button.html | 2 +- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/apps/experiments/urls.py b/apps/experiments/urls.py index 9f3f1b304..acadf631c 100644 --- a/apps/experiments/urls.py +++ b/apps/experiments/urls.py @@ -45,12 +45,12 @@ path("e//sessions-table/", views.ExperimentSessionsTableView.as_view(), name="sessions-list"), path("e//versions/", views.ExperimentVersionsTableView.as_view(), name="versions-list"), path( - "e//versions/details//", + "e//versions/details//", views.experiment_version_details, name="experiment-version-details", ), path( - "e//versions/set_default//", + "e//versions/set_default//", views.set_default_experiment, name="set-default-experiment", ), diff --git a/apps/experiments/views/experiment.py b/apps/experiments/views/experiment.py index 823a7a2d3..8cc62162d 100644 --- a/apps/experiments/views/experiment.py +++ b/apps/experiments/views/experiment.py @@ -1206,18 +1206,31 @@ def download_file(request, team_slug: str, session_id: int, pk: int): @require_POST @transaction.atomic @login_and_team_required -def set_default_experiment(request, team_slug: str, experiment_id: int, pk: int): - experiment = get_object_or_404(Experiment, working_version_id=experiment_id, version_number=pk, team=request.team) - Experiment.objects.exclude(version_number=pk).filter(team__slug=team_slug, working_version_id=experiment_id).update( - is_default_version=False, audit_action=AuditAction.AUDIT +def set_default_experiment(request, team_slug: str, experiment_id: int, version_number: int): + experiment = get_object_or_404( + Experiment, working_version_id=experiment_id, version_number=version_number, team=request.team ) + Experiment.objects.exclude(version_number=version_number).filter( + team__slug=team_slug, working_version_id=experiment_id + ).update(is_default_version=False, audit_action=AuditAction.AUDIT) experiment.is_default_version = True experiment.save() - return redirect("experiments:versions-list", team_slug=request.team.slug, experiment_id=experiment_id) + url = ( + reverse( + "experiments:single_experiment_home", + kwargs={"team_slug": request.team.slug, "experiment_id": experiment_id}, + ) + + "#versions" + ) + return redirect(url) @login_and_team_required -def experiment_version_details(request, team_slug: str, experiment_id: int, pk: int): - record = get_object_or_404(Experiment, working_version_id=experiment_id, version_number=pk, team=request.team) - return render(request, "experiments/components/experiment_version_details_content.html", {"record": record}) +def experiment_version_details(request, team_slug: str, experiment_id: int, version_number: int): + experiment_version = get_object_or_404( + Experiment, working_version_id=experiment_id, version_number=version_number, team=request.team + ) + return render( + request, "experiments/components/experiment_version_details_content.html", {"experiment": experiment_version} + ) diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html index 42ba86aad..8d0b10286 100644 --- a/templates/experiments/components/experiment_version_details_button.html +++ b/templates/experiments/components/experiment_version_details_button.html @@ -1,5 +1,5 @@
+
+ +
From 4dff3621c9a95490e200b620cea2f87b59bed9ad Mon Sep 17 00:00:00 2001 From: Chris Smit Date: Thu, 19 Sep 2024 10:42:31 +0200 Subject: [PATCH 14/17] Add a method on experiment that return version details to the template --- apps/experiments/models.py | 36 ++++++++++++++ .../experiment_version_details_content.html | 47 +++++-------------- 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/apps/experiments/models.py b/apps/experiments/models.py index 75bf4c29d..70685b91b 100644 --- a/apps/experiments/models.py +++ b/apps/experiments/models.py @@ -691,6 +691,42 @@ def is_public(self) -> bool: def is_participant_allowed(self, identifier: str): return identifier in self.participant_allowlist or self.team.members.filter(email=identifier).exists() + def version_details_for_display(self) -> list[dict]: + """ + Returns a list of dictionaries, each representing a specific detail of this the current experiment. + Each dictionary should have a `name` and `value` key. + """ + + def name_or_none(attr_name): + return getattr(self, attr_name) or "" + + def yes_no(condition): + return "Yes" if condition else "No" + + return [ + {"name": "Description", "value": self.description}, + {"name": "Version", "value": self.version_number}, + {"name": "Version Description", "value": self.version_description}, + {"name": "LLM Model", "value": self.llm}, + {"name": "LLM Provider", "value": self.llm_provider.name}, + {"name": "Assistant", "value": name_or_none("assistant")}, + {"name": "Pipeline", "value": name_or_none("pipeline")}, + {"name": "Temperature", "value": self.temperature}, + {"name": "Source Material", "value": name_or_none("source_material")}, + {"name": "Pre-Survey", "value": name_or_none("pre_survey")}, + {"name": "Post-Survey", "value": name_or_none("post_survey")}, + { + "name": "Safety Violation Notification Emails", + "value": ", ".join(self.safety_violation_notification_emails), + }, + {"name": "Max Token Limit", "value": self.max_token_limit}, + {"name": "Voice Response Behaviour", "value": self.get_voice_response_behaviour_display}, + {"name": "Trace Provider", "value": name_or_none("trace_provider")}, + {"name": "Consent Form", "value": name_or_none("consent_form")}, + {"name": "Conversational Consent Enabled", "value": yes_no(self.conversational_consent_enabled)}, + {"name": "Echo Transcript", "value": yes_no(self.echo_transcript)}, + ] + class ExperimentRouteType(models.TextChoices): PROCESSOR = "processor" diff --git a/templates/experiments/components/experiment_version_details_content.html b/templates/experiments/components/experiment_version_details_content.html index 6961affd8..9ae4a145c 100644 --- a/templates/experiments/components/experiment_version_details_content.html +++ b/templates/experiments/components/experiment_version_details_content.html @@ -1,49 +1,26 @@
-

Description: {{ record.description }}

-

LLM Model: {{ record.llm }}

- {% if record.llm_provider %} -

LLM Provider: {{ record.llm_provider.name }}

- {% endif %} - {% if record.assistant %} -

Assistant: {{ record.assistant.name }}

- {% endif %} - {% if record.pipeline %} -

Pipeline: {{ record.pipeline.name }}

- {% endif %} -

Temperature: {{ record.temperature }}

- {% if record.source_material %} -

Source Material: {{ record.source_material.name }}

- {% endif %} - {% if record.pre_survey %} -

Pre-Survey: {{ record.pre_survey.name }}

- {% endif %} - {% if record.post_survey %} -

Post-Survey: {{ record.post_survey.name }}

- {% endif %} - {% if record.safety_violation_notification_emails %} -

Safety Violation Notification Emails: {{ record.safety_violation_notification_emails|join:", " }}

- {% endif %} -

Max Token Limit: {{ record.max_token_limit }}

-

Voice Response Behaviour: {{ record.get_voice_response_behaviour_display }}

- {% if record.trace_provider %} -

Trace Provider: {{ record.trace_provider.name }}

- {% endif %} -

Consent Form: {{ record.consent_form.name }}

-

Conversational Consent Enabled: {{ record.conversational_consent_enabled|yesno:"Yes,No" }}

-

Echo Transcript: {{ record.echo_transcript|yesno:"Yes,No" }}

+ {% for field in experiment.version_details_for_display %} +
+
{{ field.name }}
+
{{ field.value }}
+
+ {% endfor %}
+
- {% url 'experiments:set-default-experiment' team_slug=team.slug experiment_id=record.working_version_id pk=record.version_number as form_action_url %} + {% url 'experiments:set-default-experiment' team_slug=team.slug experiment_id=experiment.working_version_id version_number=experiment.version_number as form_action_url%}
{% csrf_token %} - +
From a585408e1d250ad84136c5dc35e88629a76c6166 Mon Sep 17 00:00:00 2001 From: Chris Smit Date: Thu, 19 Sep 2024 12:55:18 +0200 Subject: [PATCH 15/17] Use a TypedDict for experiment details --- apps/experiments/models.py | 52 +++++++++++-------- .../experiment_version_details_content.html | 2 +- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/apps/experiments/models.py b/apps/experiments/models.py index 70685b91b..247fefff0 100644 --- a/apps/experiments/models.py +++ b/apps/experiments/models.py @@ -2,6 +2,7 @@ import uuid from datetime import datetime from functools import cached_property +from typing import TypedDict from uuid import uuid4 import markdown @@ -29,6 +30,13 @@ log = logging.getLogger(__name__) +class ExperimentDetail(TypedDict): + """Represents a specific detail about an experiment. The label is the user friendly name""" + + label: str + value: str | int + + class PromptObjectManager(AuditingManager): pass @@ -691,7 +699,7 @@ def is_public(self) -> bool: def is_participant_allowed(self, identifier: str): return identifier in self.participant_allowlist or self.team.members.filter(email=identifier).exists() - def version_details_for_display(self) -> list[dict]: + def version_details_for_display(self) -> list[ExperimentDetail]: """ Returns a list of dictionaries, each representing a specific detail of this the current experiment. Each dictionary should have a `name` and `value` key. @@ -704,27 +712,27 @@ def yes_no(condition): return "Yes" if condition else "No" return [ - {"name": "Description", "value": self.description}, - {"name": "Version", "value": self.version_number}, - {"name": "Version Description", "value": self.version_description}, - {"name": "LLM Model", "value": self.llm}, - {"name": "LLM Provider", "value": self.llm_provider.name}, - {"name": "Assistant", "value": name_or_none("assistant")}, - {"name": "Pipeline", "value": name_or_none("pipeline")}, - {"name": "Temperature", "value": self.temperature}, - {"name": "Source Material", "value": name_or_none("source_material")}, - {"name": "Pre-Survey", "value": name_or_none("pre_survey")}, - {"name": "Post-Survey", "value": name_or_none("post_survey")}, - { - "name": "Safety Violation Notification Emails", - "value": ", ".join(self.safety_violation_notification_emails), - }, - {"name": "Max Token Limit", "value": self.max_token_limit}, - {"name": "Voice Response Behaviour", "value": self.get_voice_response_behaviour_display}, - {"name": "Trace Provider", "value": name_or_none("trace_provider")}, - {"name": "Consent Form", "value": name_or_none("consent_form")}, - {"name": "Conversational Consent Enabled", "value": yes_no(self.conversational_consent_enabled)}, - {"name": "Echo Transcript", "value": yes_no(self.echo_transcript)}, + ExperimentDetail(label="Description", value=self.description), + ExperimentDetail(label="Version", value=self.version_number), + ExperimentDetail(label="Version Description", value=self.version_description), + ExperimentDetail(label="LLM Model", value=self.llm), + ExperimentDetail(label="LLM Provider", value=self.llm_provider.name), + ExperimentDetail(label="Assistant", value=name_or_none("assistant")), + ExperimentDetail(label="Pipeline", value=name_or_none("pipeline")), + ExperimentDetail(label="Temperature", value=self.temperature), + ExperimentDetail(label="Source Material", value=name_or_none("source_material")), + ExperimentDetail(label="Pre-Survey", value=name_or_none("pre_survey")), + ExperimentDetail(label="Post-Survey", value=name_or_none("post_survey")), + ExperimentDetail( + label="Safety Violation Notification Emails", + value=", ".join(self.safety_violation_notification_emails), + ), + ExperimentDetail(label="Max Token Limit", value=self.max_token_limit), + ExperimentDetail(label="Voice Response Behaviour", value=self.get_voice_response_behaviour_display), + ExperimentDetail(label="Trace Provider", value=name_or_none("trace_provider")), + ExperimentDetail(label="Consent Form", value=name_or_none("consent_form")), + ExperimentDetail(label="Conversational Consent Enabled", value=yes_no(self.conversational_consent_enabled)), + ExperimentDetail(label="Echo Transcript", value=yes_no(self.echo_transcript)), ] diff --git a/templates/experiments/components/experiment_version_details_content.html b/templates/experiments/components/experiment_version_details_content.html index 9ae4a145c..8ee1e8287 100644 --- a/templates/experiments/components/experiment_version_details_content.html +++ b/templates/experiments/components/experiment_version_details_content.html @@ -8,7 +8,7 @@

Details for {{ experiment }}

{% for field in experiment.version_details_for_display %}
-
{{ field.name }}
+
{{ field.label }}
{{ field.value }}
{% endfor %} From 81e3ca797dd6a11f64f1979ee6385d74a32e7b84 Mon Sep 17 00:00:00 2001 From: Chris Smit Date: Thu, 19 Sep 2024 12:55:58 +0200 Subject: [PATCH 16/17] Remove .zed dir --- .gitignore | 3 --- .zed/settings.json | 14 -------------- 2 files changed, 17 deletions(-) delete mode 100644 .zed/settings.json diff --git a/.gitignore b/.gitignore index 3afbdf34d..ad8460782 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,3 @@ static/css/ static/js/ .git-backup tmp_schema.yml - -# Editor config files -.zed/ \ No newline at end of file diff --git a/.zed/settings.json b/.zed/settings.json deleted file mode 100644 index b5a4b0f40..000000000 --- a/.zed/settings.json +++ /dev/null @@ -1,14 +0,0 @@ -// Folder-specific settings -// -// For a full list of overridable settings, and general information on folder-specific settings, -// see the documentation: https://zed.dev/docs/configuring-zed#folder-specific-settings -{ - "autosave": "on_focus_change", - "git_diff": true, - "hard_tabs": true, - "tabs": { - "close_position": "right", - "git_status": true - }, - "format_on_save": "off" -} From 11abeb5d3c12d9c1b925e5eb4c0943ce31da1d2c Mon Sep 17 00:00:00 2001 From: Chris Smit Date: Thu, 19 Sep 2024 13:15:32 +0200 Subject: [PATCH 17/17] Use the single existing modal when populating the version details --- .../experiment_version_details_button.html | 16 ++-------------- .../experiments/experiment_version_table.html | 19 +++++++++++-------- templates/table/single_table.html | 2 ++ 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/templates/experiments/components/experiment_version_details_button.html b/templates/experiments/components/experiment_version_details_button.html index 76e5c25ee..e4e2c93eb 100644 --- a/templates/experiments/components/experiment_version_details_button.html +++ b/templates/experiments/components/experiment_version_details_button.html @@ -1,19 +1,7 @@ - - -
-
- -
-
-
-
- -
- diff --git a/templates/experiments/experiment_version_table.html b/templates/experiments/experiment_version_table.html index a0b28c71c..146df1bdd 100644 --- a/templates/experiments/experiment_version_table.html +++ b/templates/experiments/experiment_version_table.html @@ -1,12 +1,15 @@ {% extends "table/single_table.html" %} -{% block content %} -
{% endblock %} diff --git a/templates/table/single_table.html b/templates/table/single_table.html index b1c8ced98..18b9fa1e5 100644 --- a/templates/table/single_table.html +++ b/templates/table/single_table.html @@ -1,6 +1,8 @@ {% load static %} {% load render_table from django_tables2 %} {% render_table table "table/tailwind_js_pagination.html" %} +{% block modal %} +{% endblock %}