Skip to content

Commit 5682f12

Browse files
authored
Merge branch 'main' into dataman-154-metadata-upload
2 parents 3ce097c + b14f697 commit 5682f12

File tree

286 files changed

+15616
-25498
lines changed

Some content is hidden

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

286 files changed

+15616
-25498
lines changed

.github/workflows/docker.inference-exp.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
name: ${{ matrix.dockerfile }}:${{ matrix.platform }}
6161
needs: determine-tags
6262
runs-on: ubuntu-latest
63-
timeout-minutes: 120
63+
timeout-minutes: 240
6464
permissions:
6565
# permission lets the workflow issue OIDC tokens, required by depot.dev auth
6666
id-token: write
@@ -83,6 +83,9 @@ jobs:
8383
- dockerfile: "x86.cu128.base.dockerfile"
8484
platform: "cu128"
8585
build_platforms: "linux/amd64"
86+
- dockerfile: "jp51.cu114.core.dockerfile"
87+
platform: "jp51"
88+
build_platforms: "linux/arm64"
8689
# - dockerfile: "jp61.cu126.base.dockerfile"
8790
# platform: "jp61"
8891
# build_platforms: "linux/arm64"

.github/workflows/docker.stream_manager.jetson.5.1.1.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Docs Workflow
22
permissions:
33
contents: read
4-
pages: write
54

65
on:
76
release:
@@ -15,7 +14,7 @@ on:
1514
default: false
1615

1716
jobs:
18-
deploy:
17+
build:
1918
runs-on: depot-ubuntu-22.04-32
2019
timeout-minutes: 20
2120
permissions:
@@ -44,15 +43,6 @@ jobs:
4443
path: roboflow_enterprise_blocks
4544
token: ${{ steps.enterprise_blocks_token.outputs.token }}
4645

47-
- name: Create GitHub App token (mkdocs)
48-
id: mkdocs_token
49-
uses: actions/create-github-app-token@v1
50-
with:
51-
app-id: ${{ secrets.MKDOCS_APP_ID }}
52-
private-key: ${{ secrets.MKDOCS_PEM }}
53-
owner: roboflow
54-
repositories: mkdocs-material-insiders
55-
5646
- name: Set up Node
5747
uses: actions/setup-node@v3
5848
with:
@@ -61,7 +51,11 @@ jobs:
6151
- name: Install Docs Theme
6252
run: |
6353
npm ci
64-
working-directory: ./inference_repo/theme
54+
working-directory: ./inference_repo/theme_build
55+
56+
- name: Build theme assets
57+
run: npm run build
58+
working-directory: ./inference_repo/theme_build
6559

6660
- name: Set up Python
6761
uses: actions/setup-python@v5
@@ -74,9 +68,6 @@ jobs:
7468
# Upgrade pip and setuptools
7569
python -m pip install --upgrade pip setuptools
7670
77-
# Install mkdocs-material-insiders using the GitHub App token
78-
pip install git+https://roboflow:${{ steps.mkdocs_token.outputs.token }}@github.com/roboflow/mkdocs-material-insiders.git
79-
8071
# Install doc requirements
8172
pip install -r requirements/requirements.docs.txt
8273
@@ -96,6 +87,10 @@ jobs:
9687
run: pip install .
9788
working-directory: ./roboflow_enterprise_blocks
9889

90+
- name: Generate API reference pages
91+
run: python docs/scripts/gen_ref_pages.py
92+
working-directory: ./inference_repo
93+
9994
- name: Build block docs
10095
run: python -m development.docs.build_block_docs
10196
working-directory: ./inference_repo
@@ -114,12 +109,43 @@ jobs:
114109
run: python -m development.docs.write_openapi_spec
115110
working-directory: ./inference_repo
116111

112+
- name: Replace template variables (VERSION, etc.)
113+
run: python docs/scripts/macros.py
114+
working-directory: ./inference_repo
115+
117116
- name: Validate generated docs (Jinja2 syntax)
118117
run: python -m development.docs.validate_docs_jinja2
119118
working-directory: ./inference_repo
120119

120+
- name: Build docs
121+
run: zensical build --clean
122+
working-directory: ./inference_repo
123+
124+
- name: Verify build output
125+
run: |
126+
echo "Checking for theme assets in site/..."
127+
test -f site/static/styles.css || { echo "ERROR: site/static/styles.css missing!"; exit 1; }
128+
test -f site/static/dist/home.js || { echo "ERROR: site/static/dist/home.js missing!"; exit 1; }
129+
echo "Theme assets OK."
130+
echo "Checking for API reference pages..."
131+
test -d site/reference/inference || { echo "ERROR: site/reference/inference/ missing!"; exit 1; }
132+
test -d site/reference/inference_sdk || { echo "ERROR: site/reference/inference_sdk/ missing!"; exit 1; }
133+
test -d site/reference/inference_cli || { echo "ERROR: site/reference/inference_cli/ missing!"; exit 1; }
134+
echo "API reference OK."
135+
working-directory: ./inference_repo
136+
137+
- name: Upload site artifact
138+
if: ${{ github.event_name == 'workflow_dispatch' }}
139+
uses: actions/upload-artifact@v4
140+
with:
141+
name: docs-site-preview
142+
path: ./inference_repo/site
143+
retention-days: 7
144+
121145
- name: Deploy docs
122146
# Only deploy if release event OR if deploy input was set to true
123147
if: ${{ github.event_name == 'release' || github.event.inputs.deploy == 'true' }}
124-
run: mkdocs gh-deploy --force --verbose
148+
run: |
149+
pip install ghp-import
150+
ghp-import -n -p -f site
125151
working-directory: ./inference_repo

.github/workflows/integration_e2e_tests_inference_sdk_x86.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
timeout-minutes: 20
2323
strategy:
2424
matrix:
25-
python-version: ["3.9", "3.10", "3.11", "3.12"]
25+
python-version: ["3.10", "3.11", "3.12"]
2626
steps:
2727
- name: 🛎️ Checkout
2828
uses: actions/checkout@v4
@@ -63,7 +63,7 @@ jobs:
6363
timeout-minutes: 30
6464
strategy:
6565
matrix:
66-
python-version: ["3.9", "3.10", "3.11", "3.12"]
66+
python-version: ["3.10", "3.11", "3.12"]
6767
steps:
6868
- name: 🛎️ Checkout
6969
uses: actions/checkout@v4

.github/workflows/integration_tests_inference_cli_depending_on_inference_x86.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
timeout-minutes: 30
2020
strategy:
2121
matrix:
22-
python-version: ["3.9", "3.10"]
22+
python-version: ["3.10"]
2323
steps:
2424
- name: 🛎️ Checkout
2525
uses: actions/checkout@v4

.github/workflows/integration_tests_inference_cli_x86.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
timeout-minutes: 30
2020
strategy:
2121
matrix:
22-
python-version: ["3.9", "3.10", "3.11", "3.12"]
22+
python-version: ["3.10", "3.11", "3.12"]
2323
steps:
2424
- name: 🛎️ Checkout
2525
uses: actions/checkout@v4

.github/workflows/integration_tests_inference_experimental_gpu.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ jobs:
9595
python -m pip install uv
9696
python -m uv venv
9797
python -m uv pip install -e .[test,${{ matrix.extras.install }}] --python .venv
98+
- name: 🪛 Display GPU
99+
if: ${{ (github.event.inputs.extras == '' || github.event.inputs.extras == matrix.extras.marker) && (github.event.inputs.python_version == '' || github.event.inputs.python_version == matrix.python-version) }}
100+
working-directory: inference_models
101+
run: |
102+
source .venv/bin/activate
103+
python -c "import torch; print(torch.cuda.get_device_name(0))"
98104
- name: 🧪 Run tests marked `${{ matrix.extras.marker }}`
99105
if: ${{ (github.event.inputs.extras == '' || github.event.inputs.extras == matrix.extras.marker) && (github.event.inputs.python_version == '' || github.event.inputs.python_version == matrix.python-version) }}
100106
working-directory: inference_models

.github/workflows/integration_tests_inference_models.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
timeout-minutes: 45
2020
strategy:
2121
matrix:
22-
python-version: ["3.9", "3.10", "3.11", "3.12"]
22+
python-version: ["3.10", "3.11", "3.12"]
2323
steps:
2424
- name: 🛎️ Checkout
2525
uses: actions/checkout@v4

.github/workflows/integration_tests_workflows_x86.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
default: all
1515
options:
1616
- all
17-
- "3.9"
1817
- "3.10"
1918
- "3.11"
2019
- "3.12"
@@ -39,7 +38,7 @@ jobs:
3938
group: public-depot
4039
strategy:
4140
matrix:
42-
python-version: ${{ fromJSON((github.event.inputs.python-version || 'all') == 'all' && '["3.9","3.10","3.11","3.12"]' || format('["{0}"]', github.event.inputs.python-version)) }}
41+
python-version: ${{ fromJSON((github.event.inputs.python-version || 'all') == 'all' && '["3.10","3.11","3.12"]' || format('["{0}"]', github.event.inputs.python-version)) }}
4342
use-inference-models: ${{ fromJSON((github.event.inputs.use-inference-models || 'all') == 'all'&& '["true","false"]'|| format('["{0}"]', github.event.inputs.use-inference-models)) }}
4443
timeout-minutes: 15
4544
steps:

.github/workflows/publish.pypi.inference_exp.yml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish Inference Experimental Wheels to PyPi
1+
name: Publish Inference Models Wheels to PyPi
22
on:
33
release:
44
types: [created]
@@ -9,19 +9,14 @@ on:
99
required: false
1010
default: false
1111
type: boolean
12-
pre_release:
13-
description: "Mark as pre-release"
14-
required: false
15-
default: false
16-
type: boolean
1712

1813
permissions:
1914
contents: read
2015
id-token: write
2116

2217
jobs:
2318
build:
24-
name: ${{ github.event_name == 'release' && 'Release publish' || (github.event.inputs.publish == 'true' && (github.event.inputs.pre_release == 'true' && 'Manual publish (pre-release)' || 'Manual publish (rejected - non-prerelease)') || 'Manual build only') }}
19+
name: ${{ github.event_name == 'release' && 'Release publish' || (github.event.inputs.publish == 'true' && 'Manual publish' || 'Manual build only') }}
2520
runs-on:
2621
labels: depot-ubuntu-22.04-small
2722
group: public-depot
@@ -42,22 +37,6 @@ jobs:
4237
run: |
4338
python -m pip install --upgrade pip
4439
python -m pip install uv
45-
- name: 🏷️ Modify version for pre-release
46-
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.pre_release == 'true' }}
47-
working-directory: inference_models
48-
run: |
49-
CURRENT_VERSION=$(grep -m 1 '^version = ' pyproject.toml | sed 's/version = "\(.*\)"/\1/')
50-
echo "Current version: $CURRENT_VERSION"
51-
52-
if [[ $CURRENT_VERSION =~ (a|b|rc)[0-9]+$ ]]; then
53-
echo "Version already has pre-release suffix, keeping as is"
54-
else
55-
TIMESTAMP=$(date +%Y%m%d%H%M%S)
56-
NEW_VERSION="${CURRENT_VERSION}rc${TIMESTAMP}"
57-
echo "New pre-release version: $NEW_VERSION"
58-
sed -i.bak "s/^version = \"${CURRENT_VERSION}\"/version = \"${NEW_VERSION}\"/" pyproject.toml
59-
rm pyproject.toml.bak
60-
fi
6140
- name: 🔨 Build package
6241
working-directory: inference_models
6342
run: |

0 commit comments

Comments
 (0)