Skip to content

令牌搜索适配MySQL，MJ日志增加图生文 图生图 #5

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.

Sign up for GitHub

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

Merged
Calcium-Ion merged 3 commits into from
Nov 15, 2023
Merged

令牌搜索适配MySQL，MJ日志增加图生文 图生图 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3074821
Update MjLogsTable.js
luxlzz6 Nov 14, 2023
08b8b7b
Update token.go
luxlzz6 Nov 14, 2023
6fbb6ca
Update web/src/components/MjLogsTable.js
luxlzz6 Nov 14, 2023
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
2 changes: 1 addition & 1 deletion model/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func SearchUserTokens(userId int, keyword string, token string) (tokens []*Token
if token != "" {
token = strings.Trim(token, "sk-")
}
err = DB.Where("user_id = ?", userId).Where("name LIKE ?", keyword+"%").Where("key LIKE ?", token+"%").Find(&tokens).Error
err = DB.Where("user_id = ?", userId).Where("name LIKE ?", keyword+"%").Where("`key` LIKE ?", token+"%").Find(&tokens).Error
return tokens, err
}

Expand Down
77 changes: 50 additions & 27 deletions web/src/components/MjLogsTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
import { Button, Form, Header, Label, Pagination, Segment, Select, Table } from 'semantic-ui-react';
import { Button, Form, Header, Label, Pagination, Segment, Select, Table,Modal } from 'semantic-ui-react';
import { API, isAdmin, showError, timestamp2string } from '../helpers';

import { ITEMS_PER_PAGE } from '../constants';
Expand Down Expand Up @@ -85,6 +85,8 @@ const LogsTable = () => {
const [searching, setSearching] = useState(false);
const [logType, setLogType] = useState(0);
const isAdminUser = isAdmin();


let now = new Date();
const [inputs, setInputs] = useState({
username: '',
Expand All @@ -100,33 +102,14 @@ const LogsTable = () => {
token: 0
});

const handleInputChange = (e, { name, value }) => {
setInputs((inputs) => ({ ...inputs, [name]: value }));
};
const [modalContent, setModalContent] = useState('');
const [showModal, setShowModal] = useState(false);

const getLogSelfStat = async () => {
let localStartTimestamp = Date.parse(start_timestamp) / 1000;
let localEndTimestamp = Date.parse(end_timestamp) / 1000;
let res = await API.get(`/api/log/self/stat?type=${logType}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`);
const { success, message, data } = res.data;
if (success) {
setStat(data);
} else {
showError(message);
}
const showFullContent = (content) => {
setModalContent(content);
setShowModal(true);
};

const getLogStat = async () => {
let localStartTimestamp = Date.parse(start_timestamp) / 1000;
let localEndTimestamp = Date.parse(end_timestamp) / 1000;
let res = await API.get(`/api/log/stat?type=${logType}&username=${username}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`);
const { success, message, data } = res.data;
if (success) {
setStat(data);
} else {
showError(message);
}
};

const loadLogs = async (startIdx) => {
let url = '';
Expand Down Expand Up @@ -301,6 +284,15 @@ const LogsTable = () => {
>
Prompt
</Table.HeaderCell>
<Table.HeaderCell
style={{ cursor: 'pointer' }}
onClick={() => {
sortLog('prompt_en');
}}
width={3}
>
PromptEn
</Table.HeaderCell>
<Table.HeaderCell
style={{ cursor: 'pointer' }}
onClick={() => {
Expand Down Expand Up @@ -342,8 +334,33 @@ const LogsTable = () => {
) : '暂未生成图片'
}
</Table.Cell>
<Table.Cell>{log.prompt}</Table.Cell>
<Table.Cell>{log.fail_reason ? log.fail_reason : '无'}</Table.Cell>
<Table.Cell>
{log.prompt.length > 10
? <div>
{log.prompt.slice(0, 10)}
<a style={{cursor: "pointer"}} onClick={() => showFullContent(log.prompt)}>查看全部</a>
</div>
: log.prompt
}
</Table.Cell>
<Table.Cell>
{log.prompt_en.length > 10
? <div>
{log.prompt_en.slice(0, 10)}
<a style={{cursor: "pointer"}} onClick={() => showFullContent(log.prompt_en)}>查看全部</a>
</div>
: log.prompt_en
}
</Table.Cell>
<Table.Cell>
{log.fail_reason && log.fail_reason.length > 10
? <div>
{log.fail_reason.slice(0, 10)}
<a style={{cursor: "pointer"}} onClick={() => showFullContent(log.fail_reason)}>查看全部</a>
</div>
: log.fail_reason || '无'
}
</Table.Cell>
</Table.Row>
);
})}
Expand Down Expand Up @@ -379,6 +396,12 @@ const LogsTable = () => {
</Table.Footer>
</Table>
</Segment>
{/*Modal component goes here*/}
<Modal open={showModal} onClose={() => setShowModal(false)} centered>
<Modal.Content>
<pre style={{whiteSpace: "pre-wrap"}}>{modalContent}</pre>
</Modal.Content>
</Modal>
</>
);
};
Expand Down