171 Commits

Author SHA1 Message Date
hiento09
7611a05c44
Deprecate Docker and K8s (#3219)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-07-30 13:22:11 +07:00
NamH
101268f6f3
feat: integrating cortex (#3001)
* feat: integrating cortex

* Temporary prevent crash

Signed-off-by: James <namnh0122@gmail.com>

* fix yarn lint

Signed-off-by: James <namnh0122@gmail.com>

* refactor: remove core node module - fs - extensions and so on (#3151)

* add migration script for threads, messages and models

Signed-off-by: James <namnh0122@gmail.com>

* remove freq_penalty and presence_penalty if model not supported

Signed-off-by: James <namnh0122@gmail.com>

* add back models in my models

Signed-off-by: James <namnh0122@gmail.com>

* fix api-url for setup API key popup

Signed-off-by: James <namnh0122@gmail.com>

* fix using model name for dropdown model

Signed-off-by: James <namnh0122@gmail.com>

* fix can't click to hotkey

Signed-off-by: James <namnh0122@gmail.com>

* fix: disable some UIs

Signed-off-by: James <namnh0122@gmail.com>

* fix build

Signed-off-by: James <namnh0122@gmail.com>

* reduce calling HF api

Signed-off-by: James <namnh0122@gmail.com>

* some ui update

Signed-off-by: James <namnh0122@gmail.com>

* feat: modal migration UI  (#3153)

* feat: handle popup migration

* chore: update loader

* chore: integrate script migration

* chore: cleanup import

* chore: moving out spinner loader

* chore: update check thread message success migrate

* chore: add handle script into retry button

* remove warning from joi

Signed-off-by: James <namnh0122@gmail.com>

* chore: fix duplicate children

* fix: path after migrating model

Signed-off-by: James <namnh0122@gmail.com>

* chore: apply mutation for config

* chore: prevent calling too many create assistant api

Signed-off-by: James <namnh0122@gmail.com>

* using cortexso

Signed-off-by: James <namnh0122@gmail.com>

* update download api

Signed-off-by: James <namnh0122@gmail.com>

* fix use on slider item

Signed-off-by: James <namnh0122@gmail.com>

* fix: ui no download model or simple onboarding (#3166)

* fix download huggingface model match with slider item

Signed-off-by: James <namnh0122@gmail.com>

* update owner_logo to logo and author

Signed-off-by: James <namnh0122@gmail.com>

* update new cortexso

Signed-off-by: James <namnh0122@gmail.com>

* Add install python step for macos

* add engine table

Signed-off-by: James <namnh0122@gmail.com>

* fix local icons

Signed-off-by: James <namnh0122@gmail.com>

* feat: add search feature for model hub

Signed-off-by: James <namnh0122@gmail.com>

* fix misalign switch

Signed-off-by: James <namnh0122@gmail.com>

* fix: delete thread not focus on other thread

Signed-off-by: James <namnh0122@gmail.com>

* add get model from hugging face

Signed-off-by: James <namnh0122@gmail.com>

* fix download from hugging face

Signed-off-by: James <namnh0122@gmail.com>

* small update

Signed-off-by: James <namnh0122@gmail.com>

* update

Signed-off-by: James <namnh0122@gmail.com>

* fix system monitor rounded only on the left

Signed-off-by: James <namnh0122@gmail.com>

* chore: update ui new hub screen (#3174)

* chore: update ui new hub screen

* chore: update layout centerpanel thread and hub screen

* chore: update detail model by group

* update cortexso 0.1.13

Signed-off-by: James <namnh0122@gmail.com>

* chore: add file size

Signed-off-by: James <namnh0122@gmail.com>

* chore: put engine to experimental feature

Signed-off-by: James <namnh0122@gmail.com>

* chore: open cortex folder

Signed-off-by: James <namnh0122@gmail.com>

* chore: add back user avatar

Signed-off-by: James <namnh0122@gmail.com>

* chore: minor UI hub (#3182)

* chore: add back right click thread list and update 3 dots are overlapping with the text

* chore: update position dropdown list my models

* chore: make on-device tab showing 6 items instead of 4

* chore: update style description modals detail model

* chore: update isGeneration loader and author name on modal

* feat: integrate cortex single executable

Signed-off-by: James <namnh0122@gmail.com>

* fix build

Signed-off-by: James <namnh0122@gmail.com>

* chore: added blank state

* chore: update ui component blank state

* bump cortex binary version

* fix: logic show modal migration (#3165)

* fix: logic show modal migration

* chore: fixed logic

* chore: read contain format gguf local models

* chore: change return hasLocalModel

* chore: intiial skipmigration state

* chore: filter embedding model

* fix: delete top thread not focus on any other thread

* chore: added UI no result component search models group (#3188)

* fix: remote model should show all when user config that engine

Signed-off-by: James <namnh0122@gmail.com>

* chore: set state thread and models migration using getOnInit (#3189)

* chore: set state thread and models migration using getOnInit

* chore: add state as dependecies hooks

* chore: system monitor panel show engine model (#3192)

* fix: remove config api, replace with engine

Signed-off-by: James <namnh0122@gmail.com>

* update

Signed-off-by: James <namnh0122@gmail.com>

* update reactquery

Signed-off-by: James <namnh0122@gmail.com>

* bump cortex 0.4.35

* feat: add waiting for cortex popup

Signed-off-by: James <namnh0122@gmail.com>

* chore: add loader detail model popup (#3195)

* chore: model start loader (#3197)

* chore: added model loader when user starting chat without model active

* chore: update copies loader

* fix: select min file size if recommended quant does not exist

Signed-off-by: James <namnh0122@gmail.com>

* chore: temporary hide gpu config

* fix: tensorrt not shown

Signed-off-by: James <namnh0122@gmail.com>

* fix lint

Signed-off-by: James <namnh0122@gmail.com>

* fix tests

Signed-off-by: James <namnh0122@gmail.com>

* fix e2e tests (wip)

Signed-off-by: James <namnh0122@gmail.com>

* update

Signed-off-by: James <namnh0122@gmail.com>

* fix: adding element and correct test to adapt new UI

* fix: temp skip unstable part

* fix: only show models which can be supported

Signed-off-by: James <namnh0122@gmail.com>

* Update version.txt

* update send message

Signed-off-by: James <namnh0122@gmail.com>

* fix: not allow user send message when is generating

Signed-off-by: James <namnh0122@gmail.com>

* chore: temp skip Playwright test due to env issue

* chore: temp skip Playwright test due to env issue

* update

Signed-off-by: James <namnh0122@gmail.com>

* chore: minor-ui-feedback (#3202)

---------

Signed-off-by: James <namnh0122@gmail.com>
Co-authored-by: Louis <louis@jan.ai>
Co-authored-by: Faisal Amir <urmauur@gmail.com>
Co-authored-by: Hien To <tominhhien97@gmail.com>
Co-authored-by: Van Pham <64197333+Van-QA@users.noreply.github.com>
Co-authored-by: Van-QA <van@jan.ai>
2024-07-26 17:52:43 +07:00
hiento09
5bbf7fa058
Change reviewer for nightly PR update cortex cpp (#3046)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-06-16 19:23:37 +07:00
hiento09
d0e238ea65
Add nightly update cortex cpp to Jan app (#3044)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-06-16 18:29:30 +07:00
Van Pham
b4bbe2a9ab
refactor: update label of checkbox (#3039)
Co-authored-by: Van-QA <van@jan.ai>
2024-06-13 22:29:05 +07:00
hiro
4775549212
chore: Remove OpenAI test coverage (#3033)
* chore: remove

* refactor: update markdown

---------

Co-authored-by: Van-QA <van@jan.ai>
2024-06-13 22:06:46 +07:00
Hoang Ha
f702506e58
Chore: model hub v0.5.1 update (#3036)
* init model

* init qwen2

* version bump

* refactor: correct icon

* chore: Refactor/issue template feature request (#3037)

* refactor: add issue template form for bug

* refactor: config blank_issues_enabled: false

* refactor: config feature request

* refactor: config feature request

---------

Co-authored-by: Van-QA <van@jan.ai>

* refactor: correct icon

* refactor: allow blank issue

---------

Co-authored-by: Van-QA <van@jan.ai>
Co-authored-by: Van Pham <64197333+Van-QA@users.noreply.github.com>
2024-06-13 15:06:07 +07:00
Van Pham
34ea178f5b
chore: Refactor/issue template feature request (#3037)
* refactor: add issue template form for bug

* refactor: config blank_issues_enabled: false

* refactor: config feature request

* refactor: config feature request

---------

Co-authored-by: Van-QA <van@jan.ai>
2024-06-13 14:46:02 +07:00
Van Pham
c7f0edae34
chore: Refactor/issue template and extension version bump (#3035)
* refactor: add issue template form for bug

* Bump extension v‌‌ersion for FA

* refactor: config blank_issues_enabled: false

---------

Co-authored-by: Van-QA <van@jan.ai>
2024-06-13 13:53:14 +07:00
Faisal Amir
faa09bd2bf
feat: Dekstop Revamp (#2877)
* feat: desktop revamp

* feat: refactor system monitor

* fix linter CI

* remove unused import component

* added responsive and resizeable component

* responsive and resizeable local server page

* finalize responsive and resizeable component

* fix scroll custom ui

* remove react scroll to bottom from modal troubleshoot

* fix modal troubleshoot ui

* fix setting gpu list

* text area custom scroll bar

* fix padding message input

* cleanup classname

* update inference engine model dropdown

* update loader style

* update quick ask ui

* prepare theme provider

* update dark theme

* remove update hotkey list model and navigation

* fix: cleanup hardcode classname

* fix: update feedback

* Set native theme electron

* update destop ui revamp from feedback

* update button icon component insider icon chat input message

* update model dropdown ui

* update tranaparent baclground

* update logo model provider

* fix: set background material acrylic support to blur background windows

* fix: update tranparent left and right panel

* fix: linter CI

* update app using frameless window

* styling custom style minimize, maximize and close app

* temporary hidden maximize window

* fix: responsive left and right panel

* fix: enable click outside when leftpanel responsive

* fix: remove unused import

* update transparent variable css windows

* fix: ui import model

* feat: Support Theme system (#2946)

* feat: update support theme system

* update select component

* feat: add theme folder in root project

* fix: padding left and right center panel

* fix: update padding left and right

* chore: migrate themes

* fix: rmdirsync error

* chore: update gitignore

* fix: cp recursive

* fix: files electron package json

* fix: migration

* fix: update fgit ignore

---------

Co-authored-by: Louis <louis@jan.ai>

* fix: update feedback missing state when refrash app

* fix: error test CI

* chore: refactor useLoadThemes

* chore: cleanup unused vars

* fix: revert back menubar windows

* fix minor ui

* fix: minor ui

---------

Co-authored-by: Louis <louis@jan.ai>
2024-05-29 13:37:18 +07:00
hiento09
5573ec9fdb
Replace deprecated steps github action (#2935)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-05-22 15:42:27 +07:00
Van Pham
ae499c7ac4
Feat/oai endpoints mapper using JSON (#2929)
* feat: test mapper

* chore: temporally add other runner

* chore: temp remove ubuntu-18-04-openai-api-collection-test

* chore: test json file

* chore: test json file

* Correct path endpoints_mapping.json

* feat: running via endpoints

* feat: running multiple endpoint

* feat: use endpoint value from workflow dispatch

* feat: add mapper between endpoint and python test file

* feat: config run all

* feat: config run all

---------

Co-authored-by: Van-QA <van@jan.ai>
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-05-20 23:45:37 +07:00
hiento09
0436224fa1
Revert "Revert "Change mac arm64 build use github runner (#2910)" (#2911)" (#2915)
This reverts commit 06be30876fcd5fb8c186b137ef9760e440146273.
2024-05-16 14:23:54 +07:00
hiento09
06be30876f
Revert "Change mac arm64 build use github runner (#2910)" (#2911)
This reverts commit 33697be6642b42bf3b1b8161d629ee182c40cfe3.
2024-05-16 13:27:31 +07:00
hiento09
33697be664
Change mac arm64 build use github runner (#2910)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-05-16 10:05:49 +07:00
Van Pham
aa1f01f4fa
Revert "chore: remove nutjs" and replace nutjs version (#2900)
* Revert "chore: remove nutjs (#2860)"

This reverts commit ce2d8e540582a73423efed02dbe484e213cdf0fe.

* feat: change nut-js to download from GitHub

* feat: change nut-js to use @nut-tree-fork/nut-js

* Revert "Chore: temporary disable cache for server migration (#2742)"

This reverts commit af9a35110ba2462279dfb988cc89748697a97899.

* feat: disable quickask settings on linux

* feat: enable quick ask linux again

* Change to @kirillvakalov/nut-tree__nut-js (#2906)

Co-authored-by: Hien To <tominhhien97@gmail.com>

---------

Co-authored-by: Van-QA <van@jan.ai>
Co-authored-by: hiento09 <136591877+hiento09@users.noreply.github.com>
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-05-15 15:03:29 +07:00
Louis
63a2f22414
Merge branch 'dev' into main 2024-04-25 14:14:54 +07:00
hiento09
3936ce1baa
change agent run macintel (#2814)
Co-authored-by: Service Account <service@jan.ai>
2024-04-25 10:58:07 +07:00
hiento09
957f4629e2
Add workflow test openai api (#2778)
* Add workflow test openai api

* chore: add filename as attribute to each test case

* chore: correct label

* feat: create pytest.ini

* chore: remote extra "

* chore: rename workflow to group similar type

* chore: remove auto build on push to main

* chore: rename job

---------

Co-authored-by: Hien To <tominhhien97@gmail.com>
Co-authored-by: Van-QA <van@jan.ai>
2024-04-25 10:55:11 +07:00
hiento09
af9a35110b
Chore: temporary disable cache for server migration (#2742)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-17 10:52:38 +07:00
Van-QA
76c05eec99 chore: workflow dispatch will not trigger antivirus to save resources 2024-04-11 17:39:49 +07:00
hiento09
bb567ce8c4
CI test add clean jan folder and revert download url notification on discord (#2690)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-11 17:19:04 +07:00
hiento09
ebdaaa6c10
bump nitro version to 0.3.21 (#2680)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-11 12:08:39 +07:00
hiento09
c9332d6968
Enable ci linter workflow_dispatch event (#2673)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-10 17:16:37 +07:00
hiento09
3be0b3af65
Change report portal description to git commit hash (#2668)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-10 13:38:47 +07:00
hiento09
08baf48dcb
Feature playwright integrate report portal (#2648)
* Add make script for report portual playwright agent config

* Update workflow to report to report portal

---------

Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-08 21:56:01 +07:00
hiento09
c93283ec5e
Change condition for trigger PR from forked repo (#2611)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-04 19:25:36 +07:00
hiento09
c4da1cbc90
Enable trigger for pull_request_target ci linter (#2609)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-04 10:08:11 +07:00
hiento09
beb3473d4e
Move out from cloudflare r2 to aws s3 (#2596)
* Move out from cloudflare r2 to aws s3

* Remove clean cloudflare jobs

---------

Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-03 16:10:01 +07:00
hiento09
a6cbc0b86f
Change release download url to cloudflare worker proxy and update download model tensorrt llm to aws s3 endpoint (#2576)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-02 17:08:53 +07:00
hiento09
7feaf0b3bd
Change npm registry to nexus for CI test and enable turbo remote cache (#2535)
* Change npm registry to nexus for CI test

* Change npm registry to nexus for CI test

* Add yarn.lock

* Remove clean step

* Revert to disable yarn.lock file

* Turn NPM Proxy to env

---------

Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-04-02 15:34:26 +07:00
hiento09
c5c46494eb
Add CI assign current milestone for closed PR (#2516)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-03-27 14:44:18 +07:00
Louis
254a79ccbe
fix: turborepo extensions (#2392)
* fix: turborepo extensions

Update package.json

Update Makefile

Update Makefile

Update Makefile

Update Makefile

Update Makefile

Update package.json

* chore: turbo cache

* fix: install extensions in parallel

* fix: timeout issue

* Turbo cache using s3

* Remove cache task

---------

Co-authored-by: Hien To <tominhhien97@gmail.com>
Co-authored-by: Service Account <service@jan.ai>
2024-03-22 17:53:20 +07:00
hiento09
a76c12766a
Remove docs after migrate to docs repo (#2465)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-03-22 15:54:34 +07:00
hiento09
e902d8edff
PR disable antivirus check (#2454)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-03-22 11:53:15 +07:00
Louis
489e8aab24
Sync release 0.4.9 to dev (#2407)
* fix: move tensorrt executable to engine (#2400)

* fix: move tensorrt executable to engine

Signed-off-by: James <james@jan.ai>

* some update

Signed-off-by: hiro <hiro@jan.ai>

* chore: bump tensorrt version

* fix: wrong destroy path

* fix: install extensions in parallel

* chore: update path for tensorrt engine (#2404)

Signed-off-by: James <james@jan.ai>
Co-authored-by: James <james@jan.ai>

---------

Signed-off-by: James <james@jan.ai>
Signed-off-by: hiro <hiro@jan.ai>
Co-authored-by: James <james@jan.ai>
Co-authored-by: hiro <hiro@jan.ai>
Co-authored-by: Louis <louis@jan.ai>

* Release/v0.4.9 (#2421)

* fix: turn off experimental settings should also turn off quick ask (#2411)

* fix: app glitches 1s generating response before starting model (#2412)

* fix: disable experimental feature should also disable vulkan (#2414)

* fix: model load stuck on windows when can't get CPU core count (#2413)

Signed-off-by: James <james@jan.ai>
Co-authored-by: James <james@jan.ai>

* feat: TensorRT-LLM engine update support (#2415)

* fix: engine update

* chore: add remove prepopulated models

Signed-off-by: James <james@jan.ai>

* update tinyjensen url

Signed-off-by: James <james@jan.ai>

* update llamacorn

Signed-off-by: James <james@jan.ai>

* update Mistral 7B Instruct v0.1 int4

Signed-off-by: James <james@jan.ai>

* update tensorrt

Signed-off-by: James <james@jan.ai>

* update

Signed-off-by: hiro <hiro@jan.ai>

* update

Signed-off-by: James <james@jan.ai>

* prettier

Signed-off-by: James <james@jan.ai>

* update mistral config

Signed-off-by: James <james@jan.ai>

* fix some lint

Signed-off-by: James <james@jan.ai>

---------

Signed-off-by: James <james@jan.ai>
Signed-off-by: hiro <hiro@jan.ai>
Co-authored-by: James <james@jan.ai>
Co-authored-by: hiro <hiro@jan.ai>

* Tensorrt LLM disable turing support (#2418)

Co-authored-by: Hien To <tominhhien97@gmail.com>

* chore: add prompt template tensorrtllm (#2375)

* chore: add prompt template tensorrtllm

* Add Prompt template for mistral and correct model metadata

---------

Co-authored-by: Hien To <tominhhien97@gmail.com>

* fix: correct tensorrt mistral model.json (#2419)

---------

Signed-off-by: James <james@jan.ai>
Signed-off-by: hiro <hiro@jan.ai>
Co-authored-by: Louis <louis@jan.ai>
Co-authored-by: James <james@jan.ai>
Co-authored-by: hiro <hiro@jan.ai>
Co-authored-by: hiento09 <136591877+hiento09@users.noreply.github.com>
Co-authored-by: Hien To <tominhhien97@gmail.com>

---------

Signed-off-by: James <james@jan.ai>
Signed-off-by: hiro <hiro@jan.ai>
Co-authored-by: NamH <NamNh0122@gmail.com>
Co-authored-by: James <james@jan.ai>
Co-authored-by: hiro <hiro@jan.ai>
Co-authored-by: hiento09 <136591877+hiento09@users.noreply.github.com>
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-03-19 12:20:09 +07:00
Louis
5633195f7e
fix: fail-fast would block matrix jobs as soon as a job is failed (#2401) 2024-03-17 12:47:44 +07:00
Louis
e74345ecdc
fix: clean working dir with long space support on Windows (#2399) 2024-03-17 11:22:06 +07:00
hiento09
3aeb6434b8
codesign script force sign (#2291)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-03-11 13:02:54 +07:00
hiento09
3ef660b7fe
Add modify notary team in CI (#2265)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-03-07 12:25:30 +07:00
hiento09
1584f0d21e
Add prefix latest/ for task clean r2 bucket (#2233)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-03-04 23:03:42 +07:00
hiento09
49fa6d8df2
Feature helmchart and ci jan server (#2106)
* Add helm chart for jan server

* Add CI for jan server

---------

Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-02-20 22:19:26 +07:00
Van Pham
82b361a5be
feat: Initialize POM structure with fixtures on Playwright (#2015)
* feat: video recorder on failures

* feat: fixture for sample page class

* feat: video recorder on failures

* feat: fixture for sample page class

* feat: video recorder on failures

* feat: fixture for sample page class

* feat: Apply Screenshot on failures

* feat: set timeout by default

* chore: clean up import

* feat: video recorder on failures

* feat: fixture for sample page class

* feat: add wait for app update

* chore: correct timeout

* chore: correct timeout

* chore: test timeout

* chore: test timeout

* chore: test timeout

* chore: browser context config

* chore: temporally disable the video recorder to bypass issue
2024-02-15 20:18:02 +07:00
Louis
f43fae2e86
Merge pull request #1919 from janhq/main
Sync release 0.4.6 to dev
2024-02-05 10:08:39 +07:00
hiento09
480a1d9cc1
Cloudflare R2 clean every 10 days (#1917)
Co-authored-by: Hien To <hien@jan.ai>
2024-02-04 21:02:40 +07:00
hiento09
4f751338b7
Regression fix assitant extension codesign (#1918)
* Separated build macos arm64 and x86_x64

* Update dependencies jobs name

* Remove arch from electron-builder command for mac

* Add combine latest-mac.yml jobs

* Remove unuse workflow job

* Add prefix to install js-yaml

* Run merge script from /tmp

* workflow update release draft depend on combile-latest-mac

* correct template path

* upload assert release latest-mac.yml overwrite set to true

* upload assert release latest-mac.yml overwrite set to true

* Grant permission for combine latest-mac jobs

---------

Co-authored-by: Hien To <hien@jan.ai>
2024-02-04 15:44:57 +07:00
Hieu
36cd5988d4
feat: integrate umami (#1809)
* feat: integrate umami

* fix: linter issue

* fix: run eslint

* fix window umami null

* fix property type error

* fix: check configuration before requesting analytics script

* fix: test cases

---------

Co-authored-by: Louis <louis@jan.ai>
2024-02-01 21:00:16 +07:00
Louis
97a497858d
Merge pull request #1830 from janhq/main
Sync Release 0.4.5 to dev
2024-01-29 12:45:35 +07:00
hiento09
aa94fe25d0
Update release url on README to default branch instead of main branch (#1832)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-01-29 12:34:40 +07:00
hiento09
99025cb02f
CI nightly update trigger to 3AM UTC +7 Tuesday, Wednesday, and Thursday (#1798)
Co-authored-by: Hien To <tominhhien97@gmail.com>
2024-01-26 09:24:09 +07:00