mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

be a lil more lenient with modified templates

Browse Source
This commit is contained in:
Andrew Brown 2023-02-26 20:31:13 -08:00
parent 67a8ae49ba
commit e2fbd855d6
2 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/controllers/basil_controller.rb
View File

@ -23,10 +23,14 @@ class BasilController < ApplicationController
)
@gender_field = @character.overview_field('Gender')
@gender_value = Attribute.find_by(attribute_field_id: @gender_field.id, entity: @character).try(:value)
if @gender_field
@gender_value = Attribute.find_by(attribute_field_id: @gender_field.id, entity: @character).try(:value)
end
@age_field = @character.overview_field('Age')
@age_value = Attribute.find_by(attribute_field_id: @age_field.id, entity: @character).try(:value)
if @age_field
@age_value = Attribute.find_by(attribute_field_id: @age_field.id, entity: @character).try(:value)
end
@commissions = BasilCommission.where(entity_type: 'Character', entity_id: @character.id).order('id DESC')
@can_request_another = @commissions.all? { |c| c.complete? }
@ -61,40 +65,44 @@ class BasilController < ApplicationController
# Step 1. Gender
gender_field = @character.overview_field('Gender')
gender_value = Attribute.find_by(attribute_field_id: gender_field.id, entity: @character).try(:value)
if gender_value.present?
gender_importance = params.dig(:field, gender_field.id.to_s)
gender_importance = gender_importance.to_f if gender_importance.present?
if gender_importance == 1
# If the importance is exactly 1, we can omit the parentheses and save a few tokens, since the
# default attention importance is 1.
prompt_components.push gender_value
elsif gender_importance != 0
# We also want to skip adding gender to the prompt at all if the user marked it as completely unimportant (-1 + 1 = 0)
prompt_components.push "(#{gender_value}:#{gender_importance})"
if gender_field
gender_value = Attribute.find_by(attribute_field_id: gender_field.id, entity: @character).try(:value)
if gender_value.present?
gender_importance = params.dig(:field, gender_field.id.to_s)
gender_importance = gender_importance.to_f if gender_importance.present?
if gender_importance == 1
# If the importance is exactly 1, we can omit the parentheses and save a few tokens, since the
# default attention importance is 1.
prompt_components.push gender_value
elsif gender_importance != 0
# We also want to skip adding gender to the prompt at all if the user marked it as completely unimportant (-1 + 1 = 0)
prompt_components.push "(#{gender_value}:#{gender_importance})"
end
end
end
# Step 2. Age
age_field = @character.overview_field('Age')
age_value = Attribute.find_by(attribute_field_id: age_field.id, entity: @character).try(:value)
if age_field
age_value = Attribute.find_by(attribute_field_id: age_field.id, entity: @character).try(:value)
if age_value.present?
# If the user simply entered a number in for an age field, we want to help SD along by
# giving it some context. Otherwise, we'll just use the value as-is.
if age_value.to_i.to_s == age_value
age_value = "#{age_value} years old"
end
if age_value.present?
# If the user simply entered a number in for an age field, we want to help SD along by
# giving it some context. Otherwise, we'll just use the value as-is.
if age_value.to_i.to_s == age_value
age_value = "#{age_value} years old"
end
age_importance = params.dig(:field, age_field.id.to_s)
age_importance = age_importance.to_f if age_importance.present?
age_importance = params.dig(:field, age_field.id.to_s)
age_importance = age_importance.to_f if age_importance.present?
if age_importance == 1
prompt_components.push age_value
elsif age_importance != 0
# We also want to skip adding gender to the prompt at all if the user marked it as completely unimportant (-1 + 1 = 0)
prompt_components.push "(#{age_value}:#{age_importance})"
if age_importance == 1
prompt_components.push age_value
elsif age_importance != 0
# We also want to skip adding gender to the prompt at all if the user marked it as completely unimportant (-1 + 1 = 0)
prompt_components.push "(#{age_value}:#{age_importance})"
end
end
end

40
app/views/basil/character.html.erb
View File

@ -11,25 +11,29 @@
</div>
<ul>
<li style="margin-bottom: 1em">
<div class="grey-text text-darken-3" style="font-weight: bold; font-size: 0.8em">
Gender
<%= range_field_tag "field[#{@gender_field.id}]", 1, { min: 0, max: 1.5, step: 0.25, style: 'width: 50%', class: 'js-importance-slider hide' } %>
</div>
<div>
<%= @gender_value %>
</div>
</li>
<% if @gender_field %>
<li style="margin-bottom: 1em">
<div class="grey-text text-darken-3" style="font-weight: bold; font-size: 0.8em">
Gender
<%= range_field_tag "field[#{@gender_field.id}]", 1, { min: 0, max: 1.5, step: 0.25, style: 'width: 50%', class: 'js-importance-slider hide' } %>
</div>
<div>
<%= @gender_value %>
</div>
</li>
<% end %>
<li style="margin-bottom: 1em">
<div class="grey-text text-darken-3" style="font-weight: bold; font-size: 0.8em">
Age
<%= range_field_tag "field[#{@age_field.id}]", 1, { min: 0, max: 1.5, step: 0.25, style: 'width: 50%', class: 'js-importance-slider hide' } %>
</div>
<div>
<%= @age_value %>
</div>
</li>
<% if @age_field %>
<li style="margin-bottom: 1em">
<div class="grey-text text-darken-3" style="font-weight: bold; font-size: 0.8em">
Age
<%= range_field_tag "field[#{@age_field.id}]", 1, { min: 0, max: 1.5, step: 0.25, style: 'width: 50%', class: 'js-importance-slider hide' } %>
</div>
<div>
<%= @age_value %>
</div>
</li>
<% end %>
<% shown_any_value = false %>
<% @appearance_fields.each do |field| %>