Skip to content

Commit e73a416

Browse files
authored
Merge pull request #47 from n4ze3m/next
v1.1.4
2 parents 50d4ae4 + 69809c9 commit e73a416

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11

22
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
3+
# settings
4+
.vscode
35

46
# dependencies
57
/node_modules

src/components/Common/Markdown.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { useTranslation } from "react-i18next"
1212
export default function Markdown({ message }: { message: string }) {
1313
const [isBtnPressed, setIsBtnPressed] = React.useState(false)
1414
const { t } = useTranslation("common")
15-
1615
return (
1716
<React.Fragment>
1817
<ReactMarkdown

src/components/Common/Playground/Message.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,13 @@ export const PlaygroundMessage = (props: Props) => {
7575

7676
<div className="flex flex-grow flex-col">
7777
{!editMode ? (
78-
<Markdown message={props.message} />
78+
props.isBot ? (
79+
<Markdown message={props.message} />
80+
) : (
81+
<p className="prose dark:prose-invert whitespace-pre-line prose-p:leading-relaxed prose-pre:p-0 dark:prose-dark">
82+
{props.message}
83+
</p>
84+
)
7985
) : (
8086
<EditMessageForm
8187
value={props.message}

src/hooks/useMessage.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export const useMessage = () => {
202202
url: ""
203203
}
204204
})
205-
message = message.trim().replaceAll("\n", " ")
205+
// message = message.trim().replaceAll("\n", " ")
206206

207207
let humanMessage = new HumanMessage({
208208
content: [
@@ -331,7 +331,8 @@ export const useMessage = () => {
331331

332332
const ollama = new ChatOllama({
333333
model: selectedModel!,
334-
baseUrl: cleanUrl(url)
334+
baseUrl: cleanUrl(url),
335+
verbose: true
335336
})
336337

337338
let newMessage: Message[] = []
@@ -374,8 +375,6 @@ export const useMessage = () => {
374375
try {
375376
const prompt = await systemPromptForNonRag()
376377

377-
message = message.trim().replaceAll("\n", " ")
378-
379378
let humanMessage = new HumanMessage({
380379
content: [
381380
{

src/hooks/useMessageOption.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ export const useMessageOption = () => {
172172
const { prompt, source } = await getSystemPromptForWeb(query)
173173
setIsSearchingInternet(false)
174174

175-
message = message.trim().replaceAll("\n", " ")
175+
// message = message.trim().replaceAll("\n", " ")
176176

177177
let humanMessage = new HumanMessage({
178178
content: [
@@ -365,7 +365,7 @@ export const useMessageOption = () => {
365365
const prompt = await systemPromptForNonRagOption()
366366
const selectedPrompt = await getPromptById(selectedSystemPrompt)
367367

368-
message = message.trim().replaceAll("\n", " ")
368+
// message = message.trim().replaceAll("\n", " ")
369369

370370
let humanMessage = new HumanMessage({
371371
content: [
@@ -613,7 +613,7 @@ export const useMessageOption = () => {
613613
url: ""
614614
}
615615
})
616-
message = message.trim().replaceAll("\n", " ")
616+
// message = message.trim().replaceAll("\n", " ")
617617

618618
let humanMessage = new HumanMessage({
619619
content: [

wxt.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default defineConfig({
2424
srcDir: "src",
2525
outDir: "build",
2626
manifest: {
27-
version: "1.1.3",
27+
version: "1.1.4",
2828
name: '__MSG_extName__',
2929
description: '__MSG_extDescription__',
3030
default_locale: 'en',

0 commit comments

Comments
 (0)