mirror of
https://github.com/coalaura/whiskr.git
synced 2025-09-08 17:06:42 +00:00
improvements
This commit is contained in:
@@ -33,8 +33,6 @@ whiskr is a private, self-hosted web chat interface for interacting with AI mode
|
|||||||
## TODO
|
## TODO
|
||||||
|
|
||||||
- improved custom prompts
|
- improved custom prompts
|
||||||
- collapse messages
|
|
||||||
- user defined timezone
|
|
||||||
- settings
|
- settings
|
||||||
- auto-retry on edit
|
- auto-retry on edit
|
||||||
- ctrl+enter vs enter for sending
|
- ctrl+enter vs enter for sending
|
||||||
|
20
chat.go
20
chat.go
@@ -39,14 +39,24 @@ type Reasoning struct {
|
|||||||
Tokens int `json:"tokens"`
|
Tokens int `json:"tokens"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Tools struct {
|
||||||
|
JSON bool `json:"json"`
|
||||||
|
Search bool `json:"search"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Metadata struct {
|
||||||
|
Timezone string `json:"timezone"`
|
||||||
|
Platform string `json:"platform"`
|
||||||
|
}
|
||||||
|
|
||||||
type Request struct {
|
type Request struct {
|
||||||
Prompt string `json:"prompt"`
|
Prompt string `json:"prompt"`
|
||||||
Model string `json:"model"`
|
Model string `json:"model"`
|
||||||
Temperature float64 `json:"temperature"`
|
Temperature float64 `json:"temperature"`
|
||||||
Iterations int64 `json:"iterations"`
|
Iterations int64 `json:"iterations"`
|
||||||
JSON bool `json:"json"`
|
Tools Tools `json:"tools"`
|
||||||
Search bool `json:"search"`
|
|
||||||
Reasoning Reasoning `json:"reasoning"`
|
Reasoning Reasoning `json:"reasoning"`
|
||||||
|
Metadata Metadata `json:"metadata"`
|
||||||
Messages []Message `json:"messages"`
|
Messages []Message `json:"messages"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,13 +129,13 @@ func (r *Request) Parse() (*openrouter.ChatCompletionRequest, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if model.JSON && r.JSON {
|
if model.JSON && r.Tools.JSON {
|
||||||
request.ResponseFormat = &openrouter.ChatCompletionResponseFormat{
|
request.ResponseFormat = &openrouter.ChatCompletionResponseFormat{
|
||||||
Type: openrouter.ChatCompletionResponseFormatTypeJSONObject,
|
Type: openrouter.ChatCompletionResponseFormatTypeJSONObject,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt, err := BuildPrompt(r.Prompt, model)
|
prompt, err := BuildPrompt(r.Prompt, r.Metadata, model)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -134,7 +144,7 @@ func (r *Request) Parse() (*openrouter.ChatCompletionRequest, error) {
|
|||||||
request.Messages = append(request.Messages, openrouter.SystemMessage(prompt))
|
request.Messages = append(request.Messages, openrouter.SystemMessage(prompt))
|
||||||
}
|
}
|
||||||
|
|
||||||
if model.Tools && r.Search && env.Tokens.Exa != "" {
|
if model.Tools && r.Tools.Search && env.Tokens.Exa != "" {
|
||||||
request.Tools = GetSearchTools()
|
request.Tools = GetSearchTools()
|
||||||
request.ToolChoice = "auto"
|
request.ToolChoice = "auto"
|
||||||
|
|
||||||
|
31
prompts.go
31
prompts.go
@@ -15,9 +15,10 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type PromptData struct {
|
type PromptData struct {
|
||||||
Name string
|
Name string
|
||||||
Slug string
|
Slug string
|
||||||
Date string
|
Date string
|
||||||
|
Platform string
|
||||||
}
|
}
|
||||||
|
|
||||||
type Prompt struct {
|
type Prompt struct {
|
||||||
@@ -87,7 +88,7 @@ func LoadPrompts() ([]Prompt, error) {
|
|||||||
prompt := Prompt{
|
prompt := Prompt{
|
||||||
Key: strings.Replace(filepath.Base(path), ".txt", "", 1),
|
Key: strings.Replace(filepath.Base(path), ".txt", "", 1),
|
||||||
Name: strings.TrimSpace(string(body[:index])),
|
Name: strings.TrimSpace(string(body[:index])),
|
||||||
Text: strings.TrimSpace(string(body[:index+3])),
|
Text: strings.TrimSpace(string(body[index+3:])),
|
||||||
}
|
}
|
||||||
|
|
||||||
prompts = append(prompts, prompt)
|
prompts = append(prompts, prompt)
|
||||||
@@ -110,7 +111,7 @@ func LoadPrompts() ([]Prompt, error) {
|
|||||||
return prompts, nil
|
return prompts, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func BuildPrompt(name string, model *Model) (string, error) {
|
func BuildPrompt(name string, metadata Metadata, model *Model) (string, error) {
|
||||||
if name == "" {
|
if name == "" {
|
||||||
return "", nil
|
return "", nil
|
||||||
}
|
}
|
||||||
@@ -120,12 +121,26 @@ func BuildPrompt(name string, model *Model) (string, error) {
|
|||||||
return "", fmt.Errorf("unknown prompt: %q", name)
|
return "", fmt.Errorf("unknown prompt: %q", name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tz := time.UTC
|
||||||
|
|
||||||
|
if metadata.Timezone != "" {
|
||||||
|
parsed, err := time.LoadLocation(metadata.Timezone)
|
||||||
|
if err == nil {
|
||||||
|
tz = parsed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if metadata.Platform == "" {
|
||||||
|
metadata.Platform = "Unknown"
|
||||||
|
}
|
||||||
|
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
|
|
||||||
err := tmpl.Execute(&buf, PromptData{
|
err := tmpl.Execute(&buf, PromptData{
|
||||||
Name: model.Name,
|
Name: model.Name,
|
||||||
Slug: model.ID,
|
Slug: model.ID,
|
||||||
Date: time.Now().Format(time.RFC1123),
|
Date: time.Now().In(tz).Format(time.RFC1123),
|
||||||
|
Platform: metadata.Platform,
|
||||||
})
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
Data Analyst
|
Data Analyst
|
||||||
---
|
---
|
||||||
You are {{ .Name }} ({{ .Slug }}), an expert data analyst who transforms raw data into clear, actionable insights. Today is {{ .Date }}.
|
You are {{ .Name }} ({{ .Slug }}), an expert data analyst who transforms raw data into clear, actionable insights. Today is {{ .Date }} (in the user's timezone). The users platform is `{{ .Platform }}`.
|
||||||
|
|
||||||
## Role & Expertise
|
## Role & Expertise
|
||||||
- **Primary Role**: Data analyst with expertise in statistical analysis, pattern recognition, and business intelligence
|
- **Primary Role**: Data analyst with expertise in statistical analysis, pattern recognition, and business intelligence
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
Prompt Engineer
|
Prompt Engineer
|
||||||
---
|
---
|
||||||
You are {{ .Name }} ({{ .Slug }}), an expert prompt engineering specialist who designs, optimizes, and troubleshoots prompts for maximum AI effectiveness. Today is {{ .Date }}.
|
You are {{ .Name }} ({{ .Slug }}), an expert prompt engineering specialist who designs, optimizes, and troubleshoots prompts for maximum AI effectiveness. Today is {{ .Date }} (in the user's timezone). The users platform is `{{ .Platform }}`.
|
||||||
|
|
||||||
## Role & Expertise
|
## Role & Expertise
|
||||||
- **Primary Role**: Senior prompt engineer with deep knowledge of LLM behavior, cognitive architectures, and optimization techniques
|
- **Primary Role**: Senior prompt engineer with deep knowledge of LLM behavior, cognitive architectures, and optimization techniques
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
Assistant
|
Assistant
|
||||||
---
|
---
|
||||||
You are {{ .Name }} ({{ .Slug }}), a versatile AI assistant designed to help users accomplish diverse tasks efficiently and accurately. Today is {{ .Date }}.
|
You are {{ .Name }} ({{ .Slug }}), a versatile AI assistant designed to help users accomplish diverse tasks efficiently and accurately. Today is {{ .Date }} (in the user's timezone). The users platform is `{{ .Platform }}`.
|
||||||
|
|
||||||
## Core Identity & Approach
|
## Core Identity & Approach
|
||||||
- **Role**: General-purpose AI assistant with broad knowledge and problem-solving capabilities
|
- **Role**: General-purpose AI assistant with broad knowledge and problem-solving capabilities
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
Physics Explainer
|
Physics Explainer
|
||||||
---
|
---
|
||||||
You are {{ .Name }} ({{ .Slug }}), a physics educator who makes complex concepts accessible without sacrificing accuracy. Today is {{ .Date }}.
|
You are {{ .Name }} ({{ .Slug }}), a physics educator who makes complex concepts accessible without sacrificing accuracy. Today is {{ .Date }} (in the user's timezone). The users platform is `{{ .Platform }}`.
|
||||||
|
|
||||||
## Role & Expertise
|
## Role & Expertise
|
||||||
- **Primary Role**: Physics educator with deep conceptual understanding and exceptional communication skills
|
- **Primary Role**: Physics educator with deep conceptual understanding and exceptional communication skills
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
Research Assistant
|
Research Assistant
|
||||||
---
|
---
|
||||||
You are {{ .Name }} ({{ .Slug }}), a methodical AI research specialist who conducts systematic information gathering and synthesis to provide comprehensive, evidence-based answers. Today is {{ .Date }}.
|
You are {{ .Name }} ({{ .Slug }}), a methodical AI research specialist who conducts systematic information gathering and synthesis to provide comprehensive, evidence-based answers. Today is {{ .Date }} (in the user's timezone). The users platform is `{{ .Platform }}`.
|
||||||
|
|
||||||
## Role & Expertise
|
## Role & Expertise
|
||||||
- **Primary Role**: Research methodologist skilled in systematic information gathering, source evaluation, and evidence synthesis
|
- **Primary Role**: Research methodologist skilled in systematic information gathering, source evaluation, and evidence synthesis
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
Code Reviewer
|
Code Reviewer
|
||||||
---
|
---
|
||||||
You are {{ .Name }} ({{ .Slug }}), an expert code security and quality analyst specializing in production-ready code assessment. Today is {{ .Date }}.
|
You are {{ .Name }} ({{ .Slug }}), an expert code security and quality analyst specializing in production-ready code assessment. Today is {{ .Date }} (in the user's timezone). The users platform is `{{ .Platform }}`.
|
||||||
|
|
||||||
## Role & Expertise
|
## Role & Expertise
|
||||||
- **Primary Role**: Senior code reviewer with deep expertise in security vulnerabilities, performance optimization, and maintainable code practices
|
- **Primary Role**: Senior code reviewer with deep expertise in security vulnerabilities, performance optimization, and maintainable code practices
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
Shell Scripter
|
Shell Scripter
|
||||||
---
|
---
|
||||||
You are {{ .Name }} ({{ .Slug }}), an expert automation engineer specializing in robust shell scripting and system automation. Today is {{ .Date }}.
|
You are {{ .Name }} ({{ .Slug }}), an expert automation engineer specializing in robust shell scripting and system automation. Today is {{ .Date }} (in the user's timezone). The users platform is `{{ .Platform }}`.
|
||||||
|
|
||||||
## Role & Expertise
|
## Role & Expertise
|
||||||
- **Primary Role**: Senior DevOps engineer and automation specialist with deep expertise in Bash, PowerShell, and cross-platform scripting
|
- **Primary Role**: Senior DevOps engineer and automation specialist with deep expertise in Bash, PowerShell, and cross-platform scripting
|
||||||
|
@@ -358,11 +358,16 @@ body:not(.loading) #loading {
|
|||||||
background: #181926;
|
background: #181926;
|
||||||
min-width: 480px;
|
min-width: 480px;
|
||||||
min-height: 100px;
|
min-height: 100px;
|
||||||
|
max-width: 100%;
|
||||||
padding: 10px 12px;
|
padding: 10px 12px;
|
||||||
width: 100%;
|
width: calc(700px - 24px);
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message.assistant textarea.text {
|
||||||
|
width: calc(800px - 24px);
|
||||||
|
}
|
||||||
|
|
||||||
.message .text .error {
|
.message .text .error {
|
||||||
color: #ed8796;
|
color: #ed8796;
|
||||||
}
|
}
|
||||||
@@ -392,6 +397,7 @@ body:not(.loading) #loading {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.message .body {
|
.message .body {
|
||||||
|
position: relative;
|
||||||
border-bottom-left-radius: 6px;
|
border-bottom-left-radius: 6px;
|
||||||
border-bottom-right-radius: 6px;
|
border-bottom-right-radius: 6px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
@@ -402,6 +408,21 @@ body:not(.loading) #loading {
|
|||||||
background: #24273a;
|
background: #24273a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message.collapsed .body {
|
||||||
|
height: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message.collapsed .body::before {
|
||||||
|
position: absolute;
|
||||||
|
content: "collapsed...";
|
||||||
|
font-style: italic;
|
||||||
|
color: #939ab7;
|
||||||
|
font-size: 12px;
|
||||||
|
top: 50%;
|
||||||
|
left: 12px;
|
||||||
|
transform: translateY(-50%);
|
||||||
|
}
|
||||||
|
|
||||||
.tool .call,
|
.tool .call,
|
||||||
.reasoning .toggle {
|
.reasoning .toggle {
|
||||||
position: relative;
|
position: relative;
|
||||||
@@ -419,7 +440,7 @@ body:not(.loading) #loading {
|
|||||||
background-image: url(icons/reasoning.svg);
|
background-image: url(icons/reasoning.svg);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: -2px;
|
top: -2px;
|
||||||
left: -2px;
|
left: 0px;
|
||||||
width: 20px;
|
width: 20px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
}
|
}
|
||||||
@@ -481,11 +502,11 @@ body:not(.loading) #loading {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.reasoning.expanded .toggle::after {
|
.reasoning.expanded .toggle::after {
|
||||||
transform: rotate(180deg);
|
transform: scaleY(-100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.tool.expanded .call .name::after {
|
.tool.expanded .call .name::after {
|
||||||
transform: translateY(-50%) rotate(180deg);
|
transform: translateY(-50%) scaleY(-100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.tool .call::before {
|
.tool .call::before {
|
||||||
@@ -528,6 +549,29 @@ body:not(.loading) #loading {
|
|||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message .collapse {
|
||||||
|
position: relative;
|
||||||
|
margin-right: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message .collapse::before {
|
||||||
|
content: "";
|
||||||
|
transition: 150ms;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message.collapsed .collapse::before {
|
||||||
|
transform: scaleY(-100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.message .collapse::after {
|
||||||
|
position: absolute;
|
||||||
|
top: 4px;
|
||||||
|
right: -14px;
|
||||||
|
}
|
||||||
|
|
||||||
.message.errored .options .copy,
|
.message.errored .options .copy,
|
||||||
.message.errored .options .edit,
|
.message.errored .options .edit,
|
||||||
.message.waiting .options,
|
.message.waiting .options,
|
||||||
@@ -769,6 +813,7 @@ select {
|
|||||||
gap: 4px;
|
gap: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message .options .collapse::after,
|
||||||
#chat .option+.option::before {
|
#chat .option+.option::before {
|
||||||
content: "";
|
content: "";
|
||||||
display: block;
|
display: block;
|
||||||
@@ -792,6 +837,8 @@ body.loading #version,
|
|||||||
.message .role::before,
|
.message .role::before,
|
||||||
.message .tag-json,
|
.message .tag-json,
|
||||||
.message .tag-search,
|
.message .tag-search,
|
||||||
|
.message .collapse,
|
||||||
|
.message .collapse::before,
|
||||||
.message .copy,
|
.message .copy,
|
||||||
.message .edit,
|
.message .edit,
|
||||||
.message .retry,
|
.message .retry,
|
||||||
@@ -839,6 +886,10 @@ input.invalid {
|
|||||||
border: 1px solid #ed8796;
|
border: 1px solid #ed8796;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message .collapse::before {
|
||||||
|
background-image: url(icons/collapse.svg);
|
||||||
|
}
|
||||||
|
|
||||||
.pre-copy,
|
.pre-copy,
|
||||||
.message .copy {
|
.message .copy {
|
||||||
background-image: url(icons/copy.svg);
|
background-image: url(icons/copy.svg);
|
||||||
|
7
static/css/icons/collapse.svg
Normal file
7
static/css/icons/collapse.svg
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
|
||||||
|
<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
|
||||||
|
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
|
||||||
|
|
||||||
|
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
|
After Width: | Height: | Size: 567 B |
@@ -34,6 +34,16 @@
|
|||||||
$password = document.getElementById("password"),
|
$password = document.getElementById("password"),
|
||||||
$login = document.getElementById("login");
|
$login = document.getElementById("login");
|
||||||
|
|
||||||
|
const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC";
|
||||||
|
|
||||||
|
let platform = "";
|
||||||
|
|
||||||
|
detectPlatform().then(result => {
|
||||||
|
platform = result;
|
||||||
|
|
||||||
|
console.info(`Detected platform: ${platform}`);
|
||||||
|
});
|
||||||
|
|
||||||
const messages = [],
|
const messages = [],
|
||||||
models = {},
|
models = {},
|
||||||
modelList = [],
|
modelList = [],
|
||||||
@@ -143,7 +153,6 @@
|
|||||||
#error = false;
|
#error = false;
|
||||||
|
|
||||||
#editing = false;
|
#editing = false;
|
||||||
#expanded = false;
|
|
||||||
#state = false;
|
#state = false;
|
||||||
|
|
||||||
#_diff;
|
#_diff;
|
||||||
@@ -159,7 +168,7 @@
|
|||||||
#_tool;
|
#_tool;
|
||||||
#_statistics;
|
#_statistics;
|
||||||
|
|
||||||
constructor(role, reasoning, text, files = []) {
|
constructor(role, reasoning, text, files = [], collapsed = false) {
|
||||||
this.#id = uid();
|
this.#id = uid();
|
||||||
this.#role = role;
|
this.#role = role;
|
||||||
this.#reasoning = reasoning || "";
|
this.#reasoning = reasoning || "";
|
||||||
@@ -167,7 +176,7 @@
|
|||||||
|
|
||||||
this.#_diff = document.createElement("div");
|
this.#_diff = document.createElement("div");
|
||||||
|
|
||||||
this.#build();
|
this.#build(collapsed);
|
||||||
this.#render();
|
this.#render();
|
||||||
|
|
||||||
for (const file of files) {
|
for (const file of files) {
|
||||||
@@ -181,9 +190,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#build() {
|
#build(collapsed) {
|
||||||
// main message div
|
// main message div
|
||||||
this.#_message = make("div", "message", this.#role);
|
this.#_message = make("div", "message", this.#role, collapsed ? "collapsed" : "");
|
||||||
|
|
||||||
// message role (wrapper)
|
// message role (wrapper)
|
||||||
const _wrapper = make("div", "role", this.#role);
|
const _wrapper = make("div", "role", this.#role);
|
||||||
@@ -224,11 +233,9 @@
|
|||||||
_reasoning.appendChild(_toggle);
|
_reasoning.appendChild(_toggle);
|
||||||
|
|
||||||
_toggle.addEventListener("click", () => {
|
_toggle.addEventListener("click", () => {
|
||||||
this.#expanded = !this.#expanded;
|
_reasoning.classList.toggle("expanded");
|
||||||
|
|
||||||
_reasoning.classList.toggle("expanded", this.#expanded);
|
if (_reasoning.classList.contains("expanded")) {
|
||||||
|
|
||||||
if (this.#expanded) {
|
|
||||||
this.#updateReasoningHeight();
|
this.#updateReasoningHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -303,6 +310,19 @@
|
|||||||
|
|
||||||
this.#_message.appendChild(_opts);
|
this.#_message.appendChild(_opts);
|
||||||
|
|
||||||
|
// collapse option
|
||||||
|
const _optCollapse = make("button", "collapse");
|
||||||
|
|
||||||
|
_optCollapse.title = "Collapse/Expand message";
|
||||||
|
|
||||||
|
_opts.appendChild(_optCollapse);
|
||||||
|
|
||||||
|
_optCollapse.addEventListener("click", () => {
|
||||||
|
this.#_message.classList.toggle("collapsed");
|
||||||
|
|
||||||
|
this.#save();
|
||||||
|
});
|
||||||
|
|
||||||
// copy option
|
// copy option
|
||||||
const _optCopy = make("button", "copy");
|
const _optCopy = make("button", "copy");
|
||||||
|
|
||||||
@@ -620,6 +640,10 @@
|
|||||||
data.statistics = this.#statistics;
|
data.statistics = this.#statistics;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.#_message.classList.contains("collapsed") && full) {
|
||||||
|
data.collapsed = true;
|
||||||
|
}
|
||||||
|
|
||||||
if (!data.files?.length && !data.reasoning && !data.text && !data.tool) {
|
if (!data.files?.length && !data.reasoning && !data.text && !data.tool) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -656,7 +680,7 @@
|
|||||||
console.error(err);
|
console.error(err);
|
||||||
|
|
||||||
if (!retrying && err.message.includes("not found")) {
|
if (!retrying && err.message.includes("not found")) {
|
||||||
setTimeout(this.loadGenerationData.bind(this), 750, generationID, true);
|
setTimeout(this.loadGenerationData.bind(this), 1500, generationID, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -956,12 +980,18 @@
|
|||||||
model: $model.value,
|
model: $model.value,
|
||||||
temperature: temperature,
|
temperature: temperature,
|
||||||
iterations: iterations,
|
iterations: iterations,
|
||||||
|
tools: {
|
||||||
|
json: jsonMode,
|
||||||
|
search: searchTool,
|
||||||
|
},
|
||||||
reasoning: {
|
reasoning: {
|
||||||
effort: effort,
|
effort: effort,
|
||||||
tokens: tokens || 0,
|
tokens: tokens || 0,
|
||||||
},
|
},
|
||||||
json: jsonMode,
|
metadata: {
|
||||||
search: searchTool,
|
timezone: timezone,
|
||||||
|
platform: platform,
|
||||||
|
},
|
||||||
messages: messages.map(message => message.getData()).filter(Boolean),
|
messages: messages.map(message => message.getData()).filter(Boolean),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -975,7 +1005,7 @@
|
|||||||
message.setState(false);
|
message.setState(false);
|
||||||
|
|
||||||
if (!aborted) {
|
if (!aborted) {
|
||||||
setTimeout(message.loadGenerationData.bind(message), 750, generationID);
|
setTimeout(message.loadGenerationData.bind(message), 1000, generationID);
|
||||||
}
|
}
|
||||||
|
|
||||||
message = null;
|
message = null;
|
||||||
@@ -1258,7 +1288,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
loadValue("messages", []).forEach(message => {
|
loadValue("messages", []).forEach(message => {
|
||||||
const obj = new Message(message.role, message.reasoning, message.text, message.files || []);
|
const obj = new Message(message.role, message.reasoning, message.text, message.files || [], message.collapsed);
|
||||||
|
|
||||||
if (message.error) {
|
if (message.error) {
|
||||||
obj.showError(message.error);
|
obj.showError(message.error);
|
||||||
|
@@ -45,6 +45,8 @@ function uid() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function make(tag, ...classes) {
|
function make(tag, ...classes) {
|
||||||
|
classes = classes.filter(Boolean);
|
||||||
|
|
||||||
const el = document.createElement(tag);
|
const el = document.createElement(tag);
|
||||||
|
|
||||||
if (classes.length) {
|
if (classes.length) {
|
||||||
@@ -222,3 +224,94 @@ function selectFile(accept, multiple, handler, onError = false) {
|
|||||||
input.click();
|
input.click();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function detectPlatform() {
|
||||||
|
let os, arch;
|
||||||
|
|
||||||
|
let platform = navigator.platform || "";
|
||||||
|
|
||||||
|
if (navigator.userAgentData?.getHighEntropyValues) {
|
||||||
|
try {
|
||||||
|
const data = await navigator.userAgentData.getHighEntropyValues(["platform", "architecture"]);
|
||||||
|
|
||||||
|
platform = data.platform;
|
||||||
|
arch = data.architecture;
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
const ua = navigator.userAgent || "";
|
||||||
|
|
||||||
|
// Windows
|
||||||
|
if (/Windows NT 10\.0/.test(ua)) os = "Windows 10/11";
|
||||||
|
else if (/Windows NT 6\.3/.test(ua)) os = "Windows 8.1";
|
||||||
|
else if (/Windows NT 6\.2/.test(ua)) os = "Windows 8";
|
||||||
|
else if (/Windows NT 6\.1/.test(ua)) os = "Windows 7";
|
||||||
|
else if (/Windows NT 6\.0/.test(ua)) os = "Windows Vista";
|
||||||
|
else if (/Windows NT 5\.1/.test(ua)) os = "Windows XP";
|
||||||
|
else if (/Windows NT 5\.0/.test(ua)) os = "Windows 2000";
|
||||||
|
else if (/Windows NT 4\.0/.test(ua)) os = "Windows NT 4.0";
|
||||||
|
else if (/Win(98|95|16)/.test(ua)) os = "Windows (legacy)";
|
||||||
|
else if (/Windows/.test(ua)) os = "Windows (unknown version)";
|
||||||
|
// Mac OS
|
||||||
|
else if (/Mac OS X/.test(ua)) {
|
||||||
|
os = "macOS";
|
||||||
|
|
||||||
|
const match = ua.match(/Mac OS X ([0-9_]+)/);
|
||||||
|
|
||||||
|
if (match) {
|
||||||
|
os += ` ${match[1].replace(/_/g, ".")}`;
|
||||||
|
} else {
|
||||||
|
os += " (unknown version)";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Chrome OS
|
||||||
|
else if (/CrOS/.test(ua)) {
|
||||||
|
os = "Chrome OS";
|
||||||
|
|
||||||
|
const match = ua.match(/CrOS [^ ]+ ([0-9.]+)/);
|
||||||
|
|
||||||
|
if (match) {
|
||||||
|
os += ` ${match[1]}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Linux (special)
|
||||||
|
else if (/FreeBSD/.test(ua)) os = "FreeBSD";
|
||||||
|
else if (/OpenBSD/.test(ua)) os = "OpenBSD";
|
||||||
|
else if (/NetBSD/.test(ua)) os = "NetBSD";
|
||||||
|
else if (/SunOS/.test(ua)) os = "Solaris";
|
||||||
|
// Linux (generic)
|
||||||
|
else if (/Linux/.test(ua)) {
|
||||||
|
if (/Ubuntu/i.test(ua)) os = "Ubuntu";
|
||||||
|
else if (/Debian/i.test(ua)) os = "Debian";
|
||||||
|
else if (/Fedora/i.test(ua)) os = "Fedora";
|
||||||
|
else if (/CentOS/i.test(ua)) os = "CentOS";
|
||||||
|
else if (/Red Hat/i.test(ua)) os = "Red Hat";
|
||||||
|
else if (/SUSE/i.test(ua)) os = "SUSE";
|
||||||
|
else if (/Gentoo/i.test(ua)) os = "Gentoo";
|
||||||
|
else if (/Arch/i.test(ua)) os = "Arch Linux";
|
||||||
|
else os = "Linux";
|
||||||
|
}
|
||||||
|
// Mobile
|
||||||
|
else if (/Android/.test(ua)) os = "Android";
|
||||||
|
else if (/iPhone|iPad|iPod/.test(ua)) os = "iOS";
|
||||||
|
|
||||||
|
// We still have no OS?
|
||||||
|
if (!os && platform) {
|
||||||
|
if (platform.includes("Win")) os = "Windows";
|
||||||
|
else if (/Mac/.test(platform)) os = "macOS";
|
||||||
|
else if (/Linux/.test(platform)) os = "Linux";
|
||||||
|
else os = platform;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Detect architecture
|
||||||
|
if (!arch) {
|
||||||
|
if (/WOW64|Win64|x64|amd64/i.test(ua)) arch = "x64";
|
||||||
|
else if (/arm64|aarch64/i.test(ua)) arch = "arm64";
|
||||||
|
else if (/i[0-9]86|x86/i.test(ua)) arch = "x86";
|
||||||
|
else if (/ppc/i.test(ua)) arch = "ppc";
|
||||||
|
else if (/sparc/i.test(ua)) arch = "sparc";
|
||||||
|
else if (platform && /arm/i.test(platform)) arch = "arm";
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${os || "Unknown OS"}${arch ? `, ${arch}` : ""}`;
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user