Skip to content

Commit d845598

Browse files
committed
Merge branch 'master' into vedana/backoffice/k8-etl
# Conflicts: # projects/vedana/README.md # projects/vedana/docker-compose.yml
2 parents 9d7b851 + c938d8e commit d845598

File tree

107 files changed

+5174
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+5174
-218
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
// "customizations": {},
3131
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
3232
// "remoteUser": "root"
33-
}
33+
}

.dockerignore

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
**/.env
2+
**/.env.example
3+
4+
.git
5+
**/terraform
6+
terraform
7+
8+
**/.venv
9+
**/.ruff_cache
10+
**/.mypy_cache
11+
**/docker-compose.yml
12+
**/Dockerfile
13+
**/Makefile
14+
**/.dockerignore
15+
**/.gitignore
16+
**/.gitattributes
17+
**/.pytest_cache
18+
**/.vscode
19+
**/docs
20+
**/env
21+
**/tests
22+
**/.web

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.jsonl filter=lfs diff=lfs merge=lfs -text
2+
libs/vedana-etl/tests/infra/persist/** filter=lfs diff=lfs merge=lfs -text
3+
libs/vedana-etl/tests/fixtures/grist/** filter=lfs diff=lfs merge=lfs -text

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/projects/jims/ @elephantum
2+
/projects/vedana/ @tsheyd
3+
/libs/jims-*/ @elephantum
4+
/libs/vedana-*/ @tsheyd
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Test lib {{ package.name }}
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- "{{ package.path }}/**"
7+
# - "pyproject.toml"
8+
# - "uv.lock"
9+
push:
10+
branches: [master]
11+
paths:
12+
- "{{ package.path }}/**"
13+
- "pyproject.toml"
14+
- "uv.lock"
15+
16+
jobs:
17+
test:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
with:
22+
lfs: true
23+
24+
- name: Set up Python 3.12
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: "3.12"
28+
29+
- name: Install the latest version of uv
30+
uses: astral-sh/setup-uv@v6
31+
32+
- name: Install
33+
shell: bash
34+
run: |
35+
cd {{ package.path }}
36+
uv sync --all-groups
37+
{%- if package.custom_steps %}
38+
{%- for step in package.custom_steps %}
39+
40+
- {{ step | to_nice_yaml | indent(8) }}
41+
{%- endfor %}
42+
{%- endif %}
43+
{%- if package.generate_standard_pytest_step %}
44+
45+
- name: Run tests
46+
env:
47+
{% raw %}OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}{% endraw %}
48+
shell: bash
49+
run: |
50+
uv run pytest {{ package.path }}/
51+
{%- endif %}
52+
53+
- name: Check formatting
54+
shell: bash
55+
run: |
56+
uv run ruff check {{ package.path }}
57+
{%- if package.generate_typechecking_step and package.typechecker == "mypy" %}
58+
59+
- name: Check typing
60+
shell: bash
61+
run: |
62+
uv run mypy -p {{ package.package_name }}
63+
{%- endif %}
64+
{%- if package.generate_typechecking_step and package.typechecker == "ty" %}
65+
66+
- name: Check typing
67+
shell: bash
68+
run: |
69+
uv run ty check {{ package.path }}
70+
{%- endif %}
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
name: Test project {{ package.name }}
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- "{{ package.path }}/**"
7+
- "libs/jims*/**"
8+
- "libs/vedana*/**"
9+
# - "pyproject.toml"
10+
# - "uv.lock"
11+
push:
12+
branches: [master]
13+
paths:
14+
- "{{ package.path }}/**"
15+
- "pyproject.toml"
16+
- "uv.lock"
17+
18+
jobs:
19+
test:
20+
runs-on: ubuntu-latest
21+
{%- if package.generate_alembic_migration_check_step %}
22+
services:
23+
postgres:
24+
image: pgvector/pgvector:pg15
25+
env:
26+
POSTGRES_USER: postgres
27+
POSTGRES_PASSWORD: postgres
28+
ports:
29+
- 5432:5432
30+
options: >-
31+
--health-cmd="pg_isready -U postgres"
32+
--health-interval=10s
33+
--health-timeout=5s
34+
--health-retries=5
35+
{%- endif %}
36+
steps:
37+
- uses: actions/checkout@v4
38+
with:
39+
lfs: true
40+
41+
- name: Set up Python 3.12
42+
uses: actions/setup-python@v5
43+
with:
44+
python-version: "3.12"
45+
46+
- name: Install the latest version of uv
47+
uses: astral-sh/setup-uv@v6
48+
49+
- name: Install
50+
shell: bash
51+
run: |
52+
cd {{ package.path }}
53+
uv sync --all-groups
54+
{%- if package.custom_steps %}
55+
{%- for step in package.custom_steps %}
56+
57+
- {{ step | to_nice_yaml | indent(8) }}
58+
{%- endfor %}
59+
{%- endif %}
60+
{%- if package.generate_standard_pytest_step %}
61+
62+
- name: Run tests
63+
env:
64+
{% raw %}OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}{% endraw %}
65+
shell: bash
66+
run: |
67+
uv run pytest {{ package.path }}/
68+
{%- endif %}
69+
70+
- name: Check formatting
71+
shell: bash
72+
run: |
73+
uv run ruff check {{ package.path }}
74+
{%- if package.generate_typechecking_step and package.typechecker == "mypy" %}
75+
76+
- name: Check typing
77+
shell: bash
78+
run: |
79+
uv run mypy -p {{ package.package_name }}
80+
{%- endif %}
81+
{%- if package.generate_typechecking_step and package.typechecker == "ty" %}
82+
83+
- name: Check typing
84+
shell: bash
85+
run: |
86+
uv run ty check {{ package.path }}
87+
{%- endif %}
88+
{%- if package.generate_alembic_migration_check_step %}
89+
90+
- name: Check Alembic migrations
91+
shell: bash
92+
run: |
93+
cd {{ package.path }}
94+
env $(cat .env.ci-cd | grep -v '^#') uv run alembic upgrade heads
95+
env $(cat .env.ci-cd | grep -v '^#') uv run alembic check
96+
{%- endif %}
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Test tool {{ package.name }}
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- "{{ package.path }}/**"
7+
# - "pyproject.toml"
8+
# - "uv.lock"
9+
push:
10+
branches: [master]
11+
paths:
12+
- "{{ package.path }}/**"
13+
- "pyproject.toml"
14+
- "uv.lock"
15+
16+
jobs:
17+
test:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
with:
22+
lfs: true
23+
24+
- name: Set up Python 3.12
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: "3.12"
28+
29+
- name: Install the latest version of uv
30+
uses: astral-sh/setup-uv@v6
31+
32+
- name: Install
33+
shell: bash
34+
run: |
35+
cd {{ package.path }}
36+
uv sync
37+
{%- if package.custom_steps %}
38+
{%- for step in package.custom_steps %}
39+
40+
- {{ step | to_nice_yaml | indent(8) }}
41+
{%- endfor %}
42+
{%- endif %}
43+
{%- if package.generate_standard_pytest_step %}
44+
45+
- name: Run tests
46+
shell: bash
47+
run: |
48+
uv run pytest {{ package.path }}/tests/
49+
{%- endif %}
50+
51+
- name: Check formatting
52+
shell: bash
53+
run: |
54+
uv run ruff check {{ package.path }}
55+
{%- if package.generate_typechecking_step and package.typechecker == "mypy" %}
56+
57+
- name: Check typing
58+
shell: bash
59+
run: |
60+
uv run mypy -p {{ package.package_name }}
61+
{%- endif %}
62+
{%- if package.generate_typechecking_step and package.typechecker == "ty" %}
63+
64+
- name: Check typing
65+
shell: bash
66+
run: |
67+
uv run ty check {{ package.path }}
68+
{%- endif %}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# This file was automatically generated by uv-workspace-codegen
2+
# For more information, see: https://github.com/epoch8/uv-workspace-codegen/blob/master/README.md
3+
# Do not edit this file manually - changes will be overwritten
4+
5+
name: Test lib jims-backoffice
6+
7+
on:
8+
pull_request:
9+
paths:
10+
- "libs/jims-backoffice/**"
11+
# - "pyproject.toml"
12+
# - "uv.lock"
13+
push:
14+
branches: [master]
15+
paths:
16+
- "libs/jims-backoffice/**"
17+
- "pyproject.toml"
18+
- "uv.lock"
19+
20+
jobs:
21+
test:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v4
25+
with:
26+
lfs: true
27+
28+
- name: Set up Python 3.12
29+
uses: actions/setup-python@v5
30+
with:
31+
python-version: "3.12"
32+
33+
- name: Install the latest version of uv
34+
uses: astral-sh/setup-uv@v6
35+
36+
- name: Install
37+
shell: bash
38+
run: |
39+
cd libs/jims-backoffice
40+
uv sync --all-groups
41+
42+
- name: Check formatting
43+
shell: bash
44+
run: |
45+
uv run ruff check libs/jims-backoffice
46+
47+
- name: Check typing
48+
shell: bash
49+
run: |
50+
uv run mypy -p jims_backoffice
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# This file was automatically generated by uv-workspace-codegen
2+
# For more information, see: https://github.com/epoch8/uv-workspace-codegen/blob/master/README.md
3+
# Do not edit this file manually - changes will be overwritten
4+
5+
name: Test lib jims-core
6+
7+
on:
8+
pull_request:
9+
paths:
10+
- "libs/jims-core/**"
11+
# - "pyproject.toml"
12+
# - "uv.lock"
13+
push:
14+
branches: [master]
15+
paths:
16+
- "libs/jims-core/**"
17+
- "pyproject.toml"
18+
- "uv.lock"
19+
20+
jobs:
21+
test:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v4
25+
with:
26+
lfs: true
27+
28+
- name: Set up Python 3.12
29+
uses: actions/setup-python@v5
30+
with:
31+
python-version: "3.12"
32+
33+
- name: Install the latest version of uv
34+
uses: astral-sh/setup-uv@v6
35+
36+
- name: Install
37+
shell: bash
38+
run: |
39+
cd libs/jims-core
40+
uv sync --all-groups
41+
42+
- name: Run tests
43+
env:
44+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
45+
shell: bash
46+
run: |
47+
uv run pytest libs/jims-core/
48+
49+
- name: Check formatting
50+
shell: bash
51+
run: |
52+
uv run ruff check libs/jims-core
53+
54+
- name: Check typing
55+
shell: bash
56+
run: |
57+
uv run mypy -p jims_core

0 commit comments

Comments
 (0)