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

Impl media crc #220

Merged
merged 81 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
fc0d3a2
fix: Created tempfile safely
duggalsu Mar 12, 2024
a251873
- Fixed video and audio file return path
duggalsu Mar 12, 2024
058cee5
fix: subprocess call issue
duggalsu Mar 13, 2024
acf4974
Merge pull request #171 from duggalsu/fix_subprocess_call
duggalsu Mar 13, 2024
55204f9
Merge pull request #165 from tattle-made/development
duggalsu Mar 13, 2024
4297077
0.4.0
invalid-email-address Mar 13, 2024
33fb2d8
fix: Renamed hash worker graviton file
duggalsu Mar 13, 2024
b58c11f
Merge pull request #172 from duggalsu/add_hash_worker_workflow
duggalsu Mar 13, 2024
ec7b922
Merge pull request #173 from tattle-made/hotfix
duggalsu Mar 13, 2024
b6814b8
0.4.1
invalid-email-address Mar 13, 2024
ff70726
fix: wget issues
duggalsu Mar 13, 2024
6b98b8f
Merge pull request #174 from duggalsu/fix_wget_issues
duggalsu Mar 13, 2024
fc508fa
Merge pull request #175 from tattle-made/hotfix
duggalsu Mar 13, 2024
79fb152
0.4.2
invalid-email-address Mar 13, 2024
cfc0601
fix: flask issues
duggalsu Mar 14, 2024
c68596f
Merge pull request #176 from duggalsu/fix_flask_issues
duggalsu Mar 14, 2024
f2a2b3d
Merge pull request #177 from tattle-made/hotfix
duggalsu Mar 14, 2024
eabb672
0.4.3
invalid-email-address Mar 14, 2024
badc043
fix: Created tempfile safely
duggalsu Mar 12, 2024
bc43d19
- Fixed video and audio file return path
duggalsu Mar 12, 2024
d082d93
Fix tempfile issues
duggalsu Mar 12, 2024
eb97f09
fix: Removed use of tempfile downloads
duggalsu Mar 14, 2024
2f9cc07
fix: tempfile impl
duggalsu Mar 14, 2024
36ec52b
Merge remote-tracking branch 'refs/remotes/origin/fix_tempfile_issues…
duggalsu Mar 14, 2024
d02366c
chore: removed global import
duggalsu Mar 14, 2024
831a700
fix: tempfile path for make from file in memory function
duggalsu Mar 14, 2024
c846df5
Merge pull request #164 from duggalsu/fix_tempfile_issues
duggalsu Mar 14, 2024
a85423a
Merge pull request #178 from tattle-made/hotfix
duggalsu Mar 14, 2024
771a627
0.4.4
invalid-email-address Mar 14, 2024
7bf1e20
Create scorecard.yml
duggalsu Mar 14, 2024
d1f468d
Merge pull request #179 from tattle-made/scorecard_workflow
duggalsu Mar 14, 2024
0b30a78
Merge pull request #180 from tattle-made/hotfix
duggalsu Mar 14, 2024
1d4a31e
ci: Fix issues with docker push vidvec benchmark test workflow
duggalsu Mar 15, 2024
6f2a32a
Merge pull request #181 from duggalsu/fix_vidvec_benchmark_test_workflow
duggalsu Mar 15, 2024
f6d87f8
Merge pull request #182 from tattle-made/hotfix
duggalsu Mar 15, 2024
201c900
ci: fix context in test workflow
duggalsu Mar 15, 2024
2068476
ci: removed explict checkout in docker build
duggalsu Mar 15, 2024
7d5cc01
Merge pull request #183 from duggalsu/fix_vidvec_benchmark_test_workf…
duggalsu Mar 15, 2024
3d6c84f
Merge pull request #184 from tattle-made/hotfix
duggalsu Mar 15, 2024
c356dc9
fix: Fix workflows
duggalsu Mar 15, 2024
acc4000
Merge pull request #185 from duggalsu/fix_docker_workflow
duggalsu Mar 15, 2024
2c19559
Merge pull request #186 from tattle-made/hotfix
duggalsu Mar 15, 2024
d8d22da
0.4.5
invalid-email-address Mar 15, 2024
7b181af
fix: Security enhancements and performance optimizations
duggalsu Mar 17, 2024
e5f110c
ci: added no deps and require hashes for pip audit
duggalsu Mar 17, 2024
e634622
ci: removed require hashes to allow no-deps to work
duggalsu Mar 17, 2024
2d1863c
- setup python version
duggalsu Mar 17, 2024
217d60d
Merge pull request #187 from duggalsu/opt_vid_worker
duggalsu Mar 17, 2024
f92ef82
Merge pull request #188 from tattle-made/hotfix
duggalsu Mar 17, 2024
8c8e04c
0.4.6
invalid-email-address Mar 17, 2024
8a57943
ci: Added dependabot config
duggalsu Mar 17, 2024
74945f2
Merge pull request #189 from duggalsu/add_dependabot_yml
duggalsu Mar 17, 2024
5d13eea
Merge pull request #190 from tattle-made/hotfix
duggalsu Mar 17, 2024
7b8ed07
ci: Add github cache action for local key-based caching
duggalsu Mar 18, 2024
389f021
Merge pull request #200 from duggalsu/fix_github_caching
duggalsu Mar 18, 2024
d91149a
Merge pull request #201 from tattle-made/hotfix
duggalsu Mar 18, 2024
d0542bf
ci: updated dockerfile base image platform
duggalsu Mar 18, 2024
c48efa4
Merge pull request #208 from duggalsu/modify_base_img_platform
duggalsu Mar 18, 2024
decd119
Merge pull request #209 from tattle-made/hotfix
duggalsu Mar 18, 2024
ade1e67
ci: remove intermediate cache deletion step
duggalsu Mar 18, 2024
caae5a8
Merge pull request #210 from duggalsu/rm_intermediate_cache_del
duggalsu Mar 18, 2024
cdb081a
Merge pull request #211 from tattle-made/hotfix
duggalsu Mar 18, 2024
0dfb172
fix: Remove github caching and modify base image to use TARGETPLATFORM
duggalsu Mar 18, 2024
c490cea
Merge pull request #212 from duggalsu/remove_github_caching
duggalsu Mar 18, 2024
4541139
Merge pull request #213 from tattle-made/hotfix
duggalsu Mar 18, 2024
06300c6
0.4.7
invalid-email-address Mar 18, 2024
5fd4258
fix: Fixed volume sync and non-root user permission issues
duggalsu Mar 18, 2024
3bdb16a
- Added UID and GID args to ci-sut docker compose
duggalsu Mar 18, 2024
772d71d
Merge pull request #214 from duggalsu/fix_volume_sync
duggalsu Mar 18, 2024
20ed58a
Merge pull request #215 from tattle-made/hotfix
duggalsu Mar 18, 2024
5c39131
0.4.8
invalid-email-address Mar 18, 2024
496d600
fix(ci): Added docker build args to github workflows
duggalsu Mar 18, 2024
ef9c159
Merge pull request #216 from duggalsu/fix_docker_build_args
duggalsu Mar 18, 2024
c039f63
Merge pull request #217 from tattle-made/hotfix
duggalsu Mar 18, 2024
3a14e00
0.4.9
invalid-email-address Mar 18, 2024
b6a3d14
fix(ci): Fixed github workflow docker build args format
duggalsu Mar 18, 2024
fe1adfd
Merge pull request #218 from duggalsu/fix_docker_build_args_format
duggalsu Mar 18, 2024
4b4a3ff
Merge pull request #219 from tattle-made/hotfix
duggalsu Mar 18, 2024
4824379
0.4.10
invalid-email-address Mar 18, 2024
9d57125
feat: Add calculating video vec CRC for media matching
duggalsu Mar 18, 2024
ca52993
feat: Added creation of CRC for video and audio vec for media matching
duggalsu Mar 19, 2024
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
3 changes: 3 additions & 0 deletions .ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ services:
context: ./../src
dockerfile: Dockerfile.test
target: test
args:
- "UID=${UID:-1000}"
- "GID=${GID:-1000}"
# env_file: ./../src/test.env
command: bash -c "python -m unittest discover -s ./tests/core/models -p "test_*.py";
python -m unittest core.operators.test_vid_vec_rep_resnet;
Expand Down
33 changes: 33 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
version: 2
updates:
# Enable version updates for npm
- package-ecosystem: "npm"
# Look for `package.json` and `lock` files in the `root` directory
directory: "/docs"
# Check the npm registry for updates every day (weekdays)
schedule:
interval: "weekly"

# Enable version updates for Docker
- package-ecosystem: "docker"
# Look for a `Dockerfile` in the `root` directory
directory: "/src"
# Check for updates once a week
schedule:
interval: "weekly"

# Enable version updates for Pip
- package-ecosystem: "pip"
# Look for a `Dockerfile` in the `root` directory
directory: "/src"
# Check for updates once a week
schedule:
interval: "weekly"

# Enable version updates for github-actions
- package-ecosystem: "github-actions"
# Look for a `Dockerfile` in the `root` directory
directory: ".github/workflows"
# Check for updates once a week
schedule:
interval: "weekly"
12 changes: 8 additions & 4 deletions .github/workflows/bandit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# https://pypi.org/project/bandit/ is Apache v2.0 licensed, by PyCQA

name: Bandit

permissions:
contents: read # for actions/checkout to fetch code

on:
push:
branches: [ "main" ]
Expand All @@ -22,15 +26,16 @@ jobs:
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
# actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: main

- name: Bandit Scan
uses: shundor/python-bandit-scan@9cc5aa4a006482b8a7f91134412df6772dbda22c
uses: shundor/python-bandit-scan@9cc5aa4a006482b8a7f91134412df6772dbda22c # v1.0
with: # optional arguments
# exit with 0, even with results found
exit_zero: true # optional, default is DEFAULT
Expand All @@ -48,4 +53,3 @@ jobs:
# skips: # optional, default is DEFAULT
# path to a .bandit file that supplies command line arguments
# ini_path: # optional, default is DEFAULT

57 changes: 35 additions & 22 deletions .github/workflows/docker-push-audiovec-worker-staging.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,46 @@
name: Publish Audio Worker to Dockerhub for Staging

permissions:
contents: read

on: workflow_dispatch

jobs:
api:
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0

- name: Login to Docker Hub
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v.3.1.0
with:
ref: development
- name: "Setup Node version"
uses: actions/setup-node@v4
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push amd64
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
with:
node-version: 20.9.0
- name: Declare some variables
id: vars
shell: bash
run: |
echo "setting variables"
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
context: "{{defaultContext}}:src/"
file: worker/audiovec/Dockerfile.audio_worker
platforms: linux/amd64
build-args: |
"UID=1000"
"GID=1000"
push: true
tags: tattletech/feluda-operator-audiovec:worker-amd64-latest

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- uses: elgohr/Publish-Docker-Github-Action@main
- name: Build and push arm64
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
with:
username: tattletech
password: ${{ secrets.DOCKER_PASSWORD }}
name: tattletech/feluda-operator-audiovec
workdir: src/
dockerfile: worker/audiovec/Dockerfile.audio_worker
tags: worker-amd64-latest
platforms: linux/amd64
context: "{{defaultContext}}:src/"
file: worker/audiovec/Dockerfile.audio_worker_graviton
platforms: linux/arm64
build-args: |
"UID=1000"
"GID=1000"
push: true
tags: tattletech/feluda-operator-audiovec:worker-arm64-latest
57 changes: 35 additions & 22 deletions .github/workflows/docker-push-hash-worker-staging.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,46 @@
name: Publish Hash Worker to Dockerhub for Staging

permissions:
contents: read

on: workflow_dispatch

jobs:
api:
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0

- name: Login to Docker Hub
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v.3.1.0
with:
ref: development
- name: "Setup Node version"
uses: actions/setup-node@v4
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push amd64
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
with:
node-version: 20.9.0
- name: Declare some variables
id: vars
shell: bash
run: |
echo "setting variables"
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
context: "{{defaultContext}}:src/"
file: worker/hash/Dockerfile.hash_worker
platforms: linux/amd64
build-args: |
"UID=1000"
"GID=1000"
push: true
tags: tattletech/feluda-operator-hash:worker-amd64-latest

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- uses: elgohr/Publish-Docker-Github-Action@main
- name: Build and push arm64
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
with:
username: tattletech
password: ${{ secrets.DOCKER_PASSWORD }}
name: tattletech/feluda-operator-hash
workdir: src/
dockerfile: worker/hash/Dockerfile.hash_worker
tags: worker-amd64-latest
platforms: linux/amd64
context: "{{defaultContext}}:src/"
file: worker/hash/Dockerfile.hash_worker_graviton
platforms: linux/arm64
build-args: |
"UID=1000"
"GID=1000"
push: true
tags: tattletech/feluda-operator-hash:worker-arm64-latest
49 changes: 36 additions & 13 deletions .github/workflows/docker-push-vidvec-benchmark-test.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,65 @@
name: Publish Video Operator to Dockerhub
name: Test Publish Video Operator Benchmark to Dockerhub

permissions:
contents: read

on: workflow_dispatch

jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: main

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0

- name: Cache Docker layers
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Login to Docker Hub
uses: docker/login-action@v3
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v.3.1.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push amd64
uses: docker/build-push-action@v5
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
with:
context: ./src/
context: "{{defaultContext}}:src/"
file: benchmark/vidvec/Dockerfile.vid_vec_rep_resnet
platforms: linux/amd64
build-args: |
"UID=1000"
"GID=1000"
push: true
tags: tattletech/feluda-operator-vidvec:benchmark-amd64-latest-test
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

- name: Build and push arm64
uses: docker/build-push-action@v5
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
with:
context: ./src/
context: "{{defaultContext}}:src/"
file: benchmark/vidvec/Dockerfile.vid_vec_rep_resnet_graviton
platforms: linux/arm64
build-args: |
"UID=1000"
"GID=1000"
push: true
tags: tattletech/feluda-operator-vidvec:benchmark-arm64-latest-test
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
- # Temp fix - only do this after the last docker build step to have cache for all platforms
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
name: Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
74 changes: 33 additions & 41 deletions .github/workflows/docker-push-vidvec-benchmark.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,46 @@
name: Publish Video Operator to Dockerhub

permissions:
contents: read

on: workflow_dispatch

jobs:
api:
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: master
- name: "Setup Node version"
uses: actions/setup-node@v4
with:
node-version: 20.9.0
- name: Declare some variables
id: vars
shell: bash
run: |
echo "setting variables"
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Set up QEMU
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- uses: elgohr/Publish-Docker-Github-Action@main
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0

- name: Login to Docker Hub
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v.3.1.0
with:
username: tattletech
password: ${{ secrets.DOCKER_PASSWORD }}
name: tattletech/feluda-operator-vidvec
workdir: src/
dockerfile: benchmark/vidvec/Dockerfile.vid_vec_rep_resnet
tags: benchmark-amd64-latest
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push amd64
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
with:
context: "{{defaultContext}}:src/"
file: benchmark/vidvec/Dockerfile.vid_vec_rep_resnet
platforms: linux/amd64
- uses: elgohr/Publish-Docker-Github-Action@main
build-args: |
"UID=1000"
"GID=1000"
push: true
tags: tattletech/feluda-operator-vidvec:benchmark-amd64-latest

- name: Build and push arm64
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
with:
username: tattletech
password: ${{ secrets.DOCKER_PASSWORD }}
name: tattletech/feluda-operator-vidvec
workdir: src/
dockerfile: benchmark/vidvec/Dockerfile.vid_vec_rep_resnet_graviton
tags: benchmark-arm64-latest
context: "{{defaultContext}}:src/"
file: benchmark/vidvec/Dockerfile.vid_vec_rep_resnet_graviton
platforms: linux/arm64

# - name: deploy to cluster
# uses: steebchen/[email protected]
# with: # defaults to latest kubectl binary version
# config: ${{ secrets.PROD_KUBE_CONFIG_DATA }}
# command: set image --record deployment/feluda-server feluda-server=tattletech/feluda-server:${{ steps.vars.outputs.sha_short }}
# - name: verify deployment
# uses: steebchen/[email protected]
# with:
# config: ${{ secrets.PROD_KUBE_CONFIG_DATA }}
# version: v1.21.0 # specify kubectl binary version explicitly
# command: rollout status deployment/feluda-server
build-args: |
"UID=1000"
"GID=1000"
push: true
tags: tattletech/feluda-operator-vidvec:benchmark-arm64-latest
Loading
Loading