diff --git a/.gitignore b/.gitignore index bab408d8f..ed9ff7770 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,9 @@ /.tool-versions /node_modules +# Docker Compose override file +*compose.override.y*ml + # Ignore all environment files (except templates). /.env* !/.env*.erb diff --git a/.rubocop.yml b/.rubocop.yml index 6fad3fd68..c60afbe88 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -9,7 +9,7 @@ require: - rubocop-performance AllCops: - TargetRubyVersion: 3.0 + TargetRubyVersion: 3.3 # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop # to ignore them, so only the ones explicitly set in this file are enabled. DisabledByDefault: true diff --git a/.ruby-version b/.ruby-version index fa7adc7ac..9c25013db 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.5 +3.3.6 diff --git a/.tool-versions b/.tool-versions index 1dd199803..5aa8e0c30 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.3.5 +ruby 3.3.6 diff --git a/Dockerfile b/Dockerfile index 8a3c68ba2..93ec35227 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ### START of FLY #### # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.3.5 +ARG RUBY_VERSION=3.3.6 FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-jemalloc-slim as base-for-fly LABEL fly_launch_runtime="rails" @@ -53,7 +53,7 @@ RUN bundle exec bootsnap precompile app/ lib/ RUN grep -l '#!/usr/bin/env ruby' /rails/bin/* | xargs sed -i '/^#!/aDir.chdir File.expand_path("..", __dir__)' # Precompiling assets for production without requiring secret RAILS_MASTER_KEY -RUN SECRET_KEY_BASE_DUMMY=1 VALIDATE_ENV_VARS=0 ./bin/rails assets:precompile +RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile # Final stage for app image @@ -89,7 +89,8 @@ EXPOSE 3000 #### START of DEV #### # RUBY_VERSION is the only thing used from anything above -FROM ruby:${RUBY_VERSION}-alpine AS development +FROM ruby:${RUBY_VERSION}-alpine@sha256:caeab43b356463e63f87af54a03de1ae4687b36da708e6d37025c557ade450f8 AS development +# TODO: When we bump to a new version of ruby we'll ahve to unpin from this specific sha RUN apk add --no-cache bash git build-base postgresql-dev curl-dev gcompat tzdata vips-dev imagemagick @@ -134,7 +135,7 @@ COPY . . # Precompiling assets for production without requiring secret RAILS_MASTER_KEY RUN bundle exec bootsnap precompile --gemfile app/ lib/ -RUN SECRET_KEY_BASE_DUMMY=1 VALIDATE_ENV_VARS=0 ./bin/rails assets:precompile +RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile RUN mkdir -p log tmp bin diff --git a/Gemfile b/Gemfile index 7879c5ded..6bbf7418a 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,6 @@ gem "turbo-rails", "~> 2.0.5" gem "stimulus-rails", "~> 1.3.3" gem "tailwindcss-rails", "~> 2.7.2" gem "rack-cors" -gem "ostruct" # Build JSON APIs with ease [https://github.com/rails/jbuilder] # gem "jbuilder" @@ -42,6 +41,7 @@ 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" gem "anthropic", "~> 0.1.0" # TODO update to the latest version +gem "gemini-ai", "~> 4.2.0" gem "tiktoken_ruby", "~> 0.0.9" gem "solid_queue", "~> 1.0.0" gem "name_of_person" @@ -52,6 +52,7 @@ gem "ostruct" gem "omniauth", "~> 2.1" gem "omniauth-google-oauth2", "~> 1.1" +gem "omniauth-microsoft_graph", "~> 2.0" gem "omniauth-rails_csrf_protection", "~> 1.0.2" group :development, :test do @@ -86,4 +87,6 @@ group :test do gem "selenium-webdriver" gem "minitest-stub_any_instance" gem "rails-controller-testing" + gem "minitest-retry" + gem "webmock" end diff --git a/Gemfile.lock b/Gemfile.lock index 83d95e829..42848495a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,6 +122,9 @@ GEM coderay (1.1.3) concurrent-ruby (1.3.4) connection_pool (2.4.1) + crack (1.0.0) + bigdecimal + rexml crass (1.0.6) date (3.3.4) debug (1.8.0) @@ -133,20 +136,41 @@ GEM erubi (1.13.0) et-orbi (1.2.11) tzinfo + ethon (0.16.0) + ffi (>= 1.15.0) event_stream_parser (1.0.0) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) + faraday (2.12.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger faraday-multipart (1.0.4) multipart-post (~> 2) faraday-net_http (3.0.2) + faraday-typhoeus (1.1.0) + faraday (~> 2.0) + typhoeus (~> 1.4) ffi (1.15.5) fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) + gemini-ai (4.2.0) + event_stream_parser (~> 1.0) + faraday (~> 2.10) + faraday-typhoeus (~> 1.1) + googleauth (~> 1.8) + typhoeus (~> 1.4, >= 1.4.1) globalid (1.2.1) activesupport (>= 6.1) + google-cloud-env (2.2.1) + faraday (>= 1.0, < 3.a) + googleauth (1.11.2) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + hashdiff (1.1.2) hashie (5.0.0) i18n (1.14.6) concurrent-ruby (~> 1.0) @@ -182,10 +206,13 @@ GEM mini_magick (4.13.2) mini_mime (1.1.5) minitest (5.25.1) + minitest-retry (0.2.3) + minitest (>= 5.0) minitest-stub_any_instance (1.0.3) mize (0.4.1) protocol (~> 2.0) msgpack (1.7.2) + multi_json (1.15.0) multi_xml (0.7.1) bigdecimal (~> 3.1) multipart-post (2.3.0) @@ -201,6 +228,12 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) + nokogiri (1.16.7-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-darwin) + racc (~> 1.4) nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) oauth2 (2.0.9) @@ -219,12 +252,17 @@ GEM oauth2 (~> 2.0) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) + omniauth-microsoft_graph (2.0.1) + jwt (~> 2.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8.0) omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) omniauth (~> 2.0) omniauth-rails_csrf_protection (1.0.2) actionpack (>= 4.2) omniauth (~> 2.0) + os (1.1.4) ostruct (0.6.0) parallel (1.24.0) parser (3.2.2.4) @@ -351,7 +389,6 @@ GEM 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) @@ -364,6 +401,11 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) sexp_processor (4.17.1) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) @@ -398,9 +440,18 @@ GEM railties (>= 6.0.0) stringio (3.1.1) sync (0.5.0) + tailwindcss-rails (2.7.2-aarch64-linux) + railties (>= 7.0.0) + tailwindcss-rails (2.7.2-arm64-darwin) + railties (>= 7.0.0) + tailwindcss-rails (2.7.2-x86_64-darwin) + railties (>= 7.0.0) tailwindcss-rails (2.7.2-x86_64-linux) railties (>= 7.0.0) thor (1.3.2) + tiktoken_ruby (0.0.9-aarch64-linux) + tiktoken_ruby (0.0.9-arm64-darwin) + tiktoken_ruby (0.0.9-x86_64-darwin) tiktoken_ruby (0.0.9-x86_64-linux) timecop (0.9.8) timeout (0.4.1) @@ -411,6 +462,8 @@ GEM actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) + typhoeus (1.4.1) + ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -421,6 +474,10 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) + webmock (3.24.0) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.2) websocket (1.2.11) websocket-driver (0.7.6) @@ -431,6 +488,11 @@ GEM zeitwerk (2.7.1) PLATFORMS + aarch64-linux-musl + arm64-darwin-23 + arm64-darwin-24 + x86_64-darwin-22 + x86_64-darwin-23 x86_64-linux DEPENDENCIES @@ -445,12 +507,15 @@ DEPENDENCIES debug dockerfile-rails (>= 1.6) ffi (~> 1.15.5) + gemini-ai (~> 4.2.0) image_processing (~> 1.13.0) importmap-rails + minitest-retry minitest-stub_any_instance name_of_person omniauth (~> 2.1) omniauth-google-oauth2 (~> 1.1) + omniauth-microsoft_graph (~> 2.0) omniauth-rails_csrf_protection (~> 1.0.2) ostruct pg (~> 1.1) @@ -479,9 +544,10 @@ DEPENDENCIES turbo-rails (~> 2.0.5) tzinfo-data web-console + webmock RUBY VERSION - ruby 3.3.5p100 + ruby 3.3.6p108 BUNDLED WITH - 2.5.1 + 2.5.22 diff --git a/README.md b/README.md index 78c3a5fbc..164d14022 100644 --- a/README.md +++ b/README.md @@ -22,23 +22,23 @@ This project is led by an experienced rails developer, but I'm actively looking - [Top features of HostedGPT](#top-features-of-hostedgpt) - [Watch a short demo](#watch-a-short-demo) -- [Table of Contents](#table-of-contents) - [Deploy the app on Render](#deploy-the-app-on-render) - [Troubleshooting Render](#troubleshooting-render) - [Deploy the app on Fly.io](#deploy-the-app-on-flyio) - [Deploy the app on Heroku](#deploy-the-app-on-heroku) - [Deploy on your own server](#deploy-on-your-own-server) +- [Running locally on your computer](#running-locally-on-your-computer) + - [Alternatively, you can run outside of Docker](#alternatively-you-can-run-outside-of-docker)] - [Configure optional features](#configure-optional-features) - [Give assistant access to your Google apps](#configuring-google-tools) - [Authentication](#authentication) - [Password authentication](#password-authentication) - [Google OAuth authentication](#google-oauth-authentication) + - [Microsoft Graph OAuth authentication](#microsoft-graph-oauth-authentication) - [HTTP header authentication](#http-header-authentication) - [Contribute as a developer](#contribute-as-a-developer) - - [Running locally](#Running-locally) - - [Alternatively, you can skip Docker:](#alternatively-you-can-set-skip-docker) - - [Running tests](#running-tests) -- [Understanding the Docker configuration](#understanding-the-docker-configuration) + - [Running the test suite](#running-the-test-suite) + - [Understanding the Docker configuration](#understanding-the-docker-configuration) - [Changelog](#changelog) ## Deploy the app on Render @@ -81,18 +81,19 @@ If you encountered an error while waiting for the services to be deployed on Ren Deploying to Fly.io is another great option. It's not quite one-click like Render and it's not 100% free. But we've made the configuration really easy for you and the cost should be about $2 per month, and Render costs $7 per month after 90 days of free service so Fly is actually less expensive over the long term. -1. Click Fork > Create New Fork at the top of this repository. Pull your forked repository down to your computer (the usual git clone ...). +1. Click Fork > Create New Fork at the top of this repository. **Pull your forked repository down to your computer (the usual git clone ...)**. +1. Go into the directory you just created with your git clone and run `bundle` 1. Install the Fly command-line tool on Mac with `brew install flyctl` otherwise `curl -L https://fly.io/install.sh | sh` ([view instructions](https://fly.io/docs/hands-on/install-flyctl/)) -1. Think of an internal Fly name for your app, it has to be unique to all of Fly, and then in the root directory of the repository you pulled down, run `fly launch --build-only --copy-config --name=APP_NAME_YOU_CHOSE` +1. Think of an internal Fly name for your app, it has to be unique to all of Fly. You'll use this **APP_NAME** three times in the steps below. First, in the root directory of the repository you pulled down, run `fly launch --build-only --copy-config --name=APP_NAME` - Say "Yes" when it asks if you want to tweak these settings -1. When it opens your browser, change the Database to `Fly Postgres` with a unique name such as `[APP_NAME]-db` and you can set the configuration to `Development`. +1. When it opens your browser, (i) change the Database to `Fly Automated Postgres`, (ii) set the name to be `[APP_NAME]-db`, (iii) and you can set the configuration to `Development`. 1. Click `Confirm Settings` at the bottom of the page and close the browser. -1. The app will do a bunch of build steps and then return to the command line. Scroll through the output and save the Postgres username & password somewhere as you'll never be able to see those again. -1. Next run `bin/rails db:setup_encryption[true]`. This will initialize some private keys for your app and send them to Fly. +1. The app will do a bunch of build steps and then return to the command line. Scroll through the output and **save the Postgres username & password somewhere as you'll never be able to see those again**. +1. Next run `bin/rails db:setup_encryption[true]`. This will initialize some private keys for your app and send them to Fly. (If you get an error you may have forgotten to run `bundle`). 1. Run `fly deploy --ha=false` -1. Assuming you chose `Development` as the DB size in the step above, now you should run `bin/rails db:fly[APP_NAME_FROM_EARLIER,swap,512]` This will increase the swap on your database machine so that it doesn't crash. +1. Assuming you chose `Development` as the DB size in the step above, now you should run `bin/rails db:fly[APP_NAME,swap,512]` This will increase the swap on your database machine so that it doesn't crash since the Development database has less ram. You may want to read about [configuring optional features](#configure-optional-features). @@ -152,16 +153,65 @@ If you are running a proxy such as nginx, be aware that the app is running http ``` +## Running locally on your computer + +The easiest way to get up and running is to use the provided Docker compose workflow. The only things you need installed on your computer are Docker and Git. + +1. Make sure you have [Docker Desktop](https://docs.docker.com/desktop/) installed and running +1. Clone your fork `git clone [repository url]` +1. `cd` into your clone +1. Run `docker compose up --build` to start the app +1. Open [http://localhost:3000](http://localhost:3000) and register as a new user +1. Run tests: `docker compose run base rails test` The app has comprehensive test coverage but note that system tests currently do not work in docker. +1. Open the rails console: `docker compose run base rails console` +1. Run a psql console: `docker compose run base psql` +1. If you want a few fake users and a bunch of conversations and other data pre-populated in the database, you can load fixtures into the development database. This can be helpful, for example, if you want to test a migration and save yourself the time manually creating a bunch of data: `docker compose run base rails db:fixtures:load` +1. The project root has an `.editorconfig` file to help eliminate whitespace differences in pull requests. It's nice if you install an extension in your IDE to utilize this (e.g. VS Code has "EditorConfig for VS Code"). + +Every time you pull new changes down, kill docker (if it's running) and re-run: +`docker compose up --build` This will ensure your local app picks up changes to Gemfile, migrations, and docker config. + +If you are doing development see [Running the test suite](#running-the-test-suite). + +If you need to make changes to the Docker configuration, see the [Understanding the Docker configuration](#understanding-the-docker-configuration). + +If you want to run your LLM locally so the app has no online dependencies, see [Running an LLM on your computer](https://github.com/AllYourBot/hostedgpt/discussions/471). + +### Alternatively, you can run outside of Docker + +HostedGPT requires these services to be running: + +- Postgres (`brew install postgresql@16` or other [install instructions](https://www.postgresql.org/download/)) +- rbenv ([installation instructions](https://github.com/rbenv/rbenv)) +- ImageMagick (`brew install imagemagick` should work on Mac ) + +1. `cd` into your local repository clone +1. `rbenv install` to install the correct ruby version (it reads the .ruby-version in the repo) +1. Do NOT run db:setup as it will not configure encryption properly. Proceed to the next step and it will automatically configure the database. +1. `bin/dev` starts up all the services, installs gems, and handles db. The app will automatically configure a database, but check [Configure optional features](#configure-optional-features) if you need to change the default configuration. +1. Open [http://localhost:3000](http://localhost:3000) and register as a new user. +1. `bin/rails test` and `bin/rails test:system` to run the comprehensive tests +1. The project root has an `.editorconfig` file to help eliminate whitespace differences in pull requests. It's nice if you install an extension in your IDE to utilize this (e.g. VS Code has "EditorConfig for VS Code"). +1. If you want a few fake users and a bunch of conversations and other data pre-populated in the database, you can load fixtures into the development database. This can be helpful, for example, if you want to test a migration and save yourself the time manually creating a bunch of data: `bin/rails db:fixtures:load` + +Every time you pull new changes down, kill `bin/dev` and then re-run it. This will ensure your local app picks up changes to Gemfile and migrations. + +If you are doing development see [Running the test suite](#running-the-test-suite). + +If you want to run your LLM locally so the app has no online dependencies, see [Running an LLM on your computer](https://github.com/AllYourBot/hostedgpt/discussions/471). + ## Configure optional features There are a number of optional feature flags that can be set and settings that can be configured. All of these can be seen in the file `options.yml`, however each is explained below and can be activated by setting environment variables. - `PRODUCTION_HOST` is blank but you should ideally set this if you are deploying the app with a public domain to protect against host header attacks. For example, set it to `example.com` (leave off https). You may add multiple host names separated by comma, `example.fly.dev, example.com` (whitespace is ignored). +- Database defaults can be changed with `HOSTED_DB_USERNAME`, `HOSTED_DB_PASSWORD`, `HOSTED_DB_HOST`, `HOSTED_DB_PORT`, and `HOSTED_DB_NAME` (note: _development, _test, and/or _production will be appended after DB_NAME based on the environment). - `REGISTRATON_FEATURE` is `true` by default, but you can set to `false` to prevent any new people from creating an account. - `DEFAULT_LLM_KEYS` is `false` by default so each user is expected to add LLM API keys to their user settings. Set this to `true` if you want to configure LLM API keys that will be shared by all users. Set one or more of the additional variables in order to use this feature. The app will still check if the user has added their own API keys for any services and will use those instead of the default ones. - `DEFAULT_OPENAI_KEY` will be used by the pre-configured OpenAI API Service - `DEFAULT_ANTHROPIC_KEY` will be used by the pre-configured Anthropic API Service - `DEFAULT_GROQ_KEY` will be used by the pre-configured Groq API Service +- Edit `models.yml` to modify which Language Models are automatically created for new users upon signing up. Any changes to this file will be applied to existing users when `rails models:import` is run, or when `rails db:prepare` is run, or when the server is restarted. If you ever need to export your list of models you can do `rails models:export[tmp/models.json]` - `CLOUDFLARE_STORAGE_FEATURE` is `false` by default so any files that are uploaded while chatting with your assistant will be stored in postgres. This is recommended for small deployments. Set this to `true` if you would like to store message attachments in Cloudflare's R2 storage (this mimics AWS S3). You must also sign up for Cloudflare. The free tier allows 10 GB of storage. After you sign up, you need to create a new bucket and an API token. The API token should have "Object Read and Write" access to your bucket. Take note of your Access Key ID and your Secret Access Key along with your Account ID. Set the following environment variables: - `CLOUDFLARE_ACCOUNT_ID` - Your Cloudflare Account ID - `CLOUDFLARE_ACCESS_KEY_ID` - Your Cloudflare Access Key ID @@ -195,6 +245,7 @@ HostedGPT supports multiple authentication methods: - [Password authentication](#password-authentication) - [Google OAuth authentication](#google-oauth-authentication) +- [Microsoft Graph OAuth authentication](#microsoft-graph-oauth-authentication) #### Password authentication @@ -209,6 +260,14 @@ To enable Google OAuth authentication, you need to set up Google OAuth in the Go - `GOOGLE_AUTH_CLIENT_ID` - Google OAuth client ID - `GOOGLE_AUTH_CLIENT_SECRET` - Google OAuth client secret +Alternately, add the following to your encrypted credentials file: + +```yaml +google: + auth_client_id: + auth_client_secret: +``` + **Steps to set up:** 1. **Go to the Google Cloud Console and Create a New Project:** @@ -247,6 +306,52 @@ To enable Google OAuth authentication, you need to set up Google OAuth in the Go - `GOOGLE_AUTH_CLIENT_ID`: Your Client ID - `GOOGLE_AUTH_CLIENT_SECRET`: Your Client Secret +#### Microsoft Graph OAuth authentication + +Microsoft Graph OAuth authentication is disabled by default. You can enable it by setting `MICROSOFT_GRAPH_AUTHENTICATION_FEATURE` to `true`. + +To enable Microsoft Graph OAuth authentication, you need to set up Microsoft Graph OAuth in the Microsoft Azure portal. It's a bit involved but we've outlined the steps below. After you follow these steps you will set the following environment variables: + +- `MICROSOFT_GRAPH_AUTH_CLIENT_ID` - Microsoft Graph OAuth client ID +- `MICROSOFT_GRAPH_AUTH_CLIENT_SECRET` - Microsoft Graph OAuth client secret +- `MICROSOFT_GRAPH_SCOPE` - Space separated list of scopes to request. This defaults to `openid profile email offline_access user.read mailboxsettings.read`. + +Alternately, add the following to your encrypted credentials file: + +```yaml +microsoft_graph: + auth_client_id: + auth_client_secret: + scope: openid profile email offline_access user.read mailboxsettings.read +``` + +Users will need to have setup their full name in their Microsoft account before they can use this authentication method, via , otherwise they will see a login/registration error like "First name can't be blank and last name can't be blank". + +Users can remotely remove the connection between their Microsoft account and HostedGPT by going to and clicking "Don't Allow" on the corresponding application. However, this will not sign out the user from HostedGPT until the session expires. + +**Steps to set up:** + +1. **Go to the Microsoft Azure portal and create a new application:** + + - Navigate to [Register an application](https://portal.azure.com/#view/Microsoft_AAD_RegisteredApps/CreateApplicationBlade/quickStartType) + - Give it a name + - Select the Supported account types + - Select the Redirect URI for "Web" (e.g., `https://example.com/auth/microsoft/callback` or `http://localhost:3000/auth/microsoft/callback`) + - Click Register + +2. **Create OAuth Credentials:** + + - The client ID ("Application (client) ID") is displayed on the Overview page + - To generate a client secret, click on "Add a certificate or secret" > "New client secret" + - Give it a name and pick an expiration date + - Back on the "Certificates & secrets" page, the new client secret will be listed under "Value" + +3. **Set Environment Variables:** + - Set the Client ID and Client Secret as environment variables in your application: + - `MICROSOFT_GRAPH_AUTH_CLIENT_ID`: Your Client ID + - `MICROSOFT_GRAPH_AUTH_CLIENT_SECRET`: Your Client Secret + - `MICROSOFT_GRAPH_SCOPE` - Space separated list of scopes to request. This defaults to `openid profile email offline_access user.read mailboxsettings.read`. + #### HTTP header authentication Note: Enabling this automatically disables Password-based and Google-auth based authentication. @@ -274,49 +379,15 @@ HTTP header authentication is an alternative method to authenticate users based We welcome contributors! After you get your development environment setup, review the list of Issues. We organize the issues into Milestones and are currently wrapping up v0.7 and starting 0.8 [View 0.8 Milestone](https://github.com/allyourbot/hostedgpt/milestone/8). Look for any issues tagged with **Good first issue** and add a comment so we know you're working on it. -### Running locally - -The easiest way to get up and running is to use the provided Docker compose workflow. The only things you need installed on your computer are Docker and Git. - -1. Make sure you have [Docker Desktop](https://docs.docker.com/desktop/) installed and running -1. Clone your fork `git clone [repository url]` -1. `cd` into your clone -1. Run `docker compose up --build` to start the app -1. Open [http://localhost:3000](http://localhost:3000) and register as a new user -1. Run tests: `docker compose run base rails test` The app has comprehensive test coverage but note that system tests currently do not work in docker. -1. Open the rails console: `docker compose run base rails console` -1. Run a psql console: `docker compose run base psql` -1. If you want a few fake users and a bunch of conversations and other data pre-populated in the database, you can load fixtures into the development database. This can be helpful, for example, if you want to test a migration and save yourself the time manually creating a bunch of data: `docker compose run base rails db:fixtures:load` -1. The project root has an `.editorconfig` file to help eliminate whitespace differences in pull requests. It's nice if you install an extension in your IDE to utilize this (e.g. VS Code has "EditorConfig for VS Code"). - -Every time you pull new changes down, kill docker (if it's running) and re-run: -`docker compose up --build` This will ensure your local app picks up changes to Gemfile, migrations, and docker config. - -#### Alternatively, you can skip Docker - -HostedGPT requires these services to be running: - -- Postgres ([installation instructions](https://www.postgresql.org/download/)) -- rbenv ([installation instructions](https://github.com/rbenv/rbenv)) -- ImageMagick (`brew install imagemagick` should work on Mac ) - -1. `cd` into your local repository clone -1. `rbenv install` to install the correct ruby version (it reads the .ruby-version in the repo) -1. `bin/dev` starts up all the services, installs gems, and inits database (don't run **db:setup** as it will not configure encryption properly) -1. Open [http://localhost:3000](http://localhost:3000) and register as a new user -1. `bin/rails test` and `bin/rails test:system` to run the comprehensive tests -1. The project root has an `.editorconfig` file to help eliminate whitespace differences in pull requests. It's nice if you install an extension in your IDE to utilize this (e.g. VS Code has "EditorConfig for VS Code"). -1. If you want a few fake users and a bunch of conversations and other data pre-populated in the database, you can load fixtures into the development database. This can be helpful, for example, if you want to test a migration and save yourself the time manually creating a bunch of data: `bin/rails db:fixtures:load` - -Every time you pull new changes down, kill `bin/dev` and then re-run it. This will ensure your local app picks up changes to Gemfile and migrations. +Get your development environment set up by running the Rails app directly on your machine either with Docker or outside of Docker. See [Running locally on your computer](#running-locally-on-your-computer) for more details. -### Running tests +### Running the test suite If you're set up with Docker you run `docker compose run base rails test`. Note that the system tests, which use a headless browser, are not able to run in Docker. They will be run automatically for you if you create a Pull Request against the project. If you set up the app outside of Docker, then run the usual `bin/rails test` and `bin/rails test:system`. -## Understanding the Docker configuration +### Understanding the Docker configuration The `Dockerfile` is set up to support three distinct situations: development, deploying to Render, and deploying to Fly. Each of these are completely separate targets which don't share any steps, they are simply in the same Dockerfile. diff --git a/app/assets/images/google_gemini_logo.svg b/app/assets/images/google_gemini_logo.svg new file mode 100644 index 000000000..787c83710 --- /dev/null +++ b/app/assets/images/google_gemini_logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/controllers/authentications/google_oauth_controller.rb b/app/controllers/authentications/google_oauth_controller.rb index af070aa1e..3d8a83fd3 100644 --- a/app/controllers/authentications/google_oauth_controller.rb +++ b/app/controllers/authentications/google_oauth_controller.rb @@ -97,7 +97,7 @@ def initialize_google_person def add_person_credentials(type) p = Current.person || @person c = p.user.credentials.build( - type: type, + type:, oauth_id: auth[:uid], oauth_email: auth[:info][:email], oauth_token: auth[:credentials][:token], diff --git a/app/controllers/authentications/microsoft_graph_oauth_controller.rb b/app/controllers/authentications/microsoft_graph_oauth_controller.rb new file mode 100644 index 000000000..49cce2d28 --- /dev/null +++ b/app/controllers/authentications/microsoft_graph_oauth_controller.rb @@ -0,0 +1,106 @@ +class Authentications::MicrosoftGraphOauthController < ApplicationController + allow_unauthenticated_access + + # GET /auth/microsoft_graph/callback + def create + if params[:error] + if Current.user + redirect_to(edit_settings_person_path, alert: params[:error_description]) + else + redirect_to(login_path, alert: params[:error_description]) + end + return + end + + if Current.user + Current.user.microsoft_graph_credential&.destroy + _, cred = add_person_credentials("MicrosoftGraphCredential") + cred.save! && redirect_to(edit_settings_person_path, notice: "Saved") && return + + elsif (credential = MicrosoftGraphCredential.find_by(oauth_id: auth[:uid])) + @person = credential.user.person + + elsif Feature.disabled?(:registration) + redirect_to(root_path, alert: "Registration is disabled") && return + + elsif auth_email && (user = Person.find_by(email: auth_email)&.user) + @person = init_for_user(user) + + elsif auth_email && (@person = Person.find_by(email: auth_email)) + @person = init_for_person(@person) + + else + @person = initialize_microsoft_person + end + + if @person&.save + login_as(@person, credential: @person.user.reload.microsoft_graph_credential) + redirect_to root_path + else + @person&.errors&.delete :personable + msg = @person.errors.full_messages.map { |m| m.gsub(/Personable |credentials /, "") }.to_sentence.capitalize + if msg.downcase.include?("oauth refresh token can't be blank") + msg += " " + helpers.link_to("Microsoft third-party connections", "https://account.microsoft.com/privacy/app-access", class: "underline") + " search for website, and delete all it's connections. Then try again." + end + + redirect_to new_user_path, alert: msg + end + rescue => e + warn e.message + warn e.backtrace.join("\n") + redirect_to edit_settings_person_path, alert: "Error. #{e.message}", status: :see_other + end + + private + + def auth + request.env["omniauth.auth"]&.deep_symbolize_keys || {} + end + + def auth_email + auth.dig(:info, :email) + end + + def init_for_user(user) + user.microsoft_graph_credential&.destroy + + user.first_name = auth[:info][:first_name] + user.last_name = auth[:info][:last_name] + @person = user.person + add_person_credentials("MicrosoftGraphCredential").first + end + + def init_for_person(person) + @person.personable_type = "User" + @person.personable_attributes = { + first_name: auth[:info][:first_name], + last_name: auth[:info][:last_name] + } + add_person_credentials("MicrosoftGraphCredential").first + end + + def initialize_microsoft_person + @person = Person.new({ + personable_type: "User", + email: auth_email, + personable_attributes: { + first_name: auth[:info][:first_name], + last_name: auth[:info][:last_name], + } + }) + add_person_credentials("MicrosoftGraphCredential").first + end + + def add_person_credentials(type) + p = Current.person || @person + c = p.user.credentials.build( + type: type, + oauth_id: auth[:uid], + oauth_email: auth[:info][:email], + oauth_token: auth[:credentials][:token], + oauth_refresh_token: auth[:credentials][:refresh_token], + properties: auth[:credentials].except(:token, :refresh_token) + ) + [p, c] + end +end diff --git a/app/controllers/concerns/authenticate/login_logout.rb b/app/controllers/concerns/authenticate/login_logout.rb index 3d54a5366..b589cb3ed 100644 --- a/app/controllers/concerns/authenticate/login_logout.rb +++ b/app/controllers/concerns/authenticate/login_logout.rb @@ -35,6 +35,6 @@ def reset_authentication end def manual_login_allowed? - Feature.password_authentication? || Feature.google_authentication? + Feature.password_authentication? || Feature.google_authentication? || Feature.microsoft_graph_authentication? end end diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb index aeef68680..5c0b3a084 100644 --- a/app/controllers/conversations_controller.rb +++ b/app/controllers/conversations_controller.rb @@ -1,8 +1,12 @@ class ConversationsController < ApplicationController - before_action :set_conversation, only: [:show, :edit, :update, :destroy] - before_action :set_nav_conversations + before_action :set_conversation before_action :set_nav_assistants + def index + @query = params[:query] + @nav_conversations = Conversation.grouped_by_increasing_time_interval_for_user(Current.user, @query) + end + def show end @@ -28,16 +32,12 @@ def destroy private - def set_nav_conversations - @nav_conversations = Conversation.grouped_by_increasing_time_interval_for_user(Current.user) - end - def set_nav_assistants @nav_assistants = Current.user.assistants.ordered end def set_conversation - @conversation = Current.user.conversations.find(params[:id]) + @conversation = Current.user.conversations.find_by(id: params[:id] || params[:conversation_id]) end def conversation_params diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index a88720cbb..8aff33231 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -6,7 +6,6 @@ class MessagesController < ApplicationController before_action :set_conversation, only: [:index] before_action :set_assistant, only: [:index, :new, :edit, :create] before_action :set_message, only: [:show, :edit, :update] - before_action :set_nav_conversations, only: [:index, :new] before_action :set_nav_assistants, only: [:index, :new] before_action :set_conversation_starters, only: [:new] @@ -46,7 +45,6 @@ def create redirect_to conversation_messages_path(@message.conversation, version: @message.version), status: :see_other else # what's the right flow for a failed message create? it's not this, but hacking it so tests pass until we have a plan - set_nav_conversations set_nav_assistants @new_message = @assistant.messages.new @@ -73,7 +71,7 @@ def set_conversation end def set_assistant - @assistant = Current.user.assistants_including_deleted.find_by(id: params[:assistant_id]) + @assistant = Current.user.assistants_including_deleted.find_by(slug: params[:assistant_id]) @assistant ||= @conversation.latest_message_for_version(@version).assistant end @@ -82,10 +80,6 @@ def set_message redirect_to root_url, status: :unauthorized if @message.conversation.user != Current.user end - def set_nav_conversations - @nav_conversations = Conversation.grouped_by_increasing_time_interval_for_user(Current.user) - end - def set_nav_assistants @nav_assistants = Current.user.assistants.ordered end diff --git a/app/controllers/settings/assistants_controller.rb b/app/controllers/settings/assistants_controller.rb index 37ae5317f..c823d79e8 100644 --- a/app/controllers/settings/assistants_controller.rb +++ b/app/controllers/settings/assistants_controller.rb @@ -38,7 +38,7 @@ def destroy private def set_assistant - @assistant = Current.user.assistants.find_by(id: params[:id]) + @assistant = Current.user.assistants.find_by(slug: params[:id]) if @assistant.nil? redirect_to new_settings_assistant_url, notice: "The assistant was deleted", status: :see_other end @@ -49,6 +49,6 @@ def set_last_assistant end def assistant_params - params.require(:assistant).permit(:name, :description, :instructions, :language_model_id) + params.require(:assistant).permit(:name, :slug, :description, :instructions, :language_model_id) end end diff --git a/app/controllers/settings/language_models_controller.rb b/app/controllers/settings/language_models_controller.rb index 5ff7f919d..5c99396f5 100644 --- a/app/controllers/settings/language_models_controller.rb +++ b/app/controllers/settings/language_models_controller.rb @@ -3,7 +3,7 @@ class Settings::LanguageModelsController < Settings::ApplicationController before_action :set_system_language_model, only: [:show] def index - @language_models = LanguageModel.for_user(Current.user).order(updated_at: :desc) + @language_models = LanguageModel.for_user(Current.user).ordered end def edit @@ -53,6 +53,6 @@ def set_system_language_model end def language_model_params - params.require(:language_model).permit(:api_name, :name, :supports_images, :supports_tools, :api_service_id) + params.require(:language_model).permit(:api_name, :name, :best, :supports_images, :supports_tools, :api_service_id, :supports_system_message) end end diff --git a/app/controllers/settings/memories_controller.rb b/app/controllers/settings/memories_controller.rb index cfc0b43f6..951b32474 100644 --- a/app/controllers/settings/memories_controller.rb +++ b/app/controllers/settings/memories_controller.rb @@ -1,10 +1,23 @@ class Settings::MemoriesController < Settings::ApplicationController + before_action :set_memory, only: :destroy + def index @memories = Current.user.memories.includes(:message) end def destroy + @memory.destroy! + redirect_to settings_memories_url, notice: "Forgotten", status: :see_other + end + + def destroy_all Current.user.memories.delete_all redirect_to settings_memories_url, notice: "Cleared memory", status: :see_other end + + private + + def set_memory + @memory = Current.user.memories.find_by(id: params[:id]) + end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1e2f0d02e..a088b0899 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,4 +1,10 @@ module ApplicationHelper + + def at_most_two_initials(initials) + return initials if initials.nil? || initials.length <= 2 + initials[0] + initials[-1] + end + def spinner(opts = {}) html = <<~HTML @@ -70,15 +76,15 @@ def div_tag(content_or_options_with_block = nil, options = nil, &block) end def meta_tag(name, content) - tag.meta(name: name, content: content) + tag.meta(name:, content:) end def charset_tag(charset) - tag.meta(charset: charset) + tag.meta(charset:) end def viewport_tag(content) - tag.meta(name: "viewport", content: content) + tag.meta(name: "viewport", content:) end def n_a_if_blank(value, n_a = "Not Available") @@ -86,6 +92,6 @@ def n_a_if_blank(value, n_a = "Not Available") end def to_dollars(cents, precision: 2) - number_to_currency(cents / 100.0, precision: precision) + number_to_currency(cents / 100.0, precision:) end end diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb index 9b26aaa7b..7c758bf68 100644 --- a/app/helpers/messages_helper.rb +++ b/app/helpers/messages_helper.rb @@ -4,6 +4,8 @@ module MessagesHelper def render_avatar_for(message) if message.user? render partial: "layouts/user_avatar", locals: { user: Current.user, size: 7, classes: "mt-1" } + elsif message.tool? + render partial: "layouts/tool_avatar" else render partial: "layouts/assistant_avatar", locals: { assistant: message.assistant, size: 7, classes: "mt-1" } end @@ -13,8 +15,7 @@ def from_name_for(message) case message.role when "user" then "You" when "assistant" then message.assistant.name - when "tool" then "Tool" - end + end end def format_for_copying(text) @@ -25,17 +26,36 @@ def format_for_speaking(text) ::MarkdownRenderer.render_for_speaking(text) end - def format_for_display(text, append_inside_tag: nil) - escaped_text = html_escape(text) + def format_for_display(message, append_inside_tag: nil) + if message_to_user_from_tool_call?(message) + function_name = message.content_tool_calls.dig(:function, :name) + message_to_user = JSON.parse(message.content_text)["message_to_user"] - html = ::MarkdownRenderer.render_for_display( - escaped_text, - block_code: block_code - ) + case function_name + when "memory_remember_detail_about_user" + return link_to message_to_user, + settings_memories_path, + { data: { turbo_frame: "_top" }, class: "text-gray-400 dark:!text-gray-500 font-normal no-underline" } + when "googlesearch_google_search" + query = message_to_user.partition(":").last + return link_to message_to_user, + "https://www.google.com/search?q=#{URI.encode_www_form_component(query)}", + { target: :_blank, data: { turbo_frame: "_top" }, class: "text-gray-400 dark:!text-gray-500 font-normal no-underline" } + else + return content_tag(:span, message_to_user, class: "text-gray-400 dark:!text-gray-500") + end + else + escaped_text = html_escape(message.content_text) - html = "

" if html.blank? - html = append(html, append_inside_tag) if append_inside_tag - return html.html_safe + html = ::MarkdownRenderer.render_for_display( + escaped_text, + block_code: block_code + ) + + html = "

" if html.blank? + html = append(html, append_inside_tag) if append_inside_tag + return html.html_safe + end end def thinking_html(message, thinking) @@ -59,6 +79,12 @@ def thinking_html(message, thinking) ) end + def message_to_user_from_tool_call?(message) + JSON.parse(message.content_text)["message_to_user"].present? if message.content_text.present? + rescue JSON::ParserError + false + end + private def block_code diff --git a/app/helpers/settings/api_services_helper.rb b/app/helpers/settings/api_services_helper.rb index 0168d4007..c8a1f74c8 100644 --- a/app/helpers/settings/api_services_helper.rb +++ b/app/helpers/settings/api_services_helper.rb @@ -1,7 +1,7 @@ module Settings module APIServicesHelper def official?(model) - openai?(model) || anthropic?(model) || groq?(model) + openai?(model) || anthropic?(model) || groq?(model) || gemini?(model) end def openai?(api_service) @@ -15,5 +15,9 @@ def anthropic?(api_service) def groq?(api_service) api_service.url == APIService::URL_GROQ end + + def gemini?(api_service) + api_service.url == APIService::URL_GEMINI + end end end diff --git a/app/javascript/stimulus/search_controller.js b/app/javascript/stimulus/search_controller.js new file mode 100644 index 000000000..65b58720d --- /dev/null +++ b/app/javascript/stimulus/search_controller.js @@ -0,0 +1,37 @@ +import { Controller } from "@hotwired/stimulus" + +export default class extends Controller { + static targets = [ "input", "clear" ] + + inputTargetConnected() { + this.setSearchClearIcon() + } + + disconnect() { + clearTimeout(this.timeout) + } + + clear() { + this.inputTarget.value = "" + this.element.requestSubmit() + } + + unfocus() { + this.inputTarget.autofocus = false + } + + search() { + clearTimeout(this.timeout) + this.setSearchClearIcon() + this.timeout = setTimeout(() => { + this.element.requestSubmit() + }, 500) + } + + setSearchClearIcon() { + if (this.inputTarget.value.length > 0) + this.clearTarget.classList.remove("hidden") + else + this.clearTarget.classList.add("hidden") + } +} diff --git a/app/jobs/autotitle_conversation_job.rb b/app/jobs/autotitle_conversation_job.rb index 8f80c011c..4966861a6 100644 --- a/app/jobs/autotitle_conversation_job.rb +++ b/app/jobs/autotitle_conversation_job.rb @@ -7,7 +7,7 @@ class ConversationNotReady < StandardError; end def perform(conversation_id) @conversation = Conversation.find(conversation_id) - return false if @conversation.assistant.api_service.effective_token.blank? # should we use anthropic key if that's all the user has? + return false if @conversation.assistant.api_service.requires_token? && @conversation.assistant.api_service.effective_token.blank? messages = @conversation.messages.ordered.limit(4) raise ConversationNotReady if messages.empty? @@ -31,6 +31,13 @@ def generate_title_for(text) response_format: { type: "json_object" } # this causes problems for Groq even though it's supported: https://console.groq.com/docs/api-reference#chat-create ) return JSON.parse(response)["topic"] + elsif ai_backend.class == AIBackend::Gemini + response = ai_backend.get_oneoff_message( + system_message, + [text], + generation_config: { response_mime_type: "application/json" } + ) + return JSON.parse(response)["topic"] else response = ai_backend.get_oneoff_message( system_message, diff --git a/app/jobs/get_next_ai_message_job.rb b/app/jobs/get_next_ai_message_job.rb index 0ad348334..8ad4aeb23 100644 --- a/app/jobs/get_next_ai_message_job.rb +++ b/app/jobs/get_next_ai_message_job.rb @@ -1,6 +1,7 @@ require "open-uri" include ActionView::RecordIdentifier require "nokogiri/xml/node" +class ::Gemini::Errors::ConfigurationError < ::Gemini::Errors::GeminiError; end class GetNextAIMessageJob < ApplicationJob include ActionView::Helpers::RenderingHelper @@ -14,7 +15,7 @@ def ai_backend end def perform(user_id, message_id, assistant_id, attempt = 1) - puts "\n### GetNextAIMessageJob.perform(#{user_id}, #{message_id}, #{assistant_id}, #{attempt})" unless Rails.env.test? + Rails.logger.info "### GetNextAIMessageJob.perform(#{user_id}, #{message_id}, #{assistant_id}, #{attempt})" unless Rails.env.test? @user = User.find(user_id) @message = Message.find(message_id) @@ -30,7 +31,7 @@ def perform(user_id, message_id, assistant_id, attempt = 1) @message.update!(processed_at: Time.current, content_text: "") GetNextAIMessageJob.broadcast_updated_message(@message, thinking: true) # thinking shows dot, signaling to user that we're waiting now on ai_backend - puts "\n### Wait for reply" unless Rails.env.test? + Rails.logger.info "\n### Wait for reply" unless Rails.env.test? response = Current.set(user: @user, message: @message) do ai_backend.new(@conversation.user, @assistant, @conversation, @message) @@ -60,7 +61,7 @@ def perform(user_id, message_id, assistant_id, attempt = 1) return true rescue ResponseCancelled => e - puts "\n### Response cancelled in GetNextAIMessageJob(#{message_id})" unless Rails.env.test? + Rails.logger.info "\n### Response cancelled in GetNextAIMessageJob(#{message_id})" unless Rails.env.test? wrap_up_the_message return true rescue OpenAI::ConfigurationError => e @@ -78,6 +79,10 @@ def perform(user_id, message_id, assistant_id, attempt = 1) set_anthropic_error wrap_up_the_message return true + rescue Gemini::Errors::ConfigurationError => e + set_generic_error("Gemini") + wrap_up_the_message + return true rescue Faraday::ParsingError => e set_response_error wrap_up_the_message @@ -91,22 +96,23 @@ def perform(user_id, message_id, assistant_id, attempt = 1) wrap_up_the_message return true rescue WaitForPrevious - puts "\n### WaitForPrevious in GetNextAIMessageJob(#{message_id})" unless Rails.env.test? + Rails.logger.info "\n### WaitForPrevious in GetNextAIMessageJob(#{message_id})" unless Rails.env.test? raise WaitForPrevious rescue => e msg = e.inspect.gsub(/(sk-)[\w\-]{40}/, '\1' + "*" * 40) unless Rails.env.test? - puts "\n### Finished GetNextAIMessageJob attempt ##{attempt} with ERROR: #{msg}" unless Rails.env.test? - puts e.backtrace.join("\n") if Rails.env.development? + Rails.logger.info "\n### Finished GetNextAIMessageJob attempt ##{attempt} with ERROR: #{msg}" unless Rails.env.test? + Rails.logger.info e.backtrace.join("\n") if Rails.env.development? if attempt < 3 GetNextAIMessageJob.broadcast_updated_message(@message, thinking: false) GetNextAIMessageJob.set(wait: (attempt+1).seconds).perform_later(user_id, message_id, assistant_id, attempt+1) else - error_text = nil - begin - error_text = e&.response&.dig(:body, "error", "message") + error_text = if e.try(:response) + e&.response&.dig(:body, "error", "message") rescue e&.response&.dig(:body) + else + e.message end set_unexpected_error(msg&.slice(0...1500), error_text) wrap_up_the_message @@ -119,7 +125,7 @@ def self.broadcast_updated_message(message, locals = {}) html = ApplicationController.render( partial: "messages/message", locals: { - message: message, + message:, only_scroll_down_if_was_bottom: true, streamed: true, message_counter: message.index @@ -166,8 +172,16 @@ def set_unexpected_error(msg, text) def set_billing_error service = ai_backend.to_s.split("::").second - url = service == "OpenAI" ? "https://platform.openai.com/account/billing/overview" : "https://console.anthropic.com/settings/plans" - + url = case service + when "OpenAI" + "https://platform.openai.com/account/billing/overview" + when "Anthropic" + "https://console.anthropic.com/settings/plans" + when "Gemini" + "https://aistudio.google.com/app/apikey" + else + "https://platform.openai.com/account/billing/overview" + end @message.content_text = "(I received a quota error. Try again and if you still get this error then your API key is probably valid, but you may need to adding billing details. You are using " + "#{service} so go here #{url} and add a credit card, or if you already have one review your billing plan.)" end @@ -179,11 +193,11 @@ def wrap_up_the_message @message.save! @message.conversation.touch # updated_at change will bump it up your list + ensures it will be auto-titled - puts "\n### Finished GetNextAIMessageJob.perform(#{@user.id}, #{@message.id}, #{@message.assistant_id}, #{@attempt})" unless Rails.env.test? + Rails.logger.info "\n### Finished GetNextAIMessageJob.perform(#{@user.id}, #{@message.id}, #{@message.assistant_id}, #{@attempt})" unless Rails.env.test? end def call_tools_before_wrapping_up - puts "\n### Calling tools" unless Rails.env.test? + Rails.logger.info "\n### Calling tools" unless Rails.env.test? msgs = [] Current.set(user: @user, message: @message) do @@ -198,6 +212,7 @@ def call_tools_before_wrapping_up role: tool_message[:role], content_text: tool_message[:content], tool_call_id: tool_message[:tool_call_id], + content_tool_calls: tool_message[:content_tool_calls], version: @message.version, index: index += 1, processed_at: Time.current, diff --git a/app/jobs/send_reset_password_email_job.rb b/app/jobs/send_reset_password_email_job.rb index 371de716b..e7fc1f5bd 100644 --- a/app/jobs/send_reset_password_email_job.rb +++ b/app/jobs/send_reset_password_email_job.rb @@ -7,7 +7,7 @@ def perform(email, os, browser) Rails.logger.info "Sending reset password email to #{email} from #{os} with #{browser}" if person&.user # make sure the user exists (i.e. user has not become a tombstone) - PasswordMailer.with(person: person, os: os, browser: browser).reset.deliver_now + PasswordMailer.with(person:, os:, browser:).reset.deliver_now end end end diff --git a/app/mailers/password_mailer.rb b/app/mailers/password_mailer.rb index 0360a5352..5b729f8b8 100644 --- a/app/mailers/password_mailer.rb +++ b/app/mailers/password_mailer.rb @@ -11,7 +11,7 @@ def reset purpose: Email::PasswordReset::TOKEN_PURPOSE, expires_in: @token_ttl ) - @edit_url = edit_password_credential_url(token: token) + @edit_url = edit_password_credential_url(token:) mail( to: person.email, diff --git a/app/models/api_service.rb b/app/models/api_service.rb index 303f501a0..348fc8f32 100644 --- a/app/models/api_service.rb +++ b/app/models/api_service.rb @@ -1,13 +1,14 @@ class APIService < ApplicationRecord - URL_OPEN_AI = "https://api.openai.com/" + URL_OPEN_AI = "https://api.openai.com/v1/" URL_ANTHROPIC = "https://api.anthropic.com/" URL_GROQ = "https://api.groq.com/openai/v1/" + URL_GEMINI = "https://generativelanguage.googleapis.com/v1beta/" belongs_to :user has_many :language_models, -> { not_deleted } - enum :driver, %w[ openai anthropic ].index_by(&:to_sym) + enum :driver, %w[openai anthropic gemini].index_by(&:to_sym) validates :url, format: URI::DEFAULT_PARSER.make_regexp(%w[http https]), if: -> { url.present? } validates :name, :url, presence: true @@ -20,11 +21,18 @@ class APIService < ApplicationRecord scope :ordered, -> { order(:name) } def ai_backend - openai? ? AIBackend::OpenAI : AIBackend::Anthropic + case driver + when "openai" + AIBackend::OpenAI + when "anthropic" + AIBackend::Anthropic + when "gemini" + AIBackend::Gemini + end end def requires_token? - [URL_OPEN_AI, URL_ANTHROPIC].include?(url) # other services may require it but we don't always know + [URL_OPEN_AI, URL_ANTHROPIC, URL_GEMINI].include?(url) # other services may require it but we don't always know end def effective_token diff --git a/app/models/assistant.rb b/app/models/assistant.rb index 4832796d7..dd7a06065 100644 --- a/app/models/assistant.rb +++ b/app/models/assistant.rb @@ -1,4 +1,6 @@ class Assistant < ApplicationRecord + include Export + MAX_LIST_DISPLAY = 5 belongs_to :user @@ -19,6 +21,10 @@ class Assistant < ApplicationRecord scope :ordered, -> { order(:id) } + delegate :api_name, to: :language_model, prefix: true, allow_nil: true + + before_validation :set_default_slug + def initials return nil if name.blank? @@ -31,4 +37,34 @@ def initials def to_s name end + + def to_param + slug + end + + def language_model_api_name=(api_name) + self.language_model = LanguageModel.for_user(user).find_by(api_name:) + end + + private + + # Set the slug to the name, downcased, with non-word characters replaced with "-" + # and trailing "-" removed. + # If the slug is not unique for the user, append "-2", "-3", etc. + def set_default_slug + return if slug.present? + return if name.blank? + + base_slug = name.downcase.gsub(/[^a-z0-9]+/, "-").gsub(/-$/, "") + + existing_base_slugs = user.assistants.where("slug LIKE ?", "#{base_slug}%").pluck(:slug) + largest_slug_number = existing_base_slugs.map { |slug| slug.split("--").last.to_i }.max + self.slug = if largest_slug_number.present? + "#{base_slug}--#{largest_slug_number + 1}" + elsif existing_base_slugs.any? + "#{base_slug}--1" + else + base_slug + end + end end diff --git a/app/models/assistant/export.rb b/app/models/assistant/export.rb new file mode 100644 index 000000000..f0290cc1a --- /dev/null +++ b/app/models/assistant/export.rb @@ -0,0 +1,52 @@ +module Assistant::Export + extend ActiveSupport::Concern + + DEFAULT_EXPORT_ONLY = %i[ + name + slug + description + instructions + language_model_api_name + ] + + DEFAULT_ASSISTANT_FILE = "assistants.yml" + + def attributes + super.merge("language_model_api_name" => language_model_api_name) + end + + # Unsure why this needs to re-defined, but the original ActiveModel::Serialization + # implementation is ignoring the #attributes method above. + def attribute_names_for_serialization + attributes.keys + end + + class_methods do + def export_to_file(path: Rails.root.join(DEFAULT_ASSISTANT_FILE), assistants:, only: DEFAULT_EXPORT_ONLY) + path = path.to_s + storage = { + "assistants" => assistants.as_json(only:).map(&:compact) + } + if path.ends_with?(".json") + File.write(path, storage.to_json) + else + File.write(path, storage.to_yaml) + end + end + + def import_from_file(path: Rails.root.join(DEFAULT_ASSISTANT_FILE), users: User.all) + users = Array.wrap(users) + + storage = YAML.load_file(path) + assistants = storage["assistants"] + assistants.each do |assistant| + assistant = assistant.with_indifferent_access + users.each do |user| + asst = user.assistants.find_or_create_by(slug: assistant["slug"]) + asst.assign_attributes(assistant.except("slug")) + asst.save! + end + end + end + end +end diff --git a/app/models/conversation.rb b/app/models/conversation.rb index 61106f911..af2245e3b 100644 --- a/app/models/conversation.rb +++ b/app/models/conversation.rb @@ -27,8 +27,14 @@ class Conversation < ApplicationRecord # "Last Month" => relation, # "Older" => relation # } - def self.grouped_by_increasing_time_interval_for_user(user) - nav_conversations = user.conversations.ordered + def self.grouped_by_increasing_time_interval_for_user(user, query = nil) + if query.blank? + nav_conversations = user.conversations.ordered + else + nav_conversations = user.conversations.joins(:messages).ordered.where("messages.content_text ILIKE ?", "%#{query}%"). + or(user.conversations.ordered.where("title ILIKE ?", "%#{query}%")). + select("DISTINCT conversations.*") + end keys = ["Today", "Yesterday", "This Week", "This Month", "Last Month", "Older"] values = [ diff --git a/app/models/document.rb b/app/models/document.rb index 68ab2f5b9..df20f38e1 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -30,7 +30,9 @@ def has_image?(variant = nil) def image_url(variant, fallback: nil) return nil unless has_image? - if has_file_variant_processed?(variant) + if Rails.application.config.x.app_url.blank? + file_data_url(variant) + elsif has_file_variant_processed?(variant) fully_processed_url(variant) elsif fallback.nil? redirect_to_processed_path(variant) @@ -39,20 +41,6 @@ def image_url(variant, fallback: nil) end end - def file_data_url(variant = :large) - return nil if !file.attached? - - "data:#{file.blob.content_type};base64,#{file_base64(variant)}" - end - - def file_base64(variant = :large) - return nil if !file.attached? - wait_for_file_variant_to_process!(variant.to_sym) - - file_contents = file.variant(variant.to_sym).processed.download - base64 = Base64.strict_encode64(file_contents) - end - def has_file_variant_processed?(variant) r = file.attached? && variant.present? && @@ -75,8 +63,19 @@ def redirect_to_processed_path(variant) ) end + def file_base64(variant = :large) + return nil if !file.attached? + wait_for_file_variant_to_process!(variant.to_sym) + file_contents = file.variant(variant.to_sym).processed.download + base64 = Base64.strict_encode64(file_contents) + end + private + def file_data_url(variant = :large) + "data:#{file.blob.content_type};base64,#{file_base64(variant)}" + end + def set_default_user self.user ||= message.conversation.user end diff --git a/app/models/feature.rb b/app/models/feature.rb index 2841773f6..89125c8f9 100644 --- a/app/models/feature.rb +++ b/app/models/feature.rb @@ -21,6 +21,7 @@ def features if @@features_hash[:http_header_authentication] @@features_hash[:password_authentication] = false @@features_hash[:google_authentication] = false + @@features_hash[:microsoft_graph_authentication] = false end @@features_hash diff --git a/app/models/language_model.rb b/app/models/language_model.rb index 72e26c348..a0e48e8dc 100644 --- a/app/models/language_model.rb +++ b/app/models/language_model.rb @@ -1,26 +1,6 @@ # We don"t care about large or not class LanguageModel < ApplicationRecord - BEST_GPT = "gpt-best" - BEST_CLAUDE = "claude-best" - BEST_GROQ = "groq-best" - - BEST_MODELS = { - BEST_GPT => "gpt-4o-2024-08-06", - BEST_CLAUDE => "claude-3-5-sonnet-20240620", - BEST_GROQ => "llama3-70b-8192", - } - - BEST_MODEL_INPUT_PRICES = { - BEST_GPT => 250, - BEST_CLAUDE => 300, - BEST_GROQ => 59, - } - - BEST_MODEL_OUTPUT_PRICES = { - BEST_GPT => 1000, - BEST_CLAUDE => 1500, - BEST_GROQ => 79, - } + include Export belongs_to :user belongs_to :api_service @@ -33,15 +13,14 @@ class LanguageModel < ApplicationRecord validates :api_name, :name, :position, presence: true before_save :soft_delete_assistants, if: -> { has_attribute?(:deleted_at) && deleted_at && deleted_at_changed? && deleted_at_was.nil? } + after_save :update_best_language_model_for_api_service - scope :ordered, -> { order(:position) } + scope :ordered, -> { order(Arel.sql("CASE WHEN best THEN 0 ELSE position END")).order(:position) } scope :for_user, ->(user) { where(user_id: user.id).not_deleted } + scope :best_for_api_service, ->(api_service) { where(best: true, api_service: api_service) } delegate :ai_backend, to: :api_service - - def provider_name - BEST_MODELS[api_name] || api_name - end + delegate :name, to: :api_service, prefix: true, allow_nil: true def created_by_current_user? user == Current.user @@ -61,4 +40,12 @@ def populate_position def soft_delete_assistants assistants.update_all(deleted_at: Time.current) end + + # Only one best language model per API service + def update_best_language_model_for_api_service + if best? + api_service.language_models.update_all(best: false) + update_column(:best, true) + end + end end diff --git a/app/models/language_model/export.rb b/app/models/language_model/export.rb new file mode 100644 index 000000000..261f62b14 --- /dev/null +++ b/app/models/language_model/export.rb @@ -0,0 +1,58 @@ +module LanguageModel::Export + extend ActiveSupport::Concern + + DEFAULT_EXPORT_ONLY = %i[ + api_name + name + best + api_service_name + supports_images + supports_tools + supports_system_message + input_token_cost_cents + output_token_cost_cents + ] + + DEFAULT_MODEL_FILE = "models.yml" + + def attributes + super.merge("api_service_name" => api_service_name) + end + + # Unsure why this needs to re-defined, but the original ActiveModel::Serialization + # implementation is ignoring the #attributes method above. + def attribute_names_for_serialization + attributes.keys + end + + class_methods do + def export_to_file(path: Rails.root.join(DEFAULT_MODEL_FILE), models:, only: DEFAULT_EXPORT_ONLY) + path = path.to_s + storage = { + "models" => models.as_json(only:).map(&:compact) + } + if path.ends_with?(".json") + File.write(path, storage.to_json) + else + File.write(path, storage.to_yaml) + end + end + + def import_from_file(path: Rails.root.join(DEFAULT_MODEL_FILE), users: User.all) + users = Array.wrap(users) + storage = YAML.load_file(path) + models = storage["models"] + models.each do |model| + model = model.with_indifferent_access + users.each do |user| + lm = user.language_models.find_or_initialize_by(api_name: model[:api_name]) + lm.api_service = user.api_services.find_by(name: model[:api_service_name]) if model[:api_service_name] + lm.assign_attributes(model.except(:api_service_name)) + lm.save! + rescue ActiveRecord::RecordInvalid => e + warn "Failed to import '#{model[:api_name]}': #{e.message} for #{model.inspect}" + end + end + end + end +end diff --git a/app/models/message.rb b/app/models/message.rb index 315b2b97e..f8a01ea71 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -48,7 +48,7 @@ def not_finished? = !finished? private def create_conversation - self.conversation = Conversation.create!(user: Current.user, assistant: assistant) + self.conversation = Conversation.create!(user: Current.user, assistant:) end def validate_conversation @@ -60,12 +60,12 @@ def validate_assistant end def start_assistant_reply - m = conversation.messages.create!( - assistant: assistant, + conversation.messages.create!( + assistant:, role: :assistant, content_text: nil, - version: version, - index: index+1 + version:, + index: index + 1 ) end @@ -75,7 +75,7 @@ def set_last_assistant_message def update_assistant_on_conversation return if conversation.assistant == assistant - conversation.update!(assistant: assistant) + conversation.update!(assistant:) end def update_input_token_cost diff --git a/app/models/message/toolable.rb b/app/models/message/toolable.rb index d0b44dff4..2dd7bd2a4 100644 --- a/app/models/message/toolable.rb +++ b/app/models/message/toolable.rb @@ -7,6 +7,7 @@ module Message::Toolable serialize :content_tool_calls, coder: JsonSerializer validates :tool_call_id, presence: true, if: :tool? + validates :content_tool_calls, presence: true, if: :tool? normalizes :tool_call_id, with: -> tool_call_id { tool_call_id[0...40] } end diff --git a/app/models/message/version.rb b/app/models/message/version.rb index 5baa5fa9e..8c1659ab9 100644 --- a/app/models/message/version.rb +++ b/app/models/message/version.rb @@ -81,9 +81,9 @@ def set_next_conversation_index_and_version else if version.negative? || version > max_version errors.add(:version, "#{version} is invalid for this index") - elsif conversation.messages.exists?(index: index, version: version) + elsif conversation.messages.exists?(index:, version:) errors.add(:version, "#{version} already exists for this index") - elsif versions.present? && version < versions.max && !conversation.messages.exists?(index: index-1, version: version) + elsif versions.present? && version < versions.max && !conversation.messages.exists?(index: index-1, version:) errors.add(:version, "#{version} is invalid for this index") end end diff --git a/app/models/microsoft_graph_credential.rb b/app/models/microsoft_graph_credential.rb new file mode 100644 index 000000000..a109f7992 --- /dev/null +++ b/app/models/microsoft_graph_credential.rb @@ -0,0 +1,52 @@ +class MicrosoftGraphCredential < Credential + alias_attribute :oauth_id, :external_id + + validates :oauth_token, presence: true + validates :oauth_refresh_token, presence: true + validates :oauth_id, presence: true, uniqueness: true + validates :oauth_email, presence: true, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP } + + normalizes :oauth_email, with: -> email { email.downcase.strip } + + # Use this method to retrieve the latest oauth_token. + # Token will be automatically renewed as necessary + def token + renew_token! if expired? + oauth_token + end + + def expires_at + Time.at(properties[:expires_at]) if properties[:expires_at] + rescue + nil + end + + def expired? + expires_at && expires_at < Time.current + end + + def renew_token! + new_token = current_token.refresh! + update( + oauth_token: new_token.token, + oauth_refresh_token: new_token.refresh_token, + properties: { expires_at: new_token.expires_at } + ) + end + + private + + def current_token + OAuth2::AccessToken.new( + strategy.client, + oauth_token, + refresh_token: oauth_refresh_token + ) + end + + def strategy + client_id = Setting.microsoft_graph_auth_client_id + client_secret = Setting.microsoft_graph_auth_client_secret + OmniAuth::Strategies::MicrosoftGraph.new(nil, client_id, client_secret) + end +end diff --git a/app/models/run.rb b/app/models/run.rb index 9e6976a04..438ba938e 100644 --- a/app/models/run.rb +++ b/app/models/run.rb @@ -14,6 +14,6 @@ class Run < ApplicationRecord private def set_model - self.model = assistant&.language_model&.provider_name + self.model = assistant&.language_model&.api_name end end diff --git a/app/models/setting.rb b/app/models/setting.rb index 79f9bb581..f57f842c4 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -27,5 +27,9 @@ def require_keys!(*keys) end end end + + def key_set?(key) + send(key).present? + end end end diff --git a/app/models/user.rb b/app/models/user.rb index 5f8b2df0a..c822d839b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,6 +18,7 @@ class User < ApplicationRecord has_one :google_credential, -> { type_is("GoogleCredential") }, class_name: "Credential", inverse_of: :user has_one :gmail_credential, -> { type_is("GmailCredential") }, class_name: "Credential", inverse_of: :user has_one :google_tasks_credential, -> { type_is("GoogleTasksCredential") }, class_name: "Credential", inverse_of: :user + has_one :microsoft_graph_credential, -> { type_is("MicrosoftGraphCredential") }, class_name: "Credential", inverse_of: :user has_one :http_header_credential, -> { type_is("HttpHeaderCredential") }, class_name: "Credential", inverse_of: :user belongs_to :last_cancelled_message, class_name: "Message", optional: true diff --git a/app/models/user/registerable.rb b/app/models/user/registerable.rb index 0ddfcb322..72691389f 100644 --- a/app/models/user/registerable.rb +++ b/app/models/user/registerable.rb @@ -8,76 +8,12 @@ module User::Registerable private def create_initial_assistants_etc - open_ai_api_service = api_services.create!(url: APIService::URL_OPEN_AI, driver: :openai, name: "OpenAI") - anthropic_api_service = api_services.create!(url: APIService::URL_ANTHROPIC, driver: :anthropic, name: "Anthropic") - groq_api_service = api_services.create!(url: APIService::URL_GROQ, driver: :openai, name: "Groq") + api_services.create!(url: APIService::URL_OPEN_AI, driver: :openai, name: "OpenAI") + api_services.create!(url: APIService::URL_ANTHROPIC, driver: :anthropic, name: "Anthropic") + api_services.create!(url: APIService::URL_GROQ, driver: :openai, name: "Groq") + api_services.create!(url: APIService::URL_GEMINI, driver: :gemini, name: "Google Gemini") - [ - [LanguageModel::BEST_GPT, "Best OpenAI Model", true, open_ai_api_service, LanguageModel::BEST_MODEL_INPUT_PRICES[LanguageModel::BEST_GPT], LanguageModel::BEST_MODEL_OUTPUT_PRICES[LanguageModel::BEST_GPT]], - [LanguageModel::BEST_CLAUDE, "Best Anthropic Model", true, anthropic_api_service, LanguageModel::BEST_MODEL_INPUT_PRICES[LanguageModel::BEST_CLAUDE], LanguageModel::BEST_MODEL_OUTPUT_PRICES[LanguageModel::BEST_CLAUDE]], - [LanguageModel::BEST_GROQ, "Best Open-Source Model", true, groq_api_service, LanguageModel::BEST_MODEL_INPUT_PRICES[LanguageModel::BEST_GROQ], LanguageModel::BEST_MODEL_OUTPUT_PRICES[LanguageModel::BEST_GROQ]], - - ["gpt-4o", "GPT-4o (latest)", true, open_ai_api_service, 250, 1000], - ["gpt-4o-2024-08-06", "GPT-4o Omni Multimodal (2024-08-06)", true, open_ai_api_service, 250, 1000], - ["gpt-4o-2024-05-13", "GPT-4o Omni Multimodal (2024-05-13)", true, open_ai_api_service, 500, 1500], - - ["gpt-4-turbo", "GPT-4 Turbo with Vision (latest)", true, open_ai_api_service, 1000, 3000], - ["gpt-4-turbo-2024-04-09", "GPT-4 Turbo with Vision (2024-04-09)", true, open_ai_api_service, 1000, 3000], - ["gpt-4-turbo-preview", "GPT-4 Turbo Preview", false, open_ai_api_service, 1000, 3000], - ["gpt-4-0125-preview", "GPT-4 Turbo Preview (2024-01-25)", false, open_ai_api_service, 1000, 3000], - ["gpt-4-1106-preview", "GPT-4 Turbo Preview (2023-11-06)", false, open_ai_api_service, 1000, 3000], - ["gpt-4-vision-preview", "GPT-4 Turbo with Vision Preview (2023-11-06)", true, open_ai_api_service, 1000, 3000], - ["gpt-4-1106-vision-preview", "GPT-4 Turbo with Vision Preview (2023-11-06)", true, open_ai_api_service, 1000, 3000], - - ["gpt-4", "GPT-4 (latest)", false, open_ai_api_service, 3000, 6000], - ["gpt-4-0613", "GPT-4 Snapshot improved function calling (2023-06-13)", false, open_ai_api_service, 1000, 3000], - - ["gpt-3.5-turbo", "GPT-3.5 Turbo (latest)", false, open_ai_api_service, 300, 600], - ["gpt-3.5-turbo-0125", "GPT-3.5 Turbo (2022-01-25)", false, open_ai_api_service, 50, 150], - ["gpt-3.5-turbo-1106", "GPT-3.5 Turbo (2022-11-06)", false, open_ai_api_service, 100, 200], - - ["claude-3-5-sonnet-20240620", "Claude 3.5 Sonnet (2024-06-20)", true, anthropic_api_service, 300, 1500], - ["claude-3-opus-20240229", "Claude 3 Opus (2024-02-29)", true, anthropic_api_service, 1500, 7500], - ["claude-3-sonnet-20240229", "Claude 3 Sonnet (2024-02-29)", true, anthropic_api_service, 300, 1500], - ["claude-3-haiku-20240307", "Claude 3 Haiku (2024-03-07)", true, anthropic_api_service, 25, 125], - ["claude-2.1", "Claude 2.1", false, anthropic_api_service, 800, 2400], - ["claude-2.0", "Claude 2.0", false, anthropic_api_service, 800, 2400], - ["claude-instant-1.2", "Claude Instant 1.2", false, anthropic_api_service, 80, 240], - - ["llama3-70b-8192", "Meta Llama 3 70b", false, groq_api_service, 59, 79], - ["llama3-8b-8192", "Meta Llama 3 8b", false, groq_api_service, 5, 8], - ["mixtral-8x7b-32768", "Mistral 8 7b", false, groq_api_service, 24, 24], - ["gemma-7b-it", "Google Gemma 7b", false, groq_api_service, 7, 7], - ].each do |api_name, name, supports_images, api_service, input_token_cost_per_million, output_token_cost_per_million| - million = BigDecimal(1_000_000) - input_token_cost_cents = input_token_cost_per_million/million - output_token_cost_cents = output_token_cost_per_million/million - - language_models.create!( - api_name: api_name, - api_service: api_service, - name: name, - supports_tools: true, - supports_images: supports_images, - input_token_cost_cents: input_token_cost_cents, - output_token_cost_cents: output_token_cost_cents, - ) - end - - # Only these don't support tools: - [ - ["gpt-3.5-turbo-instruct", "GPT-3.5 Turbo Instruct", false, open_ai_api_service, 150, 200], - ["gpt-3.5-turbo-16k-0613", "GPT-3.5 Turbo (2022-06-13)", false, open_ai_api_service, 300, 400], - ].each do |api_name, name, supports_images, api_service, input_token_cost_per_million, output_token_cost_per_million| - million = BigDecimal(1_000_000) - input_token_cost_cents = input_token_cost_per_million/million - output_token_cost_cents = output_token_cost_per_million/million - - language_models.create!(api_name: api_name, api_service: api_service, name: name, supports_tools: false, supports_images: supports_images, input_token_cost_cents: input_token_cost_cents, output_token_cost_cents: output_token_cost_cents) - end - - assistants.create! name: "GPT-4o", language_model: language_models.find_by(api_name: LanguageModel::BEST_GPT) - assistants.create! name: "Claude 3.5 Sonnet", language_model: language_models.find_by(api_name: LanguageModel::BEST_CLAUDE) - assistants.create! name: "Meta Llama 3 70b", language_model: language_models.find_by(api_name: LanguageModel::BEST_GROQ) + LanguageModel.import_from_file(users: [self]) + Assistant.import_from_file(users: [self]) end end diff --git a/app/serializers/JsonSerializer.rb b/app/serializers/JsonSerializer.rb index cfcd3f99c..b93276323 100644 --- a/app/serializers/JsonSerializer.rb +++ b/app/serializers/JsonSerializer.rb @@ -36,4 +36,4 @@ def self.convert_value(value) value end end -end \ No newline at end of file +end diff --git a/app/services/ai_backend.rb b/app/services/ai_backend.rb index 42e4fd7d8..d4204f084 100644 --- a/app/services/ai_backend.rb +++ b/app/services/ai_backend.rb @@ -14,9 +14,9 @@ def initialize(user, assistant, conversation = nil, message = nil) def get_oneoff_message(instructions, messages, params = {}) set_client_config( - instructions: instructions, + instructions:, messages: preceding_messages(messages), - params: params, + params:, ) response = @client.send(client_method_name, ** @client_config) @@ -77,7 +77,7 @@ def preceding_messages(messages = []) role = (i % 2).zero? ? "user" : "assistant" { - role: role, + role:, content: msg } end diff --git a/app/services/ai_backend/anthropic.rb b/app/services/ai_backend/anthropic.rb index 18f004189..f8a4d5d9d 100644 --- a/app/services/ai_backend/anthropic.rb +++ b/app/services/ai_backend/anthropic.rb @@ -39,7 +39,7 @@ def set_client_config(config) super(config) @client_config = { - model: @assistant.language_model.provider_name, + model: @assistant.language_model.api_name, system: config[:instructions], messages: config[:messages], parameters: { @@ -71,8 +71,8 @@ def stream_handler(&chunk_handler) rescue ::Faraday::UnauthorizedError => e raise ::Anthropic::ConfigurationError rescue => e - puts "\nUnhandled error in AIBackend::Anthropic response handler: #{e.message}" - puts e.backtrace + Rails.logger.info "\nUnhandled error in AIBackend::Anthropic response handler: #{e.message}" + Rails.logger.info e.backtrace end end diff --git a/app/services/ai_backend/gemini.rb b/app/services/ai_backend/gemini.rb new file mode 100644 index 000000000..f89447cf6 --- /dev/null +++ b/app/services/ai_backend/gemini.rb @@ -0,0 +1,122 @@ +class AIBackend::Gemini < AIBackend + include Tools + class ::Gemini::Errors::ConfigurationError < ::Gemini::Errors::GeminiError; end + + # Rails system tests don't seem to allow mocking because the server and the + # test are in separate processes. + # + # In regular tests, mock this method or the TestClients::Gemini class to do + # what you want instead. + def self.client + if Rails.env.test? + ::TestClient::Gemini + else + ::Gemini + end + end + + def initialize(user, assistant, conversation = nil, message = nil) + super(user, assistant, conversation, message) + begin + raise configuration_error if assistant.api_service.requires_token? && assistant.api_service.effective_token.blank? + Rails.logger.info "Connecting to Gemini API server at #{assistant.api_service.url} with access token of length #{assistant.api_service.effective_token.to_s.length}" + @client = self.class.client.new( + credentials: { + service: "generative-language-api", + api_key: assistant.api_service.effective_token, + version: "v1beta" + }, + options: { + model: assistant.language_model.api_name, + server_sent_events: true + } + ) + rescue ::Faraday::UnauthorizedError, ::Faraday::BadRequestError => e + raise configuration_error + end + end + + def client_method_name + :stream_generate_content + end + + def configuration_error + ::Gemini::Errors::ConfigurationError + end + + def set_client_config(config) + super(config) + + @client_config = { + contents: config[:messages], + system_instruction: ( system_message(config[:instructions]) if @assistant.language_model.supports_system_message?) + }.compact + end + + def get_oneoff_message(instructions, messages, params = {}) + response = @client.generate_content({ + system_instruction: system_message(instructions), + contents: { role: "user", parts: { text: messages.first }}, # TODO: could implement preceding_conversation_messages and call it here + ** params + }) + response.dig("candidates", 0, "content", "parts", 0, "text") + end + + def stream_next_conversation_message(&chunk_handler) + set_client_config( + messages: preceding_conversation_messages, + instructions: full_instructions, + ) + + begin + if Rails.env.test? + @client.send(client_method_name, @client_config).each do |intermediate_response| + content_chunk = intermediate_response.dig("candidates",0,"content","parts",0,"text") + yield content_chunk if content_chunk != nil + end + else + response = @client.send(client_method_name, @client_config) do |intermediate_response, parsed, raw| + content_chunk = intermediate_response.dig("candidates",0,"content","parts",0,"text") + yield content_chunk if content_chunk != nil + end + end + rescue ::Faraday::UnauthorizedError, ::Faraday::BadRequestError => e + puts e.message + raise configuration_error + end + return nil + end + + private + + def system_message(content) + return [] if content.blank? + { + role: "user", parts: { text: content } + } + end + + def preceding_conversation_messages + @conversation.messages.for_conversation_version(@message.version).where("messages.index < ?", @message.index).collect do |message| + if @assistant.supports_images? && message.documents.present? + + content = [{ text: message.content_text }] + content += message.documents.collect do |document| + { inline_data: { + mime_type: document.file.blob.content_type, + data: document.file_base64(:large), + } + } + end + + { + role: message.role == "assistant" ? "model" : "user", parts: content + } + else + { + role: message.role == "assistant" ? "model" : "user", parts: { text: message.content_text || "" } + } + end + end + end +end diff --git a/app/services/ai_backend/open_ai.rb b/app/services/ai_backend/open_ai.rb index 3930a7d0e..259e51013 100644 --- a/app/services/ai_backend/open_ai.rb +++ b/app/services/ai_backend/open_ai.rb @@ -19,7 +19,7 @@ def initialize(user, assistant, conversation = nil, message = nil) begin raise ::OpenAI::ConfigurationError if assistant.api_service.requires_token? && assistant.api_service.effective_token.blank? Rails.logger.info "Connecting to OpenAI API server at #{assistant.api_service.url} with access token of length #{assistant.api_service.effective_token.to_s.length}" - @client = self.class.client.new(uri_base: assistant.api_service.url, access_token: assistant.api_service.effective_token) + @client = self.class.client.new(uri_base: assistant.api_service.url, access_token: assistant.api_service.effective_token, api_version: "") rescue ::Faraday::UnauthorizedError => e raise ::OpenAI::ConfigurationError end @@ -40,7 +40,7 @@ def set_client_config(config) @client_config = { parameters: { - model: @assistant.language_model.provider_name, + model: @assistant.language_model.api_name, messages: system_message(config[:instructions]) + config[:messages], stream: config[:streaming] && @response_handler || nil, max_tokens: 2000, # we should really set this dynamically, based on the model, to the max @@ -80,15 +80,15 @@ def stream_handler(&chunk_handler) rescue ::Faraday::UnauthorizedError => e raise OpenAI::ConfigurationError rescue => e - puts "\nUnhandled error in AIBackend::OpenAI response handler: #{e.message}" - puts e.backtrace.join("\n") + Rails.logger.info "\nUnhandled error in AIBackend::OpenAI response handler: #{e.message}" + Rails.logger.info e.backtrace.join("\n") end end def system_message(content) [{ role: "system", - content: content, + content:, }] end @@ -110,8 +110,8 @@ def preceding_conversation_messages { role: message.role, name: message.name_for_api, - content: message.content_text, - tool_calls: message.content_tool_calls, # only for some assistant messages + content: (JSON.parse(message.content_text).except("message_to_user").to_json rescue message.content_text), + tool_calls: message.assistant? ? message.content_tool_calls : nil, # only for some assistant messages tool_call_id: message.tool_call_id, # only for tool messages }.compact.except( message.content_tool_calls.blank? && :tool_calls ) end diff --git a/app/services/ai_backend/tools.rb b/app/services/ai_backend/tools.rb index c654249c5..fb2c97564 100644 --- a/app/services/ai_backend/tools.rb +++ b/app/services/ai_backend/tools.rb @@ -16,8 +16,8 @@ def get_tool_messages_by_calling(tool_calls_response) function_response = begin Toolbox.call(function_name, function_arguments) rescue => e - puts "## Handled error calling tools: #{e.message}" unless Rails.env.test? - puts e.backtrace.join("\n") unless Rails.env.test? + Rails.logger.info "## Handled error calling tools: #{e.message}" unless Rails.env.test? + Rails.logger.info e.backtrace.join("\n") unless Rails.env.test? <<~STR.gsub("\n", " ") An unexpected error occurred (#{e.message}). You were querying information to help you answer a users question. Because this information @@ -29,12 +29,13 @@ def get_tool_messages_by_calling(tool_calls_response) { role: "tool", content: function_response.to_json, + content_tool_calls: tool_call, tool_call_id: id, } end rescue => e - puts "## UNHANDLED error calling tools: #{e.message}" - puts e.backtrace.join("\n") + Rails.logger.info "## UNHANDLED error calling tools: #{e.message}" + Rails.logger.info e.backtrace.join("\n") raise ::Faraday::ParsingError end end diff --git a/app/services/fly.rb b/app/services/fly.rb index d82d2415e..b384d1e15 100644 --- a/app/services/fly.rb +++ b/app/services/fly.rb @@ -2,20 +2,22 @@ class Fly < SDK def change_db_swap(app:, swap:) app_name = app+"-db" unless swap.is_a?(Integer) || swap.to_i.to_s == swap.to_s - puts "Expected an integer for swap such as 512 but it was '#{swap}'. Aborting." + Rails.logger.info "Expected an integer for swap such as 512 but it was '#{swap}'. Aborting." return end swap = swap.to_i - app_id = get_apps.find { |m| m.name == app_name }&.id + apps = get_apps + app_id = apps.find { |m| m.name == app_name }&.id if app_id.nil? - puts "Could not find the app named #{app_name}. Aborting." + Rails.logger.info "Could not find the app named #{app_name}. Aborting." + Rails.logger.info "These are all the app names on your Fly account: #{apps.map(&:name).join(", ")}" return end machines = get_machines(app_name) if machines.length > 1 - puts "Expected only a single database machine under #{app_name} but found #{machines.length}. Aborting." + Rails.logger.info "Expected only a single database machine under #{app_name} but found #{machines.length}. Aborting." return end @@ -26,7 +28,7 @@ def change_db_swap(app:, swap:) updated_config = patch_machine(app_name, machine.id, config) - puts "Updated machine id #{machine.id} on #{app_name} to #{swap}mb. It make take a minute for the machine to finish booting." + Rails.logger.info "Updated machine id #{machine.id} on #{app_name} to #{swap}mb. It make take a minute for the machine to finish booting." end def get_apps @@ -38,13 +40,13 @@ def get_machines(app_name) end def patch_machine(app_name, id, config) - patch("https://api.machines.dev/v1/apps/#{app_name}/machines/#{id}").param(config: config) + post("https://api.machines.dev/v1/apps/#{app_name}/machines/#{id}").param(config: config) end private def bearer_token - `fly auth token`.chop + @bearer_token ||= `fly auth token`.chop.split.last end def header diff --git a/app/services/sdk.rb b/app/services/sdk.rb index d073c81bd..238a038c8 100644 --- a/app/services/sdk.rb +++ b/app/services/sdk.rb @@ -1,40 +1,40 @@ class SDK def get(url, token = nil) SDK::Get.new( - url: url, + url:, bearer_token: token || bearer_token, - expected_status: expected_status, - header: header, + expected_status:, + header:, calling_method: calling_method(__method__), ) end def post(url, token = nil) SDK::Post.new( - url: url, + url:, bearer_token: token || bearer_token, - expected_status: expected_status, - header: header, + expected_status:, + header:, calling_method: calling_method(__method__), ) end def patch(url, token = nil) SDK::Patch.new( - url: url, + url:, bearer_token: token || bearer_token, - expected_status: expected_status, - header: header, + expected_status:, + header:, calling_method: calling_method(__method__), ) end def delete(url, token = nil) SDK::Delete.new( - url: url, + url:, bearer_token: token || bearer_token, - expected_status: expected_status, - header: header, + expected_status:, + header:, calling_method: calling_method(__method__), ) end diff --git a/app/services/sdk/verb.rb b/app/services/sdk/verb.rb index cf13a9423..9adcc9bf7 100644 --- a/app/services/sdk/verb.rb +++ b/app/services/sdk/verb.rb @@ -31,7 +31,7 @@ def handle(response) raise ResponseError.new(response) if !response.status.in? @expected_statuses if response.status.between?(200, 299) - response.body.presence && OpenData.for(JSON.parse(response.body)) + response.body.presence && OpenData.for(JSON.parse(response.body)) rescue response else response end @@ -131,6 +131,6 @@ def possible_test_warning(verb) return if !Rails.env.test? return if self.class.send("allow_#{verb}_#{@calling_method}") rescue false - puts "WARNING: live API call in test. USE: stub_#{verb}_response(:#{@calling_method}, status: ___, response: _______) do; ...; end" + Rails.logger.info "WARNING: live API call in test. USE: stub_#{verb}_response(:#{@calling_method}, status: ___, response: _______) do; ...; end" end end diff --git a/app/services/toolbox.rb b/app/services/toolbox.rb index 54dab1358..35ea76ebe 100644 --- a/app/services/toolbox.rb +++ b/app/services/toolbox.rb @@ -8,6 +8,7 @@ def self.descendants Toolbox::OpenMeteo, Toolbox::Dalle, Toolbox::Memory, + Toolbox::GoogleSearch, gmail_active && Toolbox::Gmail, tasks_active && Toolbox::GoogleTasks, ].compact diff --git a/app/services/toolbox/gmail/message.rb b/app/services/toolbox/gmail/message.rb index 5a26a5040..20468e0a3 100644 --- a/app/services/toolbox/gmail/message.rb +++ b/app/services/toolbox/gmail/message.rb @@ -55,13 +55,13 @@ def body_html def to_h { - id: id, - thread_id: thread_id, - date: date, - from: from, - to: to, - subject: subject, - snippet: snippet, + id:, + thread_id:, + date:, + from:, + to:, + subject:, + snippet:, body: body || body_html, } end diff --git a/app/services/toolbox/google_search.rb b/app/services/toolbox/google_search.rb new file mode 100644 index 000000000..95f42a493 --- /dev/null +++ b/app/services/toolbox/google_search.rb @@ -0,0 +1,32 @@ +class Toolbox::GoogleSearch < Toolbox + + describe :google_search, <<~S + Search Google for the indicated query. + Use this to answer questions about current events, look up information, or find answers to questions. + Try to use this sparingly; prefer to use the user's memories and the tools you have available to answer questions. + When you do use this, try to use exact queries for which you expect to get a definitive answer. + When you respond to the user, try to include an answer to the question rather than just a link. + S + def google_search(query_s:) + encoded_query = URI.encode_www_form_component(query_s) + response_body = get("https://www.google.com/search").param(q: encoded_query).body + doc = Nokogiri::HTML(response_body) + + results = doc.css("div.BNeawe").map do |div| + div.children.map do |node| + if node.name == "a" + anchor_text = node.text.strip + href = node["href"] + "#{anchor_text} (#{href})" + else + node.text.strip + end + end.join(" ") + end.join("\n") + + { + message_to_user: "Web query: #{query_s}", + query_results: results + } + end +end \ No newline at end of file diff --git a/app/services/toolbox/google_tasks/api_helpers.rb b/app/services/toolbox/google_tasks/api_helpers.rb index 8a56bbf11..4e6bfb86a 100644 --- a/app/services/toolbox/google_tasks/api_helpers.rb +++ b/app/services/toolbox/google_tasks/api_helpers.rb @@ -41,8 +41,8 @@ def get_tasks_for_list(list, due_min: nil, due_max: nil) def create_task_for_list(list, title:, notes: nil, due: nil) refresh_token_if_needed do post("https://tasks.googleapis.com/tasks/v1/lists/#{list.id}/tasks").param( - title: title, - notes: notes, + title:, + notes:, due: format_time(due), status: "needsAction", ) @@ -58,7 +58,7 @@ def move_task_to_list(task, list, keep_due: true) delete_task(task) create_task_for_list(list, title: task.title, - notes: notes, + notes:, due: keep_due.presence && task.try(:due), ) end @@ -73,12 +73,12 @@ def update_task(task, title: nil, notes: nil, due: nil, completed: nil, deleted: refresh_token_if_needed do patch("https://tasks.googleapis.com/tasks/v1/lists/#{list_id_of(task)}/tasks/#{task.id}").param( { id: task.id, - title: title, - notes: notes, + title:, + notes:, due: format_time(due), status: !!completed ? "completed" : "needsAction", completed: completed.presence && format_time(completed), - deleted: deleted, + deleted:, }.compact) # w/o this it updates values to nil end end diff --git a/app/services/toolbox/memory.rb b/app/services/toolbox/memory.rb index 5419d706e..ffab5d78c 100644 --- a/app/services/toolbox/memory.rb +++ b/app/services/toolbox/memory.rb @@ -15,6 +15,8 @@ def remember_detail_about_user(detail_s:) conversation_messages = Current.message.conversation.messages.for_conversation_version(Current.message.version) related_message = conversation_messages.where("messages.id < ?", Current.message.id).last Current.user.memories.create!(detail: detail_s, message: related_message) - "This has been remembered" + { + message_to_user: "Memory updated" + } end end diff --git a/app/views/assistants/_assistant.html.erb b/app/views/assistants/_assistant.html.erb index d36f297f6..3e04f9fea 100644 --- a/app/views/assistants/_assistant.html.erb +++ b/app/views/assistants/_assistant.html.erb @@ -6,7 +6,7 @@ <%# This extra div ^ is needed because of the absolute positioning. It doesn't lay out properly if added to the div below. %>
" data-transition-target="<%= !visible && 'transitionable' %>" > - <%= link_to new_assistant_message_path(assistant), class: "flex-1 flex items-center text-gray-950 dark:text-gray-100 font-medium truncate", data: { role: "name" } do %> + <%= link_to new_assistant_message_path(assistant), class: "flex-1 flex py-1 items-center text-gray-950 dark:text-gray-100 font-medium truncate", data: { role: "name" } do %> <%= render partial: "layouts/assistant_avatar", locals: { assistant: assistant, size: 7, classes: "mr-2" } %> <%= assistant.name %> <% end %> diff --git a/app/views/authentications/new.html.erb b/app/views/authentications/new.html.erb index f88b7a5ba..f5389ca9e 100644 --- a/app/views/authentications/new.html.erb +++ b/app/views/authentications/new.html.erb @@ -26,6 +26,27 @@ <% end %> +<% if Feature.microsoft_graph_authentication? %> + <%= button_to "Log In with Microsoft", "/auth/microsoft_graph", + method: "post", + class: %| + text-white font-medium + bg-brand-blue dark:bg-gray-900 + border border-white dark:border-gray-400 + rounded-lg p-4 text-center + cursor-pointer + hover:opacity-95 + |, + form_class: "flex flex-col space-y-4 w-80", + data: { + turbo: false, + } + %> + + - Or - + +<% end %> + <% if Feature.password_authentication? %> <%= form_with(url: login_path, method: :post, class: "flex flex-col space-y-4 w-80") do |f| %> <%= f.email_field :email, diff --git a/app/views/conversations/index.html.erb b/app/views/conversations/index.html.erb new file mode 100644 index 000000000..951113dc7 --- /dev/null +++ b/app/views/conversations/index.html.erb @@ -0,0 +1,57 @@ + +
+ <%= form_with(url: conversations_path, + data: { turbo_frame: "nav_conversations", controller: "search" }, + class: "contents", + method: :get + ) do |form| %> +
+ <%= form.text_field :query, + value: @query, + placeholder: "Search", + id: "search-input", + autofocus: @query.nil? ? false : true, + class: %| + w-full + p-2 py-1 + border border-gray-200 rounded-lg + text-black dark:text-gray-800 + |, + data: { + search_target: "input", + turbo_permanent: true, + action: %| + blur->search#unfocus + input->search#search + %| + } + %> + <%= icon "x-circle", + variant: :mini, + size: 18, + class: "cursor-pointer text-gray-800 absolute right-1 top-1/2 transform -translate-y-1/2", + data: { search_target: "clear", action: "click->search#clear" } + %> +
+ <% end %> +
+ +
+ + > + <% @nav_conversations.each do |named_time_span, conversations| %> +
+ <%= named_time_span %> +
+ + <%= render conversations %> + <% end %> + +
+ diff --git a/app/views/layouts/_assistant_avatar.erb b/app/views/layouts/_assistant_avatar.erb index 52efb8bd6..ddd74fa63 100644 --- a/app/views/layouts/_assistant_avatar.erb +++ b/app/views/layouts/_assistant_avatar.erb @@ -11,6 +11,8 @@ elsif assistant.name.starts_with?("Claude") "claude_logo.svg" elsif assistant.name.starts_with?("Meta Llama") "meta_ai_logo.svg" +elsif assistant.name.starts_with?("Gemini") + "google_gemini_logo.svg" end %> <% if logo %> diff --git a/app/views/layouts/_settings_item.erb b/app/views/layouts/_settings_item.erb index 5ec2e5ecc..085de0b37 100644 --- a/app/views/layouts/_settings_item.erb +++ b/app/views/layouts/_settings_item.erb @@ -3,7 +3,7 @@ <% selected = selected && params[:id] == item.try(:id)&.to_s if controller.to_s == "assistants" %>
\ No newline at end of file diff --git a/app/views/layouts/_user_avatar.erb b/app/views/layouts/_user_avatar.erb index ec58ae5d3..8a74e979c 100644 --- a/app/views/layouts/_user_avatar.erb +++ b/app/views/layouts/_user_avatar.erb @@ -11,5 +11,5 @@ <%= classes %> " > - <%= user.name.initials&.upcase %> + <%= at_most_two_initials(user.name.initials)&.upcase %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6f67f5e7f..86d06f452 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -35,8 +35,8 @@
<%= render partial: "layouts/user_avatar", locals: { user: Current.user, size: 7, classes: "ml-2 mr-2" } %> -
- <%= Current.user.name.full || "Profile" %> +
+ <%= Current.user.name.full || "Profile" %>
<%= icon "chevron-up", variant: :mini, class: 'text-gray-500 ml-[2px]' %>
diff --git a/app/views/messages/_message.html.erb b/app/views/messages/_message.html.erb index 794d00101..2d13888af 100644 --- a/app/views/messages/_message.html.erb +++ b/app/views/messages/_message.html.erb @@ -13,11 +13,11 @@ end %> <% scroll_down = scroll_down || initial_page_load %> <% thinking ||= last_message && message.content_text == "" && message.not_cancelled? %> <% done_thinking = !thinking && message.content_text.present? %> -<% debug_tool_messages = false %> +<% debug_tool_message = false %>
" + class="mb-5 ml-9 sm:ml-3 md:ml-8 group <%= message.only_tool_response? && !message_to_user_from_tool_call?(message) && !debug_tool_message && "hidden" %>" data-role="message" data-subrole="<%= message.role %>-message" @@ -28,7 +28,6 @@ end %> data-playback-transition-outlet="#playback-control-<%= message.id %>" data-action="turbo:before-morph-attribute->playback#preserveStimulusValues" > -
> -
+
<%= render_avatar_for(message) %>
@@ -57,7 +56,7 @@ end %> data-transition-toggle-class="hidden" >
- <%= from_name_for(message) %> + <%= from_name_for(message) unless message.tool? %>
@@ -107,10 +106,10 @@ end %>
<% end %> <% end %> - <%= formatted_text = format_for_display message.content_text, append_inside_tag: thinking_html(message, thinking) %> + <%= formatted_text = format_for_display message, append_inside_tag: thinking_html(message, thinking) %>
- <% if debug_tool_messages && message.content_tool_calls.present? %> + <% if debug_tool_message && message.content_tool_calls.present? %>
flex justify-start gap-2 text-gray-600 dark:text-gray-300 + h-[19px] <%= !last_message && done_thinking && 'invisible' %> group-hover:visible "> <% if message.versions.length > 1 %> diff --git a/app/views/messages/_nav_column.html.erb b/app/views/messages/_nav_column.html.erb index 8b359a07e..46914776d 100644 --- a/app/views/messages/_nav_column.html.erb +++ b/app/views/messages/_nav_column.html.erb @@ -25,19 +25,7 @@ <% end %> -
- - > - <% @nav_conversations.each do |named_time_span, conversations| %> -
- <%= named_time_span %> -
- - <%= render conversations %> - <% end %> - -
+ diff --git a/app/views/settings/api_services/_form.html.erb b/app/views/settings/api_services/_form.html.erb index 974871197..a6c9d0733 100644 --- a/app/views/settings/api_services/_form.html.erb +++ b/app/views/settings/api_services/_form.html.erb @@ -112,7 +112,7 @@ "Select Plan" and just pick the "Build" plan. -
    " and paste it below.
+ <%= form.text_field :token, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full dark:text-black", autocomplete: "off" %>
diff --git a/app/views/settings/assistants/_form.html.erb b/app/views/settings/assistants/_form.html.erb index 669795c0b..fc2fe2220 100644 --- a/app/views/settings/assistants/_form.html.erb +++ b/app/views/settings/assistants/_form.html.erb @@ -24,6 +24,21 @@ | %>
+ <% unless assistant.new_record? %> +
+ <%= form.label :slug %> + <%= form.text_field :slug, + autofocus: assistant.new_record?, + class: %| + block w-full + border border-gray-200 outline-none + shadow rounded-md + px-3 py-2 mt-2 + dark:text-black + | %> +
+ <% end %> +
<%= form.label :language_model_id %>
<%= form.select :language_model_id, diff --git a/app/views/settings/language_models/_form.html.erb b/app/views/settings/language_models/_form.html.erb index efcfa1f91..d8ee22f2e 100644 --- a/app/views/settings/language_models/_form.html.erb +++ b/app/views/settings/language_models/_form.html.erb @@ -39,6 +39,12 @@ %>
<% end %> + +
+ <%= form.check_box :best %> + <%= form.label :best, "Best?" %> +
+
<%= form.check_box :supports_images %> <%= form.label :supports_images, "Supports Images?" %> @@ -47,6 +53,10 @@ <%= form.check_box :supports_tools %> <%= form.label :supports_tools, "Supports Tools (Function Calling)?" %>
+
+ <%= form.check_box :supports_system_message %> + <%= form.label :supports_system_message, "Supports System Message (Instructions)?" %> +
<%= form.submit "Save", class: %| diff --git a/app/views/settings/language_models/index.html.erb b/app/views/settings/language_models/index.html.erb index 22047244e..d870ba453 100644 --- a/app/views/settings/language_models/index.html.erb +++ b/app/views/settings/language_models/index.html.erb @@ -15,6 +15,7 @@ Name + Best? Description API Service @@ -25,6 +26,7 @@ <%= turbo_frame_tag dom_id(language_model) do %> <%= language_model.api_name %> + <%= language_model.best? ? "Yes" : "No" %> <%= language_model.name %> <%= n_a_if_blank(language_model.api_service.name) %> diff --git a/app/views/settings/memories/_memory.html.erb b/app/views/settings/memories/_memory.html.erb index f631812af..37529b4dd 100644 --- a/app/views/settings/memories/_memory.html.erb +++ b/app/views/settings/memories/_memory.html.erb @@ -1,4 +1,20 @@ -
  • - <%= memory.detail %> - <%= link_to_source(memory).html_safe %> -
    • + + + <%= memory.detail %> + <%= link_to_source(memory).html_safe if memory.message.present? %> + + + <%= button_to settings_memory_path(memory), method: :delete, class: "inline-block cursor-pointer py-1 pt-0 align-middle" do %> + <%= icon "trash", + variant: :outline, + size: 22, + class: %| + stroke-2 + text-zinc-600 group-hover:text-zinc-900 dark:text-zinc-400 dark:group-hover:text-white + |, + title: "Forget", + tooltip: :bottom + %> + <% end %> + + diff --git a/app/views/settings/memories/index.html.erb b/app/views/settings/memories/index.html.erb index de1f2cb60..bbeb8ae05 100644 --- a/app/views/settings/memories/index.html.erb +++ b/app/views/settings/memories/index.html.erb @@ -25,8 +25,14 @@ <% end %>

    -
      + + + + + + + <%= render @memories %> - +
      Memory
    diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index fe5f98f62..d8754299a 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -30,6 +30,27 @@ <% end %> +<% if Feature.microsoft_graph_authentication? %> + <%= button_to "Sign Up with Microsoft", "/auth/microsoft_graph", + method: "post", + class: %| + text-white font-medium + bg-brand-blue dark:bg-gray-900 + border border-white dark:border-gray-400 + rounded-lg p-4 text-center + cursor-pointer + hover:opacity-95 + |, + form_class: "flex flex-col space-y-4 w-80", + data: { + turbo: false, + } + %> + + - Or - + +<% end %> + <% if Feature.password_authentication? %> <%= form_with method: :post, model: @person, diff --git a/assistants.yml b/assistants.yml new file mode 100644 index 000000000..13ac485da --- /dev/null +++ b/assistants.yml @@ -0,0 +1,14 @@ +--- +assistants: +- name: GPT-4o + slug: gpt-4o + language_model_api_name: gpt-4o +- name: Claude 3.5 Sonnet + slug: claude-sonnet + language_model_api_name: claude-3-5-sonnet-20241022 +- name: Meta Llama + slug: llama-3-70b + language_model_api_name: llama-3.1-70b-versatile +- name: Gemini Pro 1.5 + slug: gemini-1-5-pro + language_model_api_name: gemini-1.5-pro-002 diff --git a/bin/dev b/bin/dev index be1eec70e..af29eb0ce 100755 --- a/bin/dev +++ b/bin/dev @@ -1,6 +1,7 @@ #!/usr/bin/env bash export PORT="${PORT:-3000}" +export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES # the gemini gem throws an error without this if ! gem list overmind -i --silent; then echo "Installing overmind..." diff --git a/bin/docker_run b/bin/docker_run deleted file mode 100755 index 8b40da077..000000000 --- a/bin/docker_run +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -user_name=$(whoami) - -docker build . -t gpt -docker run \ - --rm \ - -it \ - -e SECRET_KEY_BASE=0 \ - -e RAILS_ENV=development \ - -e DATABASE_URL=postgresql://${user_name}@host.docker.internal:5432/hostedgpt_development \ - -p 3000:3000 \ - -e PORT=3000 \ - gpt diff --git a/config/application.rb b/config/application.rb index 2f53f0fa0..155741e43 100644 --- a/config/application.rb +++ b/config/application.rb @@ -37,13 +37,25 @@ class Application < Rails::Application config.time_zone = "Central Time (US & Canada)" config.eager_load_paths << Rails.root.join("lib") - if Setting.validate_env_vars == "1" - Setting.require_keys!(:app_url_protocol, :app_url_host, :app_url_port) + url_settings = [:app_url_protocol, :app_url_host] + if url_settings.any?{|k| Setting.key_set?(k)} + Setting.require_keys!(*url_settings) + + config.x.app_url_protocol = Setting.app_url_protocol + config.x.app_url_host = Setting.app_url_host + + port = Setting.app_url_port.to_s + if port.blank? || port == "80" + config.x.app_url_port = nil + else + config.x.app_url_port = Setting.app_url_port + end + + port_str = config.x.app_url_port.present? ? ":#{port}" : "" + config.x.app_url = "#{Setting.app_url_protocol}://#{Setting.app_url_host}#{port_str}" + else + config.x.app_url = nil end - config.app_url_protocol = Setting.app_url_protocol - config.app_url_host = Setting.app_url_host - config.app_url_port = Setting.app_url_port - config.app_url = "#{Setting.app_url_protocol}://#{Setting.app_url_host}:#{Setting.app_url_port}" # Active Storage if Feature.cloudflare_storage? diff --git a/config/database.yml b/config/database.yml index 6fa635417..1585067dd 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,24 +1,41 @@ +<% + def puts_red(msg) + puts "\e[31m#{msg}\e[0m" + end + + def deprecated(env, message) + puts_red "DEPRECATED: #{env} is deprecated, #{message}" if ENV[env] + end + + deprecated("HOSTEDGPT_DATABASE_PORT", "use HOSTED_DB_PORT instead") + deprecated("HOSTEDGPT_DEV_DB", "use HOSTED_DB_NAME instead") + deprecated("HOSTEDGPT_TEST_DB", "provide HOSTED_DB_NAME and test database name is generated") + deprecated("HOSTEDGPT_DATABASE_PASSWORD", "use HOSTED_DB_PASSWORD instead") +%> + default: &default adapter: postgresql + username: <%= ENV["HOSTED_DB_USERNAME"] %> + password: <%= ENV["HOSTEDGPT_DATABASE_PASSWORD"] || ENV["HOSTED_DB_PASSWORD"] %> + host: <%= ENV["HOSTED_DB_HOST"] %> + port: <%= ENV["HOSTEDGPT_DATABASE_PORT"] || ENV["HOSTED_DB_PORT"] %> encoding: unicode - host: localhost pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - port: <%= ENV['HOSTEDGPT_DATABASE_PORT'] || 5432 %> <% if RUBY_PLATFORM =~ /darwin/ %> gssencmode: disable <% end %> development: <<: *default - database: <%= ENV['HOSTEDGPT_DEV_DB'] || "hostedgpt_development" %> + database: <%= ENV["HOSTEDGPT_DEV_DB"] || "#{ENV['HOSTED_DB_NAME'] || 'hostedgpt'}_development" %> test: <<: *default - database: <%= ENV['HOSTEDGPT_TEST_DB'] || "hostedgpt_test" %> + database: <%= ENV["HOSTEDGPT_TEST_DB"] || "#{ENV['HOSTED_DB_NAME'] || 'hostedgpt'}_test" %> production: <<: *default - database: hostedgpt_production - username: hostedgpt - password: <%= ENV["HOSTEDGPT_DATABASE_PASSWORD"] %> - \ No newline at end of file + # It's best to set DATABASE_URL to configure database in production. That overrides this "database" name. + url: <%= ENV["DATABASE_URL"] %> + database: <%= ENV["HOSTEDGPT_DEV_DB"] || "#{ENV['HOSTED_DB_NAME'] || 'hostedgpt'}_production" %> + username: <%= ENV["HOSTED_DB_USERNAME"] || "hostedgpt" %> diff --git a/config/environments/development.rb b/config/environments/development.rb index 53b35c62f..5220d4138 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -87,8 +87,9 @@ config.web_console.permissions = ["192.168.0.0/16", "172.17.0.0/16", "172.18.0.0/16"] - config.hosts << Setting.app_url_host + # TODO should we combine this with APP_URL_HOST? config.hosts << ENV["DEV_HOST"] if ENV["DEV_HOST"].present? + config.hosts << Setting.app_url_host if Setting.key_set?(:app_url_host) stdout_logger = ActiveSupport::Logger.new(STDOUT) tagged_logger = ActiveSupport::TaggedLogging.new(stdout_logger) diff --git a/config/environments/production.rb b/config/environments/production.rb index f5f5c9b1b..bfe8d882b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -97,8 +97,9 @@ # "example.com", # Allow requests from example.com # /.*\.example\.com/ # Allow requests from subdomains like `www.example.com` # ] - config.hosts = ENV["PRODUCTION_HOST"].split(",").map(&:strip) if ENV["PRODUCTION_HOST"] - # config.hosts << Setting.app_url_host + # TODO should we combine this with APP_URL_HOST? + config.hosts << ENV["PRODUCTION_HOST"].split(",").map(&:strip) if ENV["PRODUCTION_HOST"] + config.hosts << Setting.app_url_host if Setting.key_set?(:app_url_host) # Skip DNS rebinding protection for the default health check endpoint. config.host_authorization = { exclude: ->(request) { request.path == "/up" } } diff --git a/config/initializers/email_feature.rb b/config/initializers/email_feature.rb index 1ef1faa05..b59725fc5 100644 --- a/config/initializers/email_feature.rb +++ b/config/initializers/email_feature.rb @@ -1,6 +1,7 @@ module Email class Providers POSTMARK = "postmark".freeze + SMTP = "smtp".freeze class << self def all @@ -27,11 +28,23 @@ class PasswordReset abort "ERROR: The value of EMAIL_PROVIDER must be one of: #{Email::Providers.all.join(", ")}" end - if Setting.email_provider == Email::Providers::POSTMARK + case Setting.email_provider + when Email::Providers::POSTMARK Setting.require_keys!(:postmark_server_api_token) config.action_mailer.delivery_method = :postmark config.action_mailer.postmark_settings = { api_token: Setting.postmark_server_api_token } + when Email::Providers::SMTP + Setting.require_keys!(:smtp_address, :smtp_user_name, :smtp_password) + config.action_mailer.delivery_method = :smtp + config.action_mailer.smtp_settings = { + address: Setting.smtp_address, + port: Setting.smtp_port.to_i, + user_name: Setting.smtp_user_name, + password: Setting.smtp_password, + authentication: Setting.smtp_authentication, + enable_starttls_auto: Setting.smtp_enable_starttls_auto.to_b + } end end end diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 48eadec41..95a227561 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -26,4 +26,10 @@ include_granted_scopes: true } + provider :microsoft_graph, Setting.microsoft_graph_auth_client_id, Setting.microsoft_graph_auth_client_secret, { + name: "microsoft_graph", + scope: Setting.microsoft_graph_scope.presence || %| + openid profile email offline_access user.read mailboxsettings.read + | + } end diff --git a/config/options.yml b/config/options.yml index 44ee2ebe8..784c4ee50 100644 --- a/config/options.yml +++ b/config/options.yml @@ -40,6 +40,7 @@ shared: google_tools: <%= ENV["GOOGLE_TOOLS_FEATURE"] || false %> password_authentication: <%= ENV["PASSWORD_AUTHENTICATION_FEATURE"] || true %> google_authentication: <%= ENV["GOOGLE_AUTHENTICATION_FEATURE"] || false %> + microsoft_graph_authentication: <%= ENV["MICROSOFT_GRAPH_AUTHENTICATION_FEATURE"] || false %> http_header_authentication: <%= ENV["HTTP_HEADER_AUTHENTICATION_FEATURE"] || false %> voice: <%= ENV["VOICE_FEATURE"] || false %> default_to_voice: <%= ENV["DEFAULT_TO_VOICE_FEATURE"] || false %> @@ -47,10 +48,9 @@ shared: password_reset_email: <%= ENV["PASSWORD_RESET_EMAIL_FEATURE"] || default_to(false, except_env_test: true) %> settings: # Be sure to add these ENV to docker-compose.yml - app_url_protocol: <%= ENV["APP_URL_PROTOCOL"] %> - app_url_host: <%= ENV["APP_URL_HOST"] %> - app_url_port: <%= ENV["APP_URL_PORT"] %> - validate_env_vars: <%= ENV["VALIDATE_ENV_VARS"] || "1" %> + app_url_protocol: <%= ENV["APP_URL_PROTOCOL"] || default_to(app_url: :protocol) %> + app_url_host: <%= ENV["APP_URL_HOST"] || default_to(app_url: :host) %> + app_url_port: <%= ENV["APP_URL_PORT"] || default_to(app_url: :port) %> product_name: <%= ENV["PRODUCT_NAME"] || "HostedGPT" %> default_openai_key: <%= ENV["DEFAULT_OPENAI_KEY"] %> default_anthropic_key: <%= ENV["DEFAULT_ANTHROPIC_KEY"] %> @@ -59,8 +59,11 @@ shared: cloudflare_access_key_id: <%= ENV["CLOUDFLARE_ACCESS_KEY_ID"] || default_to(cloudflare: :access_key_id) %> cloudflare_secret_access_key: <%= ENV["CLOUDFLARE_SECRET_ACCESS_KEY"] || default_to(cloudflare: :secret_access_key) %> cloudflare_bucket: <%= ENV["CLOUDFLARE_BUCKET"] || default_to(cloudflare: :bucket) %> - google_auth_client_id: <%= ENV["GOOGLE_AUTH_CLIENT_ID"] || default_to(:google_auth_client_id) %> - google_auth_client_secret: <%= ENV["GOOGLE_AUTH_CLIENT_SECRET"] || default_to(:google_auth_client_secret) %> + google_auth_client_id: <%= ENV["GOOGLE_AUTH_CLIENT_ID"] || default_to(google: :auth_client_id) || default_to(:google_auth_client_id) %> + google_auth_client_secret: <%= ENV["GOOGLE_AUTH_CLIENT_SECRET"] || default_to(google: :auth_client_secret) || default_to(:google_auth_client_secret) %> + microsoft_graph_auth_client_id: <%= ENV["MICROSOFT_GRAPH_AUTH_CLIENT_ID"] || default_to(microsoft_graph: :auth_client_id) %> + microsoft_graph_auth_client_secret: <%= ENV["MICROSOFT_GRAPH_AUTH_CLIENT_SECRET"] || default_to(microsoft_graph: :auth_client_secret) %> + microsoft_graph_scope: <%= ENV["MICROSOFT_GRAPH_SCOPE"] || default_to(microsoft_graph: :scope) %> http_header_auth_email: <%= ENV["HTTP_HEADER_AUTH_EMAIL"] || "X-WEBAUTH-EMAIL" %> http_header_auth_name: <%= ENV["HTTP_HEADER_AUTH_NAME"] || "X-WEBAUTH-NAME" %> http_header_auth_uid: <%= ENV["HTTP_HEADER_AUTH_UID"] || "X-WEBAUTH-USER" %> @@ -68,3 +71,9 @@ shared: email_from: <%= ENV["EMAIL_FROM"] || default_to(:email_from, except_env_test: "support@example.com") %> email_host: <%= ENV["EMAIL_HOST"] || default_to(:email_host, except_env_test: "example.com") %> postmark_server_api_token: <%= ENV["POSTMARK_SERVER_API_TOKEN"] || default_to(:postmark_server_api_token, except_env_test: "test-token") %> + smtp_address: <%= ENV["SMTP_ADDRESS"] || default_to(:smtp_address) %> + smtp_port: <%= ENV["SMTP_PORT"] || default_to(:smtp_port) || 587 %> + smtp_user_name: <%= ENV["SMTP_USER_NAME"] || default_to(:smtp_user_name) %> + smtp_password: <%= ENV["SMTP_PASSWORD"] || default_to(:smtp_password) %> + smtp_authentication: <%= ENV["SMTP_AUTHENTICATION"] || default_to(:smtp_authentication) || "plain" %> + smtp_enable_starttls_auto: <%= ENV["SMTP_ENABLE_STARTTLS_AUTO"] || default_to(:smtp_enable_starttls_auto) || true %> diff --git a/config/routes.rb b/config/routes.rb index 810de522f..73386abb5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,7 +7,7 @@ resources :messages, only: [:new, :create, :edit] end - resources :conversations, only: [:show, :edit, :update, :destroy] do + resources :conversations, only: [:index, :show, :edit, :update, :destroy] do resources :messages, only: [:index] end @@ -18,8 +18,8 @@ resource :person, only: [:edit, :update] resources :language_models resources :api_services, except: [:show] - resources :memories, only: [:index] do - delete :destroy, on: :collection + resources :memories, only: [:index, :destroy] do + delete :destroy, to: "memories#destroy_all", on: :collection end end @@ -33,6 +33,7 @@ resource :password_credential, only: [:edit, :update] end + get "/auth/microsoft_graph/callback" => "authentications/microsoft_graph_oauth#create", as: :microsoft_graph_oauth, provider: "microsoft_graph" get "/auth/:provider/callback" => "authentications/google_oauth#create", as: :google_oauth get "/auth/failure" => "authentications/google_oauth#failure" # connected in omniauth.rb diff --git a/db/migrate/20240128211815_change_column_assistant_id_on_messages.rb b/db/migrate/20240128211815_change_column_assistant_id_on_messages.rb index a5eb9294d..36192eae8 100644 --- a/db/migrate/20240128211815_change_column_assistant_id_on_messages.rb +++ b/db/migrate/20240128211815_change_column_assistant_id_on_messages.rb @@ -1,6 +1,6 @@ class ChangeColumnAssistantIdOnMessages < ActiveRecord::Migration[7.1] def up - Message.all.each { |m| m.update!(assistant: m.conversation.assistant) } + # Message.all.each { |m| m.update!(assistant: m.conversation.assistant) } change_column :messages, :assistant_id, :bigint, null: false end diff --git a/db/migrate/20240523080700_create_language_models.rb b/db/migrate/20240523080700_create_language_models.rb index 0405c4b64..79ee59f5e 100644 --- a/db/migrate/20240523080700_create_language_models.rb +++ b/db/migrate/20240523080700_create_language_models.rb @@ -75,9 +75,14 @@ def down end def create_without_validation!(attributes) - record = LanguageModel.new(attributes) - if !record.save(validate: false) - raise "Could not create LanguageModel record for #{attributes.inspect}" + LanguageModel.skip_callback(:save, :after, :update_best_language_model_for_api_service) + begin + record = LanguageModel.new(attributes) + if !record.save(validate: false) + raise "Could not create LanguageModel record for #{attributes.inspect}" + end + ensure + LanguageModel.set_callback(:save, :after, :update_best_language_model_for_api_service) end record end diff --git a/db/migrate/20240620100000_add_claude_3_5_sonnet_to_language_models.rb b/db/migrate/20240620100000_add_claude_3_5_sonnet_to_language_models.rb index dac7f4793..e8e07abfd 100644 --- a/db/migrate/20240620100000_add_claude_3_5_sonnet_to_language_models.rb +++ b/db/migrate/20240620100000_add_claude_3_5_sonnet_to_language_models.rb @@ -33,9 +33,14 @@ def down end def create_without_validation!(attributes) - record = LanguageModel.new(attributes) - if !record.save(validate: false) - raise "Could not create LanguageModel record for #{attributes.inspect}" + LanguageModel.skip_callback(:save, :after, :update_best_language_model_for_api_service) + begin + record = LanguageModel.new(attributes) + if !record.save(validate: false) + raise "Could not create LanguageModel record for #{attributes.inspect}" + end + ensure + LanguageModel.set_callback(:save, :after, :update_best_language_model_for_api_service) end record end diff --git a/db/migrate/20240622100000_move_system_language_models_to_users.rb b/db/migrate/20240622100000_move_system_language_models_to_users.rb index e0913eb72..1f9728f36 100644 --- a/db/migrate/20240622100000_move_system_language_models_to_users.rb +++ b/db/migrate/20240622100000_move_system_language_models_to_users.rb @@ -14,7 +14,7 @@ def up Rails.logger.info "Create api_services/language_models records for all #{User.count} users records" User.all.find_each do |user| Rails.logger.info "Create api_services records for OpenAI for user #{user.id}" - openai_api_service = user.api_services.create!(name: "OpenAI", driver: :openai, url: "https://api.openai.com/", token: user.openai_key) + openai_api_service = user.api_services.create!(name: "OpenAI", driver: :openai, url: "https://api.openai.com/v1/", token: user.openai_key) Rails.logger.info "Create api_services records for Anthropic for user #{user.id}" anthropic_api_service = user.api_services.create!(name: "Anthropic", driver: :anthropic, url: "https://api.anthropic.com/", token: user.anthropic_key) diff --git a/db/migrate/20240624100000_add_groq.rb b/db/migrate/20240624100000_add_groq.rb index 3fc87474c..634a6aec7 100644 --- a/db/migrate/20240624100000_add_groq.rb +++ b/db/migrate/20240624100000_add_groq.rb @@ -6,29 +6,7 @@ def up APIService.reset_column_information User.all.find_each do |user| - groq_api_service = user.api_services.create!(url: APIService::URL_GROQ, driver: :openai, name: "Groq") - language_model = user.language_models.create!(position: 3, api_name: LanguageModel::BEST_GROQ, api_service: groq_api_service, name: "Best Open-Source Model", supports_images: false) - user.language_models.where("position >= 3").where.not(id: language_model.id).find_each do |model| - model.update(position: model.position + 1) - end - - [ - ["llama3-70b-8192", "Meta Llama 3 70b", false, groq_api_service], - ["llama3-8b-8192", "Meta Llama 3 8b", false, groq_api_service], - ["mixtral-8x7b-32768", "Mistral 8 7b", false, groq_api_service], - ["gemma-7b-it", "Google Gemma 7b", false, groq_api_service], - ].each do |api_name, name, supports_images, api_service| - user.language_models.create!(api_name: api_name, api_service: api_service, name: name, supports_images: supports_images) - end - - [ "GPT-3.5", "Claude 3 Opus" ].each do |name| - asst = user.assistants.find_by(name: name) - next if asst.nil? - asst.deleted! if asst.conversations.count == 0 - asst.deleted! if asst.conversations.count == 1 && asst.conversations.first.messages.count <= 2 - end - - user.assistants.create!(name: "Meta Llama 3 70b", language_model: language_model) + user.api_services.create!(url: APIService::URL_GROQ, driver: :openai, name: "Groq") end end diff --git a/db/migrate/20240911114059_update_existing_language_models_with_prices.rb b/db/migrate/20240911114059_update_existing_language_models_with_prices.rb deleted file mode 100644 index 8116e8a57..000000000 --- a/db/migrate/20240911114059_update_existing_language_models_with_prices.rb +++ /dev/null @@ -1,56 +0,0 @@ -class UpdateExistingLanguageModelsWithPrices < ActiveRecord::Migration[7.1] - def up - [ - [LanguageModel::BEST_GPT, LanguageModel::BEST_MODEL_INPUT_PRICES[LanguageModel::BEST_GPT], LanguageModel::BEST_MODEL_OUTPUT_PRICES[LanguageModel::BEST_GPT]], - [LanguageModel::BEST_CLAUDE, LanguageModel::BEST_MODEL_INPUT_PRICES[LanguageModel::BEST_CLAUDE], LanguageModel::BEST_MODEL_OUTPUT_PRICES[LanguageModel::BEST_CLAUDE]], - [LanguageModel::BEST_GROQ, LanguageModel::BEST_MODEL_INPUT_PRICES[LanguageModel::BEST_GROQ], LanguageModel::BEST_MODEL_OUTPUT_PRICES[LanguageModel::BEST_GROQ]], - - ["gpt-4o", 500, 1500], - ["gpt-4o-2024-05-13", 500, 1500], - - ["gpt-4-turbo", 1000, 3000], - ["gpt-4-turbo-2024-04-09", 1000, 3000], - ["gpt-4-turbo-preview", 1000, 3000], # not sure on price - ["gpt-4-0125-preview", 1000, 3000], - ["gpt-4-1106-preview", 1000, 3000], - ["gpt-4-vision-preview", 1000, 3000], - ["gpt-4-1106-vision-preview", 1000, 3000], # not sure on price - - ["gpt-4", 3000, 6000], - ["gpt-4-0613", 1000, 3000], # not sure on price - - ["gpt-3.5-turbo", 300, 600], - ["gpt-3.5-turbo-0125", 50, 150], - ["gpt-3.5-turbo-1106", 100, 200], - - ["claude-3-5-sonnet-20240620",300, 1500], - ["claude-3-opus-20240229", 1500, 7500], - ["claude-3-sonnet-20240229", 300, 1500], - ["claude-3-haiku-20240307", 25, 125], - ["claude-2.1", 800, 2400], - ["claude-2.0", 800, 2400], - ["claude-instant-1.2", 80, 240], - - ["llama3-70b-8192", 59, 79], - ["llama3-8b-8192", 5, 8], - ["mixtral-8x7b-32768", 24, 24], - ["gemma-7b-it", 7, 7], - - ["gpt-3.5-turbo-instruct", 150, 200], - ["gpt-3.5-turbo-16k-0613", 300, 400], - ].each do |api_name, input_token_cost_per_million, output_token_cost_per_million| - million = BigDecimal(1_000_000) - input_token_cost_cents = input_token_cost_per_million/million - output_token_cost_cents = output_token_cost_per_million/million - - LanguageModel.where(api_name: api_name).update_all( - input_token_cost_cents: input_token_cost_cents, - output_token_cost_cents: output_token_cost_cents, - ) - end - end - - def down - # nothing to do - end -end diff --git a/db/migrate/20241022053212_update_model_prices.rb b/db/migrate/20241022053212_update_model_prices.rb deleted file mode 100644 index 0d2bd98b0..000000000 --- a/db/migrate/20241022053212_update_model_prices.rb +++ /dev/null @@ -1,49 +0,0 @@ -class UpdateModelPrices < ActiveRecord::Migration[7.1] - def up - [ - [LanguageModel::BEST_GPT, LanguageModel::BEST_MODEL_INPUT_PRICES[LanguageModel::BEST_GPT], LanguageModel::BEST_MODEL_OUTPUT_PRICES[LanguageModel::BEST_GPT]], - - ["gpt-4o", 250, 1000], - ].each do |api_name, input_token_cost_per_million, output_token_cost_per_million| - million = BigDecimal(1_000_000) - input_token_cost_cents = input_token_cost_per_million/million - output_token_cost_cents = output_token_cost_per_million/million - - LanguageModel.where(api_name: api_name).update_all( - input_token_cost_cents: input_token_cost_cents, - output_token_cost_cents: output_token_cost_cents, - ) - end - - # add new model too - User.find_each do |user| - open_ai_api_service = user.api_services.find_or_create_by!(url: APIService::URL_OPEN_AI, driver: :openai, name: "OpenAI") - - [ - ["gpt-4o-2024-08-06", "GPT-4o Omni Multimodal (2024-08-06)", true, open_ai_api_service, 250, 1000], - ].each do |api_name, name, supports_images, api_service, input_token_cost_per_million, output_token_cost_per_million| - unless user.language_models.exists?(api_name: api_name) # don't add if it already exists - million = BigDecimal(1_000_000) - input_token_cost_cents = input_token_cost_per_million/million - output_token_cost_cents = output_token_cost_per_million/million - - - user.language_models.create!( - api_name: api_name, - name: name, - supports_images: supports_images, - api_service: api_service, - supports_tools: true, - input_token_cost_cents: input_token_cost_cents, - output_token_cost_cents: output_token_cost_cents, - ) - end - end - end - - end - - def down - # nothing to do - end -end diff --git a/db/migrate/20241106213119_add_best_to_language_models.rb b/db/migrate/20241106213119_add_best_to_language_models.rb new file mode 100644 index 000000000..fe7d290fe --- /dev/null +++ b/db/migrate/20241106213119_add_best_to_language_models.rb @@ -0,0 +1,5 @@ +class AddBestToLanguageModels < ActiveRecord::Migration[7.2] + def change + add_column :language_models, :best, :boolean, default: false + end +end diff --git a/db/migrate/20241111131751_add_supports_system_message_to_language_models.rb b/db/migrate/20241111131751_add_supports_system_message_to_language_models.rb new file mode 100644 index 000000000..e1e0315b8 --- /dev/null +++ b/db/migrate/20241111131751_add_supports_system_message_to_language_models.rb @@ -0,0 +1,17 @@ +class AddSupportsSystemMessageToLanguageModels < ActiveRecord::Migration[7.1] + def change + add_column :language_models, :supports_system_message, :boolean, default: false + + ActiveRecord::Base.connection.execute <<-END_SQL + UPDATE + language_models + SET supports_system_message = true + WHERE + (api_name like 'gpt%' and api_name <> 'gpt-3.5-turbo-instruct' and api_name <> 'gpt-3.5-turbo-16k-0613') OR + api_name like 'claude%' OR + api_name like 'groq%' OR + api_name like 'gemma%' OR + api_name IN ('mixtral-8x7b-32768', 'llama3-70b-8192', 'llama3-8b-8192'); + END_SQL + end +end \ No newline at end of file diff --git a/db/migrate/20241126084627_add_slug_to_assistants.rb b/db/migrate/20241126084627_add_slug_to_assistants.rb new file mode 100644 index 000000000..ca0d134b2 --- /dev/null +++ b/db/migrate/20241126084627_add_slug_to_assistants.rb @@ -0,0 +1,43 @@ +class AddSlugToAssistants < ActiveRecord::Migration[7.2] + def up + add_column :assistants, :slug, :string, null: true + add_index :assistants, [:user_id, :slug], unique: true, where: "slug IS NOT NULL" + + # Update User's assistants to use the default slugs in assistants.yml + User.find_each do |user| + language_models = user.language_models + gpt4o = language_models.find_by(api_name: "gpt-4o") + gpt4o_mini = language_models.find_by(api_name: "gpt-4o-mini") + claude_3_5_sonnet_20241022 = language_models.find_by(api_name: "claude-3-5-sonnet-20241022") + claude_3_5_sonnet_20240620 = language_models.find_by(api_name: "claude-3-5-sonnet-20240620") + llama_3_1_70b = language_models.find_by(api_name: "llama-3.1-70b-versatile") + llama_3_70b = language_models.find_by(api_name: "llama3-70b-8192") + + ordered_assistants = user.assistants.order(created_at: :asc) + if gpt4o && (assistant = ordered_assistants.find_by(language_model: gpt4o)) + assistant.update(slug: "gpt-4o") + end + if gpt4o_mini && (assistant = ordered_assistants.find_by(language_model: gpt4o_mini)) + assistant.update(slug: "gpt-4o-mini") + end + + if claude_3_5_sonnet_20241022 && (assistant = ordered_assistants.find_by(language_model: claude_3_5_sonnet_20241022)) + assistant.update(slug: "claude-sonnet") + elsif claude_3_5_sonnet_20240620 && (assistant = ordered_assistants.find_by(language_model: claude_3_5_sonnet_20240620)) + assistant.update(slug: "claude-sonnet") + end + + if llama_3_1_70b && (assistant = ordered_assistants.find_by(language_model: llama_3_1_70b)) + assistant.update(slug: "llama-3-70b") + elsif llama_3_70b && (assistant = ordered_assistants.find_by(language_model: llama_3_70b)) + assistant.update(slug: "llama-3-70b") + end + + user.assistants.where(slug: nil).find_each(&:save!) + end + end + + def down + remove_column :assistants, :slug + end +end diff --git a/db/migrate/20241126084628_add_gemini.rb b/db/migrate/20241126084628_add_gemini.rb new file mode 100644 index 000000000..f17f4d5d1 --- /dev/null +++ b/db/migrate/20241126084628_add_gemini.rb @@ -0,0 +1,11 @@ +class AddGemini < ActiveRecord::Migration[7.2] + def up + User.all.find_each do |user| + user.api_services.create!(url: APIService::URL_GEMINI, driver: :gemini, name: "Google Gemini") + end + end + + def down + APIService.where(url: APIService::URL_GEMINI, driver: :gemini).destroy_all + end +end diff --git a/db/migrate/20241212091318_add_v1_to_api_services_url.rb b/db/migrate/20241212091318_add_v1_to_api_services_url.rb new file mode 100644 index 000000000..ec480f495 --- /dev/null +++ b/db/migrate/20241212091318_add_v1_to_api_services_url.rb @@ -0,0 +1,12 @@ +class AddV1ToAPIServicesURL < ActiveRecord::Migration[7.2] + def up + APIService.where(url: "https://api.openai.com/").each do |api_service| + api_service.update(url: api_service.url+"v1/") + end + end + def down + APIService.where(url: "https://api.openai.com/v1/").each do |api_service| + api_service.update(url: api_service.url.gsub("v1/","")) + end + end +end \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index ed71cceaa..14e07fe91 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2024_10_22_053212) do +ActiveRecord::Schema[7.2].define(version: 2024_12_12_091318) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -72,9 +72,11 @@ t.bigint "language_model_id" t.datetime "deleted_at", precision: nil t.text "external_id", comment: "The Backend AI's (e.g OpenAI) assistant id" + t.string "slug" t.index ["external_id"], name: "index_assistants_on_external_id", unique: true t.index ["language_model_id"], name: "index_assistants_on_language_model_id" t.index ["user_id", "deleted_at"], name: "index_assistants_on_user_id_and_deleted_at" + t.index ["user_id", "slug"], name: "index_assistants_on_user_id_and_slug", unique: true, where: "(slug IS NOT NULL)" t.index ["user_id"], name: "index_assistants_on_user_id" end @@ -172,6 +174,8 @@ t.boolean "supports_tools", default: false t.decimal "input_token_cost_cents", precision: 30, scale: 15 t.decimal "output_token_cost_cents", precision: 30, scale: 15 + t.boolean "best", default: false + t.boolean "supports_system_message", default: false t.index ["api_service_id"], name: "index_language_models_on_api_service_id" t.index ["user_id", "deleted_at"], name: "index_language_models_on_user_id_and_deleted_at" t.index ["user_id"], name: "index_language_models_on_user_id" diff --git a/docker-compose.yml b/docker-compose.yml index 28d6e1c26..9422c69e1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,22 @@ services: postgres: image: postgres:16 + container_name: hostedgpt_postgres restart: always environment: - POSTGRES_USER: app - POSTGRES_DB: app_development - POSTGRES_PASSWORD: secret + # NOTE: This Docker compose is intended for development. It does NOT support DATABASE_URL. + - POSTGRES_USER=${HOSTED_DB_USERNAME:-app} + - POSTGRES_PASSWORD=${HOSTED_DB_PASSWORD:-secret} + - POSTGRES_DB=${HOSTED_DB_NAME:-app}_development volumes: - hostedgpt_pgdata:/var/lib/postgresql/data healthcheck: - test: ["CMD", "pg_isready", "-U", "app", "-d", "app_development"] + test: pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB interval: 1s retries: 5 base: &base + container_name: hostedgpt depends_on: ["postgres"] restart: on-failure:3 tty: true @@ -22,11 +25,15 @@ services: target: development environment: # Be sure to add environment variables to config/options.yml + - HOSTED_DB_USERNAME=${HOSTED_DB_USERNAME:-app} + - HOSTED_DB_PASSWORD=${HOSTED_DB_PASSWORD:-secret} + - HOSTED_DB_HOST=${HOSTED_DB_HOST:-postgres} + - HOSTED_DB_PORT=${HOSTED_DB_PORT:-5432} + - HOSTED_DB_NAME=${HOSTED_DB_NAME:-app} + # NOTE: Using DATABASE_URL to configure db is NOT supported by this Docker compose - APP_URL_PROTOCOL - APP_URL_HOST - APP_URL_PORT - - VALIDATE_ENV_VARS - - DATABASE_URL=postgres://app:secret@postgres/app_development - DEV_HOST=${DEV_HOST:-localhost} # Set if you want to use a different hostname - OVERMIND_COLORS=2,3,5 - ALLOWED_REQUEST_ORIGINS diff --git a/fly.toml b/fly.toml index 976295258..da24b141f 100644 --- a/fly.toml +++ b/fly.toml @@ -23,7 +23,7 @@ console_command = '/rails/bin/rails console' [http_service] internal_port = 3000 force_https = true - auto_stop_machines = false + auto_stop_machines = 'off' auto_start_machines = true min_machines_running = 1 processes = ['app'] diff --git a/lib/active_storage/service/postgresql_service.rb b/lib/active_storage/service/postgresql_service.rb index c906b0ef5..c104e5942 100644 --- a/lib/active_storage/service/postgresql_service.rb +++ b/lib/active_storage/service/postgresql_service.rb @@ -7,14 +7,14 @@ def initialize(public: false, **options) end def upload(key, io, checksum: nil, **) - instrument :upload, key: key, checksum: checksum do - ActiveStorage::Postgresql::File.create!(key: key, io: io, checksum: checksum) + instrument :upload, key:, checksum: do + ActiveStorage::Postgresql::File.create!(key:, io:, checksum:) end end def download(key) if block_given? - instrument :streaming_download, key: key do + instrument :streaming_download, key: do ActiveStorage::Postgresql::File.open(key) do |file| while data = file.read(5.megabytes) yield data @@ -22,7 +22,7 @@ def download(key) end end else - instrument :download, key: key do + instrument :download, key: do ActiveStorage::Postgresql::File.open(key) do |file| file.read end @@ -31,7 +31,7 @@ def download(key) end def download_chunk(key, range) - instrument :download_chunk, key: key, range: range do + instrument :download_chunk, key:, range: do ActiveStorage::Postgresql::File.open(key) do |file| file.seek(range.first) file.read(range.size) @@ -40,14 +40,14 @@ def download_chunk(key, range) end def delete(key) - instrument :delete, key: key do - ActiveStorage::Postgresql::File.find_by(key: key).try(&:destroy) + instrument :delete, key: do + ActiveStorage::Postgresql::File.find_by(key:).try(&:destroy) end end def exist?(key) - instrument :exist, key: key do |payload| - answer = ActiveStorage::Postgresql::File.where(key: key).exists? + instrument :exist, key: do |payload| + answer = ActiveStorage::Postgresql::File.where(key:).exists? payload[:exist] = answer answer end @@ -60,11 +60,11 @@ def delete_prefixed(prefix) end def private_url(key, expires_in:, filename:, content_type:, disposition:, **) - generate_url(key, expires_in: expires_in, filename: filename, content_type: content_type, disposition: disposition) + generate_url(key, expires_in:, filename:, content_type:, disposition:) end def public_url(key, filename:, content_type: nil, disposition: :attachment, **) - generate_url(key, expires_in: nil, filename: filename, content_type: content_type, disposition: disposition) + generate_url(key, expires_in: nil, filename:, content_type:, disposition:) end def url(key, **options) @@ -90,23 +90,23 @@ def generate_url(key, expires_in:, filename:, disposition:, content_type:) counter = counter.to_i # End hack - instrument :url, key: key do |payload| - content_disposition = content_disposition_with(type: disposition, filename: filename) + instrument :url, key: do |payload| + content_disposition = content_disposition_with(type: disposition, filename:) verified_key_with_expiration = ActiveStorage.verifier.generate( { - key: key, + key:, disposition: content_disposition, - content_type: content_type + content_type: }, - expires_in: expires_in, + expires_in:, purpose: :blob_key ) generated_url = url_helpers.rails_postgresql_service_url(verified_key_with_expiration, **url_options, disposition: content_disposition, - content_type: content_type, - filename: filename, + content_type:, + filename:, retry_count: counter ) payload[:url] = generated_url @@ -116,15 +116,15 @@ def generate_url(key, expires_in:, filename:, disposition:, content_type:) end def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, custom_metadata: {}) - instrument :url, key: key do |payload| + instrument :url, key: do |payload| verified_token_with_expiration = ActiveStorage.verifier.generate( { - key: key, - content_type: content_type, + key:, + content_type:, content_length: content_length, - checksum: checksum + checksum: }, - expires_in: expires_in, + expires_in:, purpose: :blob_token ) @@ -152,11 +152,17 @@ def url_options return url_opts if url_opts.is_a?(Hash) end - return { - protocol: Rails.application.config.app_url_protocol, - host: Rails.application.config.app_url_host, - port: Rails.application.config.app_url_port, - } + if Rails.application.config.x.app_url.present? + { + protocol: Rails.application.config.x.app_url_protocol, + host: Rails.application.config.x.app_url_host, + port: Rails.application.config.x.app_url_port, + } + else + { + only_path: true, # This fixes an exception with attachment URL generation from a worker: https://github.com/AllYourBot/hostedgpt/pull/398#issuecomment-2168135853 + } + end end end end diff --git a/lib/tasks/assistants.rake b/lib/tasks/assistants.rake new file mode 100644 index 000000000..1590f5328 --- /dev/null +++ b/lib/tasks/assistants.rake @@ -0,0 +1,21 @@ +namespace :assistants do + desc "Export assistants to a file, defaulting to assistants.yml" + task :export, [:path] => :environment do |t, args| + args.with_defaults(path: Rails.root.join(Assistant::Export::DEFAULT_ASSISTANT_FILE)) + warn "Exporting assistants to #{args[:path]}" + unless User.first + warn "No users found, unable to export assistants" + exit 1 + end + assistants = User.first.assistants.ordered.not_deleted + Assistant.export_to_file(path: args[:path], assistants:) + end + + desc "Import assistants to all users from a file, defaulting to assistants.yml" + task :import, [:path] => :environment do |t, args| + args.with_defaults(path: Rails.root.join(Assistant::Export::DEFAULT_ASSISTANT_FILE)) + warn "Importing assistants from #{args[:path]}" + users = User.all + Assistant.import_from_file(path: args[:path], users:) + end +end diff --git a/lib/tasks/models.rake b/lib/tasks/models.rake new file mode 100644 index 000000000..feb5a5ee7 --- /dev/null +++ b/lib/tasks/models.rake @@ -0,0 +1,26 @@ +namespace :models do + desc "Export language models to a file, defaulting to models.yml" + task :export, [:path] => :environment do |t, args| + args.with_defaults(path: Rails.root.join(LanguageModel::Export::DEFAULT_MODEL_FILE)) + warn "Exporting language models to #{args[:path]}" + unless User.first + warn "No users found, unable to export language models" + exit 1 + end + models = User.first.language_models.ordered.not_deleted.includes(:api_service) + LanguageModel.export_to_file(path: args[:path], models:) + end + + desc "Import language models to all users from a file, defaulting to models.yml" + task :import, [:path] => :environment do |t, args| + args.with_defaults(path: Rails.root.join(LanguageModel::Export::DEFAULT_MODEL_FILE)) + warn "Importing language models from #{args[:path]}" + users = User.all + LanguageModel.import_from_file(path: args[:path], users:) + end +end + +Rake::Task["db:prepare"].enhance do + Rake::Task["models:import"].invoke + Rake::Task["assistants:import"].invoke +end diff --git a/lib/templates/rails/credentials/credentials.yml.tt b/lib/templates/rails/credentials/credentials.yml.tt new file mode 100644 index 000000000..883c66e22 --- /dev/null +++ b/lib/templates/rails/credentials/credentials.yml.tt @@ -0,0 +1,7 @@ +# Used as the base secret for all MessageVerifiers in Rails, including the one protecting cookies. +secret_key_base: <%= secret_key_base %> + +active_record_encryption: + primary_key: <%= SecureRandom.alphanumeric(32) %> + deterministic_key: <%= SecureRandom.alphanumeric(32) %> + key_derivation_salt: <%= SecureRandom.alphanumeric(32) %> diff --git a/models.yml b/models.yml new file mode 100644 index 000000000..a698250ed --- /dev/null +++ b/models.yml @@ -0,0 +1,308 @@ +--- +models: +- api_name: gpt-4o + name: GPT-4o (latest) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.00025' + output_token_cost_cents: '0.001' + best: true + supports_system_message: true + api_service_name: OpenAI +- api_name: claude-3-5-sonnet-20241022 + name: Claude 3.5 Sonnet (latest) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.0003' + output_token_cost_cents: '0.0015' + best: true + supports_system_message: true + api_service_name: Anthropic +- api_name: llama-3.1-70b-versatile + name: Meta Llama 3.1 70b Versatile + supports_images: false + supports_tools: true + input_token_cost_cents: '0.000059' + output_token_cost_cents: '0.000079' + best: true + supports_system_message: true + api_service_name: Groq +- api_name: gpt-4o-2024-08-06 + name: GPT-4o Omni Multimodal (2024-08-06) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.00025' + output_token_cost_cents: '0.001' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4o-2024-05-13 + name: GPT-4o Omni Multimodal (2024-05-13) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.0005' + output_token_cost_cents: '0.0015' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4-turbo + name: GPT-4 Turbo with Vision (latest) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.001' + output_token_cost_cents: '0.003' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4-turbo-2024-04-09 + name: GPT-4 Turbo with Vision (2024-04-09) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.001' + output_token_cost_cents: '0.003' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4-turbo-preview + name: GPT-4 Turbo Preview + supports_images: false + supports_tools: true + input_token_cost_cents: '0.001' + output_token_cost_cents: '0.003' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4-0125-preview + name: GPT-4 Turbo Preview (2024-01-25) + supports_images: false + supports_tools: true + input_token_cost_cents: '0.001' + output_token_cost_cents: '0.003' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4-1106-preview + name: GPT-4 Turbo Preview (2023-11-06) + supports_images: false + supports_tools: true + input_token_cost_cents: '0.001' + output_token_cost_cents: '0.003' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4-vision-preview + name: GPT-4 Turbo with Vision Preview (2023-11-06) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.001' + output_token_cost_cents: '0.003' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4-1106-vision-preview + name: GPT-4 Turbo with Vision Preview (2023-11-06) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.001' + output_token_cost_cents: '0.003' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4 + name: GPT-4 (latest) + supports_images: false + supports_tools: true + input_token_cost_cents: '0.003' + output_token_cost_cents: '0.006' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-4-0613 + name: GPT-4 Snapshot improved function calling (2023-06-13) + supports_images: false + supports_tools: true + input_token_cost_cents: '0.001' + output_token_cost_cents: '0.003' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-3.5-turbo + name: GPT-3.5 Turbo (latest) + supports_images: false + supports_tools: true + input_token_cost_cents: '0.0003' + output_token_cost_cents: '0.0006' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-3.5-turbo-0125 + name: GPT-3.5 Turbo (2022-01-25) + supports_images: false + supports_tools: true + input_token_cost_cents: '0.00005' + output_token_cost_cents: '0.00015' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: gpt-3.5-turbo-1106 + name: GPT-3.5 Turbo (2022-11-06) + supports_images: false + supports_tools: true + input_token_cost_cents: '0.0001' + output_token_cost_cents: '0.0002' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: claude-3-5-sonnet-20240620 + name: Claude 3.5 Sonnet (2024-06-20) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.0003' + output_token_cost_cents: '0.0015' + best: false + supports_system_message: true + api_service_name: Anthropic +- api_name: claude-3-opus-20240229 + name: Claude 3 Opus (2024-02-29) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.0015' + output_token_cost_cents: '0.0075' + best: false + supports_system_message: true + api_service_name: Anthropic +- api_name: claude-3-sonnet-20240229 + name: Claude 3 Sonnet (2024-02-29) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.0003' + output_token_cost_cents: '0.0015' + best: false + supports_system_message: true + api_service_name: Anthropic +- api_name: claude-3-haiku-20240307 + name: Claude 3 Haiku (2024-03-07) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.000025' + output_token_cost_cents: '0.000125' + best: false + supports_system_message: true + api_service_name: Anthropic +- api_name: claude-2.1 + name: Claude 2.1 + supports_images: false + supports_tools: true + input_token_cost_cents: '0.0008' + output_token_cost_cents: '0.0024' + best: false + supports_system_message: true + api_service_name: Anthropic +- api_name: claude-2.0 + name: Claude 2.0 + supports_images: false + supports_tools: true + input_token_cost_cents: '0.0008' + output_token_cost_cents: '0.0024' + best: false + supports_system_message: true + api_service_name: Anthropic +- api_name: claude-instant-1.2 + name: Claude Instant 1.2 + supports_images: false + supports_tools: true + input_token_cost_cents: '0.00008' + output_token_cost_cents: '0.00024' + best: false + supports_system_message: true + api_service_name: Anthropic +- api_name: llama3-70b-8192 + name: Meta Llama 3 70b + supports_images: false + supports_tools: true + input_token_cost_cents: '0.000059' + output_token_cost_cents: '0.000079' + best: false + supports_system_message: true + api_service_name: Groq +- api_name: llama3-8b-8192 + name: Meta Llama 3 8b + supports_images: false + supports_tools: true + input_token_cost_cents: '0.000005' + output_token_cost_cents: '0.000008' + best: false + supports_system_message: true + api_service_name: Groq +- api_name: mixtral-8x7b-32768 + name: Mistral 8 7b + supports_images: false + supports_tools: true + input_token_cost_cents: '0.000024' + output_token_cost_cents: '0.000024' + best: false + supports_system_message: true + api_service_name: Groq +- api_name: gemma-7b-it + name: Google Gemma 7b + supports_images: false + supports_tools: true + input_token_cost_cents: '0.000007' + output_token_cost_cents: '0.000007' + best: false + supports_system_message: true + api_service_name: Groq +- api_name: gpt-3.5-turbo-instruct + name: GPT-3.5 Turbo Instruct + supports_images: false + supports_tools: false + input_token_cost_cents: '0.00015' + output_token_cost_cents: '0.0002' + best: false + supports_system_message: false + api_service_name: OpenAI +- api_name: gpt-3.5-turbo-16k-0613 + name: GPT-3.5 Turbo (2022-06-13) + supports_images: false + supports_tools: false + input_token_cost_cents: '0.0003' + output_token_cost_cents: '0.0004' + best: false + supports_system_message: false + api_service_name: OpenAI +- api_name: gpt-4o-mini + name: GPT-4o Mini (latest) + supports_images: true + supports_tools: true + input_token_cost_cents: '0.000015' + output_token_cost_cents: '0.00006' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: o1-preview + name: OpenAI o1 (preview) + supports_images: false + supports_tools: true + input_token_cost_cents: '0.015' + output_token_cost_cents: '0.06' + best: false + supports_system_message: true + api_service_name: OpenAI +- api_name: claude-3-5-haiku-20241022 + name: Claude 3.5 Haiku (latest) + supports_images: false + supports_tools: true + input_token_cost_cents: '0.0001' + output_token_cost_cents: '0.0005' + best: false + supports_system_message: true + api_service_name: Anthropic +- api_name: gemini-1.5-pro-002 + name: Google Gemini Pro 1.5 (latest) + supports_images: true + supports_tools: false + input_token_cost_cents: '0.0000' + output_token_cost_cents: '0.0000' + best: true + supports_system_message: true + api_service_name: Google Gemini diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index fb5f8f6ab..34faec573 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -116,11 +116,11 @@ def click_element(selector_or_element, wait: Capybara.default_max_wait_time) end def get_scroll_position(selector) - page.evaluate_script("document.querySelector('#{selector}').scrollTop + document.querySelector('#{selector}').clientHeight") + page.evaluate_script("document.querySelector('#{selector}').scrollTop + document.querySelector('#{selector}').clientHeight").to_i end def get_bottom_position(selector) - page.evaluate_script("document.querySelector('#{selector}').scrollHeight") + page.evaluate_script("document.querySelector('#{selector}').scrollHeight").to_i end def scroll_to_bottom(selector) diff --git a/test/controllers/authentications/microsoft_auth_test.rb b/test/controllers/authentications/microsoft_auth_test.rb new file mode 100644 index 000000000..1da9ba72f --- /dev/null +++ b/test/controllers/authentications/microsoft_auth_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +class AuthenticationsController::MicrosoftAuthTest < ActionDispatch::IntegrationTest + test "should NOT display a Microsoft button when the feature is DISABLED" do + stub_features(microsoft_graph_authentication: false) do + get login_url + assert_response :success + assert_no_match "Log In with Microsoft", response.body + end + end + + test "should SHOW the Microsoft button when the feature is ENABLED" do + stub_features(microsoft_graph_authentication: true) do + get login_url + assert_response :success + assert_match "Log In with Microsoft", response.body + end + end +end diff --git a/test/controllers/authentications/microsoft_graph_oauth_controller_test.rb b/test/controllers/authentications/microsoft_graph_oauth_controller_test.rb new file mode 100644 index 000000000..db56cad4e --- /dev/null +++ b/test/controllers/authentications/microsoft_graph_oauth_controller_test.rb @@ -0,0 +1,180 @@ +require "test_helper" + +class Authentications::MicrosoftGraphOauthControllerTest < ActionDispatch::IntegrationTest + setup do + OmniAuth.config.test_mode = true + end + + test "cancelling a microsoft oauth flow redirects to the settings page" do + login_as users(:keith) + get "/auth/microsoft_graph/callback?error=access_denied&error_description=The%20user%20has%20denied%20access%20to%20the%20scope%20requested%20by%20the%20client%20application" + assert_redirected_to edit_settings_person_path + end + + test "cancelling a microsoft oauth flow redirects to the login" do + get "/auth/microsoft_graph/callback?error=access_denied&error_description=The%20user%20has%20denied%20access%20to%20the%20scope%20requested%20by%20the%20client%20application" + assert_redirected_to login_path + end + + test "existing user can add a MicrosoftGraphCredential and redirect to edit_settings" do + # rob has no microsoft credential + user = users(:rob) + login_as user + details = details_for_email(email: user.email, first_name: "Rob", last_name: nil) + OmniAuth.config.add_mock(:microsoft_graph, details) + + refute user.microsoft_graph_credential.present? + assert_difference "Credential.count", 1 do + assert_no_difference "User.count" do + get microsoft_graph_oauth_path + end + end + + assert_redirected_to edit_settings_person_path + assert_equal "Saved", flash[:notice] + assert_credential_matches_details(user.reload.microsoft_graph_credential, details) + end + + test "should log you in for a user that exists" do + OmniAuth.config.add_mock(:microsoft_graph, { uid: credentials(:keith_microsoft_graph).oauth_id }) + assert_no_difference "Credential.count" do + assert_difference "Authentication.count", 1 do + assert_difference "Client.count", 1 do + get microsoft_graph_oauth_path + end + end + end + + assert_redirected_to root_path + assert_logged_in(users(:keith)) + end + + test "registration is disabled" do + OmniAuth.config.add_mock(:microsoft_graph, details_for_email(email: "john@gmail.com")) + + stub_features(microsoft_graph_authentication: true, registration: false) do + get microsoft_graph_oauth_path + end + assert_redirected_to root_path + assert_equal "Registration is disabled", flash[:alert] + end + + test "should UPDATE A USER when authing with PASSWORD SIGNED UP USER that we find by matching email" do + user = users(:rob) + + assert user.password_credential.present? + refute user.microsoft_graph_credential.present? + assert_not_equal "John", user.first_name + assert_not_equal "Doe", user.last_name + + details = details_for_email(email: user.email) + OmniAuth.config.add_mock(:microsoft_graph, details) + + stub_features(microsoft_graph_authentication: true, registration: true) do + assert_no_difference "Person.count" do + assert_no_difference "User.count" do + assert_difference "Client.count", 1 do + assert_difference "Credential.count", 1 do + assert_difference "Authentication.count", 1 do + get microsoft_graph_oauth_path + end + end + end + end + end + end + user.reload + + assert_redirected_to root_path + assert_logged_in(user) + assert_credential_matches_details(user.microsoft_graph_credential, details) + assert_equal details[:info][:email], user.email + assert user.clients.ordered.last.authenticated? + end + + test "should CREATE A USER and everything else when authing with a NOT SIGNED UP person" do + assert people(:ali_invited).email.present? + assert_nil people(:ali_invited).user + + details = details_for_email(email: people(:ali_invited).email) + OmniAuth.config.add_mock(:microsoft_graph, details) + + stub_features(microsoft_graph_authentication: true, registration: true) do + assert_no_difference "Person.count" do + assert_difference "User.count", 1 do + assert_difference "Client.count", 1 do + assert_difference "Credential.count", 1 do + assert_difference "Authentication.count", 1 do + get microsoft_graph_oauth_path + end + end + end + end + end + end + user = people(:ali_invited).reload.user + assert user.present? + + assert_redirected_to root_path + assert_logged_in(user) + assert_credential_matches_details(user.microsoft_graph_credential, details) + assert_equal details[:info][:email], user.email + assert user.clients.ordered.last.authenticated? + end + + test "should CREATE A USER when google authing and NOTHING EXISTS" do + details = details_for_email(email: "john@gmail.com") + OmniAuth.config.add_mock(:microsoft_graph, details) + + stub_features(microsoft_graph_authentication: true, registration: true) do + assert_difference "Person.count", 1 do + assert_difference "User.count", 1 do + assert_difference "Client.count", 1 do + assert_difference "Credential.count", 1 do + assert_difference "Authentication.count", 1 do + get microsoft_graph_oauth_path + end + end + end + end + end + end + user = User.last + + assert_redirected_to root_path + assert_logged_in(user) + assert_credential_matches_details(user.microsoft_graph_credential, details) + assert_equal details[:info][:email], user.email + assert user.clients.ordered.last.authenticated? + end + + private + + def details_for_email(email:, first_name: "John", last_name: "Doe") + { + uid: "new_abc123", + info: { + email: email, + first_name:, + last_name: + }, + credentials: { + token: "new_token", + refresh_token: "new_refresh_token", + expires_at: 30.minutes.from_now.to_i, + scope: "openid profile email offline_access user.read mailboxsettings.read" + } + } + end + + def assert_credential_matches_details(credential, details) + user = credential.user + assert_equal details[:info][:first_name], user.first_name if details.dig(:info, :first_name) + assert_equal details[:info][:last_name], user.last_name if details.dig(:info, :last_name) + assert_equal details[:uid], credential.oauth_id + assert_equal details[:info][:email], credential.oauth_email + assert_equal details[:credentials][:token], credential.oauth_token + assert_equal details[:credentials][:refresh_token], credential.oauth_refresh_token + assert_equal details[:credentials].except(:token, :refresh_token), credential.properties + end +end diff --git a/test/controllers/authentications/registration_test.rb b/test/controllers/authentications/registration_test.rb index 74f30a8eb..c5d77c9e4 100644 --- a/test/controllers/authentications/registration_test.rb +++ b/test/controllers/authentications/registration_test.rb @@ -9,7 +9,7 @@ class AuthenticationsController::RegistrationTest < ActionDispatch::IntegrationT end test "should return not_found when all auth schemes are disabled" do - stub_features(password_authentication: false, google_authentication: false) do + stub_features(password_authentication: false, google_authentication: false, microsoft_graph_authentication: false) do get register_url assert_response :not_found end diff --git a/test/controllers/authentications_controller_test.rb b/test/controllers/authentications_controller_test.rb index a9e2c0ac3..db9c3de00 100644 --- a/test/controllers/authentications_controller_test.rb +++ b/test/controllers/authentications_controller_test.rb @@ -56,7 +56,7 @@ class AuthenticationsControllerTest < ActionDispatch::IntegrationTest end test "should return not_found when all auth schemes are disabled" do - stub_features(password_authentication: false, google_authentication: false) do + stub_features(password_authentication: false, google_authentication: false, microsoft_graph_authentication: false) do get login_path assert_response :not_found end diff --git a/test/controllers/concerns/authenticate/by_http_header_test.rb b/test/controllers/concerns/authenticate/by_http_header_test.rb index 59a51de43..c4e04d4ee 100644 --- a/test/controllers/concerns/authenticate/by_http_header_test.rb +++ b/test/controllers/concerns/authenticate/by_http_header_test.rb @@ -54,7 +54,8 @@ class Authenticate::ByHttpHeaderTest < ActionDispatch::IntegrationTest stub_features( http_header_authentication: true, password_authentication: false, - google_authentication: false + google_authentication: false, + microsoft_graph_authentication: false ) do get root_url end diff --git a/test/controllers/password_credentials_controller_test.rb b/test/controllers/password_credentials_controller_test.rb index c33e5cf0c..8e79d5e5b 100644 --- a/test/controllers/password_credentials_controller_test.rb +++ b/test/controllers/password_credentials_controller_test.rb @@ -19,7 +19,7 @@ class PasswordCredentialsControllerTest < ActionDispatch::IntegrationTest test "should get edit" do token = get_test_user_token(@user) - get edit_password_credential_url, params: { token: token } + get edit_password_credential_url, params: { token: } assert_response :success assert assigns(:user).is_a?(User) @@ -37,7 +37,7 @@ class PasswordCredentialsControllerTest < ActionDispatch::IntegrationTest token = get_test_user_token(@user) @user.destroy # make sure the user doesn't exist when we try to find it - get edit_password_credential_url, params: { token: token } + get edit_password_credential_url, params: { token: } assert_response :not_found end @@ -46,7 +46,7 @@ class PasswordCredentialsControllerTest < ActionDispatch::IntegrationTest token = get_test_user_token(@user) new_password = "new_password" - patch password_credential_url, params: { token: token, password: new_password } + patch password_credential_url, params: { token:, password: new_password } assert_response :redirect assert_redirected_to root_path @@ -61,7 +61,7 @@ class PasswordCredentialsControllerTest < ActionDispatch::IntegrationTest token = get_test_user_token(@user) new_password = "new_password" - patch password_credential_url, params: { token: token, password: new_password } + patch password_credential_url, params: { token:, password: new_password } assert_response :redirect assert_redirected_to root_path diff --git a/test/controllers/password_resets_controller_test.rb b/test/controllers/password_resets_controller_test.rb index 8cd9ccf63..3a6a9e336 100644 --- a/test/controllers/password_resets_controller_test.rb +++ b/test/controllers/password_resets_controller_test.rb @@ -31,7 +31,10 @@ class PasswordResetsControllerTest < ActionDispatch::IntegrationTest email = @person.email - # set the user agent in the request headers + # Test can flap on CI if we don't clear the queue + clear_enqueued_jobs + + # set the user agent in the request headers ActionDispatch::Request.stub_any_instance(:user_agent, "#{browser} on #{operating_system}") do post password_resets_url, params: { email: email } end diff --git a/test/controllers/settings/api_services_controller_test.rb b/test/controllers/settings/api_services_controller_test.rb index 33b1baf28..2e42e25f2 100644 --- a/test/controllers/settings/api_services_controller_test.rb +++ b/test/controllers/settings/api_services_controller_test.rb @@ -10,7 +10,7 @@ class Settings::APIServicesControllerTest < ActionDispatch::IntegrationTest test "should get index" do get settings_api_services_url assert_response :success - assert_select "table#api-services tbody tr", count: 4 + assert_select "table#api-services tbody tr", count: @user.api_services.count assert_select "p a", "Add New" assert_select "p#no-api-services", false end diff --git a/test/controllers/settings/language_models_controller_test.rb b/test/controllers/settings/language_models_controller_test.rb index 4fdf67f2e..1accfe133 100644 --- a/test/controllers/settings/language_models_controller_test.rb +++ b/test/controllers/settings/language_models_controller_test.rb @@ -10,7 +10,7 @@ class Settings::LanguageModelsControllerTest < ActionDispatch::IntegrationTest test "should get index for user" do get settings_language_models_url assert_response :success - assert_select "table#language-models tbody tr", count: 18 + assert_select "table#language-models tbody tr", count: @user.language_models.count assert_select "p a", "Add New" end @@ -33,6 +33,28 @@ class Settings::LanguageModelsControllerTest < ActionDispatch::IntegrationTest assert_equal @user, LanguageModel.last.user end + test "create new best language model replaces existing best" do + api_service = api_services(:keith_anthropic_service) + assert_equal api_service.language_models.best.pluck(:api_name), ["claude-best"] + + params = { + api_name: "new-claude-service", + api_service_id: api_service.id, + name: "new best service", + best: true, + supports_images: false, + supports_tools: false + } + + assert_difference("LanguageModel.count") do + post settings_language_models_url, params: { language_model: params } + end + + assert_redirected_to settings_language_models_url + + assert_equal api_service.language_models.best.pluck(:api_name), ["new-claude-service"] + end + test "should get edit" do get edit_settings_language_model_url(@language_model) assert_response :success @@ -46,7 +68,7 @@ class Settings::LanguageModelsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_select "form" do assert_select 'input[name="language_model[supports_tools]"]' - assert_select 'input[name="language_model[supports_tools]"][checked="checked"]', false # Not checked by default, from schema + assert_select 'input[name="language_model[supports_tools]"][checked="checked"]', false, "Checkbox should default to false within DB" end end @@ -130,6 +152,17 @@ class Settings::LanguageModelsControllerTest < ActionDispatch::IntegrationTest assert_equal params, @language_model.reload.slice(:api_name, :name, :supports_images) end + test "update should update best language model" do + api_service = api_services(:keith_anthropic_service) + assert_equal api_service.language_models.best.pluck(:api_name), ["claude-best"] + + another_language_model = language_models(:claude_3_opus_20240229) + + patch settings_language_model_url(another_language_model), params: { language_model: {best: true}} + assert_redirected_to settings_language_models_url + assert_equal api_service.language_models.best.pluck(:api_name), ["claude-3-opus-20240229"] + end + test "destroy should soft-delete language_model" do assert_no_difference "LanguageModel.count" do delete settings_language_model_url(@language_model) @@ -140,4 +173,30 @@ class Settings::LanguageModelsControllerTest < ActionDispatch::IntegrationTest assert flash[:notice].present?, "There should have been a success message" refute flash[:alert].present?, "There should NOT have been an error message" end + + test "create should not have supports_system_message checkbox" do + get new_settings_language_model_url + assert_response :success + assert_select "form" do + assert_select 'input[name="language_model[supports_system_message]"]' + assert_select 'input[name="language_model[supports_system_message]"][checked="checked"]', false, "Checkbox should default to false within DB" + end + end + + test "edit should have supports_system_message checkbox checked" do + get edit_settings_language_model_url(@language_model) + assert_response :success + assert_select "form" do + assert_select 'input[name="language_model[supports_system_message]"][checked="checked"]' + end + end + + test "edit should have supports_system_message checkbox unchecked" do + get edit_settings_language_model_url(language_models(:guanaco)) + assert_response :success + assert_select "form" do + assert_select 'input[name="language_model[supports_system_message]"]' + assert_select 'input[name="language_model[supports_system_message]"][checked="checked"]', false + end + end end diff --git a/test/controllers/settings/memories_controller_test.rb b/test/controllers/settings/memories_controller_test.rb index c9378da87..7dc5904e2 100644 --- a/test/controllers/settings/memories_controller_test.rb +++ b/test/controllers/settings/memories_controller_test.rb @@ -18,7 +18,7 @@ class Settings::MemoriesControllerTest < ActionDispatch::IntegrationTest assert_match "Clear All Memories", response.body end - test "destroy should soft-delete assistant" do + test "delete all the user's memories" do login_as users(:keith) assert_difference "Memory.count", -users(:keith).memories.count do delete settings_memories_url @@ -27,4 +27,14 @@ class Settings::MemoriesControllerTest < ActionDispatch::IntegrationTest assert_redirected_to settings_memories_url assert flash[:notice].present? end + + test "delete a single user's memory" do + login_as users(:keith) + assert_difference "Memory.count", -1 do + delete settings_memory_url(memories(:pet)) + end + + assert_redirected_to settings_memories_url + assert flash[:notice].present? + end end diff --git a/test/controllers/users/google_auth_test.rb b/test/controllers/users/google_auth_test.rb index 808f16573..698aebd1a 100644 --- a/test/controllers/users/google_auth_test.rb +++ b/test/controllers/users/google_auth_test.rb @@ -2,7 +2,7 @@ class UsersController::GoogleAuthTest < ActionDispatch::IntegrationTest test "should NOT display a Google button when the feature is DISABLED" do - stub_features(google_authentication: false) do + stub_features(google_authentication: false, password_authentication: true) do get register_url assert_response :success assert_no_match "Sign Up with Google", response.body @@ -10,10 +10,35 @@ class UsersController::GoogleAuthTest < ActionDispatch::IntegrationTest end test "should SHOW the Google button when the feature is ENABLED" do - stub_features(google_authentication: true) do + stub_features(google_authentication: true, password_authentication: true) do get register_url assert_response :success assert_match "Sign Up with Google", response.body end end + + test "authentication - should NOT display a Google button when the feature is DISABLED" do + stub_features(google_authentication: false, password_authentication: true) do + get login_url + assert_response :success + assert_no_match "Log In with Google", response.body + end + end + + test "authentication - should SHOW the Google button when the feature is ENABLED" do + stub_features(google_authentication: true, password_authentication: true) do + get login_url + assert_response :success + assert_match "Log In with Google", response.body + end + end + + # even if password authentication is turned off, we still want to show the Microsoft button + test "authentication - should SHOW the Google button when password authentication is DISABLED" do + stub_features(google_authentication: true, password_authentication: false) do + get login_url + assert_response :success + assert_match "Log In with Google", response.body + end + end end diff --git a/test/controllers/users/microsoft_auth_test.rb b/test/controllers/users/microsoft_auth_test.rb new file mode 100644 index 000000000..379f1506e --- /dev/null +++ b/test/controllers/users/microsoft_auth_test.rb @@ -0,0 +1,44 @@ +require "test_helper" + +class UsersController::MicrosoftAuthTest < ActionDispatch::IntegrationTest + test "register - should NOT display a Microsoft button when the feature is DISABLED" do + stub_features(microsoft_graph_authentication: false, password_authentication: true) do + get register_url + assert_response :success + assert_no_match "Sign Up with Microsoft", response.body + end + end + + test "register - should SHOW the Microsoft button when the feature is ENABLED" do + stub_features(microsoft_graph_authentication: true, password_authentication: true) do + get register_url + assert_response :success + assert_match "Sign Up with Microsoft", response.body + end + end + + test "authentication - should NOT display a Microsoft button when the feature is DISABLED" do + stub_features(microsoft_graph_authentication: false, password_authentication: true) do + get login_url + assert_response :success + assert_no_match "Log In with Microsoft", response.body + end + end + + test "authentication - should SHOW the Microsoft button when the feature is ENABLED" do + stub_features(microsoft_graph_authentication: true, password_authentication: true) do + get login_url + assert_response :success + assert_match "Log In with Microsoft", response.body + end + end + + # even if password authentication is turned off, we still want to show the Microsoft button + test "authentication - should SHOW the Microsoft button when password authentication is DISABLED" do + stub_features(microsoft_graph_authentication: true, password_authentication: false) do + get login_url + assert_response :success + assert_match "Log In with Microsoft", response.body + end + end +end diff --git a/test/controllers/users/registration_test.rb b/test/controllers/users/registration_test.rb index cd2b922c9..8abc4dc6f 100644 --- a/test/controllers/users/registration_test.rb +++ b/test/controllers/users/registration_test.rb @@ -9,7 +9,7 @@ class UsersController::RegistrationTest < ActionDispatch::IntegrationTest end test "should return not_found when all auth schemes are disabled" do - stub_features(password_authentication: false, google_authentication: false) do + stub_features(password_authentication: false, google_authentication: false, microsoft_graph_authentication: false) do get register_url assert_response :not_found end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index bce48c45f..148abd111 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -58,7 +58,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest user = Person.find_by(email: email).user assert_equal "John", user.first_name assert_equal "Doe", user.last_name - assert_equal 3, user.assistants.count, "This new user did not get the expected number of assistants" + assert_equal 4, user.assistants.count, "This new user did not get the expected number of assistants" assistant = user.assistants.ordered.first diff --git a/test/fixtures/api_services.yml b/test/fixtures/api_services.yml index cd9094939..c3f0ca84b 100644 --- a/test/fixtures/api_services.yml +++ b/test/fixtures/api_services.yml @@ -1,7 +1,7 @@ keith_openai_service: name: OpenAI user: keith - url: https://api.openai.com/ + url: https://api.openai.com/v1/ token: abc-secret driver: openai @@ -30,10 +30,17 @@ keith_other_service: rob_openai_service: name: OpenAI user: rob - url: https://api.openai.com/ + url: https://api.openai.com/v1/ token: rob-secret driver: openai +keith_gemini_service: + name: Gemini + user: keith + url: https://generativelanguage.googleapis.com/v1beta/ + token: keith-secret + driver: gemini + rob_anthropic_service: name: Anthropic user: rob diff --git a/test/fixtures/assistants.yml b/test/fixtures/assistants.yml index 4892f1639..1158ccb16 100644 --- a/test/fixtures/assistants.yml +++ b/test/fixtures/assistants.yml @@ -1,5 +1,6 @@ samantha: user: keith + slug: samantha language_model: gpt_4o name: Samantha description: My personal assistant @@ -8,14 +9,16 @@ samantha: keith_gpt4: user: keith + slug: gpt-4o language_model: gpt_4o - name: OpenAI's GPT-4 - description: OpenAI's GPT-4 + name: OpenAI GPT-4o + description: OpenAI's GPT-4o instructions: tools: [{"type": "code_interpreter"}, {"type": "retrieval"}, {"type": "function"}] keith_claude3: user: keith + slug: claude-opus language_model: claude_3_opus_20240229 name: Claude 3 Opus description: Claude 3, Opus version @@ -24,6 +27,7 @@ keith_claude3: keith_claude35: user: keith + slug: claude-sonnet language_model: claude_3_5_sonnet_20240620 name: Claude 3.5 Sonnet description: Claude 3.5, Sonnet version @@ -32,15 +36,26 @@ keith_claude35: keith_gpt3: user: keith + slug: gpt-3-5-turbo language_model: gpt_3_5_turbo name: GPT 3.5 description: OpenAI's GPT-3 but with Zen instructions: Include a Zen perspective when possilbe tools: [{"type": "code_interpreter"}, {"type": "retrieval"}, {"type": "function"}] +keith_gemini: + user: keith + slug: gemini-1-5-pro + language_model: gemini-1.5-pro-002 + name: Gemini Pro 1.5 + description: Gemini Pro 1.5 + instructions: + tools: [] + rob_gpt4: user: rob + slug: gpt-4o language_model: rob_gpt name: GPT-4 description: OpenAI's GPT @@ -49,6 +64,7 @@ rob_gpt4: mandela_gpt4: user: rob + slug: mandela language_model: rob_gpt name: Mandela description: OpenAI assistant GPT4 @@ -59,6 +75,7 @@ mandela_gpt4: alpaca_asst: user: taylor + slug: alpaca language_model: alpaca name: Game Alpaca description: Play games (Alpaca backed) @@ -68,6 +85,7 @@ alpaca_asst: pacos_asst: user: taylor + slug: pacos language_model: pacos name: Travel/Flowers description: Flowers themed travel advice (Pacos backed) diff --git a/test/fixtures/conversations.yml b/test/fixtures/conversations.yml index d0e301697..4a51ab95f 100644 --- a/test/fixtures/conversations.yml +++ b/test/fixtures/conversations.yml @@ -34,6 +34,12 @@ hello_claude: title: Meeting Claude last_assistant_message: claude_age_replying +gemini_conversation: + user: keith + assistant: keith_gemini + title: Meeting Gemini + last_assistant_message: hello_gemini + debugging: user: rob assistant: rob_gpt4 @@ -86,6 +92,12 @@ image_generation: title: Generating an image last_assistant_message: image_generation_explained +memorize: + user: keith + assistant: samantha + title: Memorize + last_assistant_message: keep_memory_explained + trees: user: keith assistant: keith_gpt3 diff --git a/test/fixtures/credentials.yml b/test/fixtures/credentials.yml index 0be77dad9..f53d47a27 100644 --- a/test/fixtures/credentials.yml +++ b/test/fixtures/credentials.yml @@ -34,6 +34,15 @@ keith_google_tasks: properties: {"expires_at":1717004605,"expires":true,"scope":"https://www.googleapis.com/auth/gmail.modify https://www.googleapis.com/auth/userinfo.email"} last_authenticated_at: 2023-12-19 08:40:05 +keith_microsoft_graph: + user: keith + type: MicrosoftGraphCredential + external_id: microsoft_id123 + oauth_email: keith@hostedgpt.com + oauth_token: some-token + oauth_refresh_token: some-refresh-token + properties: {"expires_at":<%= 30.minutes.from_now.to_i %>} + rob_password: user: rob type: PasswordCredential diff --git a/test/fixtures/language_models.yml b/test/fixtures/language_models.yml index ac21c32f1..0e4eff650 100644 --- a/test/fixtures/language_models.yml +++ b/test/fixtures/language_models.yml @@ -1,4 +1,17 @@ # Taylor's Language Models +gemini-1.5-pro-002: + position: 0 + user: keith + name: Google Gemini 1.5 Pro (latest) + api_service: keith_gemini_service + api_name: gemini-1.5-pro-002 + best: true + supports_images: true + supports_tools: false + supports_system_message: true + input_token_cost_cents: 0.0001 + output_token_cost_cents: 0.0001 + alpaca: position: 1 user: taylor @@ -135,10 +148,12 @@ gpt_best: position: 1 user: keith name: Best OpenAI Model + best: true api_name: gpt-best api_service: keith_openai_service supports_images: true supports_tools: true + supports_system_message: true input_token_cost_cents: 0.0001 output_token_cost_cents: 0.0001 @@ -146,6 +161,7 @@ claude_best: position: 2 user: keith name: Best Anthropic Model + best: true api_service: keith_anthropic_service api_name: claude-best supports_images: true @@ -328,3 +344,14 @@ guanaco: supports_tools: false input_token_cost_cents: 0.0001 output_token_cost_cents: 0.0001 + +gemini_flash_1_5: + position: 23 + user: keith + name: Gemini Flash 1.5 + api_name: gemini-1.5-flash + api_service: keith_gemini_service + supports_images: true + supports_tools: false + input_token_cost_cents: 0.0001 + output_token_cost_cents: 0.0001 \ No newline at end of file diff --git a/test/fixtures/memories.yml b/test/fixtures/memories.yml index 85cbe9894..de0a227d6 100644 --- a/test/fixtures/memories.yml +++ b/test/fixtures/memories.yml @@ -2,3 +2,8 @@ location: user: keith message: hear_me detail: He lives in Austin, Texas + +pet: + user: keith + message: identify_photo + detail: He owns a cat diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml index 7f6fe0b0c..c7e092587 100644 --- a/test/fixtures/messages.yml +++ b/test/fixtures/messages.yml @@ -327,6 +327,17 @@ hello_claude: index: 0 version: 1 +hello_gemini: + assistant: keith_gemini + conversation: gemini_conversation + role: user + content_text: Hi Gemini, can you hear me? + content_document: + run: + created_at: 2023-12-30 1:00:00 + index: 0 + version: 1 + claude_replying: assistant: keith_claude3 conversation: hello_claude @@ -647,7 +658,7 @@ weather_tool_result: role: tool tool_call_id: abc123 content_text: weather is - content_tool_calls: + content_tool_calls: '{"index": 0, "id": "abc123", "type": "function", "function": {"name": "helloworld_hi", "arguments": {"name": "World"}}}' content_document: created_at: 2023-12-30 1:02:00 processed_at: 2023-12-30 1:02:00 @@ -721,3 +732,58 @@ trees_explained: processed_at: 2024-05-25 1:03:00 index: 0 version: 1 + + +# Next conversation + +keep_memory: + assistant: samantha + conversation: memorize + role: user + tool_call_id: + content_text: Remember that my favorite color is green + content_document: + content_tool_calls: + created_at: 2024-01-30 1:00:00 + processed_at: 2024-01-30 1:00:00 + index: 0 + version: 1 + +keep_memory_tool_call: + assistant: samantha + conversation: memorize + role: assistant + tool_call_id: + content_text: + content_tool_calls: '[{"index": 0, "id": "abc123", "type": "function", "function": {"name": "memory_remember_detail_about_user", "arguments": "{\"detail\":\"Users favorite color is green.\"}"}}]' + content_document: + created_at: 2024-01-30 1:01:00 + processed_at: 2024-01-30 1:01:00 + index: 1 + version: 1 + +keep_memory_tool_result: + assistant: samantha + conversation: memorize + role: tool + tool_call_id: xyz123 + content_text: '{"message_to_user": "Memory updated"}' + content_tool_calls: '{"index": 0, "id": "xyz123", "type": "function", "function": {"name": "memory_remember_detail_about_user", "arguments": "{\"detail\":\"Users favorite color is green.\"}"}}' + content_document: + created_at: 2024-01-30 1:02:00 + processed_at: 2024-01-30 1:02:00 + index: 2 + version: 1 + +keep_memory_explained: + assistant: samantha + conversation: memorize + role: assistant + tool_call_id: + content_text: Got it + content_tool_calls: + content_document: + created_at: 2024-01-30 1:03:00 + processed_at: 2024-01-30 1:03:00 + index: 3 + version: 1 \ No newline at end of file diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb new file mode 100644 index 000000000..1497ec26f --- /dev/null +++ b/test/helpers/application_helper_test.rb @@ -0,0 +1,33 @@ +require "test_helper" + +class ApplicationHelperTest < ActionView::TestCase + + test "only at most 2 initials" do + assert_equal "jz", at_most_two_initials("jdz") + end + + test "single initials allowed" do + assert_equal "q", at_most_two_initials("q") + end + + test "nil returns nil" do + assert_nil at_most_two_initials(nil) + end + + test "can have numbers" do + assert_equal "P2", at_most_two_initials("P2") + end + + test "does not change case" do + assert_equal "p2", at_most_two_initials("p2") + end + + test "returns the correct two initials when there are more than two" do + assert_equal "kS", at_most_two_initials("kRxS") + end + + test "can have spaces" do + assert_equal "pQ", at_most_two_initials("p v Q") + end + +end diff --git a/test/helpers/messages_helper_test.rb b/test/helpers/messages_helper_test.rb new file mode 100644 index 000000000..43d05761a --- /dev/null +++ b/test/helpers/messages_helper_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +class MessagesHelperTest < ActionView::TestCase + + test "message_to_user_from_tool_call responds properly for tool result" do + message = messages(:keep_memory_tool_result) + assert message_to_user_from_tool_call?(message) + end + + test "from_name_for responds properly for tool result" do + message = messages(:keep_memory_tool_result) + assert_nil from_name_for(message) + end +end diff --git a/test/jobs/get_next_ai_message_job_anthropic_test.rb b/test/jobs/get_next_ai_message_job_anthropic_test.rb index 60af1827c..570c7b966 100644 --- a/test/jobs/get_next_ai_message_job_anthropic_test.rb +++ b/test/jobs/get_next_ai_message_job_anthropic_test.rb @@ -37,11 +37,13 @@ class GetNextAIMessageJobAnthropicTest < ActiveJob::TestCase end test "when anthropic key is blank, a nice error message is displayed" do - api_service = @conversation.assistant.language_model.api_service - api_service.update!(token: "") + stub_features(default_llm_keys: false) do + api_service = @conversation.assistant.language_model.api_service + api_service.update!(token: "") - assert GetNextAIMessageJob.perform_now(@user.id, @message.id, @conversation.assistant.id) - assert_includes @conversation.latest_message_for_version(:latest).content_text, "need to enter a valid API key for Anthropic" + assert GetNextAIMessageJob.perform_now(@user.id, @message.id, @conversation.assistant.id) + assert_includes @conversation.latest_message_for_version(:latest).content_text, "need to enter a valid API key for Anthropic" + end end test "when API response key is, a nice error message is displayed" do diff --git a/test/jobs/get_next_ai_message_job_gemini_test.rb b/test/jobs/get_next_ai_message_job_gemini_test.rb new file mode 100644 index 000000000..cf850fa47 --- /dev/null +++ b/test/jobs/get_next_ai_message_job_gemini_test.rb @@ -0,0 +1,56 @@ +require "test_helper" + +class GetNextAIMessageJobGeminiTest < ActiveJob::TestCase + setup do + @conversation = conversations(:gemini_conversation) + @user = @conversation.user + @assistant = @conversation.assistant + @conversation.messages.create! role: :user, content_text: "Still there?", assistant: @assistant + @assistant.language_model.update!(supports_tools: false) # this will change the TestClient response so we want to be selective about this + @message = @conversation.latest_message_for_version(:latest) + @test_client = TestClient::Gemini.new(access_token: "abc") + end + + test "populates the latest message from the assistant" do + assert_no_difference "@conversation.messages.reload.length" do + TestClient::Gemini.stub :text, "Hello" do + assert GetNextAIMessageJob.perform_now(@user.id, @message.id, @assistant.id) + end + end + + assert_equal "Hello", @conversation.latest_message_for_version(:latest).content_text + end + + test "returns early if the message id was invalid" do + refute GetNextAIMessageJob.perform_now(@user.id, 0, @assistant.id) + end + + test "returns early if the assistant id was invalid" do + refute GetNextAIMessageJob.perform_now(@user.id, @message.id, 0) + end + + test "returns early if the message was already generated" do + @message.update!(content_text: "Hello") + refute GetNextAIMessageJob.perform_now(@user.id, @message.id, @assistant.id) + end + + test "returns early if the user has replied after this" do + @conversation.messages.create! role: :user, content_text: "Ignore that, new question:", assistant: @assistant + refute GetNextAIMessageJob.perform_now(@user.id, @message.id, @assistant.id) + end + + test "when Gemini key is blank, a nice error message is displayed" do + api_service = @assistant.language_model.api_service + api_service.update!(token: "") + + assert GetNextAIMessageJob.perform_now(@user.id, @message.id, @assistant.id) + assert_includes @conversation.latest_message_for_version(:latest).content_text, "There is a configuration error with the Gemini API Service" + end + + test "when API response key is missing, a nice error message is displayed" do + TestClient::Gemini.stub :text, "" do + assert GetNextAIMessageJob.perform_now(@user.id, @message.id, @assistant.id) + assert_includes @conversation.latest_message_for_version(:latest).content_text, "a blank response" + end + end +end diff --git a/test/jobs/get_next_ai_message_job_openai_test.rb b/test/jobs/get_next_ai_message_job_openai_test.rb index 333ecf6f3..612470baf 100644 --- a/test/jobs/get_next_ai_message_job_openai_test.rb +++ b/test/jobs/get_next_ai_message_job_openai_test.rb @@ -43,7 +43,7 @@ class GetNextAIMessageJobOpenaiTest < ActiveJob::TestCase assert first_new_message.tool? assert_equal "Hello, Keith!".to_json, first_new_message.content_text, "First new message should have the result of calling the tool" assert first_new_message.tool_call_id.present? - assert first_new_message.content_tool_calls.blank? + assert first_new_message.content_tool_calls.present? assert_equal @message.content_tool_calls.dig(0, :id), first_new_message.tool_call_id, "ID of tool execution should have matched decision to call the tool" assert first_new_message.finished?, "This message SHOULD HAVE been considered finished" @@ -135,11 +135,13 @@ class GetNextAIMessageJobOpenaiTest < ActiveJob::TestCase end test "when openai key is blank, a nice error message is displayed" do - api_service = @assistant.language_model.api_service - api_service.update!(token: "") + stub_features(default_llm_keys: false) do + api_service = @assistant.language_model.api_service + api_service.update!(token: "") - assert GetNextAIMessageJob.perform_now(@user.id, @message.id, @assistant.id) - assert_includes @conversation.latest_message_for_version(:latest).content_text, "need to enter a valid API key for OpenAI" + assert GetNextAIMessageJob.perform_now(@user.id, @message.id, @assistant.id) + assert_includes @conversation.latest_message_for_version(:latest).content_text, "need to enter a valid API key for OpenAI" + end end test "when API response key is missing, a nice error message is displayed" do diff --git a/test/lib/active_storage/service/public_postgresql_test.rb b/test/lib/active_storage/service/public_postgresql_test.rb index 12e9fdb3f..ea7af9650 100644 --- a/test/lib/active_storage/service/public_postgresql_test.rb +++ b/test/lib/active_storage/service/public_postgresql_test.rb @@ -2,7 +2,6 @@ require "./test/lib/active_storage/service/shared_service_tests" class ActiveStorage::Service::PublicPostgresqlTest < ActiveSupport::TestCase - SERVICE = ActiveStorage::Service.configure(:tmp_public, { tmp_public: { service: "Postgresql", public: true }}) include ActiveStorage::Service::SharedServiceTests test "public URL generation" do diff --git a/test/lib/active_storage/service/shared_service_tests.rb b/test/lib/active_storage/service/shared_service_tests.rb index 00c7b04a5..489d5e890 100644 --- a/test/lib/active_storage/service/shared_service_tests.rb +++ b/test/lib/active_storage/service/shared_service_tests.rb @@ -11,6 +11,15 @@ module ActiveStorage::Service::SharedServiceTests included do setup do + stub_custom_config_value(:app_url_protocol, "https") + stub_custom_config_value(:app_url_host, "example.com") + stub_custom_config_value(:app_url_port, nil) + stub_custom_config_value(:app_url, "https://example.com") + + unless self.class.const_defined?(:SERVICE) + self.class.const_set(:SERVICE, ActiveStorage::Service.configure(:tmp_public, { tmp_public: { service: "Postgresql", public: true } })) + end + @service = self.class.const_get(:SERVICE) @service.upload FIXTURE_KEY, StringIO.new(FIXTURE_DATA) @key = FIXTURE_KEY diff --git a/test/models/api_service_test.rb b/test/models/api_service_test.rb index 81088cd52..71b566851 100644 --- a/test/models/api_service_test.rb +++ b/test/models/api_service_test.rb @@ -57,9 +57,7 @@ class APIServiceTest < ActiveSupport::TestCase end test "can create record" do - assert_nothing_raised do - APIService.create!(create_params) - end + assert APIService.create!(create_params) end test "soft delete also soft deletes language_models" do diff --git a/test/models/assistant/export_test.rb b/test/models/assistant/export_test.rb new file mode 100644 index 000000000..60c8537f1 --- /dev/null +++ b/test/models/assistant/export_test.rb @@ -0,0 +1,103 @@ +require "test_helper" + +class Assistant::ExportTest < ActiveSupport::TestCase + test "as_json includes language_model_api_name" do + assistant = assistants(:keith_gpt4) + assert assistant.as_json.key?("language_model_api_name") + end + + test "language_model can be nil" do + assert_nil Assistant.new(language_model: nil).as_json["language_model_api_name"] + end + + test "except api_service_name" do + assistant = assistants(:rob_gpt4) + assert_nil assistant.as_json(except: ["language_model_api_name"])["language_model_api_name"] + end + + test "export_to_file json" do + path = Rails.root.join("tmp/assistants.json") + Assistant.export_to_file(path:, assistants: users(:keith).assistants.not_deleted) + assert File.exist?(path) + storage = JSON.load_file(path) + assistants = storage["assistants"] + assert_equal assistants.first.keys.sort, %w[name description instructions slug language_model_api_name].sort + end + + test "export_to_file yaml" do + path = Rails.root.join("tmp/assistants.yml") + Assistant.export_to_file(path:, assistants: users(:keith).assistants.not_deleted) + assert File.exist?(path) + storage = YAML.load_file(path) + assistants = storage["assistants"] + assert_equal assistants.first.keys.sort, %w[name description instructions slug language_model_api_name].sort + end + + test "import_from_file with only new models" do + user = users(:keith) + user.assistants.destroy_all + assistants = [{ + name: "new assistant", + description: "new description", + instructions: "new instructions", + tools: "new tools", + external_id: "new external_id", + language_model_api_name: language_models(:gpt_4o).api_name + }] + storage = { + "assistants" => assistants + } + path = Rails.root.join("tmp/newmodels.yml") + File.write(path, storage.to_yaml) + assert_difference "Assistant.count", 1 do + Assistant.import_from_file(path:, users: [user]) + end + assert user.assistants.find_by(external_id: "new external_id") + end + + test "import_from_file json with only new models" do + user = users(:keith) + user.assistants.destroy_all + assistants = [{ + name: "new assistant", + slug: "new-assistant", + description: "new description", + instructions: "new instructions", + language_model_api_name: language_models(:gpt_4o).api_name + }] + storage = { + "assistants" => assistants + } + path = Rails.root.join("tmp/newmodels.json") + File.write(path, storage.to_json) + assert_difference "Assistant.count", 1 do + Assistant.import_from_file(path:, users: [user]) + end + assert user.assistants.find_by(name: "new assistant") + end + + test "import_from_file with existing models by slug" do + user = users(:keith) + assistant = user.assistants.not_deleted.first + assistants = [{ + name: "new name", + slug: assistant.slug, + description: "new description", + instructions: "new instructions", + language_model_api_name: language_models(:gpt_4o).api_name + }] + storage = { + "assistants" => assistants + } + path = Rails.root.join("tmp/newmodels.yml") + File.write(path, storage.to_yaml) + assert_no_difference "Assistant.count" do + Assistant.import_from_file(path:, users: [user]) + end + assistant.reload + assert_equal "new name", assistant.name + assert_equal "new description", assistant.description + assert_equal "new instructions", assistant.instructions + assert_equal language_models(:gpt_4o).api_name, assistant.language_model_api_name + end +end diff --git a/test/models/assistant_test.rb b/test/models/assistant_test.rb index 5eccc51b3..342315d87 100644 --- a/test/models/assistant_test.rb +++ b/test/models/assistant_test.rb @@ -132,4 +132,35 @@ class AssistantTest < ActiveSupport::TestCase refute record.valid? assert record.errors[:name].present? end + + test "sets a default slug" do + samantha = assistants(:samantha) + assert_equal "samantha", samantha.slug + + keith_gpt4 = assistants(:keith_gpt4) + assert_equal "gpt-4o", keith_gpt4.slug + keith_gpt4.slug = nil + keith_gpt4.save! + assert_equal "openai-gpt-4o", keith_gpt4.slug + + lm = language_models(:gpt_best) + user = users(:keith) + same_name1 = user.assistants.create!(language_model: lm, name: "Best OpenAI Model") + assert_equal "best-openai-model", same_name1.slug + same_name2 = user.assistants.create!(language_model: lm, name: "Best OpenAI Model") + assert_equal "best-openai-model--1", same_name2.slug + same_name3 = user.assistants.create!(language_model: lm, name: "Best OpenAI Model") + assert_equal "best-openai-model--2", same_name3.slug + + similar_name = user.assistants.create!(language_model: lm, name: "Best OpenAI Model 2") + assert_equal "best-openai-model-2", similar_name.slug + similar_name2 = user.assistants.create!(language_model: lm, name: "Best OpenAI Model 2") + assert_equal "best-openai-model-2--1", similar_name2.slug + end + + test "ensure all fixtures have a slug defined since it will not be set automatically" do + Assistant.all.each do |assistant| + assert_not_nil assistant.slug, "Assistant #{assistant.name} does not have a slug defined in the fixture" + end + end end diff --git a/test/models/conversation_test.rb b/test/models/conversation_test.rb index f382e7c79..58a38ac94 100644 --- a/test/models/conversation_test.rb +++ b/test/models/conversation_test.rb @@ -125,4 +125,38 @@ class ConversationTest < ActiveSupport::TestCase assert_equal 3, grouped_conversations["Older"].count end end + + test "#grouped_by_increasing_time_interval_for_user with a query returning a single conversation title" do + user = users(:keith) + query = "Ruby" + + grouped_conversations = Conversation.grouped_by_increasing_time_interval_for_user(user, query).values.flatten + + assert_equal 1, grouped_conversations.count + assert_equal conversations(:ruby_version), grouped_conversations.first, "Should have returned this conversation based on title" + end + + test "#grouped_by_increasing_time_interval_for_user with a query returning a single conversation message" do + user = users(:keith) + query = "alive" + + grouped_conversations = Conversation.grouped_by_increasing_time_interval_for_user(user, query).values.flatten + + assert_equal 1, grouped_conversations.count + assert_equal conversations(:greeting), grouped_conversations.first, "Should have returned this conversation based on message content" + end + + test "#grouped_by_increasing_time_interval_for_user with a query returning matching conversation titles and a message" do + user = users(:keith) + query = "test" + + grouped_conversations = Conversation.grouped_by_increasing_time_interval_for_user(user, query).values.flatten + + assert_equal 3, grouped_conversations.count + assert_equal [ + conversations(:attachment).id, # matches title + conversations(:attachments).id, # matches title + conversations(:ruby_version).id # matches "latest" in messages + ].sort, grouped_conversations.map(&:id).sort, "Should have returned these conversations based on title and message content" + end end diff --git a/test/models/document_test.rb b/test/models/document_test.rb index b36372f9a..290974a95 100644 --- a/test/models/document_test.rb +++ b/test/models/document_test.rb @@ -1,6 +1,12 @@ require "test_helper" class DocumentTest < ActiveSupport::TestCase + setup do + stub_custom_config_value(:app_url_protocol, "https") + stub_custom_config_value(:app_url_host, "example.com") + stub_custom_config_value(:app_url_port, nil) + end + test "has an associated user" do assert_instance_of User, documents(:cat_photo).user end @@ -39,15 +45,13 @@ class DocumentTest < ActiveSupport::TestCase assert document.file.attached? end - test "file_data_url returns for a file" do - prefix = "data:image/png;base64," - assert documents(:cat_photo).file_data_url - assert documents(:cat_photo).file_data_url.starts_with?(prefix) - assert documents(:cat_photo).file_data_url.length > 40000 - end + test "image_url returns data url when app_url is not set" do + stub_custom_config_value(:app_url, "") do + url = documents(:cat_photo).image_url(:small) - test "file_base64 returns a long string" do - assert documents(:cat_photo).file_base64.length > 40000 + assert url.starts_with?("data:image/png;base64,") + assert url.length > 40000 + end end test "has_file_variant_processed?" do @@ -55,8 +59,11 @@ class DocumentTest < ActiveSupport::TestCase end test "fully_processed_url" do - assert documents(:cat_photo).fully_processed_url(:small).include?('rails/active_storage/postgresql') - assert documents(:cat_photo).fully_processed_url(:small).exclude?('/redirect') + stub_custom_config_value(:app_url, "https://example.com") do + assert documents(:cat_photo).fully_processed_url(:small).starts_with?("http") + assert documents(:cat_photo).fully_processed_url(:small).include?("rails/active_storage/postgresql") + assert documents(:cat_photo).fully_processed_url(:small).exclude?("/redirect") + end end test "redirect_to_processed_path" do diff --git a/test/models/feature_test.rb b/test/models/feature_test.rb index e78a6ab07..b0cca2c33 100644 --- a/test/models/feature_test.rb +++ b/test/models/feature_test.rb @@ -60,6 +60,7 @@ class FeatureTest < ActiveSupport::TestCase http_header_authentication: true, password_authentication: true, google_authentication: true, + microsoft_graph_authentication: true ) do assert Feature.enabled?(:http_header_authentication) assert Feature.http_header_authentication? @@ -67,6 +68,8 @@ class FeatureTest < ActiveSupport::TestCase refute Feature.password_authentication? refute Feature.enabled?(:google_authentication) refute Feature.google_authentication? + refute Feature.enabled?(:microsoft_graph_authentication) + refute Feature.microsoft_graph_authentication? end end @@ -76,13 +79,16 @@ class FeatureTest < ActiveSupport::TestCase http_header_authentication: false, password_authentication: true, google_authentication: false, - ) do + microsoft_graph_authentication: false + ) do refute Feature.enabled?(:http_header_authentication) refute Feature.http_header_authentication? assert Feature.enabled?(:password_authentication) assert Feature.password_authentication? refute Feature.enabled?(:google_authentication) refute Feature.google_authentication? + refute Feature.enabled?(:microsoft_graph_authentication) + refute Feature.microsoft_graph_authentication? end end diff --git a/test/models/language_model/export_test.rb b/test/models/language_model/export_test.rb new file mode 100644 index 000000000..c67829c78 --- /dev/null +++ b/test/models/language_model/export_test.rb @@ -0,0 +1,105 @@ +require "test_helper" + +class LanguageModel::ExportTest < ActiveSupport::TestCase + test "as_json includes api_service_name" do + language_model = LanguageModel.new(api_service: api_services(:rob_openai_service)) + assert language_model.as_json.key?("api_service_name") + end + + test "api_service can be nil" do + assert_nil LanguageModel.new(api_service: nil).as_json["api_service_name"] + end + + test "except api_service_name" do + language_model = LanguageModel.new(api_service: api_services(:rob_openai_service)) + assert_nil language_model.as_json(except: ["api_service_name"])["api_service_name"] + end + + test "export_to_file json" do + path = Rails.root.join("tmp/models.json") + LanguageModel.export_to_file(path:, models: users(:rob).language_models.not_deleted) + assert File.exist?(path) + storage = JSON.load_file(path) + models = storage["models"] + assert_equal models.first.keys.sort, %w[api_name name best supports_images supports_tools supports_system_message input_token_cost_cents output_token_cost_cents api_service_name].sort + end + + test "export_to_file yaml" do + path = Rails.root.join("tmp/models.yml") + LanguageModel.export_to_file(path:, models: users(:rob).language_models.not_deleted) + assert File.exist?(path) + storage = YAML.load_file(path) + models = storage["models"] + assert_equal models.first.keys.sort, %w[api_name name best supports_images supports_tools supports_system_message input_token_cost_cents output_token_cost_cents api_service_name].sort + end + + test "import_from_file with only new models" do + models = [{ + api_name: "new-model", + name: "new model", + api_service_name: api_services(:rob_openai_service).name, + supports_images: true, + supports_tools: true, + input_token_cost_cents: 1, + output_token_cost_cents: 1 + }] + storage = { + "models" => models + } + path = Rails.root.join("tmp/newmodels.yml") + File.write(path, storage.to_yaml) + assert_difference "LanguageModel.count", 1 do + LanguageModel.import_from_file(path:, users: users(:rob)) + end + assert users(:rob).language_models.find_by(api_name: "new-model") + end + + test "import_from_file json with only new models" do + models = [{ + api_name: "new-model", + name: "new model", + api_service_name: api_services(:rob_openai_service).name, + supports_images: true, + supports_tools: true, + input_token_cost_cents: 1, + output_token_cost_cents: 1 + }] + storage = { + "models" => models + } + path = Rails.root.join("tmp/newmodels.json") + File.write(path, storage.to_json) + assert_difference "LanguageModel.count", 1 do + LanguageModel.import_from_file(path:, users: users(:rob)) + end + assert users(:rob).language_models.find_by(api_name: "new-model") + end + + test "import_from_file with existing models by api_name" do + user = users(:rob) + api_name = "gpt-4o" + model = user.language_models.find_by(api_name:) + models = [{ + api_name:, + name: "new name", + supports_images: false, + supports_tools: true, + input_token_cost_cents: 0.1234, + output_token_cost_cents: 0.5678 + }] + storage = { + "models" => models + } + path = Rails.root.join("tmp/newmodels.yml") + File.write(path, storage.to_yaml) + assert_no_difference "LanguageModel.count" do + LanguageModel.import_from_file(path:, users: [user]) + end + model.reload + assert_equal "new name", model.name + assert_equal false, model.supports_images + assert_equal true, model.supports_tools + assert_equal 0.1234, model.input_token_cost_cents + assert_equal 0.5678, model.output_token_cost_cents + end +end diff --git a/test/models/language_model_test.rb b/test/models/language_model_test.rb index f1d8d551b..31944055e 100644 --- a/test/models/language_model_test.rb +++ b/test/models/language_model_test.rb @@ -22,26 +22,6 @@ class LanguageModelTest < ActiveSupport::TestCase assert_equal AIBackend::OpenAI, language_models(:gpt_best).ai_backend end - test "provider_name for Anthropic models" do - assert_equal "claude-3-sonnet-20240229", language_models(:claude_3_sonnet_20240229).provider_name - assert_equal "claude-3-opus-20240229", language_models(:claude_3_opus_20240229).provider_name - end - - test "provider_name for OpenAI models" do - assert_equal "gpt-3.5-turbo-0125", language_models(:gpt_3_5_turbo_0125).provider_name - assert_equal "gpt-4o", language_models(:gpt_4o).provider_name - end - - test "provider_name for best models" do - assert_equal "gpt-4o-2024-08-06", language_models(:gpt_best).provider_name - assert_equal "claude-3-5-sonnet-20240620", language_models(:claude_best).provider_name - end - - test "provider_name for non-best models" do - assert_equal "gpt-4o", language_models(:gpt_4o).provider_name - assert_equal "claude-3-opus-20240229", language_models(:claude_3_opus_20240229).provider_name - end - test "validates api_name" do record = LanguageModel.new(api_name: "") refute record.valid? diff --git a/test/models/message/document_image_test.rb b/test/models/message/document_image_test.rb index 0ceca2088..681640035 100644 --- a/test/models/message/document_image_test.rb +++ b/test/models/message/document_image_test.rb @@ -16,12 +16,11 @@ class Message::DocumentImageTest < ActiveSupport::TestCase refute messages(:examine_this).has_document_image?(:small) end - test "document_image_url" do - assert messages(:examine_this).document_image_url(:small).is_a?(String) - assert messages(:examine_this).document_image_url(:small).starts_with?("/rails/active_storage/representations/redirect") - end - - test "document_image_url with fallback" do - assert_equal "", messages(:examine_this).document_image_url(:small, fallback: "") + test "document_image_url with data url" do + stub_custom_config_value(:app_url, "") do + url = messages(:examine_this).document_image_url(:small) + assert url.is_a?(String) + assert url.starts_with?("data:image/png;base64,") + end end end diff --git a/test/models/message/toolable_test.rb b/test/models/message/toolable_test.rb index 7d68ebffd..20415b245 100644 --- a/test/models/message/toolable_test.rb +++ b/test/models/message/toolable_test.rb @@ -2,7 +2,7 @@ class Message::ToolableTest < ActiveSupport::TestCase setup do - @has_tool_response = { role: :tool, tool_call_id: "abc123", content_text: "success" } + @has_tool_response = { role: :tool, tool_call_id: "abc123", content_text: "success", content_tool_calls: { function: "hello" } } @has_tool_calls = { content_tool_calls: { func: "hello" } } @has_content_text = { content_text: "Hello" } end diff --git a/test/models/message/version_test.rb b/test/models/message/version_test.rb index 16b31ae75..44439825a 100644 --- a/test/models/message/version_test.rb +++ b/test/models/message/version_test.rb @@ -65,10 +65,8 @@ class Message::VersionTest < ActiveSupport::TestCase end test "creating a message with branched true AND branched_from_version specified SUCCEEDS" do - assert_nothing_raised do - Current.user = users(:keith) - conversations(:versioned).messages.create!(assistant: assistants(:samantha), content_text: "What is your name?", index: 2, version: 3, branched: true, branched_from_version: 2) - end + Current.user = users(:keith) + assert conversations(:versioned).messages.create!(assistant: assistants(:samantha), content_text: "What is your name?", index: 2, version: 3, branched: true, branched_from_version: 2) end test "creating a new messages for a SPECIFIC INDEX and SPECIFIC VERSION fails if the VERSION is SKIPPING a number" do diff --git a/test/models/message_test.rb b/test/models/message_test.rb index fd27ed03f..f980d2d0c 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -91,6 +91,7 @@ class MessageTest < ActiveSupport::TestCase assistant: assistants(:samantha), role: :tool, content_text: "tool response", + content_tool_calls: { type: "function", function: { name: "memory", arguments: "memory" } }, ) end end @@ -101,17 +102,30 @@ class MessageTest < ActiveSupport::TestCase assistant: assistants(:samantha), role: :tool, tool_call_id: "tool_1234", + content_tool_calls: { type: "function", function: { name: "memory", arguments: "memory" } }, ) end end - test "creating a tool message succeeds with both tool_call_id and content_text" do + test "creating a tool message fails without a content_tool_calls" do + assert_raises ActiveRecord::RecordInvalid do + conversations(:weather).messages.create!( + assistant: assistants(:samantha), + role: :tool, + content_text: "tool response", + tool_call_id: "tool_1234", + ) + end + end + + test "creating a tool message succeeds with tool_call_id, content_text, and content_tool_calls" do assert_nothing_raised do conversations(:weather).messages.create!( assistant: assistants(:samantha), role: :tool, content_text: "tool response", tool_call_id: "tool_1234", + content_tool_calls: { type: "function", function: { name: "memory", arguments: "memory" } }, ) end end @@ -123,7 +137,7 @@ class MessageTest < ActiveSupport::TestCase assert_raises ActiveRecord::RecordInvalid do Message.create!( - assistant: assistant, + assistant:, conversation: conversation_owned_by_someone_else, content_text: "This should fail" ) @@ -137,8 +151,8 @@ class MessageTest < ActiveSupport::TestCase assert_nothing_raised do message = Message.create!( - assistant: assistant, - conversation: conversation, + assistant:, + conversation:, content_text: "This works since Conversation is owned by Current.user" ) assert_equal Current.user, message.conversation.user @@ -154,8 +168,8 @@ class MessageTest < ActiveSupport::TestCase assert_nothing_raised do message = Message.create!( - assistant: assistant, - conversation: conversation, + assistant:, + conversation:, content_text: "This works since Current.user not set" ) end diff --git a/test/models/microsoft_graph_credential_test.rb b/test/models/microsoft_graph_credential_test.rb new file mode 100644 index 000000000..932b3c8e2 --- /dev/null +++ b/test/models/microsoft_graph_credential_test.rb @@ -0,0 +1,28 @@ +require "test_helper" + +class MicrosoftGraphCredentialTest < ActiveSupport::TestCase + # See credential_test for tests in common to all credentials + + test "confirm STI is working" do + assert_instance_of MicrosoftGraphCredential, credentials(:keith_microsoft_graph) + end + + test "confirm that one of the MicrosoftGraphApp included changes is working" do + assert_equal credentials(:keith_microsoft_graph).external_id, credentials(:keith_microsoft_graph).oauth_id + end + + test "token not expired so not renewed" do + credential = credentials(:keith_microsoft_graph) + refute credential.expired? + token = credential.token + assert token + credential.reload + assert_equal token, credential.token + end + + test "token expired" do + credential = credentials(:keith_microsoft_graph) + credential.update(properties: { expires_at: 1.minute.ago.to_i }) + assert credential.expired? + end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 2d37ac0c2..b64cf217a 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -29,6 +29,10 @@ class UserTest < ActiveSupport::TestCase assert_instance_of GoogleTasksCredential, users(:keith).google_tasks_credential end + test "has an associated microsoft_graph_credential" do + assert_instance_of MicrosoftGraphCredential, users(:keith).microsoft_graph_credential + end + test "has an associated http_header_credential" do assert_instance_of HttpHeaderCredential, users(:rob).http_header_credential end diff --git a/test/services/ai_backend/anthropic_test.rb b/test/services/ai_backend/anthropic_test.rb index ed38a6014..f2590a260 100644 --- a/test/services/ai_backend/anthropic_test.rb +++ b/test/services/ai_backend/anthropic_test.rb @@ -24,7 +24,7 @@ class AIBackend::AnthropicTest < ActiveSupport::TestCase TestClient::Anthropic.stub :text, nil do # this forces it to fall back to default text streamed_text = "" @anthropic.stream_next_conversation_message { |chunk| streamed_text += chunk } - expected_start = "Hello this is model claude-3-5-sonnet-20240620 with instruction \"Note these additional items that you've been told and remembered:\\n\\nHe lives in Austin, Texas\\n\\nFor the user, the current time" + expected_start = "Hello this is model claude-3-5-sonnet-20240620 with instruction \"Note these additional items that you've been told and remembered:\\n\\nHe lives in Austin, Texas\\nHe owns a cat\\n\\nFor the user, the current time" expected_end = "\"! How can I assist you today?" assert streamed_text.start_with?(expected_start) assert streamed_text.end_with?(expected_end) @@ -48,11 +48,11 @@ class AIBackend::AnthropicTest < ActiveSupport::TestCase end end + # TODO # test "preceding_conversation_messages only considers messages on the intended conversation version and includes the correct names" do - # # TODO # end + # TODO # test "preceding_conversation_messages includes the appropriate tool details" do - # # TODO # end end diff --git a/test/services/ai_backend/open_ai_test.rb b/test/services/ai_backend/open_ai_test.rb index 378f84a3f..6305b6692 100644 --- a/test/services/ai_backend/open_ai_test.rb +++ b/test/services/ai_backend/open_ai_test.rb @@ -19,7 +19,7 @@ class AIBackend::OpenAITest < ActiveSupport::TestCase end test "openai url is properly set" do - assert_equal "https://api.openai.com/", @openai.client.uri_base + assert_equal "https://api.openai.com/v1/", @openai.client.uri_base end test "get_oneoff_message responds with a reply" do @@ -44,7 +44,7 @@ class AIBackend::OpenAITest < ActiveSupport::TestCase TestClient::OpenAI.stub :text, nil do # this forces it to fall back to default text streamed_text = "" @openai.stream_next_conversation_message { |chunk| streamed_text += chunk } - expected_start = "Hello this is model gpt-4o with instruction \"Note these additional items that you've been told and remembered:\\n\\nHe lives in Austin, Texas\\n\\nFor the user, the current time" + expected_start = "Hello this is model gpt-4o with instruction \"Note these additional items that you've been told and remembered:\\n\\nHe lives in Austin, Texas\\nHe owns a cat\\n\\nFor the user, the current time" expected_end = "\"! How can I assist you today?" assert streamed_text.start_with?(expected_start) assert streamed_text.end_with?(expected_end) @@ -56,6 +56,7 @@ class AIBackend::OpenAITest < ActiveSupport::TestCase role: "tool", content: "\"Hello, World!\"", tool_call_id: "abc123", + content_tool_calls: messages(:weather_tool_call).content_tool_calls.first, } assert_equal [tool_message], AIBackend::OpenAI.get_tool_messages_by_calling(messages(:weather_tool_call).content_tool_calls) end diff --git a/test/services/ai_backend/tools_test.rb b/test/services/ai_backend/tools_test.rb index 8ee3a5b10..05c1408ab 100644 --- a/test/services/ai_backend/tools_test.rb +++ b/test/services/ai_backend/tools_test.rb @@ -6,6 +6,7 @@ class AIBackend::ToolsTest < ActiveSupport::TestCase role: "tool", content: "\"Hello, World!\"", tool_call_id: "abc123", + content_tool_calls: messages(:weather_tool_call).content_tool_calls.first, } assert_equal [tool_message], AIBackend.get_tool_messages_by_calling(messages(:weather_tool_call).content_tool_calls) end @@ -18,6 +19,7 @@ class AIBackend::ToolsTest < ActiveSupport::TestCase msg = AIBackend::OpenAI.get_tool_messages_by_calling(tool_calls).first assert_equal "tool", msg[:role] assert_equal "abc123", msg[:tool_call_id] + assert_equal messages(:weather_tool_call).content_tool_calls.first, msg[:content_tool_calls] assert msg[:content].starts_with?('"An unexpected error occurred') end @@ -29,6 +31,7 @@ class AIBackend::ToolsTest < ActiveSupport::TestCase msg = AIBackend::OpenAI.get_tool_messages_by_calling(tool_calls).first assert_equal "tool", msg[:role] assert_equal "abc123", msg[:tool_call_id] + assert_equal messages(:weather_tool_call).content_tool_calls.first, msg[:content_tool_calls] assert msg[:content].starts_with?('"An unexpected error occurred') end end diff --git a/test/services/toolbox/google_search_test.rb b/test/services/toolbox/google_search_test.rb new file mode 100644 index 000000000..795a30f59 --- /dev/null +++ b/test/services/toolbox/google_search_test.rb @@ -0,0 +1,42 @@ +require "test_helper" + +class Toolbox::GoogleSearchTest < ActiveSupport::TestCase + setup do + @google_search = Toolbox::GoogleSearch.new + WebMock.enable! + end + + test "google_search returns the expected result" do + expected_result = { + message_to_user: "Web query: Sandi Metz POODR title", + query_results: "Practical Object-Oriented Design in Ruby by Sandi Metz. Learn more (https://www.poodr.com) for more details." + } + html_content = <<-HTML + + +
    + Practical Object-Oriented Design in Ruby by Sandi Metz.#{' '} + Learn more for more details. +
    +
    + Not relevant content. + Ignore this. +
    + + + HTML + + stub_request(:get, /www.google.com/) + .with( + headers: { + "Accept"=>"*/*", + "Accept-Encoding"=>"gzip;q=1.0,deflate;q=0.6,identity;q=0.3", + "User-Agent"=>"Ruby" + } + ) + .to_return(status: 200, body: html_content, headers: {}) + + result = @google_search.google_search(query_s: "Sandi Metz POODR title") + assert_equal expected_result, result + end +end diff --git a/test/services/toolbox/google_tasks_test.rb b/test/services/toolbox/google_tasks_test.rb index e2b82b931..f2f32bc2f 100644 --- a/test/services/toolbox/google_tasks_test.rb +++ b/test/services/toolbox/google_tasks_test.rb @@ -389,13 +389,13 @@ def lists_data def task_data(title: "Title of task", notes: "notes for task", deleted: false, due: nil, completed: false) { id: "mockid", - title: title, + title:, selfLink: "https://www.googleapis.com/tasks/v1/lists/SjBhVUFfLWtEVElJRnJ2Yg/tasks/NHhjQUY3bGlHVHdPUEwwaA", - notes: notes, + notes:, status: completed ? "completed" : "needsAction", completed: completed.presence && Time.zone.today.strftime("%Y-%m-%dT00:00:00.000Z"), due: due == "clear" ? nil : due, - deleted: deleted, + deleted:, links: [], webViewLink: "https://tasks.google.com/task/4xcAF7liGTwOPL0h" } @@ -403,7 +403,7 @@ def task_data(title: "Title of task", notes: "notes for task", deleted: false, d def tasks_data(deleted: false) { items: [ - task_data(deleted: deleted).merge(position: "00001"), + task_data(deleted:).merge(position: "00001"), { id: "mockid2", position: "00002", @@ -411,7 +411,7 @@ def tasks_data(deleted: false) selfLink: "https://www.googleapis.com/tasks/v1/lists/SjBhVUFfLWtEVElJRnJ2Yg/tasks/NHhjQUY3bGlHVHdPUEwwaA", status: "needsAction", due: nil, - deleted: deleted, + deleted:, links: [], webViewLink: "https://tasks.google.com/task/4xcAF7liGTwOPL0h" },{ @@ -421,7 +421,7 @@ def tasks_data(deleted: false) selfLink: "https://www.googleapis.com/tasks/v1/lists/SjBhVUFfLWtEVElJRnJ2Yg/tasks/NHhjQUY3bGlHVHdPUEwwaA", status: "needsAction", due: nil, - deleted: deleted, + deleted:, links: [], webViewLink: "https://tasks.google.com/task/4xcAF7liGTwOPL0h" }] @@ -432,13 +432,13 @@ def create_data(title:, notes: nil, due: nil) { kind: "tasks#task", id: "mockid", etag: "\"NzU5Mjc2NTA2\"", - title: title, + title:, updated: "2024-06-18T21:29:54.000Z", selfLink: "https://www.googleapis.com/tasks/v1/lists/SjBhVUFfLWtEVElJRnJ2Yg/tasks/NHhjQUY3bGlHVHdPUEwwaA", position: "00000000000000000000", - notes: notes, + notes:, status: "needsAction", - due: due, + due:, links: [], webViewLink: "https://tasks.google.com/task/4xcAF7liGTwOPL0h" }.compact diff --git a/test/services/toolbox/open_meteo_test.rb b/test/services/toolbox/open_meteo_test.rb index 899afd6c0..76a70a3c9 100644 --- a/test/services/toolbox/open_meteo_test.rb +++ b/test/services/toolbox/open_meteo_test.rb @@ -26,6 +26,8 @@ class Toolbox::OpenMeteoTest < ActiveSupport::TestCase end test "get_current_and_todays_weather hits the API and doesn't fail" do + WebMock.disable! + allow_request(:get, :get_location) do allow_request(:get, :get_current_and_todays_weather) do result = @open_meteo.get_current_and_todays_weather(city_s: "Austin", state_province_or_region_s: "Texas") @@ -35,6 +37,8 @@ class Toolbox::OpenMeteoTest < ActiveSupport::TestCase end test "get_current_and_todays_weather works as a tool call" do + WebMock.disable! + allow_request(:get, :get_location) do allow_request(:get, :get_current_and_todays_weather) do result = Toolbox.call("openmeteo_get_current_and_todays_weather", city: "Austin", state_province_or_region: "Texas") diff --git a/test/support/config_helpers.rb b/test/support/config_helpers.rb new file mode 100644 index 000000000..f4d50132a --- /dev/null +++ b/test/support/config_helpers.rb @@ -0,0 +1,35 @@ +module ConfigHelpers + + def teardown + super + + unless @original_values.nil? + unstub_custom_config_values + end + end + + private + + def stub_custom_config_value(key, value, &block) + @original_values ||= {} + + if block_given? + Rails.application.config.x.stub(key, value) do + yield + end + else + @original_values[key] = Rails.application.config.x.send(key) + + Rails.application.config.x.send("#{key}=", value) + Rails.application.reloader.reload! + end + end + + def unstub_custom_config_values + @original_values.each do |key, value| + Rails.application.config.x.send("#{key}=", value) + end + Rails.application.reloader.reload! + @original_values = {} + end +end diff --git a/test/support/postgresql_helper.rb b/test/support/postgresql_helper.rb deleted file mode 100644 index 01cea14ae..000000000 --- a/test/support/postgresql_helper.rb +++ /dev/null @@ -1,18 +0,0 @@ -module PostgresqlHelper - extend ActiveSupport::Concern - - included do - # Added this ActiveStorage configuration when implementing postgres-file storage - setup do - if ActiveStorage::Current.respond_to?(:url_options) - ActiveStorage::Current.url_options = { host: "example.com", protocol: "https" } - else - ActiveStorage::Current.host = "https://example.com" - end - end - - teardown do - ActiveStorage::Current.reset - end - end -end diff --git a/test/support/sdk_helper.rb b/test/support/sdk_helper.rb index ad6cdd7b1..fec305809 100644 --- a/test/support/sdk_helper.rb +++ b/test/support/sdk_helper.rb @@ -20,24 +20,24 @@ def stub_response(verb, method, status:, response: {}, &block) end def stub_get_response(method, status:, response: {}, &block) - stub_response(:get, method, status: status, response: response, &block) + stub_response(:get, method, status:, response:, &block) end def stub_post_response(method, status:, response: {}, &block) - stub_response(:post, method, status: status, response: response, &block) + stub_response(:post, method, status:, response:, &block) end def stub_patch_response(method, status:, response: {}, &block) - stub_response(:patch, method, status: status, response: response, &block) + stub_response(:patch, method, status:, response:, &block) end def stub_delete_response(method, status:, response: {}, &block) - stub_response(:delete, method, status: status, response: response, &block) + stub_response(:delete, method, status:, response:, &block) end def response_for(status, hash) OpenData.new( - status: status, + status:, body: hash.to_json, ) end diff --git a/test/support/test_client/gemini.rb b/test/support/test_client/gemini.rb new file mode 100644 index 000000000..c63a9dcac --- /dev/null +++ b/test/support/test_client/gemini.rb @@ -0,0 +1,30 @@ +module TestClient + class Gemini + def initialize(args) + end + + def self.text + nil + end + + # This response is a valid example response from the API. + # + # Stub this method to respond with something more specific if needed. + def stream_generate_content(args) + contents = args.dig(:contents) + system_message = args.dig(:system_instruction) + return [{"candidates"=> + [{"content"=> + {"role"=>"model", + "parts"=> + [{"text"=> self.class.text || "Hello this is a model with instruction #{system_message.to_s.inspect}! How can I assist you today?"}]}, + "safetyRatings"=> + [{"category"=>"HARM_CATEGORY_HARASSMENT", "probability"=>"NEGLIGIBLE"}, + {"category"=>"HARM_CATEGORY_HATE_SPEECH", "probability"=>"NEGLIGIBLE"}, + {"category"=>"HARM_CATEGORY_SEXUALLY_EXPLICIT", "probability"=>"NEGLIGIBLE"}, + {"category"=>"HARM_CATEGORY_DANGEROUS_CONTENT", "probability"=>"NEGLIGIBLE"}]}], + "usageMetadata"=>{"promptTokenCount"=>1037, "candidatesTokenCount"=>31, "totalTokenCount"=>1068} + }] + end + end +end diff --git a/test/support/test_client/open_ai.rb b/test/support/test_client/open_ai.rb index 6d8258c0b..bc4052b22 100644 --- a/test/support/test_client/open_ai.rb +++ b/test/support/test_client/open_ai.rb @@ -2,7 +2,7 @@ module TestClient class OpenAI attr_reader :uri_base - def initialize(access_token:, uri_base:nil) + def initialize(access_token:, uri_base:nil, api_version: "") @uri_base = uri_base end diff --git a/test/system/conversations/messages/images_test.rb b/test/system/conversations/messages/images_test.rb index 89b99f99e..7893fe7eb 100644 --- a/test/system/conversations/messages/images_test.rb +++ b/test/system/conversations/messages/images_test.rb @@ -45,7 +45,7 @@ class ConversationMessagesImagesTest < ApplicationSystemTestCase end test "images eventually render in messages WHEN NOT pre-processed, clicking opens modal" do - stimulate_image_variant_processing do + simulate_image_variant_processing do visit_and_scroll_wait conversation_messages_path(@conversation) image_msg = find_messages.third @@ -85,56 +85,64 @@ class ConversationMessagesImagesTest < ApplicationSystemTestCase end end - test "ensure images display a spinner initially if they get a 404 and then eventually get replaced with the image" do - stimulate_image_variant_processing do - visit_and_scroll_wait conversation_messages_path(@conversation) - - image_msg = find_messages.third - image_btn = image_msg.find_role("image-preview") - loader = image_btn.find_role("image-loader") - img = image_btn.find("img", visible: :all) - modal_container = image_msg.find_role("image-modal") - modal_loader = modal_container.find_role("image-loader") - modal_img = modal_container.find("img", visible: :all) - - assert_true "image loader should be visible", wait: 0.6 do - loader.visible? - end - refute img.visible? - - image_btn.click - - 2.times do - sleep 0.1 - sleep 0.5 if !modal_loader.visible? - sleep 0.1 - image_btn.click if !modal_loader.visible? - end # TODO: sometimes modal has not popped up after clicking, why?? Try 2x times before failing the test. - - assert_true "modal image loader should be visible", wait: 0.6 do - modal_loader.visible? - end - refute modal_img.visible? - - send_keys "esc" - - assert_false "image loader should have eventually disappeared", wait: 10 do - loader.visible? - end - assert img.visible? - wait_for_images_to_load - - image_btn.click - - assert_true "modal image should be visible" do - modal_img.visible? - end - refute modal_loader.visible? - end - end + # This test is failing intermittently in CI and I can't reproduce it locally. + # ConversationMessagesImagesTest#test_ensure_images_display_a_spinner_initially_if_they_get_a_404_and_then_eventually_get_replaced_with_the_image: + # Selenium::WebDriver::Error::ElementClickInterceptedError: element click intercepted: Element is not clickable at point (818, 386). Other element would receive the click: + # Image here: https://github.com/AllYourBot/hostedgpt/actions/runs/12424552298/artifacts/2346575925 + # Failure example: https://github.com/AllYourBot/hostedgpt/actions/runs/12424552298/job/34689893027 + # + # test "ensure images display a spinner initially if they get a 404 and then eventually get replaced with the image" do + # simulate_image_variant_processing do + # visit_and_scroll_wait conversation_messages_path(@conversation) + + # image_msg = find_messages.third + # image_btn = image_msg.find_role("image-preview") + # loader = image_btn.find_role("image-loader") + # img = image_btn.find("img", visible: :all) + # modal_container = image_msg.find_role("image-modal") + # modal_loader = modal_container.find_role("image-loader") + # modal_img = modal_container.find("img", visible: :all) + + # assert_true "image loader should be visible", wait: 0.6 do + # loader.visible? + # end + # refute img.visible? + + # image_btn.click + # 2.times do + # sleep 0.1 + # sleep 0.5 if !modal_loader.visible? + # sleep 0.1 + # image_btn.click if !modal_loader.visible? + # end # TODO: sometimes modal has not popped up after clicking, why?? Try 2x times before failing the test. + + # assert_true "modal image loader should be visible", wait: 3 do + # modal_loader.visible? + # end + # refute modal_img.visible? + + # send_keys "esc" + + # assert_false "image loader should have eventually disappeared", wait: 10 do + # loader.visible? + # end + # assert img.visible? + # wait_for_images_to_load + + # image_btn.click + + # assert_true "modal image should be visible" do + # modal_img.visible? + # end + # refute modal_loader.visible? + # end + # end test "ensure page scrolls back down to the bottom after an image pops in late" do - stimulate_image_variant_processing do + simulate_image_variant_processing do visit_and_scroll_wait conversation_messages_path(@conversation) image_msg = find_messages.third @@ -156,7 +164,7 @@ class ConversationMessagesImagesTest < ApplicationSystemTestCase test "images in previous messages remain after submitting a new message, they should not display a new spinner" do image_msg = img = nil - stimulate_image_variant_processing do + simulate_image_variant_processing do visit_and_scroll_wait conversation_messages_path(@conversation) image_msg = find_messages.third @@ -189,10 +197,12 @@ def preprocess_all_variants! end end - def stimulate_image_variant_processing(&block) - Document.stub_any_instance(:has_file_variant_processed?, false) do - ActiveStorage::PostgresqlController.stub_any_instance(:decode_verified_key, simulate_not_preprocessed) do - yield block + def simulate_image_variant_processing(&block) + stub_custom_config_value(:app_url, "not_nil") do + Document.stub_any_instance(:has_file_variant_processed?, false) do + ActiveStorage::PostgresqlController.stub_any_instance(:decode_verified_key, simulate_not_preprocessed) do + yield block + end end end end diff --git a/test/system/messages/nav_column_test.rb b/test/system/messages/nav_column_test.rb index 9c95448cc..c5d44b7be 100644 --- a/test/system/messages/nav_column_test.rb +++ b/test/system/messages/nav_column_test.rb @@ -7,9 +7,7 @@ class NavColumnTest < ApplicationSystemTestCase end test "clicking conversation in the left column updates the right and preserves scroll position of the left" do - resize_browser_to(1400, 500) page.execute_script("document.querySelector('#nav-scrollable').scrollTop = 100") # scroll the nav column down slightly - assert_did_not_scroll "#nav-scrollable" do click_text conversations(:attachment).title end diff --git a/test/system/messages/tool_response_test.rb b/test/system/messages/tool_response_test.rb new file mode 100644 index 000000000..fc6ab04c1 --- /dev/null +++ b/test/system/messages/tool_response_test.rb @@ -0,0 +1,14 @@ +require "application_system_test_case" + +class ToolResponseTest < ApplicationSystemTestCase + setup do + @user = users(:keith) + login_as @user + @conversation = conversations(:memorize) + end + + test "ensure a visible link is displayed to user that the memory was updated" do + visit_and_scroll_wait conversation_messages_path(@conversation) + assert_text "Memory updated" + end +end diff --git a/test/system/sessions_test.rb b/test/system/sessions_test.rb index 65aa0e2ab..08fb88e7e 100644 --- a/test/system/sessions_test.rb +++ b/test/system/sessions_test.rb @@ -43,4 +43,18 @@ class SessionsTest < ApplicationSystemTestCase assert_text "Log In with Google" end end + + test "should SHOW the Microsoft button when the feature is ENABLED" do + stub_features(microsoft_graph_authentication: true) do + visit root_url + assert_text "Log In with Microsoft" + end + end + + test "should NOT display a Microsoft button when the feature is DISABLED" do + stub_features(microsoft_graph_authentication: false) do + visit root_url + assert_no_text "Log In with Microsoft" + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 312447d10..d9f11631d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,7 +2,9 @@ require_relative "../config/environment" require "rails/test_help" require "minitest/autorun" +require "minitest/retry" require "pry" +require "webmock/minitest" Dir[Rails.root.join("test/support/**/*.rb")].sort.each { |file| require file } @@ -20,11 +22,20 @@ def exists? end end +Minitest::Retry.use!( + retry_count: 1, + verbose: true, + exceptions_to_retry: [Net::ReadTimeout, Minitest::Assertion] +) + class ActionDispatch::IntegrationTest include Rails.application.routes.url_helpers Capybara.default_max_wait_time = 10 + WebMock.disable_net_connect!(allow_localhost: true) + + def login_as(user_or_person, password = "secret") user = if user_or_person.is_a?(Person) user_or_person.user @@ -52,9 +63,13 @@ module ActiveSupport class TestCase include Turbo::Broadcastable::TestHelper include ActiveJob::TestHelper - include OptionsHelpers, PostgresqlHelper, ViewHelpers, SDKHelpers + include OptionsHelpers, ViewHelpers, SDKHelpers, ConfigHelpers parallelize(workers: :number_of_processors) fixtures :all end end + +class ActionDispatch::SystemTestCase + parallelize(workers: Etc.nprocessors/2) +end