Skip to content

Commit

Permalink
Merge Master into development (#2)
Browse files Browse the repository at this point in the history
* docs: Update Models table column headers in README (HumanSignal#500)

Co-authored-by: caitlin_wheeless <caitlin.wheeless@packetfabric.com>

* fix: Rename default NewModel classes (HumanSignal#522)

Co-authored-by: nik <nik@heartex.net>

* fix: Add model version in all ML backend examples (HumanSignal#523)

* fix: Add model version in all ML backend examples

* Fix tests, fix flair model

* Move model initialization outside the class

* Fix mmdetection

* Fix huggingface_ner, mmdetection CI run

---------

Co-authored-by: nik <nik@heartex.net>

* ci: disable fail_ci_on_error for codecov

* ci: PLT-318: Update Docker build config (HumanSignal#525)

* ci: Cleanup runner space

* ci: Simplify base sha

* ci: force image builds

* docs: DOC-208: Note on concurrent request errors (HumanSignal#527)

Co-authored-by: Caitlin Wheeless <caitlin@humansignal.com>

* docs: Copy editing readme files and adding front matter for tutorials (HumanSignal#476)

* docs: Copy editing readmes and adding front matter for tutorials

* Adding headers to the last 5 readmes

* Adjusting order

* Updated image paths

* Added header to sklearn readme

* adjusting order

* Updating readme files

* Working through read me files

* All readme files have been edited, ready for review

* Apply suggestions from code review

Co-authored-by: niklub <nikolai@heartex.com>

* Standardizing categories

* Updated image path for interactive substring matching

* Typos in categories

---------

Co-authored-by: caitlin_wheeless <caitlin.wheeless@packetfabric.com>
Co-authored-by: Caitlin Wheeless <caitlin@humansignal.com>
Co-authored-by: niklub <nikolai@heartex.com>

* ci: Use absolute path for ML_REPO_PATH

* ci: Fix GITHUB_WORKSPACE var name

* Update README.md

* Add labeling config in bert_classifier

* mmdetection: set default config

* ci: bump codecov/codecov-action from 4.3.0 to 4.3.1 (HumanSignal#537)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v4.3.0...v4.3.1)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Create image url fixture example in easyocr tests

* Add test images in dockerignore for easyocr

* Fix typo in tests

* easyocr test: Fix image content, add temp dir fixture, remove prints

* feat: DIA-1061: Add START_TRAINING to fit in models (HumanSignal#529)

* feat: DIA-1061: Add START_TRAINING to fit in models

* Update model.py

* Update model.py

* fix: Add doc string to default model with START_TRAINING (HumanSignal#538)

* docs: Adjust formatting for indentations in lists (HumanSignal#532)

Co-authored-by: Caitlin Wheeless <caitlin@humansignal.com>

* feat: GLiNER ML Backend (HumanSignal#534)

* GLiNER example ML Backend

* ReadMe

* Update label_studio_ml/examples/gliner/model.py

Co-authored-by: niklub <nikolai@heartex.com>

* Update label_studio_ml/examples/gliner/model.py

Co-authored-by: niklub <nikolai@heartex.com>

* Update label_studio_ml/examples/gliner/model.py

Co-authored-by: niklub <nikolai@heartex.com>

* Update label_studio_ml/examples/gliner/model.py

Co-authored-by: niklub <nikolai@heartex.com>

* Update for dynamic labels and rename model class

* Apply suggestions from code review

Co-authored-by: niklub <nikolai@heartex.com>

* updated for PR edits

* updated when model fitting starts -- START_TRAINING is not the event when the start training button is clicked

* updated for PR edits

* unit tests

* unit tests

* Update label_studio_ml/examples/gliner/docker-compose.yml

* Update README.md to include frontmatter

* Update README.md

* updated test to approx

* updated test to approx

* updated test to approx

---------

Co-authored-by: niklub <nikolai@heartex.com>
Co-authored-by: Caitlin Wheeless <caitlin.wheeless@gmail.com>

* docs: Updating frontmatter for styling changes (HumanSignal#541)

* docs: Updating frontmatter for styling changes

* Change hide_sidebar to hide_menu

---------

Co-authored-by: caitlinwheeless <caitlin@humansignal.com>

* fix: RND-71: Support cloud storage links resolution for textual ML backends (HumanSignal#546)

* fix: RND-71: Support cloud storage links resolution for textual ML backends

* Preload task data

* Fix

* Cleanup

* Add tests

* Add read_file

* Fix

* ci: bump codecov/codecov-action from 4.3.1 to 4.4.1 (HumanSignal#547)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.1 to 4.4.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v4.3.1...v4.4.1)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Langchain search test and deps (HumanSignal#548)

* Added support for Ollama in LLM Interactive example (HumanSignal#552)

* Added support for Ollama

* Fixed connection bug

* Updated readme

* fix: DIA-1061: Add START_TRAINING in api (HumanSignal#549)

* Fix codeblock indents in readme mmdetection-3 (HumanSignal#542)

* fix: Apply exif_transpose (HumanSignal#536)

* fix: Apply exif_transpose

* test: Add tesseract non default orientation test

* tesseract test: Fix test image cache conflict.

* docs: Update README.md, add LABEL_STUDIO_URL to quickstart (HumanSignal#555)

* ci: bump docker/login-action from 3.1.0 to 3.2.0 (HumanSignal#554)

Bumps [docker/login-action](https://github.com/docker/login-action) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix/sdk-version

* fix: Spacy pydantic deps (HumanSignal#559)

* fix: Spacy pydantic deps

* Fix

* Fix langchain_search

* Fix

* ci: PLT-377: Automerge Dependabot security patches

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/gliner (HumanSignal#540)

chore(deps): bump gunicorn in /label_studio_ml/examples/gliner

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/tesseract (HumanSignal#517)

chore(deps): bump gunicorn in /label_studio_ml/examples/tesseract

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/interactive_substring_matching (HumanSignal#509)

chore(deps): bump gunicorn

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/llm_interactive (HumanSignal#513)

chore(deps): bump gunicorn in /label_studio_ml/examples/llm_interactive

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/sklearn_text_classifier (HumanSignal#512)

chore(deps): bump gunicorn

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/huggingface_ner (HumanSignal#511)

chore(deps): bump gunicorn in /label_studio_ml/examples/huggingface_ner

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/huggingface_llm (HumanSignal#508)

chore(deps): bump gunicorn in /label_studio_ml/examples/huggingface_llm

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/bert_classifier (HumanSignal#514)

chore(deps): bump gunicorn in /label_studio_ml/examples/bert_classifier

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/mmdetection-3 (HumanSignal#518)

chore(deps): bump gunicorn in /label_studio_ml/examples/mmdetection-3

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/nemo_asr (HumanSignal#516)

chore(deps): bump gunicorn in /label_studio_ml/examples/nemo_asr

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: PLT-377: Remove unused requirements.txt (HumanSignal#562)

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/langchain_search_agent (HumanSignal#515)

chore(deps): bump gunicorn

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/spacy (HumanSignal#504)

chore(deps): bump gunicorn in /label_studio_ml/examples/spacy

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/easyocr (HumanSignal#510)

chore(deps): bump gunicorn in /label_studio_ml/examples/easyocr

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/flair (HumanSignal#506)

chore(deps): bump gunicorn in /label_studio_ml/examples/flair

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/segment_anything_model (HumanSignal#503)

chore(deps): bump gunicorn

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/grounding_dino (HumanSignal#505)

chore(deps): bump gunicorn in /label_studio_ml/examples/grounding_dino

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/default_configs (HumanSignal#507)

chore(deps): bump gunicorn in /label_studio_ml/default_configs

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump transformers from 4.30.2 to 4.38.0 in /label_studio_ml/examples/bert_classifier (HumanSignal#498)

chore(deps): bump transformers

Bumps [transformers](https://github.com/huggingface/transformers) from 4.30.2 to 4.38.0.
- [Release notes](https://github.com/huggingface/transformers/releases)
- [Commits](huggingface/transformers@v4.30.2...v4.38.0)

---
updated-dependencies:
- dependency-name: transformers
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump transformers from 4.30.2 to 4.38.0 in /label_studio_ml/examples/huggingface_llm (HumanSignal#497)

chore(deps): bump transformers

Bumps [transformers](https://github.com/huggingface/transformers) from 4.30.2 to 4.38.0.
- [Release notes](https://github.com/huggingface/transformers/releases)
- [Commits](huggingface/transformers@v4.30.2...v4.38.0)

---
updated-dependencies:
- dependency-name: transformers
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: Update CODEOWNERS (HumanSignal#563)

* fix: DIA-1061: Start training instead of project update (HumanSignal#565)

fix: Start training instead of project update

* ci: bump docker/build-push-action from 5.3.0 to 5.4.0 (HumanSignal#567)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.3.0 to 5.4.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v5.3.0...v5.4.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: bump codecov/codecov-action from 4.4.1 to 4.5.0 (HumanSignal#568)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.4.1 to 4.5.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v4.4.1...v4.5.0)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* docs: Add Ollama to LLM interactive frontmatter (HumanSignal#569)

Co-authored-by: caitlinwheeless <caitlin@humansignal.com>

* fix: RND-101: Fix ML backend compatibility with sdk>=1 (HumanSignal#570)

* fix: RND-101: Fix ML backend compatibility with sdk>=1

* Fix sdk version

* Install sdk from git

* Fix label-studio-tools imports

* Install numpy in requirements

* Cast float

* Add numpy reqs to easyocr and nemo

* Upgrade label-studio-sdk==1.0.2

---------

Co-authored-by: nik <nik@heartex.net>

* Fix imports in examples

* Fix dino import

* ci: bump docker/build-push-action from 5.4.0 to 6.1.0 (HumanSignal#573)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.4.0 to 6.1.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v5.4.0...v6.1.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: MMDetection deps with mmcv (HumanSignal#574)

* ci: bump docker/build-push-action from 6.1.0 to 6.2.0 (HumanSignal#575)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.1.0...v6.2.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: bump docker/setup-buildx-action from 3.3.0 to 3.4.0 (HumanSignal#578)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@v3.3.0...v3.4.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: bump docker/build-push-action from 6.2.0 to 6.3.0 (HumanSignal#577)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.2.0...v6.3.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: PLT-409: Skip Docker image push for external contributors

* ci: bump docker/build-push-action from 6.3.0 to 6.4.1 (HumanSignal#580)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: bump docker/setup-buildx-action from 3.4.0 to 3.5.0 (HumanSignal#586)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: bump docker/login-action from 3.2.0 to 3.3.0 (HumanSignal#585)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: bump docker/build-push-action from 6.4.1 to 6.5.0 (HumanSignal#584)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Rebuild grounding dino (HumanSignal#589)

* feat: RND-111: Add SegmentAnything2 support to LabelStudio (HumanSignal#591)

Co-authored-by: nik <nik@heartex.net>
Co-authored-by: Nikita Belonogov <nikita.belonogov@humansignal.com>

* Update readme

* ci: PLT-440: fix build steps for sa2

* ci: fix runner size for builds

* ci: trigger sa2 build

* ci: fix build workflow

* sa2: fix missing gunicorn

* ci: onboard new models to large runners

* ci: onboard tests

* feat: RND-112: Improve GroundingDINO (HumanSignal#592)

Co-authored-by: nik <nik@heartex.net>
Co-authored-by: Sergey Zhuk <sergey.zhuk@humansignal.com>

* ci: onboard groduning sam to build pipeline

* ci: bump docker/setup-buildx-action from 3.5.0 to 3.6.1 (HumanSignal#593)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* docs: Update documentation for segment_anything_2_image (HumanSignal#595)

* test: Update SAM2_video runner size (HumanSignal#598)

* ci: fix sam2_video runner size

* feat: Watsonx (HumanSignal#594)

Co-authored-by: niklub <nikolai@heartex.com>
Co-authored-by: Caitlin Wheeless <caitlin.wheeless@gmail.com>
Co-authored-by: Micaela Kaplan <kaplan.micaela@gmail.com>
Co-authored-by: Micaela Kaplan <micaela@humansignal.com>

* build(deps): bump gunicorn from 20.1.0 to 22.0.0 in /label_studio_ml/examples/watsonx_llm (HumanSignal#599)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Remove Personal Info from watsonx docker compose (HumanSignal#600)

Co-authored-by: Micaela Kaplan <kaplan.micaela@gmail.coml>

* ci: bump docker/build-push-action from 6.5.0 to 6.6.1 (HumanSignal#603)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Watsonx logging (HumanSignal#602)

Co-authored-by: Micaela Kaplan <kaplan.micaela@gmail.coml>

* ci: PLT-448: Improve docker build config (HumanSignal#604)

* ci: Remove irrelevant latest tag

* ci: PLT-442: Fix bypass tag

* fix: Model_wsgi to wsgi (HumanSignal#605)

* feat: RND-114: Add SAM2 integration for Video Object Tracking (HumanSignal#596)

Co-authored-by: nik <nik@heartex.net>
Co-authored-by: Micaela Kaplan <kaplan.micaela@gmail.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Caitlin Wheeless <caitlin.wheeless@gmail.com>
Co-authored-by: caitlin_wheeless <caitlin.wheeless@packetfabric.com>
Co-authored-by: niklub <nikolai@heartex.com>
Co-authored-by: nik <nik@heartex.net>
Co-authored-by: Sergey Zhuk <sergey.zhuk@humansignal.com>
Co-authored-by: Nikita Belonogov <nikita.belonogov@humansignal.com>
Co-authored-by: Caitlin Wheeless <caitlin@humansignal.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Tkachenko <makseq@gmail.com>
Co-authored-by: micaelakaplan <32578813+micaelakaplan@users.noreply.github.com>
Co-authored-by: Jimmy <10526094+JimmyWhitaker@users.noreply.github.com>
Co-authored-by: Bert Verhelst <verhelstbert@gmail.com>
Co-authored-by: rick0000 <rickdev0000@gmail.com>
Co-authored-by: Micaela Kaplan <kaplan.micaela@gmail.com>
Co-authored-by: Micaela Kaplan <micaela@humansignal.com>
Co-authored-by: Micaela Kaplan <kaplan.micaela@gmail.coml>
  • Loading branch information
17 people authored Aug 19, 2024
1 parent c00372d commit a14cacd
Show file tree
Hide file tree
Showing 174 changed files with 5,480 additions and 1,335 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.github/ @farioas
.github/ @HumanSignal/devops
47 changes: 43 additions & 4 deletions .github/docker-build-config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,45 @@
- backend_dir_name: segment_anything_model
backend_tag_prefix: sam-
- backend_dir_name: bert_classifier
backend_tag_prefix: bertclass-
- backend_dir_name: easyocr
backend_tag_prefix: easyocr-
- backend_dir_name: flair
backend_tag_prefix: flair-
- backend_dir_name: grounding_dino
backend_tag_prefix: grnddino-
runs_on: ubuntu-latest-4c-16gb
- backend_dir_name: grounding_sam
backend_tag_prefix: grounding_sam-
runs_on: ubuntu-latest-4c-16gb
- backend_dir_name: huggingface_llm
backend_tag_prefix: huggingfacellm-
- backend_dir_name: huggingface_ner
backend_tag_prefix: huggingfacener-
- backend_dir_name: interactive_substring_matching
backend_tag_prefix: interactsubstrmatch-
- backend_dir_name: langchain_search_agent
backend_tag_prefix: langchainsearch-
- backend_dir_name: llm_interactive
backend_tag_prefix: llm-
- backend_dir_name: the_simplest_backend
backend_tag_prefix: simplebackend-
- backend_dir_name: mmdetection-3
backend_tag_prefix: mmdetection3-
runs_on: ubuntu-latest-4c-16gb
- backend_dir_name: nemo_asr
backend_tag_prefix: nemoasr-
- backend_dir_name: segment_anything_model
backend_tag_prefix: sam-
- backend_dir_name: segment_anything_2_image
backend_tag_prefix: sa2-
runs_on: ubuntu-latest-4c-16gb
bypass:
- pytests
- backend_dir_name: segment_anything_2_video
backend_tag_prefix: segment_anything_2_video-
runs_on: ubuntu-latest-4c-16gb
bypass:
- pytests
- backend_dir_name: sklearn_text_classifier
backend_tag_prefix: sklearntxtclass-
- backend_dir_name: spacy
backend_tag_prefix: spacy-
- backend_dir_name: tesseract
backend_tag_prefix: tesseract-
117 changes: 61 additions & 56 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,50 @@ on:
push:
branches:
- master
paths:
- ".github/workflows/build.yml"
- "label_studio_ml/examples"

env:
DOCKER_BUILD_CONFIG_BRANCH: "master"
DOCKER_BUILD_CONFIG_PATH: ".github/docker-build-config.yml"
DOCKER_EXAMPLES_DIRECTORY: "label_studio_ml/examples"

jobs:
build-image:
name: Build image
if: needs.calculate_matrix.outputs.matrix-include != '[]'
needs: calculate_matrix
runs-on: ubuntu-latest
runs-on: ${{ matrix.runs_on || 'ubuntu-latest' }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix: ${{fromJSON(needs.calculate_matrix.outputs.matrix)}}
matrix:
include: ${{ fromJson(needs.calculate_matrix.outputs.matrix-include) }}
env:
IMAGE_NAME: heartexlabs/label-studio-ml-backend
examples_dir: label_studio_ml/examples
backend_dir_name: ${{ matrix.ml_backend.backend_dir_name }}
backend_tag_prefix: ${{ matrix.ml_backend.backend_tag_prefix }}
backend_dir_name: ${{ matrix.backend_dir_name }}
backend_tag_prefix: ${{ matrix.backend_tag_prefix }}
steps:
- uses: hmarr/debug-action@v3.0.0

- name: Check user's membership
uses: actions/github-script@v7
id: actor-membership
env:
ACTOR: ${{ github.actor }}
with:
github-token: ${{ secrets.GIT_PAT }}
script: |
const { repo, owner } = context.repo;
const actor = process.env.ACTOR;
const { data: membership } = await github.rest.orgs.getMembershipForUser({
org: owner,
username: actor,
});
core.setOutput("state", membership.state);
core.setOutput("active", membership.state == "active");
- uses: actions/checkout@v4
with:
ref: "${{ env.GITHUB_SHA }}"
Expand Down Expand Up @@ -52,11 +80,11 @@ jobs:
echo "image_branch_version=$image_branch_version" >> $GITHUB_OUTPUT
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.6.1

- name: Login to DockerHub
if: ${{ !github.event.pull_request.head.repo.fork }}
uses: docker/login-action@v3.1.0
uses: docker/login-action@v3.3.0
with:
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -66,7 +94,7 @@ jobs:
uses: actions/github-script@v7
env:
IMAGE_NAME: "${{ env.IMAGE_NAME }}"
TAGS: "${{ steps.version.outputs.image_version }},${{ steps.version.outputs.image_branch_version }},latest"
TAGS: "${{ steps.version.outputs.image_version }},${{ steps.version.outputs.image_branch_version }}"
with:
script: |
const raw_tags_input = process.env.TAGS;
Expand All @@ -80,13 +108,12 @@ jobs:
core.notice(`tags='${tags}'`)
core.setOutput("tags", tags);
- name: Push Docker image
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@v6.6.1
id: docker_build_and_push
with:
context: "${{ env.examples_dir }}/${{ env.backend_dir_name }}"
push: true
context: "${{ env.DOCKER_EXAMPLES_DIRECTORY }}/${{ env.backend_dir_name }}"
push: ${{ steps.actor-membership.outputs.active }}
tags: "${{ steps.calculate-docker-tags.outputs.tags }}"
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -95,53 +122,31 @@ jobs:
name: "Calculate build matrix"
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
matrix-include: ${{ steps.matrix.outputs.matrix-include }}
steps:
- uses: hmarr/debug-action@v3.0.0

- name: Extract branch name on direct push to a branch
if: github.event_name == 'push'
run: |
echo "BASE_SHA=${{ github.event.before }}" >> $GITHUB_ENV
- run: npm install js-yaml

- name: Extract branch name on 'pull_request'
if: github.event_name == 'pull_request'
run: |
echo "BASE_SHA=${{ github.event.pull_request.base.sha }}" >> $GITHUB_ENV
- name: Checkout
uses: actions/checkout@v4
- name: Build matrix
id: matrix
uses: actions/github-script@v7
with:
ref: "${{ env.GITHUB_SHA }}"
fetch-depth: 2
script: |
const yaml = require('js-yaml');
- name: Build matrix
id: set-matrix
shell: bash
env:
BASE_SHA: ${{ env.BASE_SHA }}
CONFIG: .github/docker-build-config.yml
run: |
set -xuo pipefail
set +e
CHANGED=$(git diff --name-only $BASE_SHA ${{ github.sha }} -- label_studio_ml/ | xargs -L1 dirname | uniq | cut -d'/' -f2-)
CHANGED_EXAMPLES=$(echo "$CHANGED" | grep examples )
set -e
echo "Finding examples to test"
if [[ $(echo "$CHANGED" | grep -c -v ^$) == 0 ]]; then
echo "matrix={\"ml_backend\":[]}" >> $GITHUB_OUTPUT
else
ALL_EXAMPLES=$(ls -1d label_studio_ml/examples/*/ | cut -d'/' -f3- | cut -d'/' -f1)
echo "Reading configuration from $CONFIG"
MATRIX="{\"ml_backend\": ["
while IFS= read -r line; do
FOLDER=$(echo $line | awk '{print $1}')
TAG_PREFIX=$(echo $line | awk '{print $2}')
if egrep -q $FOLDER <<< "${CHANGED_EXAMPLES}"; then
MATRIX+="{\"backend_dir_name\":\"$FOLDER\", \"backend_tag_prefix\":\"$TAG_PREFIX\"},"
fi
done < <(yq '.[] | .backend_dir_name + " " + .backend_tag_prefix' $CONFIG)
MATRIX=$(echo "$MATRIX" | sed 's/,$//')
MATRIX+="]}"
echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
fi
const {owner, repo} = context.repo;
const default_branch = process.env.DOCKER_BUILD_CONFIG_BRANCH;
const docker_build_config_path = process.env.DOCKER_BUILD_CONFIG_PATH;
const docker_build_config_blob = await github.rest.repos.getContent({
owner: owner,
repo: repo,
ref: default_branch,
path: docker_build_config_path,
});
const docker_build_config_content = Buffer.from(docker_build_config_blob.data.content, docker_build_config_blob.data.encoding).toString("utf8");
const docker_build_config = yaml.load(docker_build_config_content);
core.setOutput("matrix-include", docker_build_config);
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:

- name: Generate Docs
env:
ML_REPO_PATH: '${{ env.ML_REPO_PATH }}'
ML_REPO_PATH: "${{ github.workspace }}/${{ env.ML_REPO_PATH }}"
working-directory: "${{ env.DOCS_REPO_PATH }}"
run: python 'scripts/update_ml_tutorials.py'

Expand Down
Loading

0 comments on commit a14cacd

Please sign in to comment.