Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
Browse files Browse the repository at this point in the history
…edesign
  • Loading branch information
bmartel committed Jun 21, 2024
2 parents 403b537 + 19afc18 commit 18b4337
Show file tree
Hide file tree
Showing 89 changed files with 1,667 additions and 1,352 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/cicd_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ jobs:
- '.github/workflows/test_conda.yml'
- '.github/workflows/test_migrations.yml'
frontend:
- 'label_studio/frontend/**'
- 'web/**'
- 'docs/source/tags/**'
- '.github/workflows/frontend-build.yml'
- '.github/workflows/tests-yarn-unit.yml'
- '.github/workflows/tests-yarn-integration.yml'
Expand Down Expand Up @@ -143,7 +141,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.ref || github.ref }}
build_static: false
generate_version_files: true
generate_version_files: false
generate_doc_tags_files: true
secrets: inherit

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-ontop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Push Docker image
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@v5.4.0
id: docker_build_and_push
with:
context: .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-ubi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
core.setOutput("ubi-tags", ubiTags.join(','));
- name: Build and push ubi
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@v5.4.0
id: docker_build_and_push_ubi
with:
context: .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
fi
- name: Push Docker image
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@v5.4.0
id: docker_build_and_push
with:
context: .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-release-promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ jobs:
EOF
- name: Build and Push Release Ubuntu Docker image
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@v5.4.0
id: docker_build
with:
context: ${{ steps.release_dockerfile.outputs.release_dir }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-yarn-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
main:
name: "yarn e2e"
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 60
steps:
- uses: hmarr/debug-action@v3.0.0

Expand Down Expand Up @@ -56,11 +56,11 @@ jobs:
BUILD_NO_MINIMIZATION: true
run: |
set -xeuo pipefail
yarn lsf:serve &
pid=$!
echo "pid=${pid}" >> $GITHUB_OUTPUT
while ! curl -s -o /dev/null -L "http://localhost:3000"; do
echo "=> Waiting for service to become available"
sleep 2s
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
run: poetry run pytest --cov=. --cov-report=xml -vv -n auto

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4.4.1
uses: codecov/codecov-action@v4.5.0
with:
name: codecov-python-${{ matrix.python-version }}
flags: pytests
Expand Down
4 changes: 4 additions & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ markdown:
smartLists: true
smartypants: true

marked:
gfm: true
breaks: false

# Home page setting
# path: Root path for your blogs index page. (default = '')
# per_page: Posts displayed per page. (0 = disable pagination)
Expand Down
2 changes: 1 addition & 1 deletion docs/source/guide/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ section: "Install & Setup"

Install Label Studio on premises or in the cloud. Choose the installation method that works best for your environment:

- [Install with pip](#Install-with-pip)
- [Install with pip](#Install-using-pip)
- [Install with Docker](#Install-with-Docker)
- [Install on Ubuntu](#Install-on-Ubuntu)
- [Install from source](#Install-from-source)
Expand Down
19 changes: 17 additions & 2 deletions docs/source/guide/ml.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,28 @@ class MLBackend(LabelStudioMLBase)
The `get_local_path()` function resolves URIs to URLs, then downloads and caches the file.
For this to work, you must specify the `LABEL_STUDIO_URL` and `LABEL_STUDIO_API_KEY` environment variables for your ML backend before using `get_local_path`.
For this to work, you must specify the `LABEL_STUDIO_URL` and `LABEL_STUDIO_API_KEY` environment variables for your ML backend before using `get_local_path`. If you are using docker-compose.yml, these variables have to be added to the environment section. For example:
```yaml
services:
ml-backend-1:
container_name: ml-backend-1
...
environment:
# Specify the Label Studio URL and API key to access
# uploaded, local storage and cloud storage files.
# Do not use 'localhost' as it does not work within Docker containers.
# Use prefix 'http://' or 'https://' for the URL always.
# Determine the actual IP using 'ifconfig' (Linux/Mac) or 'ipconfig' (Windows).
- LABEL_STUDIO_URL=http://192.168.42.42:8080/ # replace with your IP!
- LABEL_STUDIO_API_KEY=<your-label-studio-api-key>
```
Note the following:
* `LABEL_STUDIO_URL` must be accessible from the ML backend instance.
* If you are running the ML backend in Docker, `LABEL_STUDIO_URL` can’t contain `localhost`. Use the full IP address instead. You can get this using the `ifconfig` (Unix) or `ipconfig` (Windows) commands.
* If you are running the ML backend in Docker, `LABEL_STUDIO_URL` can’t contain `localhost` or `0.0.0.0`. Use the full IP address instead, e.g. `192.168.42.42`. You can get this using the `ifconfig` (Unix) or `ipconfig` (Windows) commands.
* `LABEL_STUDIO_URL` must start either with `http://` or `https://`.
Expand Down
Loading

0 comments on commit 18b4337

Please sign in to comment.