Skip to content
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.

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

Sync dev branch to docs branch #1948

Merged
merged 131 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift click to select a range
736ea8f
Merge pull request #1752 from janhq/dev
louis-jan Jan 25, 2024
5f65d00
fix: bring back open app directory
louis-jan Jan 25, 2024
44053a6
Merge pull request #1756 from janhq/regression/add-back-open-app-data…
louis-jan Jan 25, 2024
79049ee
Remove paths trigger for pre-release ci
hientominh Jan 25, 2024
9f71ec2
Merge pull request #1757 from janhq/hotfix/ci-pre-release-trigger-failed
hiento09 Jan 25, 2024
045e544
adds devcontainer
avb-is-me Jan 25, 2024
f73e738
Combine 2 ci pipeline pre-release and nightly into one for correcting…
hientominh Jan 25, 2024
8e28c2a
Add ignore trigger pre-release to main for docs and README.md
hientominh Jan 25, 2024
c752e71
Merge pull request #1767 from janhq/regression/combine-ci-pre-release…
hiento09 Jan 25, 2024
023ab04
Correct bash script syntax in ci
hientominh Jan 25, 2024
1b49c76
Merge pull request #1769 from janhq/regression/fix-ci-run-failed
hiento09 Jan 25, 2024
7f55c1b
fix(Log): server log is not display in windows (#1764)
namchuai Jan 25, 2024
acc774d
fix(Wording): #1758 correct text for windows (#1768)
namchuai Jan 25, 2024
b9584db
fix: input port local server not accepted alphabets
urmauur Jan 25, 2024
d779c81
Merge pull request #1772 from janhq/regression/fix-input-port
urmauur Jan 25, 2024
917d69d
fix: can not start model when server is not enabled from model settin…
louis-jan Jan 25, 2024
c2310ed
fix: could not delete model (#1779)
louis-jan Jan 25, 2024
f0e88d6
Docs publish to github page trigger on push to docs branch (#1782)
hiento09 Jan 25, 2024
f4bf8ba
Merge pull request #1783 from janhq/chore/cherrypick-docs-ci
hiento09 Jan 25, 2024
b2b1479
Added focus
copyhold Jan 25, 2024
7ed523e
fix: api settings are not applied on changes (#1789)
louis-jan Jan 25, 2024
b2ff76c
fix: app log not being printed (#1790)
namchuai Jan 25, 2024
a78e183
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 25, 2024
e8796a7
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 25, 2024
8c5ba26
Merge pull request #1759 from team-dev-docs/devcontainer
henryh0x1 Jan 25, 2024
663bf0c
fix: clean last message when user clean thread message (#1793)
namchuai Jan 25, 2024
b0d63c9
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 25, 2024
a52d81c
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 25, 2024
99025cb
CI nightly update trigger to 3AM UTC 7 Tuesday, Wednesday, and Thurs…
hiento09 Jan 26, 2024
85b58eb
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 26, 2024
143e76a
chore: clean up code and remove some lint suppression (#1777)
namchuai Jan 26, 2024
a7edd37
fix: disabled input darkmode (#1800)
urmauur Jan 26, 2024
b156502
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 26, 2024
bdebbca
fix: stop openai inference raises something amiss (#1799)
louis-jan Jan 26, 2024
2d96b69
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 26, 2024
c4d5636
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 26, 2024
9fa28d2
fix: user can't use a model in model hub (#1801)
namchuai Jan 26, 2024
ba07f92
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 26, 2024
532a589
fix: model selection does not show in api settings page (#1802)
louis-jan Jan 26, 2024
8bd539a
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 26, 2024
23dfb1c
fix: cannot change jan data folder (#1805)
namchuai Jan 26, 2024
38f757d
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 26, 2024
28e4405
feat: support RAG
hiro-v Dec 19, 2023
8a68275
Merge pull request #1506 from janhq/chore/jan-can-see-rebase
hiro-v Jan 26, 2024
642d7aa
fix: user can't view model setting in local api server (#1807)
namchuai Jan 27, 2024
36a8809
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 27, 2024
5fe68c1
feat: put timestamp under thread name in left panel
urmauur Jan 28, 2024
89e3f28
Rebase
copyhold Jan 28, 2024
982b0dc
Revert
copyhold Jan 28, 2024
51eeccf
Merge pull request #1821 from copyhold/autofocus-text-input-when-star…
urmauur Jan 28, 2024
61d5c6a
fix: model selection does not show in API settings page (#1828)
louis-jan Jan 29, 2024
3445a25
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 29, 2024
50c4996
fix: highlight menu dropdown server options
urmauur Jan 29, 2024
025415f
Update README.md with Stable Download URLs
jan-service-account Jan 29, 2024
aa94fe2
Update release url on README to default branch instead of main branch…
hiento09 Jan 29, 2024
7c30c56
chore: resolve (#1833)
louis-jan Jan 29, 2024
97a4978
Merge pull request #1830 from janhq/main
louis-jan Jan 29, 2024
edaf6bb
Merge pull request #1831 from janhq/fix/dropdown-api-server
urmauur Jan 29, 2024
bb47d68
perf: remove unnecessary rerender when user typing input (#1818)
namchuai Jan 29, 2024
391f053
fix: typo copy
urmauur Jan 29, 2024
7b1337a
fix: preserve focused thread when navigating in jan app (#1814)
namchuai Jan 29, 2024
f338968
Merge pull request #1820 from janhq/feat/improve-thread-left-panel
urmauur Jan 29, 2024
86a5de2
Add code sign step for darwin assistant extension (#1841)
hiento09 Jan 29, 2024
f19db6c
chore: The Data Folder is no longer an experimental feature (#1847)
louis-jan Jan 29, 2024
00a109d
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 29, 2024
a477220
fix: add loader when user change folder
urmauur Jan 29, 2024
4237c46
Merge pull request #1850 from janhq/fix/jan-data-folder
urmauur Jan 29, 2024
1689702
fix: all input text box are disabled (#1855)
namchuai Jan 29, 2024
24fc0f0
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 29, 2024
12ebf27
fix: retrieval always ask for api key
louis-jan Jan 29, 2024
0778beb
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 29, 2024
b4602ef
Merge pull request #1856 from janhq/fix/retrieval-always-ask-for-api-key
urmauur Jan 30, 2024
a2b6055
fix: auto collapse retrieval setting while update config
urmauur Jan 30, 2024
5e13fd2
fix: loader error change folder
urmauur Jan 30, 2024
00c4397
fix: loader error change folder
urmauur Jan 30, 2024
96aded6
fix: showing catch error on modal when change folder
urmauur Jan 30, 2024
282dd58
fix: not allow user to choose sub directory as jan data folder
Jan 30, 2024
0b20a40
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 30, 2024
0e17f77
Merge pull request #1870 from janhq/fix/loader-change-folder
urmauur Jan 31, 2024
0693f55
Merge pull request #1866 from janhq/fix/retrieval-setting
urmauur Jan 31, 2024
2ec6037
chore: Bump nitro to 0.3.3 for fixing hungup 2nd request
hiro-v Jan 31, 2024
203f816
Merge pull request #1877 from janhq/chore/bump_nitro_0.3.3
hiro-v Jan 31, 2024
cfadd13
Increase timeout for explore.e2e.spec test (#1844)
hiento09 Jan 31, 2024
5e58f67
chore: add react developer tools to electron (#1858)
Helloyunho Jan 31, 2024
50fb0bc
feat: add snackbar component and update style side banner
urmauur Jan 30, 2024
8151ef0
feat: add factory reset feature (#1750)
namchuai Jan 31, 2024
509f6cb
feat: move open app directory into icon folder (#1879)
urmauur Jan 31, 2024
8150f2f
fix: add dialog confirm when move folder and next dest isn't empty
urmauur Jan 31, 2024
7d03150
Merge pull request #1880 from janhq/fix/modal-confirm
urmauur Jan 31, 2024
71fcaa3
Merge pull request #1874 from janhq/feat/snackbar-component
urmauur Jan 31, 2024
ad842db
chore: mark RAG as experimental feature
louis-jan Jan 31, 2024
32330cb
Merge pull request #1882 from janhq/chore/mark-rag-as-experimental-fe…
louis-jan Jan 31, 2024
4b8b13b
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Jan 31, 2024
4116aaa
feat: add start/stop model via http api (#1862)
namchuai Feb 1, 2024
5ddc6ea
fix: the selected model auto revert back to previous used model with …
louis-jan Feb 1, 2024
ae073d2
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 1, 2024
11e2a76
feat: Add default value for ngl (#1886)
hiro-v Feb 1, 2024
36cd598
feat: integrate umami (#1809)
henryh0x1 Feb 1, 2024
5ce2e42
fix: display error message on model load fail (#1894)
louis-jan Feb 1, 2024
9e4658f
fix: show generate response on message send (#1895)
louis-jan Feb 1, 2024
36ad16f
Merge pull request #1888 from janhq/dev
louis-jan Feb 1, 2024
fd872c3
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 1, 2024
bef8dcd
fix: load model fail overlays thread message error (#1901)
louis-jan Feb 2, 2024
9e1c41b
fix: chat using web interface (#1889)
namchuai Feb 2, 2024
eaa3053
fix: openAIEmbedding now requires top level API Key configuration (#1…
louis-jan Feb 2, 2024
071c928
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 2, 2024
afa80b9
fix: broken manual import model with NA fields (#1912)
louis-jan Feb 3, 2024
81bbd83
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 3, 2024
6ea7d8f
fix: migration loading indicator (#1913)
louis-jan Feb 3, 2024
135a777
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 3, 2024
4472bb1
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 4, 2024
0b44649
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 4, 2024
4f75133
Regression fix assitant extension codesign (#1918)
hiento09 Feb 4, 2024
3fecdc3
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 4, 2024
480a1d9
Cloudflare R2 clean every 10 days (#1917)
hiento09 Feb 4, 2024
f43fae2
Merge pull request #1919 from janhq/main
louis-jan Feb 5, 2024
ccbe18e
Update README.md with Stable Download URLs
jan-service-account Feb 5, 2024
0b7e634
fix: download model will close panel item hub
urmauur Feb 5, 2024
01fec49
fix: reduce the number of api call (#1896)
namchuai Feb 5, 2024
ee5a44a
fix: umami analytics send app loaded event (#1928)
louis-jan Feb 5, 2024
d5830b3
adding new feature for v0.4.6 (#1927)
Van-QA Feb 5, 2024
0d152a2
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 5, 2024
589bcf8
Merge pull request #1929 from janhq/main
hiento09 Feb 5, 2024
7be34b6
Merge pull request #1923 from janhq/fix/collapse-panel-hub-items
urmauur Feb 5, 2024
61419e5
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 5, 2024
29a7fb8
fix: avoid users to create so many threads at the same time (#1930)
urmauur Feb 6, 2024
4471b2c
feat: User Selectable GPUs and GPU-based Model Recommendations (#1730)
hiento09 Feb 6, 2024
a8cd972
fix: markdown render for chat completion role user (#1944)
urmauur Feb 6, 2024
823f8e0
janhq/jan: Update README.md with nightly build artifact URL
jan-service-account Feb 6, 2024
2f961d7
feat: Playwright capture screenshot of Electron desktop app (Jan) on …
Van-QA Feb 7, 2024
97466c7
Merge pull request #1947 from janhq/docs
henryh0x1 Feb 7, 2024
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
Prev Previous commit
Next Next commit
feat: Playwright capture screenshot of Electron desktop app (Jan) on …
…failures (#1934)

* feat: Apply Screenshot on failures

* feat: set timeout by default

* chore: clean up import
  • Loading branch information
Van-QA committed Feb 7, 2024
commit 2f961d7cabcfa025c6da3cb2b4597edb01ceed43
9 changes: 8 additions & 1 deletion electron/playwright.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 1,16 @@
import { PlaywrightTestConfig } from '@playwright/test'

const config: PlaywrightTestConfig = {
testDir: './tests',
testDir: './tests/e2e',
retries: 0,
globalTimeout: 300000,
use: {
screenshot: 'only-on-failure',
video: 'retain-on-failure',
trace: 'retain-on-failure',
},

reporter: [['html', { outputFolder: './playwright-report' }]],
}

export default config
34 changes: 34 additions & 0 deletions electron/tests/e2e/hub.e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 1,34 @@
import {
page,
test,
setupElectron,
teardownElectron,
TIMEOUT,
} from '../pages/basePage'
import { expect } from '@playwright/test'

test.beforeAll(async () => {
const appInfo = await setupElectron()
expect(appInfo.asar).toBe(true)
expect(appInfo.executable).toBeTruthy()
expect(appInfo.main).toBeTruthy()
expect(appInfo.name).toBe('jan')
expect(appInfo.packageJson).toBeTruthy()
expect(appInfo.packageJson.name).toBe('jan')
expect(appInfo.platform).toBeTruthy()
expect(appInfo.platform).toBe(process.platform)
expect(appInfo.resourcesDir).toBeTruthy()
})

test.afterAll(async () => {
await teardownElectron()
})

test('explores hub', async () => {
await page.getByTestId('Hub').first().click({
timeout: TIMEOUT,
})
await page.getByTestId('hub-container-test-id').isVisible({
timeout: TIMEOUT,
})
})
38 changes: 38 additions & 0 deletions electron/tests/e2e/navigation.e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 1,38 @@
import { expect } from '@playwright/test'
import {
page,
setupElectron,
TIMEOUT,
test,
teardownElectron,
} from '../pages/basePage'

test.beforeAll(async () => {
await setupElectron()
})

test.afterAll(async () => {
await teardownElectron()
})

test('renders left navigation panel', async () => {
const systemMonitorBtn = await page
.getByTestId('System Monitor')
.first()
.isEnabled({
timeout: TIMEOUT,
})
const settingsBtn = await page
.getByTestId('Thread')
.first()
.isEnabled({ timeout: TIMEOUT })
expect([systemMonitorBtn, settingsBtn].filter((e) => !e).length).toBe(0)
// Chat section should be there
await page.getByTestId('Local API Server').first().click({
timeout: TIMEOUT,
})
const localServer = page.getByTestId('local-server-testid').first()
await expect(localServer).toBeVisible({
timeout: TIMEOUT,
})
})
23 changes: 23 additions & 0 deletions electron/tests/e2e/settings.e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 1,23 @@
import { expect } from '@playwright/test'

import {
setupElectron,
teardownElectron,
test,
page,
TIMEOUT,
} from '../pages/basePage'

test.beforeAll(async () => {
await setupElectron()
})

test.afterAll(async () => {
await teardownElectron()
})

test('shows settings', async () => {
await page.getByTestId('Settings').first().click({ timeout: TIMEOUT })
const settingDescription = page.getByTestId('testid-setting-description')
await expect(settingDescription).toBeVisible({ timeout: TIMEOUT })
})
48 changes: 0 additions & 48 deletions electron/tests/hub.e2e.spec.ts

This file was deleted.

61 changes: 0 additions & 61 deletions electron/tests/navigation.e2e.spec.ts

This file was deleted.

67 changes: 67 additions & 0 deletions electron/tests/pages/basePage.ts
Original file line number Diff line number Diff line change
@@ -0,0 1,67 @@
import {
expect,
test as base,
_electron as electron,
ElectronApplication,
Page,
} from '@playwright/test'
import {
findLatestBuild,
parseElectronApp,
stubDialog,
} from 'electron-playwright-helpers'

export const TIMEOUT: number = parseInt(process.env.TEST_TIMEOUT || '300000')

export let electronApp: ElectronApplication
export let page: Page

export async function setupElectron() {
process.env.CI = 'e2e'

const latestBuild = findLatestBuild('dist')
expect(latestBuild).toBeTruthy()

// parse the packaged Electron app and find paths and other info
const appInfo = parseElectronApp(latestBuild)
expect(appInfo).toBeTruthy()

electronApp = await electron.launch({
args: [appInfo.main], // main file from package.json
executablePath: appInfo.executable, // path to the Electron executable
})
await stubDialog(electronApp, 'showMessageBox', { response: 1 })

page = await electronApp.firstWindow({
timeout: TIMEOUT,
})
// Return appInfo for future use
return appInfo
}

export async function teardownElectron() {
await page.close()
await electronApp.close()
}

export const test = base.extend<{
attachScreenshotsToReport: void
}>({
attachScreenshotsToReport: [
async ({ request }, use, testInfo) => {
await use()

// After the test, we can check whether the test passed or failed.
if (testInfo.status !== testInfo.expectedStatus) {
const screenshot = await page.screenshot()
await testInfo.attach('screenshot', {
body: screenshot,
contentType: 'image/png',
})
}
},
{ auto: true },
],
})

test.setTimeout(TIMEOUT)
45 changes: 0 additions & 45 deletions electron/tests/settings.e2e.spec.ts

This file was deleted.

Loading