Skip to content

Commit

Permalink
Merge branch 'main' into dalle
Browse files Browse the repository at this point in the history
  • Loading branch information
ceicke authored Aug 25, 2024
2 parents 0aea5c0 + 4d987f8 commit 8414909
Show file tree
Hide file tree
Showing 205 changed files with 4,313 additions and 1,482 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app/javascript/blocks/services/audio_service.js linguist-generated=false
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: DON'T POST ISSUES. Have a bug, feature idea, or any question? Start a discussion
- name: DON'T POST ISSUES. Have a bug, feature idea, or any question? Open a Discussion
about: Please start Discussions for everything. Project maintainers will create issues.
url: https://github.com/allyourbot/hostedgpt/discussions/new?category=general
6 changes: 4 additions & 2 deletions .github/workflows/rubyonrails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ jobs:
run: bin/rails test

system_tests:
runs-on: ubuntu-latest
if: github.repository == 'AllYourBot/hostedgpt'
runs-on: large-runner
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}-system
cancel-in-progress: true
Expand Down Expand Up @@ -92,8 +93,9 @@ jobs:

- name: Run system tests
run: |
echo -e "###\n###\n###\n### NOTICE: If these tests fail because of Net::ReadTimeout then re-run the test suite. I can't figure out this sporadic failure.\n###\n###\n###"
sed -i 's/hoverOnlyWhenSupported: true/hoverOnlyWhenSupported: false/' config/tailwind.config.js
bin/rails test:system
PARALLEL_WORKERS=2 bin/rails test:system
- name: Upload screenshots
uses: actions/upload-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
/.ruby-version
.issues

# Mac

# Other Mac programs
.DS_Store
.serenade

# JetBrains
/.idea/*
Expand Down
27 changes: 14 additions & 13 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ AllCops:
DisabledByDefault: true
SuggestExtensions: false
Exclude:
- '**/tmp/**/*'
- '**/vendor/**/*'
- '**/node_modules/**/*'
- 'bin/*'
- 'native/**/*'
- "**/tmp/**/*"
- "**/vendor/**/*"
- "**/node_modules/**/*"
- "bin/*"
- "native/**/*"

Performance:
Exclude:
- '**/test/**/*'
- "**/test/**/*"

# Method definitions after `private` or `protected` isolated calls do NOT
# need extra level of indentation.
Expand All @@ -39,7 +39,7 @@ Layout/IndentationWidth:
Enabled: true
Width: 2
Exclude:
- '**/test/**/*'
- "**/test/**/*"

# No spaces at the end of a line
Layout/TrailingWhitespace:
Expand All @@ -54,22 +54,22 @@ Style/SymbolArray:
Enabled: true
EnforcedStyle: brackets
Include:
- 'routes.rb'
- 'app/controllers/**/*'
- "routes.rb"
- "app/controllers/**/*"

# Rules below this line are disabled

# Prefer assert_not over assert !
Rails/AssertNot:
Enabled: false
Include:
- '**/test/**/*'
- "**/test/**/*"

# Prefer assert_not_x over refute_x
Rails/RefuteMethods:
Enabled: false
Include:
- '**/test/**/*'
- "**/test/**/*"

Rails/IndexBy:
Enabled: false
Expand Down Expand Up @@ -246,7 +246,7 @@ Lint/DeprecatedClassMethods:
Style/EvalWithLocation:
Enabled: false
Exclude:
- '**/test/**/*'
- "**/test/**/*"

Style/ParenthesesAroundCondition:
Enabled: false
Expand Down Expand Up @@ -346,7 +346,8 @@ Minitest/UnreachableAssertion:

# Check quotes usage according to lint rule below.
Style/StringLiterals:
Enabled: false
EnforcedStyle: double_quotes
Severity: info

# Files should always have a new line at the end
Layout/TrailingEmptyLines:
Expand Down
13 changes: 8 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ gem "pg", "~> 1.1"
gem "puma", ">= 5.0"
gem "importmap-rails" # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
gem "turbo-rails", "~> 2.0.5"
gem "stimulus-rails"
gem "tailwindcss-rails", "~> 2.6.0"
gem "stimulus-rails", "~> 1.3.3"
gem "tailwindcss-rails", "~> 2.7.2"
gem "rack-cors"

# Build JSON APIs with ease [https://github.com/rails/jbuilder]
Expand All @@ -35,7 +35,7 @@ gem "bootsnap", require: false
gem "redcarpet", "~> 3.6.0"

# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
gem "image_processing", "~> 1.2"
gem "image_processing", "~> 1.13.0"
gem "amatch", "~> 0.4.1" # enables fuzzy comparison of strings, a tool uses this
gem "rails_heroicon", "~> 2.2.0"
gem "ruby-openai", "~> 7.0.1"
Expand All @@ -44,6 +44,8 @@ gem "tiktoken_ruby", "~> 0.0.6"
gem "solid_queue", "~> 0.2.1"
gem "name_of_person"
gem "actioncable-enhanced-postgresql-adapter" # longer paylaods w/ postgresql actioncable
gem "aws-sdk-s3", require: false
gem "postmark-rails"

gem "omniauth", "~> 2.1"
gem "omniauth-google-oauth2", "~> 1.1"
Expand Down Expand Up @@ -78,6 +80,7 @@ end
group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
gem "capybara"
gem "selenium-webdriver"
gem "selenium-webdriver", "~> 4.23.0"
gem "minitest-stub_any_instance"
end
gem "rails-controller-testing"
end
63 changes: 48 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,22 @@ GEM
faraday (>= 1)
faraday-multipart (>= 1)
ast (2.4.2)
aws-eventstream (1.3.0)
aws-partitions (1.956.0)
aws-sdk-core (3.201.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.156.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
bcrypt (3.1.20)
bigdecimal (3.1.7)
Expand Down Expand Up @@ -125,13 +141,13 @@ GEM
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (3.0.2)
ffi (1.16.3)
ffi (1.17.0)
globalid (1.2.1)
activesupport (>= 6.1)
hashie (5.0.0)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
image_processing (1.12.2)
image_processing (1.13.0)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
importmap-rails (1.2.3)
Expand All @@ -142,11 +158,13 @@ GEM
irb (1.12.0)
rdoc
reline (>= 0.4.2)
jmespath (1.6.2)
json (2.7.1)
jwt (2.8.1)
base64
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
logger (1.6.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -158,7 +176,7 @@ GEM
marcel (1.0.4)
matrix (0.4.2)
method_source (1.0.0)
mini_magick (4.12.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
minitest (5.22.3)
minitest-stub_any_instance (1.0.3)
Expand Down Expand Up @@ -216,6 +234,11 @@ GEM
ast (~> 2.4.1)
racc
pg (1.5.6)
postmark (1.25.1)
json
postmark-rails (0.22.1)
actionmailer (>= 3.0.0)
postmark (>= 1.21.3, < 2.0)
prism (0.19.0)
protocol (2.0.0)
ruby_parser (~> 3.0)
Expand Down Expand Up @@ -257,6 +280,10 @@ GEM
activesupport (= 7.1.3.2)
bundler (>= 1.15.0)
railties (= 7.1.3.2)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand Down Expand Up @@ -323,14 +350,17 @@ GEM
faraday (>= 1)
faraday-multipart (>= 1)
ruby-progressbar (1.13.0)
ruby-vips (2.2.0)
ruby-vips (2.2.2)
ffi (~> 1.12)
logger
ruby2_keywords (0.0.5)
ruby_parser (3.21.0)
racc (~> 1.5)
sexp_processor (~> 4.16)
rubyzip (2.3.2)
selenium-webdriver (4.15.0)
selenium-webdriver (4.23.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -360,17 +390,17 @@ GEM
standard-performance (1.2.1)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.1)
stimulus-rails (1.3.0)
stimulus-rails (1.3.3)
railties (>= 6.0.0)
stringio (3.1.0)
sync (0.5.0)
tailwindcss-rails (2.6.0-aarch64-linux)
tailwindcss-rails (2.7.2-aarch64-linux)
railties (>= 7.0.0)
tailwindcss-rails (2.6.0-arm64-darwin)
tailwindcss-rails (2.7.2-arm64-darwin)
railties (>= 7.0.0)
tailwindcss-rails (2.6.0-x86_64-darwin)
tailwindcss-rails (2.7.2-x86_64-darwin)
railties (>= 7.0.0)
tailwindcss-rails (2.6.0-x86_64-linux)
tailwindcss-rails (2.7.2-x86_64-linux)
railties (>= 7.0.0)
thor (1.3.1)
tiktoken_ruby (0.0.6-aarch64-linux)
Expand All @@ -396,7 +426,7 @@ GEM
bindex (>= 0.4.0)
railties (>= 6.0.0)
webrick (1.8.1)
websocket (1.2.10)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -416,24 +446,27 @@ DEPENDENCIES
actioncable-enhanced-postgresql-adapter
amatch (~> 0.4.1)
anthropic (~> 0.1.0)
aws-sdk-s3
bcrypt (~> 3.1.7)
bootsnap
byebug
capybara
debug
dockerfile-rails (>= 1.6)
image_processing (~> 1.2)
image_processing (~> 1.13.0)
importmap-rails
minitest-stub_any_instance
name_of_person
omniauth (~> 2.1)
omniauth-google-oauth2 (~> 1.1)
omniauth-rails_csrf_protection (~> 1.0.2)
pg (~> 1.1)
postmark-rails
pry-rails
puma (>= 5.0)
rack-cors
rails (~> 7.1.3)
rails-controller-testing
rails_heroicon (~> 2.2.0)
redcarpet (~> 3.6.0)
redis (>= 4.0.1)
Expand All @@ -442,12 +475,12 @@ DEPENDENCIES
rubocop-rails
ruby-lsp
ruby-openai (~> 7.0.1)
selenium-webdriver
selenium-webdriver (~> 4.23.0)
solid_queue (~> 0.2.1)
sprockets-rails
standard
stimulus-rails
tailwindcss-rails (~> 2.6.0)
stimulus-rails (~> 1.3.3)
tailwindcss-rails (~> 2.7.2)
tiktoken_ruby (~> 0.0.6)
timecop
turbo-rails (~> 2.0.5)
Expand Down
Loading

0 comments on commit 8414909

Please sign in to comment.