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

Pro beta #32

Merged
merged 220 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
220 commits
Select commit Hold shift + click to select a range
c846f60
first push
neonwatty Oct 21, 2024
5170c64
first push
neonwatty Oct 21, 2024
2603cef
setting up
neonwatty Oct 21, 2024
9925cda
dev and test dbs setup, migrations instantiated
neonwatty Oct 21, 2024
d46739a
migrations update
neonwatty Oct 21, 2024
3ebb1db
migrations update
neonwatty Oct 21, 2024
0cba9d3
models instantiated, scopes next, then controllers
neonwatty Oct 22, 2024
daeaf31
cleaning up models, added image_paths
neonwatty Oct 22, 2024
6e050f8
controllers and views init
neonwatty Oct 22, 2024
a2c0a79
button styling and navbar added
neonwatty Oct 22, 2024
3a0ec4f
updating image path
neonwatty Oct 22, 2024
e7f7e3c
paths model updates
neonwatty Oct 22, 2024
729197e
paths model updates
neonwatty Oct 22, 2024
773e4d4
paths model updates
neonwatty Oct 22, 2024
c66c306
notifications fixed
neonwatty Oct 22, 2024
da96029
notifications fixed
neonwatty Oct 22, 2024
26dfcd5
paths controller cleanup, pagy added
neonwatty Oct 23, 2024
a037dec
image_core controller added
neonwatty Oct 23, 2024
0053c11
image data routing updated
neonwatty Oct 23, 2024
e243318
image paths model linked to public
neonwatty Oct 23, 2024
6074fbd
image paths model linked to public
neonwatty Oct 23, 2024
9c919ab
basic styling for image data
neonwatty Oct 23, 2024
16c7561
new removed from image_core
neonwatty Oct 23, 2024
d9465f3
styling update
neonwatty Oct 23, 2024
9c0b8e3
styling update
neonwatty Oct 23, 2024
3e8c4d1
styling update
neonwatty Oct 23, 2024
2e6f04d
styling update
neonwatty Oct 23, 2024
4daa82f
manual image description update added
neonwatty Oct 23, 2024
adbd0fa
working on tag name views
neonwatty Oct 23, 2024
8c24aad
working on tag name views
neonwatty Oct 23, 2024
cac6439
working on tag name views
neonwatty Oct 23, 2024
b8fdfcf
working on tag name views
neonwatty Oct 23, 2024
89e1eca
working on image tags
neonwatty Oct 23, 2024
cdcb28a
working on image tags
neonwatty Oct 24, 2024
cf23cd5
working on nested tags build
neonwatty Oct 24, 2024
3a49f67
working on nested tags build
neonwatty Oct 24, 2024
cf4ff8e
working on nested tags build
neonwatty Oct 24, 2024
b6b5131
working on nested tags build
neonwatty Oct 24, 2024
af1ba3d
working on nested tags build
neonwatty Oct 24, 2024
7e7db37
working on nested tags build
neonwatty Oct 24, 2024
d916438
working on nested tags build
neonwatty Oct 24, 2024
6c23e97
starter styling for tags and cards
neonwatty Oct 24, 2024
fc12c33
style update
neonwatty Oct 24, 2024
458aa62
keyword search
neonwatty Oct 24, 2024
f9d65ce
keyword search
neonwatty Oct 24, 2024
9dc34c4
keyword search
neonwatty Oct 24, 2024
f22eac9
keyword search
neonwatty Oct 24, 2024
5c18c90
keyword search
neonwatty Oct 24, 2024
787ba29
re-doing multi-select
neonwatty Oct 25, 2024
ee318c3
updating tag selector
neonwatty Oct 25, 2024
8ed9a36
updating tag selector
neonwatty Oct 25, 2024
314f68b
updating tag selector
neonwatty Oct 26, 2024
5cd4b86
working on tag names for search
neonwatty Oct 26, 2024
e17e7d0
working on tag names for search
neonwatty Oct 26, 2024
f1590f1
setting up tag filtered search
neonwatty Oct 26, 2024
1e7cd74
setting up tag filtered search
neonwatty Oct 26, 2024
106c62b
tag filter for all images added
neonwatty Oct 26, 2024
cd96abc
tag filter for all images added
neonwatty Oct 26, 2024
750b127
scope update
neonwatty Oct 26, 2024
a3c92b5
description embedding
neonwatty Oct 26, 2024
e75fbf8
description embedding
neonwatty Oct 26, 2024
09ec54e
description embedding
neonwatty Oct 26, 2024
6864507
description embedding
neonwatty Oct 26, 2024
b86cca7
description embedding
neonwatty Oct 26, 2024
fdc7115
description embedding
neonwatty Oct 26, 2024
ec4a1be
description embedding
neonwatty Oct 26, 2024
165e195
description embedding
neonwatty Oct 26, 2024
8dbcf23
description embedding
neonwatty Oct 26, 2024
cb01dd7
scaffolding added for image to text processing
neonwatty Oct 27, 2024
43d43e1
sqlite version added
neonwatty Oct 27, 2024
8167adf
search tag toggle switched to true
neonwatty Oct 27, 2024
ed172e5
sinatra test server added, dockerfile update for image to text server
neonwatty Oct 27, 2024
1691385
cleanup
neonwatty Oct 27, 2024
a474965
cleanup
neonwatty Oct 27, 2024
07a47ec
cleanup
neonwatty Oct 28, 2024
3b48383
cleanup
neonwatty Oct 28, 2024
6378a75
cleanup
neonwatty Oct 28, 2024
758ae60
remove solargraph, added status to image_core
neonwatty Oct 28, 2024
47a3603
remove solargraph, added status to image_core
neonwatty Oct 28, 2024
12d159f
remove solargraph, added status to image_core
neonwatty Oct 28, 2024
c7186a9
text gen server update
neonwatty Oct 28, 2024
5111755
working on ruby docker connection
neonwatty Oct 28, 2024
c532bb4
nil tag update, working on description update
neonwatty Oct 28, 2024
509ff6b
bug fixing
neonwatty Oct 28, 2024
064396c
tag edit fix
neonwatty Oct 29, 2024
2dd828c
updating image description generator
neonwatty Oct 29, 2024
7d9f298
switching json for sqlite
neonwatty Oct 29, 2024
5733c76
ready for text to image
neonwatty Oct 29, 2024
4a4dbc2
ready for text to image
neonwatty Oct 29, 2024
dca0242
ready for text to image
neonwatty Oct 29, 2024
7146039
image to text gen model update
neonwatty Oct 29, 2024
a82338d
compose update
neonwatty Oct 29, 2024
c296f99
image to text operational
neonwatty Oct 29, 2024
ca83306
cleanup
neonwatty Oct 29, 2024
ec520d4
adding convenience apis on text to image
neonwatty Oct 29, 2024
2f71599
working on view status
neonwatty Oct 29, 2024
00fb90c
tags added
neonwatty Oct 29, 2024
3a5c6ff
tags added
neonwatty Oct 29, 2024
f8ba59a
cleanup
neonwatty Oct 29, 2024
49cf8ac
cleanup
neonwatty Oct 29, 2024
43a1a65
status made partial
neonwatty Oct 29, 2024
a7fe502
layering in action cable
neonwatty Oct 30, 2024
9ba11c9
action cable for status added
neonwatty Oct 30, 2024
700e05e
adding channel for description gen
neonwatty Oct 30, 2024
f5c096f
adding channel for description gen - cleanup
neonwatty Oct 30, 2024
8deb9e3
cleanup
neonwatty Oct 30, 2024
383bd82
cleanup
neonwatty Oct 30, 2024
6e08f99
cleanup
neonwatty Oct 30, 2024
b7415d9
adding path filter
neonwatty Oct 30, 2024
d36f54a
path filter added
neonwatty Oct 30, 2024
3038691
cleanup
neonwatty Oct 30, 2024
1f5eea2
cleanup
neonwatty Oct 30, 2024
2a8fc75
new icons
neonwatty Oct 30, 2024
a19c2b5
cleanup
neonwatty Oct 30, 2024
8f801da
cleanup
neonwatty Oct 30, 2024
2626221
cleanup
neonwatty Oct 30, 2024
ca1ca96
cleanup
neonwatty Oct 30, 2024
77215ef
cleanup
neonwatty Oct 30, 2024
9d534c5
cleanup
neonwatty Oct 30, 2024
664fecf
cleanup
neonwatty Oct 30, 2024
7c52f53
cleanup
neonwatty Oct 31, 2024
6603d01
cleanup
neonwatty Oct 31, 2024
8493751
routes cleanup
neonwatty Oct 31, 2024
16e6a78
settings route added
neonwatty Oct 31, 2024
259b6c5
updating tag_name paths
neonwatty Oct 31, 2024
e4cb618
updating tag_name paths
neonwatty Oct 31, 2024
9ff772d
updating image_path paths
neonwatty Oct 31, 2024
a9a8340
cleanup
neonwatty Oct 31, 2024
be7d380
cleanup
neonwatty Oct 31, 2024
f5a926e
cleanup
neonwatty Oct 31, 2024
0bfa9b6
cleanup
neonwatty Oct 31, 2024
f5d83a9
cleanup
neonwatty Oct 31, 2024
9235052
edit screen style update
neonwatty Oct 31, 2024
31a7318
alert notice style update
neonwatty Oct 31, 2024
08b3027
adding compose for entire stack
neonwatty Oct 31, 2024
8486e9d
adding compose for entire stack
neonwatty Nov 1, 2024
9685e58
cleanup
neonwatty Nov 1, 2024
1715fb4
cleanup
neonwatty Nov 1, 2024
25a1cf9
cleanup
neonwatty Nov 1, 2024
c3ef8f6
cleanup
neonwatty Nov 1, 2024
40df95c
cleanup
neonwatty Nov 1, 2024
3553ebb
linting
neonwatty Nov 2, 2024
2f8ec44
seed update
neonwatty Nov 2, 2024
5e1d7f0
working on remove_job
neonwatty Nov 2, 2024
53f9faa
working on remove_job
neonwatty Nov 3, 2024
30c8c1e
working on remove_job
neonwatty Nov 3, 2024
c306367
remove manual test pass
neonwatty Nov 4, 2024
9f16f00
prepping integration tests
neonwatty Nov 4, 2024
25c291a
typo
neonwatty Nov 4, 2024
5b5f1b4
cleanup
neonwatty Nov 4, 2024
9c95e2e
fixtures
neonwatty Nov 4, 2024
e1f5a73
fixtures
neonwatty Nov 4, 2024
ef6a596
integration tests
neonwatty Nov 4, 2024
b229cb4
integration tests
neonwatty Nov 4, 2024
29ce786
integration tests
neonwatty Nov 4, 2024
1418a94
system tests
neonwatty Nov 5, 2024
dec4a91
system tests
neonwatty Nov 5, 2024
60b9a42
system tests
neonwatty Nov 5, 2024
20d6e18
system tests
neonwatty Nov 5, 2024
a3fdd7b
system tests
neonwatty Nov 5, 2024
61c44ac
system tests
neonwatty Nov 5, 2024
37e0cbe
system tests
neonwatty Nov 5, 2024
c92f5eb
system tests
neonwatty Nov 5, 2024
52acf4b
system tests
neonwatty Nov 5, 2024
8ac9bce
system tests
neonwatty Nov 5, 2024
b0e4435
system tests
neonwatty Nov 5, 2024
dc28f3b
system tests
neonwatty Nov 5, 2024
533db2b
system tests
neonwatty Nov 5, 2024
53114d8
system tests
neonwatty Nov 5, 2024
e73d96c
system tests
neonwatty Nov 5, 2024
9e20cb6
system tests
neonwatty Nov 5, 2024
66ed935
system tests
neonwatty Nov 5, 2024
50bb52b
system tests
neonwatty Nov 5, 2024
646f06d
system tests
neonwatty Nov 5, 2024
a525da9
system tests
neonwatty Nov 5, 2024
9b1cb06
system tests
neonwatty Nov 5, 2024
5b2d851
system tests
neonwatty Nov 5, 2024
5c02b19
system tests
neonwatty Nov 6, 2024
26a6ad3
filters update
neonwatty Nov 6, 2024
50b9f98
filters update
neonwatty Nov 6, 2024
e973f2f
filters update
neonwatty Nov 6, 2024
927a0ca
filters update
neonwatty Nov 6, 2024
0df9a18
filters update
neonwatty Nov 6, 2024
47c5ecb
filter fix
neonwatty Nov 6, 2024
e675058
system tests
neonwatty Nov 6, 2024
c0c02c7
system tests
neonwatty Nov 6, 2024
289c98d
system tests
neonwatty Nov 6, 2024
aa7f2e5
system tests
neonwatty Nov 6, 2024
c3e8e07
system tests
neonwatty Nov 6, 2024
e915e47
system tests
neonwatty Nov 6, 2024
a4887a3
cleanup
neonwatty Nov 7, 2024
dfd51f3
cleanup
neonwatty Nov 7, 2024
ef84713
cleanup
neonwatty Nov 7, 2024
70ffaa5
cleanup
neonwatty Nov 7, 2024
c39bc24
cleanup
neonwatty Nov 7, 2024
498427a
cleanup
neonwatty Nov 7, 2024
3f5199f
reorg
neonwatty Nov 7, 2024
8682f71
merging
neonwatty Nov 7, 2024
b9a6ba3
cleanup
neonwatty Nov 7, 2024
20e7ef2
pro local clear
neonwatty Nov 7, 2024
da48ce2
workflow update
neonwatty Nov 7, 2024
5ffc55b
readme
neonwatty Nov 7, 2024
5730243
readme
neonwatty Nov 7, 2024
04b4dd6
renaming
neonwatty Nov 7, 2024
51c9442
workflow update
neonwatty Nov 7, 2024
d5a690a
readme update
neonwatty Nov 7, 2024
0b9ca75
workflow update
neonwatty Nov 7, 2024
db1cd96
commenting out pro build workflow for now
neonwatty Nov 8, 2024
a3fac15
cleanup
neonwatty Nov 8, 2024
9468e1a
changelog
neonwatty Nov 8, 2024
e3e9167
readme update
neonwatty Nov 8, 2024
e4ceb89
readme
neonwatty Nov 8, 2024
1fcdc66
readme
neonwatty Nov 8, 2024
6d7f2d4
readme
neonwatty Nov 8, 2024
ccfa7b6
readme
neonwatty Nov 8, 2024
49a6bbc
readme
neonwatty Nov 8, 2024
a3e3c12
readme
neonwatty Nov 8, 2024
da12050
readme
neonwatty Nov 8, 2024
dc19d7e
workflow updates
neonwatty Nov 8, 2024
31f471b
cleanup
neonwatty Nov 8, 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
46 changes: 46 additions & 0 deletions .github/workflows/pro-app-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# name: "pro app build"
# on:
# workflow_dispatch:
# pull_request:
# push:
# branches: ["main"]
# paths:
# - "meme_search_pro/meme_search_app/**"

# jobs:
# Build_And_Push_App:
# runs-on: ubuntu-22.04
# permissions:
# contents: read
# packages: write

# steps:
# - name: Set up QEMU
# uses: docker/setup-qemu-action@v3

# - name: Set Buildx
# uses: docker/setup-buildx-action@v3

# - name: Log in to Github Docker Image Registry
# uses: docker/login-action@v3
# with:
# registry: ghcr.io
# username: neonwatty
# password: ${{ secrets.TOKEN_GITHUB }}

# - name: Print current working directory
# run: pwd # Prints the current working directory

# - name: Print root directory contents
# run: ls -l .

# - name: Print app directory contents
# run: ls -l ./meme_search

# - name: Build and Upload for AMD64 and ARM64
# uses: docker/build-push-action@v6
# with:
# context: ./meme_search_pro/meme_search_app
# platforms: linux/amd64,linux/arm64
# push: true
# tags: ghcr.io/neonwatty/meme_search_pro:latest
121 changes: 121 additions & 0 deletions .github/workflows/pro-app-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
name: rails tests for meme search pro app

on:
workflow_dispatch:
pull_request:
branches: ["main"]
paths:
- "meme_search_pro/meme_search_app/**"

jobs:
scan_ruby:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: .ruby-version
bundler-cache: false
working-directory: ./meme_search_pro/meme_search_app

- name: Install dependencies
run: gem install bundler && bundle install
working-directory: ./meme_search_pro/meme_search_app

- name: Scan for common Rails security vulnerabilities using static analysis
run: bin/brakeman -w3 --no-pager
working-directory: ./meme_search_pro/meme_search_app

scan_js:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: .ruby-version
bundler-cache: false
working-directory: ./meme_search_pro/meme_search_app

- name: Install dependencies
run: gem install bundler && bundle install
working-directory: ./meme_search_pro/meme_search_app

- name: Scan for security vulnerabilities in JavaScript dependencies
working-directory: ./meme_search_pro/meme_search_app
run: gem uninstall error_highlight -v 0.3.0 && bin/importmap audit

lint:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: .ruby-version
bundler-cache: false
working-directory: ./meme_search_pro/meme_search_app

- name: Install dependencies
run: gem install bundler && bundle install
working-directory: ./meme_search_pro/meme_search_app

- name: Lint code for consistent style
run: gem uninstall error_highlight -v 0.3.0 && bin/rubocop -f github
working-directory: ./meme_search_pro/meme_search_app

test:
runs-on: ubuntu-latest

services:
meme-search-db:
image: pgvector/pgvector:pg17
env:
POSTGRES_DB: meme_search
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
ports:
- 5432:5432
options: --health-cmd="pg_isready -U postgres" --health-interval=10s --health-timeout=5s --health-retries=3

steps:
- name: Install packages
run: sudo apt-get update && sudo apt-get install --no-install-recommends -y google-chrome-stable curl libjemalloc2 libvips postgresql-client

- name: Checkout code
uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: .ruby-version
bundler-cache: false
working-directory: ./meme_search_pro/meme_search_app

- name: Install dependencies
run: gem install bundler && bundle install
working-directory: ./meme_search_pro/meme_search_app

- name: Run tests
working-directory: ./meme_search_pro/meme_search_app
env:
RAILS_ENV: test
DATABASE_URL: postgres://postgres:postgres@localhost:5432
run: bin/rails db:test:prepare test test:system

- name: Keep screenshots from failed system tests
uses: actions/upload-artifact@v4
if: failure()
with:
name: screenshots
path: ${{ github.workspace }}/tmp/screenshots
if-no-files-found: ignore
47 changes: 0 additions & 47 deletions .github/workflows/python-app.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: 'DockerBuild'
name: "DockerBuild"

on:
push:
tags:
- 'v*'

workflow_dispatch:
# push:
# tags:
# - "v*"

jobs:
Build_And_Push:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -49,8 +50,8 @@ jobs:
- name: Build and Upload for AMD64 and ARM64
uses: docker/build-push-action@v4
with:
context: .
context: ./meme_search/
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
labels: ${{ steps.meta.outputs.labels }}
57 changes: 57 additions & 0 deletions .github/workflows/standard-app-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: python tests for meme search standard app

on:
workflow_dispatch:
pull_request:
branches: ["main"]
paths:
- "meme_search/meme_search_app/**"

jobs:
ruff:
name: lint with ruff
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.12"

- name: Install Ruff and dependencies
run: |
python -m pip install --upgrade pip
pip install ruff

- name: Run Ruff linting
run: |
ruff format --check --config ./meme_search/.ruff.toml ./meme_search/meme_search_app

test:
name: run pytest
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.10"

- name: Install dependencies
run: |
cd meme_search
python -m pip install --upgrade pip
pip install -r requirements.test
pip install -r requirements.txt

- name: Run pytest
run: |
cd meme_search &&
PYTHONPATH=. python3.10 -m pytest tests/test_app.py
# PYTHONPATH=. python3.10 -m pytest tests/utilities/test_add_remove.py ## requires large runner
Loading
Loading