A platform for community discussion. Free, open, simple.
UX: improve AI agent form and tool chart (#38478)
Kris5a3b48d5b816
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjsindex 110b0ca6770..38894e8df3d 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjs@@ -12,6 +12,7 @@ import AdminUser from "discourse/admin/models/admin-user";import BackButton from "discourse/components/back-button";import Form from "discourse/components/form";import Avatar from "discourse/helpers/bound-avatar-template";+import icon from "discourse/helpers/d-icon";import { popupAjaxError } from "discourse/lib/ajax-error";import {addUniqueValueToArray,@@ -36,6 +37,7 @@ const TOOL_TOKEN_LOW_THRESHOLD = 2000;const TOOL_TOKEN_HIGH_THRESHOLD = 4000;const TOOL_TOKEN_BAR_MAX = 6000;const TOOL_COUNT_WARNING_THRESHOLD = 5;+const TOOL_COUNT_BAR_MAX = 7;export default class AgentEditor extends Component {@service router;@@ -296,10 +298,16 @@ export default class AgentEditor extends Component {}@action- toolTokenBarStyle(tools) {+ toolTokenIndicatorStyle(tools) {const total = this.totalToolTokens(tools);const percent = Math.min(100, (total / TOOL_TOKEN_BAR_MAX) * 100);- return trustHTML(`width: ${percent}%`);+ return trustHTML(`left: ${percent}%`);+ }++ @action+ toolCountIndicatorStyle(tools) {+ const percent = Math.min(100, (tools.length / TOOL_COUNT_BAR_MAX) * 100);+ return trustHTML(`left: ${percent}%`);}@action@@ -319,6 +327,33 @@ export default class AgentEditor extends Component {return "low";}+ @action+ toolTokenOnlySeverity(tools) {+ if (!tools) {+ return "low";+ }+ const total = this.totalToolTokens(tools);+ if (total >= TOOL_TOKEN_HIGH_THRESHOLD) {+ return "high";+ } else if (total >= TOOL_TOKEN_LOW_THRESHOLD) {+ return "medium";+ }+ return "low";+ }++ @action+ toolCountOnlySeverity(tools) {+ if (!tools) {+ return "low";+ }+ return tools.length >= TOOL_COUNT_WARNING_THRESHOLD ? "high" : "low";+ }++ @action+ showExamples(data) {+ return data.examples?.length > 0 || !data.system;+ }+@actiontooManyTools(tools) {return tools.length >= TOOL_COUNT_WARNING_THRESHOLD;@@ -536,31 +571,36 @@ export default class AgentEditor extends Component {</form.Field>{{/if}}- <form.Section- @title={{i18n "discourse_ai.ai_agent.examples.title"}}- @subtitle={{i18n "discourse_ai.ai_agent.examples.examples_help"}}- >- {{#unless data.system}}- <form.Container>- <form.Button- @action={{fn this.addExamplesPair form data}}- @label="discourse_ai.ai_agent.examples.new"- class="ai-agent-editor__new_example"- />- </form.Container>- {{/unless}}+ {{#if (this.showExamples data)}}+ <form.Section+ @title={{i18n "discourse_ai.ai_agent.examples.title"}}+ @subtitle={{i18n "discourse_ai.ai_agent.examples.examples_help"}}+ >+ {{#unless data.system}}+ <form.Container>+ <form.Button+ @action={{fn this.addExamplesPair form data}}+ @label="discourse_ai.ai_agent.examples.new"+ class="btn-default ai-agent-editor__new_example"+ />+ </form.Container>+ {{/unless}}- {{#if (gt data.examples.length 0)}}- <form.Collection @name="examples" as |exCollection exCollectionIdx|>- <AiAgentCollapsableExample- @examplesCollection={{exCollection}}- @exampleNumber={{exCollectionIdx}}- @system={{data.system}}- @form={{form}}- />- </form.Collection>- {{/if}}- </form.Section>+ {{#if (gt data.examples.length 0)}}+ <form.Collection+ @name="examples"+ as |exCollection exCollectionIdx|+ >+ <AiAgentCollapsableExample+ @examplesCollection={{exCollection}}+ @exampleNumber={{exCollectionIdx}}+ @system={{data.system}}+ @form={{form}}+ />+ </form.Collection>+ {{/if}}+ </form.Section>+ {{/if}}<form.Section @title={{i18n "discourse_ai.ai_agent.ai_tools"}}><form.Field@@ -608,42 +648,72 @@ export default class AgentEditor extends Component {<span class="ai-agent-editor__tool-context-cost-label">{{i18n "discourse_ai.ai_agent.context_cost"}}</span>- <span class="ai-agent-editor__tool-context-cost-value">- {{i18n- "discourse_ai.ai_agent.tool_tokens_total"- tokens=(this.totalToolTokens data.tools)- }}- </span></div><div class="ai-agent-editor__tool-context-cost-bar">- <div- class="ai-agent-editor__tool-context-cost-bar-fill"- style={{this.toolTokenBarStyle data.tools}}+ <span+ class="ai-agent-editor__tool-context-cost-bar-indicator --token"+ style={{this.toolTokenIndicatorStyle data.tools}}>- <span- class="ai-agent-editor__tool-context-cost-bar-indicator"- ></span>- </div>+ {{icon "caret-down"}}+ </span>+ <span+ class="ai-agent-editor__tool-context-cost-bar-indicator --count"+ style={{this.toolCountIndicatorStyle data.tools}}+ >+ {{icon "caret-up"}}+ </span></div>+ <span class="ai-agent-editor__tool-context-cost-legend">+ <span+ class="ai-agent-editor__tool-context-cost-legend-item --token"+ >+ {{icon "caret-down"}}+ {{i18n "discourse_ai.ai_agent.token_usage"}}:+ <span+ class="ai-agent-editor__tool-context-cost-value+ {{this.toolTokenOnlySeverity data.tools}}"+ >+ {{i18n+ "discourse_ai.ai_agent.tool_tokens_total"+ tokens=(this.totalToolTokens data.tools)+ }}+ </span>+ </span>+ <span+ class="ai-agent-editor__tool-context-cost-legend-item --count"+ >+ {{icon "caret-up"}}+ {{i18n "discourse_ai.ai_agent.tool_count"}}:+ <span+ class="ai-agent-editor__tool-context-cost-value+ {{this.toolCountOnlySeverity data.tools}}"+ >+ {{i18n+ "discourse_ai.ai_agent.tool_count_value"+ count=data.tools.length+ }}+ </span>+ </span>+ </span>{{#if (eq (this.toolTokenSeverity data.tools) "medium")}}<div class="ai-agent-editor__tool-context-cost-warning">- <strong>{{i18n- "discourse_ai.ai_agent.tool_severity_medium"- }}:</strong>+ <span>+ {{i18n "discourse_ai.ai_agent.tool_severity_medium"}}:+ </span>{{i18n "discourse_ai.ai_agent.tool_tokens_warning"}}</div>{{/if}}{{#if (eq (this.toolTokenSeverity data.tools) "high")}}<div class="ai-agent-editor__tool-context-cost-warning">{{#if (this.tooManyTools data.tools)}}- <strong>{{i18n- "discourse_ai.ai_agent.tool_severity_too_many"- }}:</strong>+ <span>+ {{i18n "discourse_ai.ai_agent.tool_severity_too_many"}}:+ </span>{{i18n "discourse_ai.ai_agent.tool_count_warning"}}{{else}}- <strong>{{i18n- "discourse_ai.ai_agent.tool_severity_high"- }}:</strong>+ <span>+ {{i18n "discourse_ai.ai_agent.tool_severity_high"}}:+ </span>{{i18n "discourse_ai.ai_agent.tool_tokens_warning"}}{{/if}}</div>@@ -888,7 +958,7 @@ export default class AgentEditor extends Component {<form.Button@action={{fn this.createUser form}}@label="discourse_ai.ai_agent.create_user"- class="ai-agent-editor__create-user"+ class="btn-default ai-agent-editor__create-user"/>{{/if}}</form.Container>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-agent-response-format-editor.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-agent-response-format-editor.gjsindex 71a02de2df2..cbdbd0d6bee 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-agent-response-format-editor.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-agent-response-format-editor.gjs@@ -93,6 +93,7 @@ export default class AiAgentResponseFormatEditor extends Component {@action={{this.openModal}}@label="discourse_ai.ai_agent.response_format.open_modal"@disabled={{@data.system}}+ class="btn-default"/></div></@form.Container>diff --git a/plugins/discourse-ai/assets/stylesheets/modules/ai-bot/common/ai-agent.scss b/plugins/discourse-ai/assets/stylesheets/modules/ai-bot/common/ai-agent.scssindex 07f50bd5496..59ee85f77e9 100644--- a/plugins/discourse-ai/assets/stylesheets/modules/ai-bot/common/ai-agent.scss+++ b/plugins/discourse-ai/assets/stylesheets/modules/ai-bot/common/ai-agent.scss@@ -237,7 +237,7 @@&__tool-options {padding: 1em;- border: 1px solid var(--primary-low-mid);+ border: 1px solid var(--content-border-color);width: 480px;}@@ -258,6 +258,7 @@align-items: center;padding: 0.2em 0;font-size: var(--font-down-1);+ border-bottom: 1px solid var(--primary-low);}&__tool-token-count {@@ -265,86 +266,124 @@}&__tool-context-cost {- margin-bottom: 1em;+ margin-bottom: var(--space-4);+ padding: var(--space-4);+ border: 1px solid var(--content-border-color);@include viewport.from(lg) {- max-width: 55%;+ max-width: 480px;+ }++ &:has(.--token:hover) {+ .ai-agent-editor__tool-context-cost-bar-indicator.--token {+ color: var(--primary);+ transform: translateX(-50%) scale(1.4);+ }+ }++ &:has(.--count:hover) {+ .ai-agent-editor__tool-context-cost-bar-indicator.--count {+ color: var(--primary);+ transform: translateX(-50%) scale(1.4);+ }}}&__tool-context-cost-header {- display: flex;- justify-content: space-between;- align-items: baseline;- margin-bottom: 0.35em;+ margin-block: var(--space-4) var(--space-2);}&__tool-context-cost-label {font-weight: bold;font-size: var(--font-down-1);+ color: var(--primary);+ }++ &__tool-context-cost-legend {+ display: flex;+ flex-wrap: wrap;+ gap: var(--space-2);+ font-size: var(--font-down-1);color: var(--primary-high);}+ &__tool-context-cost-legend-item {+ display: flex;+ align-items: center;+ gap: 0.25em;+ cursor: default;++ .d-icon {+ color: var(--primary-medium);+ transition: color 0.15s ease;+ }++ &:hover .d-icon {+ color: var(--primary);+ }+ }+&__tool-context-cost-value {- font-weight: bold;- font-size: var(--font-down-1);color: var(--primary-high);- .--medium & {- color: var(--highlight);+ &.low {+ color: var(--success);+ }++ &.medium {+ color: var(--highlight-high);}- .--high & {+ &.high {color: var(--danger);}}&__tool-context-cost-bar {- height: 8px;- border-radius: 4px;+ height: 0.35em;+ border-radius: 1em;background: linear-gradient(- to right,- var(--success) 0%,- var(--success) 33%,- var(--highlight) 33%,- var(--highlight) 66%,- var(--danger) 66%,- var(--danger) 100%+ in oklch to right,+ var(--success),+ var(--danger));position: relative;- margin-top: 10px;- margin-bottom: 0.5em;- }-- &__tool-context-cost-bar-fill {- height: 100%;- position: relative;- min-width: 4px;- max-width: 100%;+ margin-block: var(--space-4) var(--space-6);}&__tool-context-cost-bar-indicator {position: absolute;- right: -5px;- bottom: 100%;- margin-bottom: 2px;- width: 0;- height: 0;- border-left: 5px solid transparent;- border-right: 5px solid transparent;- border-top: 7px solid var(--primary-medium);+ transform: translateX(-50%);+ color: var(--primary-medium);+ transition:+ transform 0.15s ease,+ color 0.15s ease;++ .d-icon {+ display: block;+ }++ &.--token {+ bottom: 100%;+ }++ &.--count {+ top: 100%;+ }}&__tool-context-cost-warning {font-size: var(--font-down-1);color: var(--primary-high);line-height: var(--line-height-large);+ margin-top: var(--space-4);- strong {- color: var(--highlight);+ span {+ font-weight: bold;+ color: var(--highlight-high);}- .--high & strong {+ .--high & span {color: var(--danger);}}diff --git a/plugins/discourse-ai/config/locales/client.en.yml b/plugins/discourse-ai/config/locales/client.en.ymlindex 85d5a326c88..27894cb67e7 100644--- a/plugins/discourse-ai/config/locales/client.en.yml+++ b/plugins/discourse-ai/config/locales/client.en.yml@@ -568,6 +568,11 @@ en:tools: "Enabled tools"tokens: "tokens"context_cost: "Context Cost"+ token_usage: "Token Usage"+ tool_count: "Tool Count"+ tool_count_value:+ one: "%{count} tool"+ other: "%{count} tools"tool_tokens_total: "~%{tokens} Tokens"tool_severity_medium: "Moderate capacity"tool_severity_high: "High capacity"