Skip to content

Commit

Permalink
Merge pull request #47 from n4ze3m/next
Browse files Browse the repository at this point in the history
v1.1.4
  • Loading branch information
n4ze3m committed Apr 25, 2024
2 parents 50d4ae4 + 69809c9 commit e73a416
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@

# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# settings
.vscode

# dependencies
/node_modules
Expand Down
1 change: 0 additions & 1 deletion src/components/Common/Markdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { useTranslation } from "react-i18next"
export default function Markdown({ message }: { message: string }) {
const [isBtnPressed, setIsBtnPressed] = React.useState(false)
const { t } = useTranslation("common")

return (
<React.Fragment>
<ReactMarkdown
Expand Down
8 changes: 7 additions & 1 deletion src/components/Common/Playground/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,13 @@ export const PlaygroundMessage = (props: Props) => {

<div className="flex flex-grow flex-col">
{!editMode ? (
<Markdown message={props.message} />
props.isBot ? (
<Markdown message={props.message} />
) : (
<p className="prose dark:prose-invert whitespace-pre-line prose-p:leading-relaxed prose-pre:p-0 dark:prose-dark">
{props.message}
</p>
)
) : (
<EditMessageForm
value={props.message}
Expand Down
7 changes: 3 additions & 4 deletions src/hooks/useMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export const useMessage = () => {
url: ""
}
})
message = message.trim().replaceAll("\n", " ")
// message = message.trim().replaceAll("\n", " ")

let humanMessage = new HumanMessage({
content: [
Expand Down Expand Up @@ -331,7 +331,8 @@ export const useMessage = () => {

const ollama = new ChatOllama({
model: selectedModel!,
baseUrl: cleanUrl(url)
baseUrl: cleanUrl(url),
verbose: true
})

let newMessage: Message[] = []
Expand Down Expand Up @@ -374,8 +375,6 @@ export const useMessage = () => {
try {
const prompt = await systemPromptForNonRag()

message = message.trim().replaceAll("\n", " ")

let humanMessage = new HumanMessage({
content: [
{
Expand Down
6 changes: 3 additions & 3 deletions src/hooks/useMessageOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export const useMessageOption = () => {
const { prompt, source } = await getSystemPromptForWeb(query)
setIsSearchingInternet(false)

message = message.trim().replaceAll("\n", " ")
// message = message.trim().replaceAll("\n", " ")

let humanMessage = new HumanMessage({
content: [
Expand Down Expand Up @@ -365,7 +365,7 @@ export const useMessageOption = () => {
const prompt = await systemPromptForNonRagOption()
const selectedPrompt = await getPromptById(selectedSystemPrompt)

message = message.trim().replaceAll("\n", " ")
// message = message.trim().replaceAll("\n", " ")

let humanMessage = new HumanMessage({
content: [
Expand Down Expand Up @@ -613,7 +613,7 @@ export const useMessageOption = () => {
url: ""
}
})
message = message.trim().replaceAll("\n", " ")
// message = message.trim().replaceAll("\n", " ")

let humanMessage = new HumanMessage({
content: [
Expand Down
2 changes: 1 addition & 1 deletion wxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default defineConfig({
srcDir: "src",
outDir: "build",
manifest: {
version: "1.1.3",
version: "1.1.4",
name: '__MSG_extName__',
description: '__MSG_extDescription__',
default_locale: 'en',
Expand Down

0 comments on commit e73a416

Please sign in to comment.