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

Scnm #6

Open
wants to merge 173 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
9367b16
scnm settings
clevermx Aug 9, 2023
bfb743c
try just load
clevermx Aug 10, 2023
9714a06
add tmp
clevermx Aug 10, 2023
07e94c9
arg number
clevermx Aug 10, 2023
f081bfe
test print
clevermx Aug 10, 2023
8237860
test print
clevermx Aug 10, 2023
0be8f61
test
clevermx Aug 10, 2023
e2e7a35
return arg check and fix dirname
clevermx Aug 10, 2023
bf2fbcd
path fixes
clevermx Aug 10, 2023
f0c152d
try to create directory
clevermx Aug 10, 2023
9119c30
rename all coolections
clevermx Aug 10, 2023
3e1612c
remove test print, add time
clevermx Aug 10, 2023
e9bcef1
remove css
clevermx Aug 10, 2023
a7697e9
sleep after time
clevermx Aug 10, 2023
90e5de6
create index after
clevermx Aug 11, 2023
ed3f832
try insert many
clevermx Aug 14, 2023
3637f47
syntax error
clevermx Aug 15, 2023
e5d6d7d
test print
clevermx Aug 15, 2023
d0b896d
remove lazyness
clevermx Aug 15, 2023
fe2740e
stream walk
clevermx Aug 15, 2023
9b30df7
syntax
clevermx Aug 15, 2023
230ccba
try 100
clevermx Aug 15, 2023
7b4429b
insert one version again
clevermx Aug 15, 2023
283daaf
try to_list
clevermx Aug 15, 2023
7610bf1
add parallel stream
clevermx Aug 15, 2023
0e83e04
try walk
clevermx Aug 15, 2023
1f8ee1e
change order add test print
clevermx Aug 15, 2023
097c956
try 1 k
clevermx Aug 15, 2023
43fff50
test with filter
clevermx Aug 15, 2023
7212870
try to create ktor app
clevermx Aug 17, 2023
1107ec9
try fix gradle
clevermx Aug 17, 2023
eaa90fd
remove box for now
clevermx Aug 17, 2023
ac5c140
add more deps
clevermx Aug 17, 2023
7c76a51
imports
clevermx Aug 17, 2023
a1dbb31
import
clevermx Aug 17, 2023
6e0f3bf
args fix
clevermx Aug 17, 2023
ad0cb68
fix fs_serv conf
clevermx Aug 17, 2023
f5abecd
try add resources
clevermx Aug 17, 2023
c4ff0fb
remove from nginx conf
clevermx Aug 17, 2023
d1db4e9
try 8080
clevermx Aug 17, 2023
2e7c11e
try something
clevermx Aug 17, 2023
0440905
try respond text
clevermx Aug 17, 2023
20181ce
test_print
clevermx Aug 17, 2023
f496a08
try other domain
clevermx Aug 17, 2023
ea3b579
try ebeded server
clevermx Aug 18, 2023
45b6874
try box api
clevermx Aug 18, 2023
79a126b
remove strange string
clevermx Aug 18, 2023
e692a09
request?
clevermx Aug 18, 2023
168fdff
add test print
clevermx Aug 18, 2023
9f1d6f7
try to print all headers
clevermx Aug 18, 2023
0c5fd07
print params
clevermx Aug 18, 2023
85ed1a4
try print cookies
clevermx Aug 18, 2023
aaaeeb2
try add more headers
clevermx Aug 21, 2023
95cf16b
redo nginx, remove get
clevermx Aug 21, 2023
8d02c24
add new keys
clevermx Aug 21, 2023
ed5bdf4
syntax
clevermx Aug 21, 2023
85f0f37
start parse
clevermx Aug 22, 2023
6d19d74
try check error
clevermx Aug 22, 2023
b112415
move body print
clevermx Aug 22, 2023
516bfbd
try receive message
clevermx Aug 22, 2023
91fe26e
look error
clevermx Aug 22, 2023
6417b33
use jackson and ignore
clevermx Aug 22, 2023
a048081
try fancy parsing
clevermx Aug 23, 2023
27ee5d4
syntax
clevermx Aug 23, 2023
23e9b76
remove delegating
clevermx Aug 23, 2023
c08c1e7
try without creator
clevermx Aug 23, 2023
e812654
try annotate secondary
clevermx Aug 23, 2023
fdf04c1
verify and then parse
clevermx Aug 23, 2023
06e90c3
try nullable
clevermx Aug 24, 2023
1e5d664
fix ?
clevermx Aug 24, 2023
efb2e09
jsonobject
clevermx Aug 24, 2023
0f0396f
try jsoninclude
clevermx Aug 24, 2023
73fafa2
try ?
clevermx Aug 24, 2023
8811f30
try nested classes
clevermx Aug 25, 2023
5f14e2d
try list any
clevermx Aug 25, 2023
93f9277
try something
clevermx Aug 25, 2023
d5e026f
try just jsonObject
clevermx Aug 25, 2023
a700fdf
try goggle jsonobj
clevermx Aug 25, 2023
1718222
try subtypes again
clevermx Aug 25, 2023
3abb6f6
try custom serializer
clevermx Aug 25, 2023
b17fe42
chesk that works
clevermx Aug 25, 2023
76926c7
try to get path
clevermx Aug 28, 2023
47db84d
add test print
clevermx Aug 28, 2023
c806026
add dev key
clevermx Aug 28, 2023
0a5637b
more test print
clevermx Aug 29, 2023
6dad29d
new dev token
clevermx Aug 29, 2023
b702d38
fix order
clevermx Aug 29, 2023
32e31bb
try add first
clevermx Aug 29, 2023
f9fd9fc
test print again
clevermx Aug 29, 2023
9598549
fix order again
clevermx Aug 29, 2023
181354b
refactor and return closest dir
clevermx Aug 29, 2023
9d5730b
new dev key
clevermx Aug 29, 2023
a0593ed
new dev token
clevermx Aug 29, 2023
13ed2ac
remove break in lambda
clevermx Aug 29, 2023
d7af3fc
test print status
clevermx Aug 29, 2023
a239979
fix case
clevermx Aug 29, 2023
9fd14b2
check if works with folders
clevermx Aug 29, 2023
d876f78
try use env for key
clevermx Aug 29, 2023
a2d7b78
add env like on server
clevermx Aug 29, 2023
f295122
add key stuf
clevermx Aug 29, 2023
6f5b0c4
try to catch forget files
clevermx Aug 30, 2023
691a035
syntax fix
clevermx Aug 30, 2023
ac0132d
new webhook keys
clevermx Aug 30, 2023
b22c3c9
fix env
clevermx Aug 30, 2023
2943701
try fix strange error
clevermx Aug 30, 2023
b96e652
print message
clevermx Aug 30, 2023
2d6de34
try not concurent
clevermx Aug 30, 2023
2955c29
try new versions
clevermx Aug 30, 2023
f22d861
update only datetime
clevermx Aug 30, 2023
bf25ca3
try build
clevermx Aug 30, 2023
f57105b
look at time
clevermx Aug 30, 2023
253c60b
remove logging
clevermx Aug 30, 2023
e14f751
try error level
clevermx Aug 30, 2023
98603a8
comment box
clevermx Aug 30, 2023
a42a0fd
try new version
clevermx Aug 30, 2023
5e15692
use ususal hashmap
clevermx Aug 30, 2023
de4f859
O_o
clevermx Aug 30, 2023
a39c92b
return concurent print classes
clevermx Aug 31, 2023
763b959
try full name
clevermx Aug 31, 2023
e7d4c87
try names
clevermx Aug 31, 2023
086a1fe
try remove file
clevermx Aug 31, 2023
650cfc0
remove deps
clevermx Aug 31, 2023
64b9af1
remove second class
clevermx Aug 31, 2023
a8ebb4a
remove box
clevermx Aug 31, 2023
f82e4b6
try to endend conf
clevermx Aug 31, 2023
a247b92
maybe order
clevermx Aug 31, 2023
e4e1af4
remove todouble
clevermx Aug 31, 2023
a0ce741
O_o
clevermx Aug 31, 2023
0969151
try box
clevermx Aug 31, 2023
b7b4a2f
test print
clevermx Aug 31, 2023
923a94e
try use rclone docker
clevermx Aug 31, 2023
8a638a4
use ktor response
clevermx Aug 31, 2023
57ef28b
get proper path
clevermx Sep 8, 2023
22c70d6
add try
clevermx Sep 8, 2023
de2deb0
new response and port
clevermx Sep 8, 2023
4712701
try all events
clevermx Sep 8, 2023
5911e04
fix events, add test print
clevermx Sep 8, 2023
405b5a2
return test print
clevermx Sep 11, 2023
6285ae6
response as soon as possible
clevermx Sep 11, 2023
c9d695b
add some test print
clevermx Sep 11, 2023
ac316b2
add recursive updates
clevermx Sep 12, 2023
b7a8d1b
fix path name
clevermx Sep 12, 2023
627550f
non recursive sync
clevermx Sep 12, 2023
9376649
fix trigger name
clevermx Sep 12, 2023
23b3713
add rename
clevermx Sep 12, 2023
bf8c9a5
add test print
clevermx Sep 12, 2023
6c86883
try to fix null root
clevermx Sep 12, 2023
7d0def2
add test prtin for move
clevermx Sep 12, 2023
c011c76
add move
clevermx Sep 12, 2023
26dbda5
add test print for move
clevermx Sep 12, 2023
60ed92f
fix move path
clevermx Sep 12, 2023
cdeabba
add create folder
clevermx Sep 12, 2023
4d15ada
update env file
clevermx Sep 12, 2023
02f13ec
test print again
clevermx Sep 15, 2023
bf41fdb
update params
clevermx Sep 15, 2023
dc37c27
test
clevermx Sep 15, 2023
24498f5
?
clevermx Sep 15, 2023
11ec5e8
update keys
clevermx Sep 22, 2023
fadb184
add test print
clevermx Sep 22, 2023
be97ddb
add proper auth
clevermx Sep 22, 2023
9057bcc
mount box cache to server
clevermx Oct 2, 2023
b870e4f
add shared to datasets in web
clevermx Oct 2, 2023
51e284b
add more test pring
clevermx Oct 10, 2023
0d5d429
add some test print
clevermx Nov 13, 2023
e1a8c91
more test print
clevermx Nov 13, 2023
a50159d
more test prints
clevermx Nov 13, 2023
1bc6749
syntax
clevermx Nov 13, 2023
49c3dd3
try use mongo to delete datasets
clevermx Nov 14, 2023
eeec5ce
fix field and test print
clevermx Nov 14, 2023
7278571
try to fix folders
clevermx Nov 14, 2023
84ffa1b
remove test print
clevermx Nov 14, 2023
33bfd94
add box api check
clevermx May 15, 2024
52fd45a
null return and check
clevermx May 15, 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
15 changes: 13 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
DATASET_PATH=/path/to/datasets
GMT_PATH=./genequery
DATASET_PATH=/home/maksim/box_dir
GMT_PATH=/home/maksim/scnm/gmts
MONGODB_HOST=mongodb://mongo:27017
MONGODB_DATABASE=scn
MONGODB_COLLECTION=datasets
PROD_PATH=/scn/scn_js/prod
DOCS_PATH=/scn_docs/build/docs
TMP_PATH=/tmp/scnm_temp
BOX_SOURCE=scn_m_datasets
BOX_CACHE=/home/maksim/box_cache
BOX_WEBHOOK_KEY_PRIMARY=key1
BOX_WEBHOOK_KEY_SECONDARY=key2
BOX_CLIENT_ID=key3
BOX_CLIENT_SECRET=key4
BOX_ENTERPRISE_ID=some_id



60 changes: 50 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,19 @@ services:
- "./nginx/sites-enabled:/etc/nginx/sites-enabled"
- "./scn_js:/scn/scn_js"
- "./scn_docs/build/:/scn/docs"
- "$DATASET_PATH:/var/datasets"
- "$DATASET_PATH:/var/datasets:shared"
ports:
- "31:80"
- "3133:80"

genequery:
container_name: gq
depends_on:
- fs
restart: always
build: ./genequery
expose:
- 8423
ports:
- "8423:8423"
- "8433:8423"
volumes:
- "$GMT_PATH:/genequery/data-files"

Expand All @@ -32,11 +31,12 @@ services:
image: mongo:latest
restart: always
# ports:
# - "27017:27017"
# - "27033:27017"
depends_on:
- rclone_fs
volumes:
- "./mongo/init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro"
- "$DATASET_PATH:/var/datasets"

- "$DATASET_PATH:/var/datasets:shared"
fs:
env_file:
- .env
Expand All @@ -45,9 +45,11 @@ services:
- mongo
build: ./scn_fs
volumes:
- "$DATASET_PATH:/var/datasets"
- "$DATASET_PATH:/var/datasets:shared"
- "$BOX_CACHE:/data/cache:shared"
- "$GMT_PATH:/vat/gmt"
command: ["java", "-Djava.library.path=./", "-jar", "fs.jar", "/var/datasets", "/vat/gmt"]
- "$TMP_PATH:/var/tmp"
command: ["java", "-Djava.library.path=./", "-jar", "fs.jar", "/var/datasets", "/vat/gmt", "All Files/$BOX_SOURCE", "$BOX_WEBHOOK_KEY_PRIMARY", "$BOX_WEBHOOK_KEY_SECONDARY", "$BOX_ENTERPRISE_ID","$BOX_CLIENT_ID", "$BOX_CLIENT_SECRET"]

web:
env_file:
Expand All @@ -57,6 +59,44 @@ services:
- fs
build: ./scn_server
volumes:
- "$DATASET_PATH:/var/datasets"
- "$DATASET_PATH:/var/datasets:shared"
- "$BOX_CACHE:/data/cache:shared"
- "./scn_js:/scn/scn_js"
command: ["java", "-Djava.library.path=./", "-jar", "server.jar"]

rclone_fs:
env_file:
- .env
restart: always
image: rclone/rclone
user: 1014:1014
volumes:
- "~/.config/rclone:/config/rclone"
- "$DATASET_PATH:/data/box:shared"
- "$BOX_CACHE:/data/cache:shared"
- "/etc/passwd:/etc/passwd:ro"
- "/etc/group:/etc/group:ro"
ports:
- "5533:5572"
devices:
- "/dev/fuse:/dev/fuse"
cap_add:
- SYS_ADMIN
security_opt:
- apparmor:unconfined
command: ["mount", "remote:/$BOX_SOURCE", "/data/box",
"--vfs-cache-mode", "full",
"--cache-dir", "/data/cache",
"--vfs-cache-max-age", "10h",
"--vfs-cache-poll-interval", "120s",
"--vfs-read-ahead", "20M",
"--buffer-size", "2000M",
"--vfs-disk-space-total-size", "10G",
"--read-only",
"--dir-cache-time", "5m",
"--poll-interval", "60s",
"--allow-non-empty",
"--allow-other",
"-v",
"--rc",
"--rc-addr", ":5572"]
7 changes: 7 additions & 0 deletions nginx/sites-enabled/scn.conf
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ server {
proxy_cache_valid 200 60m;
proxy_pass http://web:8080;
}
location /scn_fs/ {
proxy_cache_revalidate on;
proxy_cache my_cache;
proxy_cache_key $host$uri$is_args$args;
proxy_cache_valid 200 60m;
proxy_pass http://fs:8081;
}

location /perform-enrichment {
proxy_pass http://genequery:8423;
Expand Down
11 changes: 11 additions & 0 deletions scn_fs/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ repositories {

dependencies {
val mongoVersion: String by System.getProperties()
val ktorVersion: String by System.getProperties()
implementation(kotlin("stdlib"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
implementation("org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.3.0")
Expand All @@ -37,6 +38,16 @@ dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("junit", "junit", "4.12")
testImplementation(kotlin("script-runtime"))
implementation("io.ktor:ktor-server-netty:$ktorVersion")
implementation("io.ktor:ktor-server-core:$ktorVersion")
implementation("io.ktor:ktor-jackson:$ktorVersion")
implementation("io.ktor:ktor-server-host-common:$ktorVersion")
implementation("io.ktor:ktor-jackson:$ktorVersion")
implementation("io.ktor:ktor-client-core:$ktorVersion")
implementation("io.ktor:ktor-client-core-jvm:$ktorVersion")
implementation("io.ktor:ktor-client-apache:$ktorVersion")
implementation("io.ktor:ktor-gson:$ktorVersion")
implementation("com.box:box-java-sdk:4.4.0")
}

sourceSets {
Expand Down
Loading