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.

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

Some fixes #1127

Merged
merged 4 commits into from
Feb 3, 2025
Merged
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
10 changes: 8 additions & 2 deletions apps/experiments/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,10 @@ def default_version(self) -> "Experiment":
return Experiment.objects.get_default_or_working(self)

def as_chip(self) -> Chip:
return Chip(label=self.name, url=self.get_absolute_url())
label = self.name
if self.is_archived:
label = f"{label} (archived)"
return Chip(label=label, url=self.get_absolute_url())

def get_chat_model(self):
service = self.get_llm_service()
Expand Down Expand Up @@ -1285,6 +1288,8 @@ def global_data(self):
def __str__(self):
if self.name:
return f"{self.name} ({self.identifier})"
elif self.user and self.user.get_full_name():
return f"{self.user.get_full_name()} ({self.identifier})"
return self.identifier

def get_platform_display(self):
Expand Down Expand Up @@ -1331,7 +1336,8 @@ def get_experiments_for_display(self):
last_message = exp_scoped_human_message.order_by("-created_at")[:1].values("created_at")
joined_on = self.experimentsession_set.order_by("created_at")[:1].values("created_at")
return (
Experiment.objects.annotate(
Experiment.objects.get_all()
.annotate(
joined_on=Subquery(joined_on),
last_message=Subquery(last_message),
)
Expand Down
2 changes: 1 addition & 1 deletion apps/experiments/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def render_participant(self, record):
template = get_template("generic/chip.html")
participant = record.participant
chip = chips.Chip(
label=participant.identifier, url=participant.get_link_to_experiment_data(experiment=record.experiment)
label=str(participant), url=participant.get_link_to_experiment_data(experiment=record.experiment)
)
return template.render({"chip": chip})

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="grid grid-cols-2 gap-1">
<div class="grid {% if field.previous_field_version %}grid-cols-2{% else %}grid-cols-1{% endif %} gap-1">
{% if field.is_a_version %}
<div class="col-span-2">
{% include 'experiments/components/versions/compare.html' with version_details=field.raw_value_version level=level|add:"1" %}
Expand Down
2 changes: 1 addition & 1 deletion templates/experiments/experiment_version_table.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% block modal %}
<dialog id="versionDetailsModal" class="modal">
<div class="modal-box">
<div class="modal-box max-w-none w-1/2">
<form method="dialog">
<button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2" aria-label="Close">✕</button>
</form>
Expand Down