Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into protcon_pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
jupinator committed Sep 29, 2023
2 parents d9ed6d8 + 47873e8 commit f89f58a
Show file tree
Hide file tree
Showing 52 changed files with 2,033 additions and 303 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 GEO-BON

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ description: # Targetted to those who will interpret pipeline results and edit p
author: # 1 to many
- name: # Full name
identifier: # Optional, full URL of a unique digital identifier such as an ORCID
license: # Optional, examples here: https://creativecommons.org/about/cclicenses/
license: # Optional. If unspecified, the project's MIT license will apply.
external_link: # Optional, link to a separate project, github repo, etc.
timeout: # Optional, in minutes. By defaults steps time out after 1h to avoid hung process to consume resources. It can be made longer for heavy processes.
Expand Down Expand Up @@ -257,7 +257,9 @@ Pipelines also have inputs and outputs. In order to run, a pipeline needs to spe
### Pipeline editor
The pipeline editor allows you to create pipelines by plugging steps together.

The left pane shows the available steps, the right pane shows the canvas.
The left pane shows the available steps, the main section shows the canvas.

On the right side, a collapsible pane allows to edit the labels and descriptions of the pipeline inputs and outputs.

**To add a step:** drag and drop from the left pane to the canvas. Steps that are single scripts will display with a single border, while steps that are pipelines will display with a double border.

Expand Down Expand Up @@ -302,6 +304,11 @@ Add an **output** node linked to a step output to specify that this output is an

![image](https://user-images.githubusercontent.com/6223744/181108988-97d988ca-8f4b-45b1-b4a3-32e90821b68b.png)

Pipeline inputs and outputs then appear in a collapsible pane on the right of the canvas, where their descriptions and labels can be edited.

<img src="https://github.com/GEO-BON/biab-2.0/assets/6223744/215b75db-7198-486d-880d-87c0b340668b" height="218">

Once edited, make sure to save your work before leaving the page.

### Saving and loading
The editor _does not_ allow you to edit files live on the server. Files need to be committed to the github repo using git.
Expand Down
14 changes: 8 additions & 6 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: "3.7"

services:
# This can be accessed within the docker network with http://biab-script-server:8081/script/...
# This can be accessed within the docker network with http://biab-script-server:8081/script/...
script-server:
container_name: biab-script-server
volumes:
Expand All @@ -12,7 +12,7 @@ services:
- ./output:/output:rw
- /var/run/docker.sock:/var/run/docker.sock
expose:
- '8080'
- "8080"
environment:
- SCRIPT_LOCATION=/scripts
- PIPELINES_LOCATION=/pipelines
Expand All @@ -27,7 +27,6 @@ services:
- runner-r
- runner-julia


runner-r:
container_name: biab-runner-r
image: geobon/bon-in-a-box:runner-r
Expand Down Expand Up @@ -67,7 +66,7 @@ services:
container_name: http-rev-prox
image: nginx
ports:
- '80:80'
- "80:80"
volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro
- ./output:/static/output:ro
Expand All @@ -76,9 +75,12 @@ services:

tiler:
container_name: biab-tiler
image: ghcr.io/developmentseed/titiler:0.12.0
image: ghcr.io/developmentseed/titiler:latest
volumes:
- ./output:/output:rw
- ./output:/output:ro
environment:
- PORT=8000
- WORKERS_PER_CORE=1
- TITILER_API_CORS_ORIGINS=*
extra_hosts:
- "host.docker.internal:host-gateway"
7 changes: 7 additions & 0 deletions http-proxy/conf.d-prod/ngnix.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,30 @@ server {
proxy_read_timeout 3600;
proxy_connect_timeout 3600;
proxy_send_timeout 3600;
add_header Access-Control-Allow-Origin *;
}

location /pipeline/ {
proxy_pass http://biab-script-server:8080/pipeline/;
add_header Access-Control-Allow-Origin *;
}

location /api/ {
proxy_pass http://biab-script-server:8080/api/;
}

location /tiler/ {
proxy_pass http://biab-tiler:8000/;
}

location / {
proxy_pass http://biab-ui-prod:80;
add_header Access-Control-Allow-Origin *;
}

location /output/ {
root /static/;
add_header Access-Control-Allow-Origin *;
}

}
8 changes: 8 additions & 0 deletions http-proxy/conf.d/ngnix.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,16 @@ server {
proxy_read_timeout 3600;
proxy_connect_timeout 3600;
proxy_send_timeout 3600;
add_header Access-Control-Allow-Origin *;
}

location /pipeline/ {
proxy_pass http://biab-script-server:8080/pipeline/;
add_header Access-Control-Allow-Origin *;
}

location /api/ {
proxy_pass http://biab-script-server:8080/api/;
}

## Server to use when making changes to the OpenAPI specification. (dev only)
Expand All @@ -33,11 +39,13 @@ server {
# https://stackoverflow.com/a/69079753/3519951
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
add_header Access-Control-Allow-Origin *;
# --- end hot reloading
}

location /output/ {
root /static/;
add_header Access-Control-Allow-Origin *;
}

}
Loading

0 comments on commit f89f58a

Please sign in to comment.