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

Feat/one helm deploy #154

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
57d4c6a
feat: link category with taxonomy if data attribute was provided.
ashulaev Nov 29, 2022
987e045
feat: add taxonomy version support, update url to reach taxonomy service
ashulaev Nov 29, 2022
4eac9c4
feat: minor fix for test
ashulaev Nov 29, 2022
f161a79
feat: add hierarchy categories support with LTREE and filter_lib (#28)
khyurri Dec 1, 2022
ef72677
feat: change taxonomy category relation into many to many (#61)
MagicTearsAsunder Dec 6, 2022
c03a2e3
ci: add initial github actions with precommit actions (#40)
thinklab Dec 6, 2022
8464836
feat: add S3_PREFIX and authorization with AWS IAM Role support
spiridonovfed Dec 7, 2022
2b59ca3
fix: change login with SSO button name
Dec 8, 2022
e3d1abd
ci: add postgresql to annotation tests github action (#70)
thinklab Dec 8, 2022
0d3e100
fix linter issue in filter_lib tests (#80)
spiridonovfed Dec 12, 2022
cf91f7e
ci: fix postgres
Dec 12, 2022
8c72269
ci: fix postgres
Dec 12, 2022
8b4f960
ci: fix postgres
Dec 12, 2022
6830ea0
Merge pull request #82 from epam/ci/fix-postgres
thinklab Dec 13, 2022
1ed57c7
fix: Fixed AttributeError in filter_lib (#83)
Nathicanaa Dec 13, 2022
8251719
fix: fix failing tests for 'annotation'
spiridonovfed Dec 13, 2022
53291ed
Merge pull request #85 from epam/issue_3-fix_tests_for_annotation_ser…
spiridonovfed Dec 13, 2022
7cf21cb
fix: bug with datasets filters
Iogsotot Dec 14, 2022
dbce05c
Merge pull request #89 from Iogsotot/feature/documents-filtering-by-d…
Iogsotot Dec 14, 2022
c283ef5
ci/cd: One helm helm chart for minimal deploy
Dec 15, 2022
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
73 changes: 73 additions & 0 deletions .github/workflows/annotation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: annotation precommit and test
run-name: annotation precommit and test
on:
push
# paths:
# - 'annotation/**'
# pull_request:
# paths:
# - 'annotation/**'
jobs:
annotation-pre-commit-actions:
strategy:
matrix:
python-version: [ "3.8.15" ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Run isort
uses: isort/isort-action@v1.1.0
with:
configuration:
--profile=black
--filter-files
--line-length=79
- name: Black
uses: psf/black@stable
with:
options: "--line-length=79"
- run: pip install flake8
- run: flake8 --extend-ignore=E203 annotation
annotation-build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.8.15" ]
services:
postgres-postgresql:
image: postgres:13
ports:
- 5432:5432
env:
POSTGRES_DB: annotation
POSTGRES_HOST_AUTH_METHOD: trust
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Install dependencies and run tests
run: |
python -m pip install --upgrade pip
cd annotation
pip install poetry
poetry install --no-root
poetry add --editable ../lib/filter_lib
poetry add --editable ../lib/tenants
poetry run alembic upgrade head
poetry run pytest
env:
POSTGRES_HOST: 127.0.0.1
POSTGRES_PORT: 5432
POSTGRES_DB: annotation
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
58 changes: 58 additions & 0 deletions .github/workflows/assets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: assets precommit and test
run-name: assets precommit and test
on:
push:
paths:
- 'assets/**'
pull_request:
paths:
- 'assets/**'
jobs:
assets-pre-commit-actions:
strategy:
matrix:
python-version: [ "3.8.15" ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Run isort
uses: isort/isort-action@v1.1.0
with:
configuration:
--profile=black
--filter-files
--line-length=79
- name: Black
uses: psf/black@stable
with:
options: "--line-length=79"
- run: pip install flake8
- run: flake8 --extend-ignore=E203 assets
assets-build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.8.15" ]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
cd assets
sudo apt-get update && sudo apt-get -y install poppler-utils
pip install -r requirements.txt
pip install -e ../lib/filter_lib
pip install -e ../lib/tenants
- name: Test with pytest
run: |
cd assets
pytest
56 changes: 56 additions & 0 deletions .github/workflows/filter-lib.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: filter_lib precommit and test
run-name: filter_lib precommit and test
on:
push:
paths:
- 'lib/filter-lib/**'
pull_request:
paths:
- 'lib/filter-lib/**'
jobs:
filter-lib-pre-commit-actions:
strategy:
matrix:
python-version: [ "3.8.15" ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Run isort
uses: isort/isort-action@v1.1.0
with:
configuration:
--profile=black
--filter-files
--line-length=79
- name: Black
uses: psf/black@stable
with:
options: "--line-length=79"
- run: pip install flake8
- run: flake8 --extend-ignore=E203 lib/filter_lib
filter-lib-build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.8.15" ]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
cd lib/filter_lib
pip install -r requirements.txt
pip install -r requirements-dev.txt
- name: Test with pytest
run: |
cd lib/filter_lib
pytest
56 changes: 56 additions & 0 deletions .github/workflows/tenants.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: tenants precommit and test
run-name: tenants precommit and test
on:
push:
paths:
- 'lib/filter-lib/**'
pull_request:
paths:
- 'lib/filter-lib/**'
jobs:
tenants-pre-commit-actions:
strategy:
matrix:
python-version: [ "3.8.15" ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Run isort
uses: isort/isort-action@v1.1.0
with:
configuration:
--profile=black
--filter-files
--line-length=79
- name: Black
uses: psf/black@stable
with:
options: "--line-length=79"
- run: pip install flake8
- run: flake8 --extend-ignore=E203 lib/tenants
tenants-build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.8.15" ]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
cd lib/tenants
pip install -r requirements.txt
pip install -r requirements-dev.txt
- name: Test with pytest
run: |
cd lib/tenants
pytest
3 changes: 3 additions & 0 deletions annotation/.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ POSTGRES_PASSWORD="postgres"
POSTGRES_DB="annotation"

S3_ENDPOINT_URL="http://minio"
S3_PREFIX=
S3_LOGIN="minioadmin"
S3_PASS="minioadmin"
S3_START_PATH="annotation"
# S3_CREDENTIALS_PROVIDER can be: "minio" (default), "aws_iam"
S3_CREDENTIALS_PROVIDER="minio"
ASSETS_URL="http://assets/datasets"
ASSETS_FILES_URL="http://assets/files/search"
JOBS_SEARCH_URL="http://jobs/jobs/search"
Expand Down
Loading