Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into docs-pena-team

Browse Source
This commit is contained in:
Arista Indrajaya 2024-03-05 17:34:50 +07:00 committed by GitHub
commit 800789631d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 65 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
web/hooks/useLogs.tsx
View File

@ -1,26 +1,37 @@
import {
fs,
joinPath,
openFileExplorer,
getJanDataFolderPath,
} from '@janhq/core'
import { useCallback } from 'react'
import { fs, joinPath, openFileExplorer } from '@janhq/core'
import { useAtomValue } from 'jotai'
import { janDataFolderPathAtom } from '@/helpers/atoms/AppConfig.atom'
export const useLogs = () => {
const getLogs = async (file: string) => {
const path = await joinPath(['file://logs', `${file}.log`])
if (!(await fs.existsSync(path))) return {}
const logs = await fs.readFileSync(path, 'utf-8')
const janDataFolderPath = useAtomValue(janDataFolderPathAtom)
return logs
}
const openServerLog = async () => {
const janDataFolderPath = await getJanDataFolderPath()
const getLogs = useCallback(
async (file: string) => {
const path = await joinPath(['file://logs', `${file}.log`])
if (!(await fs.existsSync(path))) return ''
const logs = await fs.readFileSync(path, 'utf-8')
const sanitizedLogs = logs.replace(
new RegExp(`${janDataFolderPath}\\/`, 'g'),
'jan-data-folder/'
)
return sanitizedLogs
},
[janDataFolderPath]
)
const openServerLog = useCallback(async () => {
const fullPath = await joinPath([janDataFolderPath, 'logs', 'server.log'])
return openFileExplorer(fullPath)
}
}, [janDataFolderPath])
const clearServerLog = async () => {
const clearServerLog = useCallback(async () => {
await fs.writeFileSync(await joinPath(['file://logs', 'server.log']), '')
}
}, [])
return { getLogs, openServerLog, clearServerLog }
}

21
web/hooks/usePath.ts
View File

@ -1,16 +1,13 @@
import {
openFileExplorer,
joinPath,
getJanDataFolderPath,
baseName,
} from '@janhq/core'
import { openFileExplorer, joinPath, baseName } from '@janhq/core'
import { useAtomValue } from 'jotai'
import { selectedModelAtom } from '@/containers/DropdownListSidebar'
import { janDataFolderPathAtom } from '@/helpers/atoms/AppConfig.atom'
import { activeThreadAtom } from '@/helpers/atoms/Thread.atom'
export const usePath = () => {
const janDataFolderPath = useAtomValue(janDataFolderPathAtom)
const activeThread = useAtomValue(activeThreadAtom)
const selectedModel = useAtomValue(selectedModelAtom)
@ -18,7 +15,6 @@ export const usePath = () => {
// TODO: this logic should be refactored.
if (type !== 'Model' && !activeThread) return
const userSpace = await getJanDataFolderPath()
let filePath = undefined
const assistantId = activeThread?.assistants[0]?.assistant_id
switch (type) {
@ -40,7 +36,7 @@ export const usePath = () => {
}
if (!filePath) return
const fullPath = await joinPath([userSpace, filePath])
const fullPath = await joinPath([janDataFolderPath, filePath])
openFileExplorer(fullPath)
}
@ -48,7 +44,6 @@ export const usePath = () => {
// TODO: this logic should be refactored.
if (type !== 'Model' && !activeThread) return
const userSpace = await getJanDataFolderPath()
let filePath = undefined
const assistantId = activeThread?.assistants[0]?.assistant_id
switch (type) {
@ -74,31 +69,29 @@ export const usePath = () => {
}
if (!filePath) return
const fullPath = await joinPath([userSpace, filePath])
const fullPath = await joinPath([janDataFolderPath, filePath])
openFileExplorer(fullPath)
}
const onViewFile = async (id: string) => {
if (!activeThread) return
const userSpace = await getJanDataFolderPath()
let filePath = undefined
id = await baseName(id)
filePath = await joinPath(['threads', `${activeThread.id}/files`, `${id}`])
if (!filePath) return
const fullPath = await joinPath([userSpace, filePath])
const fullPath = await joinPath([janDataFolderPath, filePath])
openFileExplorer(fullPath)
}
const onViewFileContainer = async () => {
if (!activeThread) return
const userSpace = await getJanDataFolderPath()
let filePath = undefined
filePath = await joinPath(['threads', `${activeThread.id}/files`])
if (!filePath) return
const fullPath = await joinPath([userSpace, filePath])
const fullPath = await joinPath([janDataFolderPath, filePath])
openFileExplorer(fullPath)
}

8
web/screens/Chat/ChatInput/index.tsx
View File

@ -165,8 +165,7 @@ const ChatInput: React.FC = () => {
if (
fileUpload.length > 0 ||
(activeThread?.assistants[0].tools &&
!activeThread?.assistants[0].tools[0]?.enabled &&
!activeThread?.assistants[0].model.settings.vision_model)
!activeThread?.assistants[0].tools[0]?.enabled)
) {
e.stopPropagation()
} else {
@ -178,8 +177,7 @@ const ChatInput: React.FC = () => {
<TooltipPortal>
{fileUpload.length > 0 ||
(activeThread?.assistants[0].tools &&
!activeThread?.assistants[0].tools[0]?.enabled &&
!activeThread?.assistants[0].model.settings.vision_model && (
!activeThread?.assistants[0].tools[0]?.enabled && (
<TooltipContent side="top" className="max-w-[154px] px-3">
{fileUpload.length !== 0 && (
<span>
@ -205,7 +203,7 @@ const ChatInput: React.FC = () => {
{showAttacmentMenus && (
<div
ref={refAttachmentMenus}
className="absolute bottom-10 right-0 w-36 cursor-pointer rounded-lg border border-border bg-background py-1 shadow"
className="absolute bottom-10 right-0 z-30 w-36 cursor-pointer rounded-lg border border-border bg-background py-1 shadow"
>
<ul>
<li

33
web/screens/Chat/index.tsx
View File

@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/naming-convention */
import React, { useEffect, useState } from 'react'
import { useDropzone } from 'react-dropzone'
import { Accept, useDropzone } from 'react-dropzone'
import { useAtomValue, useSetAtom } from 'jotai'
@ -68,12 +68,22 @@ const ChatScreen: React.FC = () => {
const isGeneratingResponse = useAtomValue(isGeneratingResponseAtom)
const acceptedFormat: Accept = activeThread?.assistants[0].model.settings
.vision_model
? {
'application/pdf': ['.pdf'],
'image/jpeg': ['.jpeg'],
'image/png': ['.png'],
'image/jpg': ['.jpg'],
}
: {
'application/pdf': ['.pdf'],
}
const { getRootProps, isDragReject } = useDropzone({
noClick: true,
multiple: false,
accept: {
'application/pdf': ['.pdf'],
},
accept: acceptedFormat,
onDragOver: (e) => {
// Retrieval file drag and drop is experimental feature
@ -164,10 +174,21 @@ const ChatScreen: React.FC = () => {
<div className="mt-4 text-blue-600">
<h6 className="font-bold">
{isDragReject
? 'Currently, we only support 1 attachment at the same time with PDF format'
? `Currently, we only support 1 attachment at the same time with ${
activeThread?.assistants[0].model.settings
.vision_model
? 'PDF, JPEG, JPG, PNG'
: 'PDF'
} format`
: 'Drop file here'}
</h6>
{!isDragReject && <p className="mt-2">(PDF)</p>}
{!isDragReject && (
<p className="mt-2">
{activeThread?.assistants[0].model.settings.vision_model
? 'PDF, JPEG, JPG, PNG'
: 'PDF'}
</p>
)}
</div>
</div>
</div>