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

Prepare for ver 1.2.0 release #626

Merged
merged 277 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
277 commits
Select commit Hold shift + click to select a range
1f5759c
onCancel when edit
sanglevinh Nov 23, 2023
6f93994
fix remove data
quanpython Nov 23, 2023
a313fb4
fix cancel when edit
sanglevinh Nov 23, 2023
cfaaeee
alway cancel when edit
sanglevinh Nov 23, 2023
4f7f0db
Disable workflow editing
sanglevinh Nov 23, 2023
772a7ea
disable import when run workflow
sanglevinh Nov 24, 2023
ac380d8
disable Reproduce when run workflow
sanglevinh Nov 24, 2023
c898987
onCancel() when deleteMenu or reload
sanglevinh Nov 27, 2023
a9da4d6
exclude images from tmp pickle file
quanpython Nov 27, 2023
47a92d1
Merge branch 'develop-main' into feature/add_ROI_edit
sanglevinh Nov 28, 2023
7d2c297
add data back in pickle file when commit
quanpython Nov 28, 2023
d387884
Merge branch 'develop-main' into improve-edit-roi
quanpython Nov 28, 2023
5541b5f
refactor condition disable button
sanglevinh Nov 28, 2023
dbb2f16
Merge branch 'develop-main' into feature/disable_when_run_workflow
ReiHashimoto Nov 28, 2023
1c3be09
fix typo on gui merge
ReiHashimoto Nov 28, 2023
1667ff9
add onCancel() when switch tab
sanglevinh Nov 29, 2023
ddc3e05
fix duplicate loading
sanglevinh Nov 29, 2023
3c00702
fix no change when select ROI
sanglevinh Nov 29, 2023
1d8134b
fix condition onCancel and display edit ROI
sanglevinh Nov 29, 2023
5abf693
fix bug when add mutil ROI
sanglevinh Nov 30, 2023
fa25214
fix warning
sanglevinh Nov 30, 2023
96cd3f9
Merge branch 'develop-main' into feature/add_ROI_edit
sanglevinh Nov 30, 2023
623d986
add onCancel when click button close visualize
sanglevinh Nov 30, 2023
fc00523
fix call cancel edit roi
sanglevinh Dec 1, 2023
5a84d69
Merge remote-tracking branch 'origin' into feature/add_ROI_edit
ReiHashimoto Dec 1, 2023
7fd68c6
remove file VisualizeItemLayoutMenuIcon
sanglevinh Dec 1, 2023
dd0ef48
handle exception
quanpython Dec 1, 2023
7b31d77
update dependences function handleClose
sanglevinh Dec 1, 2023
4a6c4b3
rollback file VisualizeItem
sanglevinh Dec 1, 2023
1f7fc6f
fix reload timeseries when commit edit roi
sanglevinh Dec 1, 2023
3184145
Merge branch 'develop-main' into feature/disable_when_run_workflow
sanglevinh Dec 4, 2023
551120b
resolve conflic
sanglevinh Dec 4, 2023
7543be2
add catch when cancel error
sanglevinh Dec 4, 2023
1fa4022
allow download file from url
quanpython Dec 4, 2023
8e813db
Merge branch 'develop-main' into feature/disable_when_run_workflow
sanglevinh Dec 5, 2023
11f32ad
change when to call cancel api and hide edit roi when not cell_roi.json
sanglevinh Dec 5, 2023
b1a5f83
add unmount when close (x) and rollback VisualizeItem.tsx
sanglevinh Dec 5, 2023
eaac673
fix duplicate loading
sanglevinh Dec 5, 2023
34ac954
Merge branch 'develop-main' into feature/add_ROI_edit
sanglevinh Dec 5, 2023
421e088
fix bug dont back to edit top when delete and merge ROI, refactor text
sanglevinh Dec 5, 2023
dc5b50c
change download api method
quanpython Dec 6, 2023
ca576ed
use redux with action ROI and change loading
sanglevinh Dec 7, 2023
2668897
refactor code
sanglevinh Dec 7, 2023
8a03f49
Merge branch 'develop-main' into feature/add_ROI_edit
sanglevinh Dec 7, 2023
f7d0ca6
change icon and add feature upload via url
sanglevinh Dec 8, 2023
d16195a
Block invalid files
sanglevinh Dec 8, 2023
06683a0
Merge branch 'develop-main' into feature/up_load_url_link
sanglevinh Dec 8, 2023
3bcf2c6
fix loading comment
sanglevinh Dec 11, 2023
93053ec
fix csv with header
ReiHashimoto Dec 11, 2023
4212831
fix not cancel when press (X)
sanglevinh Dec 11, 2023
db08bcc
remove console and add eslint-disable
sanglevinh Dec 11, 2023
2f6bd94
add motion corrected image to suite2p result
ReiHashimoto Dec 11, 2023
a3da3cb
use copied data
ReiHashimoto Dec 11, 2023
5c4deb3
handle input tiff image with dtype is float32
quanpython Dec 12, 2023
b6f7bf7
make setting header back to null available
ReiHashimoto Dec 12, 2023
0b46f42
add condition loading
sanglevinh Dec 12, 2023
e0c7461
fix condition cancel
sanglevinh Dec 13, 2023
b468909
save converted tiff file in output_dir
quanpython Dec 13, 2023
cc806bc
remove unused import
sanglevinh Dec 14, 2023
ff88d8e
fix download status
quanpython Dec 14, 2023
3657d33
add status download
sanglevinh Dec 14, 2023
c601db5
remove icon setting behavior and fluo node
sanglevinh Dec 15, 2023
d5aac05
fix condition dispatch setInputNodeFilePath
sanglevinh Dec 15, 2023
71d6599
add matlab node
sanglevinh Dec 18, 2023
89816b8
fix UI node container
sanglevinh Dec 18, 2023
acb580d
change file type, add message validate url, setOpen popup
sanglevinh Dec 18, 2023
6129f67
fix not load file csv from via url
sanglevinh Dec 18, 2023
92a14fe
Merge branch 'feature/download-file-from-url' into feature/check-tiff…
quanpython Dec 18, 2023
0e2f0bb
get tiff shape when upload, download file
quanpython Dec 18, 2023
4fc532d
add node matlab
sanglevinh Dec 19, 2023
b83d67b
add microscope data reader modules (initial)
Dec 20, 2023
1353fc7
apply formatter
Dec 20, 2023
39c5c13
add init member variables
Dec 20, 2023
3e8474e
remove MatlabPlot
sanglevinh Dec 20, 2023
ba44f26
add shape tiff, update shape
sanglevinh Dec 20, 2023
fbda797
Merge pull request #194 from arayabrain/feature/disable_when_run_work…
ReiHashimoto Dec 21, 2023
5f93505
Merge pull request #233 from arayabrain/feature/fix-csv-with-header
ReiHashimoto Dec 21, 2023
4faa42c
Merge pull request #234 from arayabrain/feature/suite2p-image-output
ReiHashimoto Dec 21, 2023
e02b423
docker image verup
Dec 21, 2023
e56c439
Added explicit loading of other libraries on which the microscopy lib…
Dec 21, 2023
e0f08df
docker image verup
Dec 21, 2023
44c35ab
Merge branch 'develop-main' into feature/up_load_url_link
sanglevinh Dec 21, 2023
79b848a
fix typo
Dec 21, 2023
5e17da7
check condition setting icon node fluo and, behavior
sanglevinh Dec 21, 2023
b2801f3
fix fileType, add nameNode
sanglevinh Dec 21, 2023
c926ff1
add dataType, change UI
sanglevinh Dec 21, 2023
5e82550
fix load api file when upload file
sanglevinh Dec 21, 2023
20711f9
Merge pull request #217 from arayabrain/feature/download-file-from-url
ReiHashimoto Dec 22, 2023
a8c284f
Merge pull request #231 from arayabrain/feature/up_load_url_link
ReiHashimoto Dec 22, 2023
fc5e435
Merge pull request #251 from arayabrain/feature/docker-image-verup
ReiHashimoto Dec 22, 2023
5b8a919
Merge branch 'develop-main' into feature/check_format_tiff_file
sanglevinh Dec 22, 2023
bb82773
fix condition error shape, UI
sanglevinh Dec 22, 2023
aa59613
Merge branch 'develop-main' into feature/matlab
sanglevinh Dec 22, 2023
d06c8a1
fix param run matlab
sanglevinh Dec 22, 2023
fc72b5a
fix ellipsis text
sanglevinh Dec 22, 2023
ec1a0ca
allow upload and display matlab structure
quanpython Dec 5, 2023
505053e
display matlab tree
quanpython Dec 19, 2023
96a15c1
update MatNode schemas
quanpython Dec 21, 2023
0a8e15b
add MatlabFileNode
quanpython Dec 22, 2023
c39a8cb
fix matlab file type
quanpython Dec 22, 2023
10679f4
Merge pull request #240 from arayabrain/feature/verify-tiff-image-input
ReiHashimoto Dec 25, 2023
a99d1a0
Merge pull request #107 from arayabrain/improve-edit-roi
ReiHashimoto Dec 25, 2023
5cebae2
Merge branch 'develop-main' into feature/add_ROI_edit
ReiHashimoto Dec 25, 2023
df8f768
Merge pull request #106 from arayabrain/feature/add_ROI_edit
ReiHashimoto Dec 25, 2023
1e0cc3b
Merge branch 'develop-main' into feature/matlab
sanglevinh Dec 25, 2023
9b73bef
fix UI
sanglevinh Dec 25, 2023
b27ef37
change icon, used Divider Component
sanglevinh Dec 25, 2023
0922c2b
change testdata path
Dec 26, 2023
aa5ebd7
Merge pull request #248 from arayabrain/feature/microscope/nikon
itutu-tienday Dec 26, 2023
ebf177e
Merge branch 'feature/microscope/nikon' into feature/microscope/main
Dec 26, 2023
c834624
fix UI node, and fix warning
sanglevinh Dec 26, 2023
94c6e91
remove isMatlabItem
sanglevinh Dec 26, 2023
e136dd6
create Inscopix isxd reader module
Dec 26, 2023
42f7f20
create olympus oir reader mock
Dec 26, 2023
b46b6a7
fix get shape of nested file, add indent for json format
quanpython Dec 27, 2023
26771dc
fix tests
quanpython Dec 27, 2023
e37010f
support matlab v7.3
quanpython Dec 27, 2023
05be76a
refactoring (use list comprehension, etc)
Dec 28, 2023
205445f
fix linter
Dec 28, 2023
a52d56d
update nikon metadata retrieval code
Dec 28, 2023
6c7bdf4
improved highlight run
sanglevinh Dec 29, 2023
39d10e3
fix data test
sanglevinh Dec 29, 2023
8af5d33
fix data file test
sanglevinh Dec 29, 2023
3b557cf
Added nikon image stack loading process
Dec 29, 2023
470f50d
Merge branch 'feature/microscope/nikon' into feature/microscope/olympus
Dec 29, 2023
ea5b591
ignore attributes startwith #
quanpython Jan 4, 2024
29bdaa1
keep checking the ancestor node's status.
sanglevinh Jan 5, 2024
8e55988
fix data file test
sanglevinh Jan 5, 2024
522e767
use `pymatreader` to read matlab file
quanpython Jan 8, 2024
25de013
Merge pull request #257 from arayabrain/feature/microscope/inscopix
itutu-tienday Jan 9, 2024
7c7934c
Merge pull request #262 from arayabrain/feature/microscope/nikon
itutu-tienday Jan 9, 2024
e9fb24d
Merge branch 'feature/microscope/main' into feature/microscope/olympus
Jan 9, 2024
ec1109f
Merge pull request #225 from arayabrain/feature/allow-upload-and-disp…
ReiHashimoto Jan 9, 2024
a22892f
Merge pull request #247 from arayabrain/feature/matlab
ReiHashimoto Jan 9, 2024
6848e6f
change originalValue to isUpdated
sanglevinh Jan 9, 2024
389c0d8
Merge pull request #260 from arayabrain/feature/improved_highlight
ReiHashimoto Jan 10, 2024
8957d99
Merge remote-tracking branch 'origin/develop-main' into feature/check…
quanpython Jan 10, 2024
f76722a
fix not params to be sorted after reproduce
ReiHashimoto Jan 11, 2024
540beec
update docker settings for frontend builder
Jan 11, 2024
8d6e0fc
Merge pull request #267 from arayabrain/feature/add-fe-build-docker
itutu-tienday Jan 11, 2024
18e1049
improve docker volume performance (use cached)
Jan 11, 2024
800eb88
Merge pull request #268 from arayabrain/feature/add-fe-build-docker
itutu-tienday Jan 11, 2024
abf1a66
fix reset password and search
sanglevinh Jan 12, 2024
5692018
remove unused file
ReiHashimoto Jan 15, 2024
6e8d7d1
fix button colors in workflow tab
ReiHashimoto Jan 15, 2024
12b6f58
disable reproduce button while running workflow
ReiHashimoto Jan 15, 2024
870326f
Merge pull request #272 from arayabrain/feature/fix-disable-buttons
ReiHashimoto Jan 15, 2024
15132ea
use tifffile to get image shape
quanpython Jan 15, 2024
b3c18d3
Merge pull request #266 from arayabrain/feature/fix-sort-params
ReiHashimoto Jan 16, 2024
a01462d
Merge branch 'develop-main' into feature/check_format_tiff_file
sanglevinh Jan 16, 2024
a78cc6a
Merge pull request #270 from arayabrain/feature/fix_search_and_reset_…
ReiHashimoto Jan 16, 2024
c7a264e
Merge remote-tracking branch 'origin/feature/check-tiff-format-when-u…
sanglevinh Jan 16, 2024
a3f2ec6
fix icon folder
sanglevinh Jan 16, 2024
bcc65da
disable icon reload when isDir
sanglevinh Jan 16, 2024
0a9d17e
fix height file
sanglevinh Jan 16, 2024
d230a3d
Merge pull request #253 from arayabrain/feature/check_format_tiff_file
ReiHashimoto Jan 17, 2024
5ed3c1f
Merge branch 'develop-main' into feature/check-tiff-format-when-upload
ReiHashimoto Jan 17, 2024
e3b28a5
fix conflicts
ReiHashimoto Jan 17, 2024
afa4b1e
Merge pull request #245 from arayabrain/feature/check-tiff-format-whe…
ReiHashimoto Jan 17, 2024
df4b395
update nd2reader
Jan 20, 2024
5b92c55
Merge branch 'feature/microscope/nikon' into feature/microscope/olympus
Jan 20, 2024
6dba7c0
Merge pull request #275 from arayabrain/feature/microscope/nikon
itutu-tienday Jan 22, 2024
e843ad9
update nd2 lab_specific_metadata
Jan 23, 2024
3f0c093
Merge pull request #276 from arayabrain/feature/microscope/nikon
itutu-tienday Jan 23, 2024
60d4149
Merge branch 'feature/microscope/main' into feature/microscope/olympus
Jan 23, 2024
ff5ecfd
arrow 1d data from hdf5
ReiHashimoto Jan 23, 2024
6e36f3d
Merge pull request #277 from arayabrain/feature/fix-hdf-node
ReiHashimoto Jan 24, 2024
adb77e3
support save raw image to nwb
quanpython Jan 25, 2024
4da4f46
Merge branch 'develop-main' into feature/microscope/main
Jan 29, 2024
c01e31e
Merge branch 'feature/microscope/main' into feature/microscope/olympus
Jan 29, 2024
a42b5f3
update .codespellignore
Jan 29, 2024
5cb6236
add .codespellignore setting
Jan 29, 2024
f217085
oir reader module initial commit
Jan 29, 2024
0cb2efe
add spiking activity datatype for spike_deconv
ReiHashimoto Jan 30, 2024
597e5fa
Merge pull request #280 from arayabrain/feature/rename-fluo-data
ReiHashimoto Jan 30, 2024
9103391
Implement required functionality (needs refactoring)
Jan 30, 2024
78ffc1a
refactor olympus modules
Jan 30, 2024
6c64ee0
refactor olympus modules
Jan 30, 2024
544c94c
refactor olympus metadata reader
Jan 30, 2024
099d0b6
refactor olympus image stack reader
Jan 30, 2024
c05f209
refactor microscopes modules throughout
Jan 31, 2024
096e53e
Merge pull request #279 from arayabrain/feature/save_raw_image_to_nwb
ReiHashimoto Jan 31, 2024
16018b1
Merge pull request #281 from arayabrain/feature/microscope/olympus
itutu-tienday Feb 1, 2024
2533781
enhance exception handling
Feb 1, 2024
8a61d52
expand OME metadata
Feb 1, 2024
a781d24
Merge pull request #283 from arayabrain/feature/microscope/main
itutu-tienday Feb 2, 2024
4ef8b12
apply minor refactoring and bugfix
Feb 6, 2024
e6a7c32
Merge branch 'feature/microscope/develop' into feature/microscope/tho…
Feb 6, 2024
b2b27bd
add thorlabs image reader
Feb 7, 2024
3b09e78
Merge pull request #288 from arayabrain/feature/microscope/develop
itutu-tienday Feb 8, 2024
26898b7
add node to visualize fluo from hdf5
ReiHashimoto Feb 14, 2024
750e72e
transpose nwb fluo data of suite2p
ReiHashimoto Feb 14, 2024
9e2b1f1
microscopes: add OMEDataModel fields
Feb 14, 2024
25e9845
Merge branch 'feature/microscope/develop' into feature/microscope/tho…
Feb 14, 2024
fdb03e8
microscope: support for processing thorlabs raw archive file
Feb 14, 2024
bb3720f
Merge pull request #287 from arayabrain/feature/microscope/thorlabs
itutu-tienday Feb 14, 2024
a013e47
microscopes: remove unnecessary code
Feb 14, 2024
fd04237
add node to visualize roi from hdf5
ReiHashimoto Feb 14, 2024
f2963fe
show cell_roi and non_cell_roi with iscell input
ReiHashimoto Feb 14, 2024
fbe8ad6
transpose fluo data
ReiHashimoto Feb 14, 2024
360af55
update pytest config
Feb 15, 2024
ac49a96
update pytest config
Feb 15, 2024
3252beb
fix test path specifications
ReiHashimoto Feb 15, 2024
ef991f6
Merge pull request #293 from arayabrain/feature/update-pytest-config
itutu-tienday Feb 15, 2024
82bf904
Merge branch 'develop-main' into feature/microscope/develop
Feb 15, 2024
de3bb60
Merge pull request #292 from arayabrain/feature/visualize-hdf5-data
ReiHashimoto Feb 15, 2024
0dda35f
Merge branch 'develop-main' into feature/microscope/develop
Feb 15, 2024
acd73a3
Merge pull request #291 from arayabrain/feature/microscope/develop
itutu-tienday Feb 15, 2024
00b4521
added caiman advanced parameters
Feb 20, 2024
455ec99
fix typo
Feb 20, 2024
e6a72b3
caiman: refactor params config
Feb 22, 2024
1e89918
fix linter warning
Feb 22, 2024
3dcaa8e
fix split
sanglevinh Feb 27, 2024
2b336c7
update poetry.lock
quanpython Feb 27, 2024
db686de
disable button output when not data
sanglevinh Feb 27, 2024
d63b19b
fix base url
sanglevinh Feb 27, 2024
e148df9
update poetry.lock
quanpython Feb 27, 2024
cdd2492
disable button output when status error
sanglevinh Feb 28, 2024
84f0c21
Merge pull request #308 from arayabrain/feature/fix_output
itutu-tienday Feb 29, 2024
c8b43c9
Merge pull request #307 from arayabrain/feature/fix_split
itutu-tienday Feb 29, 2024
022f989
microscopes: modify modules paths
Feb 29, 2024
09cbf15
apply linter
Feb 29, 2024
fdf0b8e
microscope: support inscopix oss isx module properties
Mar 1, 2024
cb39a17
fix oss isx module image reading
Mar 1, 2024
cdd639f
add scanner_settings module for OIRReader
Mar 2, 2024
f0a66ce
Merge pull request #311 from arayabrain/feature/microscope/develop
itutu-tienday Mar 4, 2024
edc101d
Merge branch 'develop-main' into feature/caiman-additional-params
Mar 4, 2024
8a3c211
update caiman params yaml format
Mar 4, 2024
f2fec3c
Merge pull request #300 from arayabrain/feature/caiman-additional-params
itutu-tienday Mar 5, 2024
f50488d
microscope) minor modifications to test code
Mar 5, 2024
809287b
microscope) thorlabs: support zip archives containing subdirectories
Mar 5, 2024
751c88a
microscope) adjust the calculation of each microscopes framerate
Mar 5, 2024
4c92cad
microscopes) Improve validation
Mar 8, 2024
15db5a2
microscopes) refactor test code
Mar 8, 2024
6df176c
Fix IDA_PARAM_ELEMENT value type
Mar 9, 2024
7c620d7
microscopes) ND2Reader 4D data support
Mar 9, 2024
67a5f3c
bugfix) fixed variable reference flaws
Mar 9, 2024
ac95d35
microscopes) OIRReader 4D data support
Mar 9, 2024
30afde9
refactor NDReader: refactor ndarray manipulation
Mar 11, 2024
ee340b8
microscopes) unify image data format to ndarray
Mar 11, 2024
c690a11
Merge pull request #313 from arayabrain/feature/microscope/4d-support
itutu-tienday Mar 11, 2024
3eab111
Merge pull request #312 from arayabrain/feature/microscope/develop
itutu-tienday Mar 11, 2024
d6f1d54
microscopes) update metadata field name (imaging_rate)
Mar 12, 2024
30e7473
Merge pull request #314 from arayabrain/feature/microscope/develop
itutu-tienday Mar 12, 2024
2446836
update docker compose yml (build-fe)
Mar 22, 2024
a016d76
Merge pull request #315 from arayabrain/feature/update-docker-compose…
ReiHashimoto Mar 24, 2024
9888a22
fix noncell shows background
ReiHashimoto Mar 26, 2024
dd2d8f2
Merge pull request #316 from arayabrain/feature/fix-bg-to-noncell
ReiHashimoto Mar 26, 2024
a623541
implement microscope data reader nodes
ReiHashimoto Mar 26, 2024
752a944
Merge pull request #317 from arayabrain/feature/microscope-node
ReiHashimoto Mar 26, 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
3 changes: 3 additions & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ afterAll
xdescribe
optinist
Optinist
nnumber
nNumber
NNUMBER
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ repos:
rev: v2.2.4
hooks:
- id: codespell
args: [-I, .codespellignore]
additional_dependencies:
- tomli
13 changes: 13 additions & 0 deletions docker-compose.build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: "3"

services:
studio-build-fe:
image: node:20.8.0-alpine3.18
working_dir: /app/frontend
volumes:
- ./frontend/:/app/frontend/:cached
command: ash -c 'yarn install && yarn build'
environment:
TZ: Asia/Tokyo
GENERATE_SOURCEMAP: false
NODE_OPTIONS: --max-old-space-size=1024
2 changes: 1 addition & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
image: node:20.8.0-alpine3.18
working_dir: /app/frontend
volumes:
- ./frontend/:/app/frontend/
- ./frontend/:/app/frontend/:cached
ports:
- "127.0.0.1:3000:3000"
command: ash -c 'yarn install && yarn start'
Expand Down
13 changes: 1 addition & 12 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
environment:
PYTHONPATH: .
TZ: Asia/Tokyo
command: bash -c "poetry install --no-root --with test && poetry run python3 -m pytest -s ."
command: bash -c "poetry install --no-root --with test && poetry run python3 -m pytest -s"
volumes:
- .:/app

Expand All @@ -23,14 +23,3 @@ services:
environment:
TZ: Asia/Tokyo
command: yarn test:ci

build_studio_frontend:
image: build_studio_frontend
container_name: build_studio_frontend
build:
context: ./frontend
dockerfile: Dockerfile.build
environment:
TZ: Asia/Tokyo
volumes:
- ./frontend/build:/app/build:cached
11 changes: 0 additions & 11 deletions frontend/Dockerfile.build

This file was deleted.

4 changes: 1 addition & 3 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ const App: FC = () => {
dispatch(getModeStandalone())
.unwrap()
.catch(() => {
new Promise((resolve) =>
setTimeout(resolve, RETRY_WAIT),
).then(() => {
new Promise((resolve) => setTimeout(resolve, RETRY_WAIT)).then(() => {
getMode()
})
})
Expand Down
41 changes: 41 additions & 0 deletions frontend/src/api/files/Files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export const FILE_TREE_TYPE_SET = {
HDF5: "hdf5",
FLUO: "fluo",
BEHAVIOR: "behavior",
MATLAB: "matlab",
MICROSCOPE: "microscope",
ALL: "all",
} as const

Expand All @@ -21,6 +23,7 @@ export interface NodeBaseDTO {
path: string
name: string
isdir: boolean
shape: []
}

export interface DirNodeDTO extends NodeBaseDTO {
Expand All @@ -32,6 +35,12 @@ export interface FileNodeDTO extends NodeBaseDTO {
isdir: false
}

export type GetStatusViaUrl = {
total: number
current: number
error: string | null
}

export async function getFilesTreeApi(
workspaceId: number,
fileType: FILE_TREE_TYPE,
Expand Down Expand Up @@ -59,3 +68,35 @@ export async function uploadFileApi(
)
return response.data
}

export async function updateShapeApi(
workspaceId: number,
fileName: string,
): Promise<boolean> {
const response = await axios.post(
`${BASE_URL}/files/${workspaceId}/shape/${fileName}`,
)
return response.data
}

export const uploadViaUrlApi = async (
workspaceId: number,
url: string,
): Promise<{ file_name: string }> => {
const res = await axios.post(
`${BASE_URL}/files/${workspaceId}/download`,
{ url },
// config,
)
return res.data
}

export const getStatusLoadViaUrlApi = async (
workspaceId: number,
file_name: string,
): Promise<GetStatusViaUrl> => {
const res = await axios.get(
`${BASE_URL}/files/${workspaceId}/download/status?file_name=${file_name}`,
)
return res.data
}
31 changes: 31 additions & 0 deletions frontend/src/api/matlab/Matlab.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { BASE_URL } from "const/API"
import axios from "utils/axios"

export type MatlabTreeDTO = MatlabDirDTO | MatlabFileDTO

export interface MatlabDirDTO {
isDir: true
name: string
nodes: MatlabTreeDTO[]
path: string
dataType: string | null
}

export interface MatlabFileDTO {
isDir: false
name: string
shape: [number]
path: string
nbytes: string
dataType: string | null
}

export async function getMatlabTreeApi(
path: string,
workspaceId: number,
): Promise<MatlabTreeDTO[]> {
const response = await axios.get(
`${BASE_URL}/mat/${path}?workspace_id=${workspaceId}`,
)
return response.data
}
53 changes: 50 additions & 3 deletions frontend/src/api/outputs/Outputs.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { StatusROI } from "components/Workspace/Visualize/Plot/ImagePlot"
import { BASE_URL } from "const/API"
import { PlotMetaData } from "store/slice/DisplayData/DisplayDataType"
import axios from "utils/axios"
Expand Down Expand Up @@ -90,6 +91,19 @@ export async function getCsvDataApi(
return response.data
}

export type MatlabData = number[][]

export async function getMatlabDataApi(
path: string,
params: { workspaceId: number },
): Promise<{ data: MatlabData; meta?: PlotMetaData }> {
const response = await axios.get(`${BASE_URL}/outputs/matlab/${path}`, {
params: { workspace_id: params.workspaceId },
})

return response.data
}

export type RoiData = number[][][]

export async function getRoiDataApi(
Expand Down Expand Up @@ -142,37 +156,70 @@ export async function getHTMLDataApi(

export async function addRoiApi(
path: string,
workspaceId: number,
data: { posx: number; posy: number; sizex: number; sizey: number },
): Promise<{ data: HTMLData; meta?: PlotMetaData }> {
const response = await axios.post(
`${BASE_URL}/outputs/image/${path}/add_roi`,
`${BASE_URL}/outputs/image/${path}/add_roi?workspace_id=${workspaceId}`,
data,
)
return response.data
}

export async function mergeRoiApi(
path: string,
workspaceId: number,
data: { ids: number[] },
): Promise<{ data: HTMLData; meta?: PlotMetaData }> {
const response = await axios.post(
`${BASE_URL}/outputs/image/${path}/merge_roi`,
`${BASE_URL}/outputs/image/${path}/merge_roi?workspace_id=${workspaceId}`,
data,
)
return response.data
}

export async function deleteRoiApi(
path: string,
workspaceId: number,
data: { ids: number[] },
): Promise<{ data: HTMLData; meta?: PlotMetaData }> {
const response = await axios.post(
`${BASE_URL}/outputs/image/${path}/delete_roi`,
`${BASE_URL}/outputs/image/${path}/delete_roi?workspace_id=${workspaceId}`,
data,
)
return response.data
}

export async function commitRoiApi(
path: string,
workspace_id: number,
): Promise<boolean> {
const response = await axios.post(
`${BASE_URL}/outputs/image/${path}/commit_edit?workspace_id=${workspace_id}`,
)
return response.data
}

export async function cancelRoiApi(
path: string | string[],
workspace_id: number,
): Promise<{ data: HTMLData; meta?: PlotMetaData }> {
const response = await axios.post(
`${BASE_URL}/outputs/image/${path}/cancel_edit?workspace_id=${workspace_id}`,
)
return response.data
}

export async function getStatusRoi(
path: string,
workspace_id: number,
): Promise<StatusROI> {
const response = await axios.post(
`${BASE_URL}/outputs/image/${path}/status?workspace_id=${workspace_id}`,
)
return response.data
}

export type LineData = number[][]

export async function getLineDataApi(
Expand Down
1 change: 1 addition & 0 deletions frontend/src/api/run/Run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export interface InputNodePostData extends InputNodeData {
[key: string]: unknown
}
hdf5Path?: string
matPath?: string
}

export interface AlgorithmNodePostData extends AlgorithmNodeData {
Expand Down
Loading
Loading