Skip to content

Commit f3ebc61

Browse files
misrasaurabh1misrasaurabh1
authored
Merge branch 'main' into codeflash/optimize-select_top_confidence_detection-m7drsd4o
2 parents 36c29a9 + b0178fd commit f3ebc61

File tree

169 files changed

+6423
-944
lines changed

Some content is hidden

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

169 files changed

+6423
-944
lines changed

‎.github/workflows/docker.cpu.yml

+39-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
username: ${{ secrets.DOCKERHUB_USERNAME }}
3737
password: ${{ secrets.DOCKERHUB_TOKEN }}
38-
- name: 🛎️ Checkout
38+
- name: Checkout
3939
uses: actions/checkout@v4
4040
- name: Read version from file
4141
run: echo "VERSION=$(DISABLE_VERSION_CHECK=true python ./inference/core/version.py)" >> $GITHUB_ENV
@@ -58,3 +58,41 @@ jobs:
5858
tags: ${{ steps.tags.outputs.image_tags }}
5959
platforms: linux/amd64,linux/arm64
6060
file: ${{ env.DOCKERFILE }}
61+
62+
63+
- name: Authenticate gcloud
64+
uses: 'google-github-actions/auth@v2'
65+
id: auth
66+
with:
67+
workload_identity_provider: 'projects/391662651862/locations/global/workloadIdentityPools/github-actions/providers/github'
68+
service_account: 'github-gcloud-deployer@roboflow-artifacts.iam.gserviceaccount.com'
69+
token_format: 'access_token'
70+
- name: Login to Google Artifact Registry
71+
uses: docker/login-action@v3
72+
with:
73+
registry: us-docker.pkg.dev
74+
username: oauth2accesstoken
75+
password: ${{ steps.auth.outputs.access_token }}
76+
- name: Set up build variables
77+
id: set_up_build_variables
78+
run: |
79+
TAGS=""
80+
IFS=',' read -ra TAG_ARRAY <<< "${{ steps.tags.outputs.image_tags }}"
81+
for tag in "${TAG_ARRAY[@]}"; do
82+
if [ -n "$TAGS" ]; then
83+
TAGS="${TAGS}","us-docker.pkg.dev/roboflow-artifacts/${tag}"
84+
else
85+
TAGS="us-docker.pkg.dev/roboflow-artifacts/${tag}"
86+
fi
87+
done
88+
echo "PROCESSED_TAGS=${TAGS}" >> "$GITHUB_OUTPUT"
89+
echo "GCP artifacts to be pushed:"
90+
echo "$TAGS"
91+
- name: Build and push CPU image to GCP Artifact Registry
92+
uses: depot/build-push-action@v1
93+
with:
94+
push: ${{ github.event_name == 'release' || (github.event.inputs.force_push == 'true') }}
95+
project: grl7ffzxd7
96+
tags: ${{ steps.set_up_build_variables.outputs.PROCESSED_TAGS }}
97+
platforms: linux/amd64
98+
file: ${{ env.DOCKERFILE }}

‎.github/workflows/docker.gpu.yml

+37-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
username: ${{ secrets.DOCKERHUB_USERNAME }}
3737
password: ${{ secrets.DOCKERHUB_TOKEN }}
38-
- name: 🛎️ Checkout
38+
- name: Checkout
3939
uses: actions/checkout@v4
4040
- name: Read version from file
4141
run: echo "VERSION=$(DISABLE_VERSION_CHECK=true python ./inference/core/version.py)" >> $GITHUB_ENV
@@ -58,3 +58,39 @@ jobs:
5858
tags: ${{ steps.tags.outputs.image_tags }}
5959
platforms: linux/amd64
6060
file: ${{ env.DOCKERFILE }}
61+
- name: 'Authenticate gcloud'
62+
uses: 'google-github-actions/auth@v2'
63+
id: auth
64+
with:
65+
workload_identity_provider: 'projects/391662651862/locations/global/workloadIdentityPools/github-actions/providers/github'
66+
service_account: 'github-gcloud-deployer@roboflow-artifacts.iam.gserviceaccount.com'
67+
token_format: 'access_token'
68+
- name: Login to Google Artifact Registry
69+
uses: docker/login-action@v3
70+
with:
71+
registry: us-docker.pkg.dev
72+
username: oauth2accesstoken
73+
password: ${{ steps.auth.outputs.access_token }}
74+
- name: Set up build variables
75+
id: set_up_build_variables
76+
run: |
77+
TAGS=""
78+
IFS=',' read -ra TAG_ARRAY <<< "${{ steps.tags.outputs.image_tags }}"
79+
for tag in "${TAG_ARRAY[@]}"; do
80+
if [ -n "$TAGS" ]; then
81+
TAGS="${TAGS}","us-docker.pkg.dev/roboflow-artifacts/${tag}"
82+
else
83+
TAGS="us-docker.pkg.dev/roboflow-artifacts/${tag}"
84+
fi
85+
done
86+
echo "PROCESSED_TAGS=${TAGS}" >> "$GITHUB_OUTPUT"
87+
echo "GCP artifacts to be pushed:"
88+
echo "$TAGS"
89+
- name: Build and push GPU image to GCP Artifact Registry
90+
uses: depot/build-push-action@v1
91+
with:
92+
push: ${{ github.event_name == 'release' || (github.event.inputs.force_push == 'true') }}
93+
project: grl7ffzxd7
94+
tags: ${{ steps.set_up_build_variables.outputs.PROCESSED_TAGS }}
95+
platforms: linux/amd64
96+
file: ${{ env.DOCKERFILE }}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ coverage.xml
6262
*.py,cover
6363
.hypothesis/
6464
.pytest_cache/
65+
.pytest.env*
6566

6667
# Translations
6768
*.mo

‎.release/pypi/inference.cli.setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import os
2+
import shutil
3+
import sys
4+
25
import setuptools
36
from setuptools import find_packages
4-
import sys
5-
import shutil
67

78
root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
89
sys.path.append(root)
@@ -18,7 +19,6 @@
1819

1920
from inference.core.version import __version__
2021

21-
2222
with open("inference_cli/README.md", "r") as fh:
2323
long_description = fh.read()
2424

‎.release/pypi/inference.core.setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import os
2+
import sys
3+
24
import setuptools
35
from setuptools import find_packages
4-
import sys
56

67
root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
78
sys.path.append(root)

‎.release/pypi/inference.cpu.setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import os
2+
import sys
3+
24
import setuptools
35
from setuptools import find_packages
4-
import sys
56

67
root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
78
sys.path.append(root)

‎.release/pypi/inference.gpu.setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import os
2+
import sys
3+
24
import setuptools
35
from setuptools import find_packages
4-
import sys
56

67
root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
78
sys.path.append(root)

‎.release/pypi/inference.sdk.setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import os
22
import shutil
3+
import sys
34

45
import setuptools
56
from setuptools import find_packages
6-
import sys
77

88
root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
99
sys.path.append(root)

‎.release/pypi/inference.setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import os
2+
import sys
3+
24
import setuptools
35
from setuptools import find_packages
4-
import sys
56

67
root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
78
sys.path.append(root)

‎development/benchmark_scripts/benchmark_owlv2_inference_time.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import requests
21
import tempfile
3-
from PIL import Image
42
import time
53

4+
import requests
5+
from PIL import Image
6+
67
from inference.models.owlv2.owlv2 import OwlV2
78

89
# run a simple latency test

‎development/docs/build_block_docs.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
1+
import inspect
12
import json
23
import os
34
import re
45
from collections import defaultdict
56
from typing import Dict, List, Set, Tuple, Type
6-
import inspect
77

8+
from jinja2 import Environment, FileSystemLoader
89

910
from inference.core.utils.file_system import dump_text_lines, read_text_file
1011
from inference.core.workflows.execution_engine.entities.base import OutputDefinition
11-
from inference.core.workflows.execution_engine.entities.types import STEP_AS_SELECTED_ELEMENT
12+
from inference.core.workflows.execution_engine.entities.types import (
13+
STEP_AS_SELECTED_ELEMENT,
14+
)
1215
from inference.core.workflows.execution_engine.introspection.blocks_loader import (
1316
describe_available_blocks,
1417
)
1518
from inference.core.workflows.execution_engine.introspection.connections_discovery import (
1619
discover_blocks_connections,
1720
)
1821
from inference.core.workflows.execution_engine.introspection.entities import (
19-
SelectorDefinition, BlockDescription, BlockManifestMetadata,
22+
BlockDescription,
23+
BlockManifestMetadata,
24+
SelectorDefinition,
2025
)
2126
from inference.core.workflows.execution_engine.introspection.schema_parser import (
2227
parse_block_manifest,
2328
)
2429
from inference.core.workflows.prototypes.block import WorkflowBlock
2530

26-
27-
from jinja2 import Environment, FileSystemLoader
28-
2931
template_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")
3032
jinja_env = Environment(loader=FileSystemLoader(template_dir))
3133

‎development/docs/workflows_gallery_builder.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
import re
44
from collections import defaultdict
55
from functools import lru_cache
6-
from typing import List, Dict, Optional
6+
from typing import Dict, List, Optional
77

88
import pytest
99
import requests
1010
from requests import Response
1111

12-
from tests.workflows.integration_tests.execution.workflows_gallery_collector.decorators import GALLERY_ENTRIES, \
13-
WorkflowGalleryEntry
12+
from tests.workflows.integration_tests.execution.workflows_gallery_collector.decorators import (
13+
GALLERY_ENTRIES,
14+
WorkflowGalleryEntry,
15+
)
1416

1517
API_URL = "https://api.roboflow.com"
1618
API_KEY_PATTERN = re.compile(r"api_key=(.[^&]*)")

‎development/docs/write_cli_docs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import os
12
import subprocess
2-
import os
33

44
DOCS_ROOT_DIR = os.path.abspath(
55
os.path.join(

‎development/docs/write_openapi_spec.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@
1616
from inference.core.registries.roboflow import (
1717
RoboflowModelRegistry,
1818
)
19-
20-
2119
from inference.models.utils import ROBOFLOW_MODEL_TYPES
2220

23-
24-
2521
model_registry = RoboflowModelRegistry(ROBOFLOW_MODEL_TYPES)
2622

2723

@@ -35,10 +31,11 @@
3531

3632

3733

38-
from fastapi.openapi.utils import get_openapi
3934
import json
4035
import os
4136

37+
from fastapi.openapi.utils import get_openapi
38+
4239
DOCS_ROOT_DIR = os.path.abspath(
4340
os.path.join(
4441
os.path.dirname(__file__),

‎development/stream_interface/camera_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import argparse
22
from typing import Union
33

4-
import supervision as sv
54
import cv2
5+
import supervision as sv
66

77
from inference.core.utils.preprocess import letterbox_image
88

‎development/stream_interface/inference_pipeline_on_camera.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@
1212

1313
from inference.core.interfaces.camera.entities import VideoFrame
1414
from inference.core.interfaces.stream.inference_pipeline import InferencePipeline
15-
from inference.core.interfaces.stream.sinks import render_boxes, display_image, UDPSink, multi_sink
15+
from inference.core.interfaces.stream.sinks import (
16+
UDPSink,
17+
display_image,
18+
multi_sink,
19+
render_boxes,
20+
)
1621
from inference.core.interfaces.stream.watchdog import (
1722
BasePipelineWatchDog,
1823
PipelineWatchDog,

‎development/stream_interface/multiplexer.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import numpy as np
44

5-
from inference.core.interfaces.camera.entities import FrameTimestamp, FrameID, VideoFrame
5+
from inference.core.interfaces.camera.entities import (
6+
FrameID,
7+
FrameTimestamp,
8+
VideoFrame,
9+
)
610
from inference.core.interfaces.camera.exceptions import EndOfStreamError
711
from inference.core.interfaces.camera.video_source import VideoSource
812

‎development/stream_interface/objects_passing_line_demo.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
from inference import InferencePipeline
99
from inference.core.interfaces.camera.entities import VideoFrame
10-
from inference.core.interfaces.stream.watchdog import PipelineWatchDog, BasePipelineWatchDog
10+
from inference.core.interfaces.stream.watchdog import (
11+
BasePipelineWatchDog,
12+
PipelineWatchDog,
13+
)
1114
from inference.core.utils.drawing import create_tiles
1215

1316
STOP = False

‎development/stream_interface/old_inference_pipeline_demo.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
from inference import Stream
1414
from inference.core.interfaces.camera.entities import VideoFrame
1515
from inference.core.interfaces.stream.inference_pipeline import InferencePipeline
16-
from inference.core.interfaces.stream.sinks import render_boxes, display_image
16+
from inference.core.interfaces.stream.sinks import display_image, render_boxes
1717
from inference.core.interfaces.stream.watchdog import (
1818
BasePipelineWatchDog,
1919
PipelineWatchDog,
2020
)
2121
from inference.core.utils.environment import str2bool
2222
from inference.core.utils.preprocess import letterbox_image
2323

24-
2524
STOP = False
2625

2726
MODELS = {

‎development/stream_interface/path_deviation_demo.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
from typing import Any, Dict, Union
33

44
import cv2 as cv
5+
import supervision as sv
56

67
from inference.core.interfaces.camera.entities import VideoFrame
78
from inference.core.interfaces.stream.inference_pipeline import InferencePipeline
89
from inference.core.managers.base import ModelManager
910
from inference.core.registries.roboflow import (
1011
RoboflowModelRegistry,
1112
)
12-
from inference.core.workflows.core_steps.transformations.byte_tracker.v1 import OUTPUT_KEY as BYTE_TRACKER_OUTPUT_KEY
13-
from inference.core.workflows.core_steps.analytics.path_deviation.v1 import OUTPUT_KEY as PATH_DEVIATION_OUTPUT
13+
from inference.core.workflows.core_steps.analytics.path_deviation.v1 import (
14+
OUTPUT_KEY as PATH_DEVIATION_OUTPUT,
15+
)
16+
from inference.core.workflows.core_steps.transformations.byte_tracker.v1 import (
17+
OUTPUT_KEY as BYTE_TRACKER_OUTPUT_KEY,
18+
)
1419
from inference.models.utils import ROBOFLOW_MODEL_TYPES
15-
import supervision as sv
16-
1720

1821
model_registry = RoboflowModelRegistry(ROBOFLOW_MODEL_TYPES)
1922
model_manager = ModelManager(model_registry=model_registry)

‎development/stream_interface/time_in_zone_demo.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
from inference import InferencePipeline
99
from inference.core.interfaces.camera.entities import VideoFrame
10-
from inference.core.interfaces.stream.watchdog import PipelineWatchDog, BasePipelineWatchDog
10+
from inference.core.interfaces.stream.watchdog import (
11+
BasePipelineWatchDog,
12+
PipelineWatchDog,
13+
)
1114
from inference.core.utils.drawing import create_tiles
1215

1316
STOP = False

0 commit comments

Comments
 (0)