Merge branch 'main' into rails_71

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Changelog
 
-## 7.10.0 - 2023-10-19
+## 7.11.0 - 2023-11-19
+
+### Features
+
+Want to have custom filters or other variables per query?  You can now access a per query `#$qOption##` hash of JSON data in your query template.  For example, if you are accessing a RAG endpoint, and you are passing in a query and need some query specific document ids, you can now do that!
+
+https://github.com/o19s/quepid/pull/883 and https://github.com/o19s/quepid/pull/885 by @epugh.   Big thanks to @mkr for his work on splainer-search upgrades to support this, and @atarora for masterminding the use of the `qOption` in queries. 
+
+### Improvements
+
+* More robust handling of the Static File end point, and better handling of proxied queries that don't return json.  https://github.com/o19s/quepid/pull/886 by @epugh. 
+
+* On to Rails 7.1.2!  https://github.com/o19s/quepid/pull/837 by @epugh.
+
+## 7.10.0 - 2023-11-03
 
 Big feature!  Or should I say big refactoring?   Meet your new friend "The Search Endpoint".  You can now configure a connection to a search engine, maybe one of the classic ones like Solr, OpenSearch, or Elasticsearch, or some new ones like "Static CSV File" or even a "Custom Search API".  Once that is configured, then you can reuse that connection over and over.  Even better, you can share it with your friends in your Team, similar to how you share Cases and Scorers.
 

Dockerfile.dev

@@ -6,7 +6,7 @@ ENV home .
 
 # Must have packages
 RUN apt-get update -qq \
-  && apt-get install -y --no-install-recommends vim curl tmux wget \
+  && apt-get install -y --no-install-recommends vim curl tmux wget netcat \
   && rm -rf /var/lib/apt/lists/*
 
 COPY Gemfile* /srv/app/
@@ -26,11 +26,18 @@ RUN apt-get update -qq && apt-get install -y chromium \
   && rm -rf /var/lib/apt/lists/*
 
 # Node and Yarn
-RUN wget --no-check-certificate -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-  && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-  && curl -sL https://deb.nodesource.com/setup_20.x | bash - \
-  && apt-get update -qq && apt-get install -y --no-install-recommends nodejs yarn netcat \
+RUN apt-get update -qq \
+  && apt-get install -y --no-install-recommends ca-certificates curl gnupg \
+  && mkdir -p /etc/apt/keyrings \
+  && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+  && NODE_MAJOR=20 \
+  && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && apt-get update -qq \
+  && apt-get install --no-install-recommends -y nodejs \
+  && apt remove yarn \
+  && npm install --global yarn \
   && rm -rf /var/lib/apt/lists/*
 
+
 # Clean environment
 RUN apt-get clean all

Dockerfile.prod

@@ -1,4 +1,4 @@
-FROM node:19-bullseye AS build-dep
+FROM node:20-bullseye AS build-dep
 WORKDIR /srv/app
 COPY package.json yarn.lock ./
 RUN yarn install --production=true
@@ -11,22 +11,19 @@ ARG QUEPID_VERSION_VARIABLE
 ENV QUEPID_VERSION=$QUEPID_VERSION_VARIABLE
 
 # Must have packages
-RUN apt-get update -qq && apt-get install -y --no-install-recommends vim curl apt-transport-https ca-certificates \
+RUN apt-get update -qq && apt-get install -y --no-install-recommends vim curl netcat \
   && rm -rf /var/lib/apt/lists/*
 
-# Node and Yarn
-RUN wget --no-check-certificate -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
-
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-    nodejs                                      \
-    yarn                                        \
-    ca-certificates                             \
-    bzip2                                       \
-    libfontconfig                               \
-  && apt-get clean all                          \
+# Node Only
+RUN apt-get update -qq \
+  && apt-get install -y --no-install-recommends ca-certificates gnupg \
+  && mkdir -p /etc/apt/keyrings \
+  && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+  && NODE_MAJOR=20 \
+  && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && apt-get update -qq \
+  && apt-get install --no-install-recommends -y nodejs \
+  && apt remove yarn \
   && rm -rf /var/lib/apt/lists/*
 
 # Install dependencies
@@ -39,7 +36,7 @@ RUN gem install bundler:2.4.21
 # Clean up Bundle
 RUN bundle config set without 'development test'
 RUN bundle config set deployment true
-RUN bundle install && \
+RUN bundle install --jobs 4 && \
   bundle clean --force && \
   rm -rf /app/.bundle/cache && \
   rm -rf /app/vendor/bundle/ruby/*/cache

Gemfile

@@ -6,55 +6,48 @@ ruby '3.2.2'
 
 gem 'activerecord-import', '>= 1.0.7'
 gem 'acts_as_list', '>= 1.0.1'
+gem 'ancestry'
+gem 'angular-rails-templates', '>= 1.0.0.beta'
 gem 'apipie-rails', '~> 1.2'
 gem 'angular-rails-templates', '~> 1.2'
 gem 'bcrypt', '~> 3.1.7'
-gem 'sassc-rails', '~> 2.1'
-gem 'turbolinks', '~> 5'
+gem 'bootsnap', require: false
+gem 'cal-heatmap-rails', '~> 3.6' # provides assets for cal heatmap, that requires old d3
 gem 'colorize', require: false
 gem 'cookies_eu'
+gem 'd3-rails', '~> 3.5.5' # For cal heatmap
 gem 'devise', '>= 4.6.2'
 gem 'devise_invitable', '~> 2.0'
+
+# Using this as it wires in via Sprockets and I can't get npm version to work with the main app.
+# Had no luck with js/svg approach ;-(
+gem 'font-awesome-sass'
 gem 'gabba'
 gem 'intercom-rails'
 gem 'jbuilder', '~> 2.7'
-gem 'redis', '~> 5.0.6'
 gem 'jquery-rails'
 gem 'jquery-ui-rails' # Can we narrow the widgets to load faster?
+gem 'listen', '~> 3.3'
 gem 'mysql2'
-
-gem 'net-smtp'
-gem 'net-pop', '~> 0.1.1'
-gem 'net-imap', '~> 0.3.0'
+gem 'omniauth'
+gem 'omniauth-google-oauth2'
+gem 'omniauth-keycloak'
+gem 'omniauth-rails_csrf_protection'
 gem 'postmark-rails'
-gem "puma", ">= 5.0"
+gem 'prophet-rb', '~> 0.5.0'
+gem 'puma'
 gem 'pundit'
-gem "rails", "~> 7.1.1"
+gem 'rails', '~> 7.1.2'
+gem 'rails-healthcheck', '~> 1.4'
+gem 'rails-html-sanitizer'
+gem 'rack-cors', '~> 2.0'
+gem 'redis', '~> 5.0.6'
 gem 'responders'
+gem 'sassc-rails', '~> 2.1'
 gem 'sidekiq'
 gem 'terser'
-gem 'bootsnap', require: false
-gem 'listen', '~> 3.3'
-
-gem 'cal-heatmap-rails', '~> 3.6' # provides assets for cal heatmap, that requires old d3
-gem 'd3-rails', '~> 3.5.5' # For cal heatmap
-
-# Using this as it wires in via Sprockets and I can't get npm version to work with the main app.
-# Had no luck with js/svg approach ;-(
-gem 'font-awesome-sass'
-
-gem 'rack-cors', '~> 2.0'
-gem 'ancestry'
-
-gem 'omniauth', '~> 2.0'
-gem 'omniauth-keycloak'
-gem 'omniauth-google-oauth2'
-gem 'omniauth-rails_csrf_protection', '~> 1.0'
-
-gem 'prophet-rb', '~> 0.5.0'
-gem 'rails-healthcheck', '~> 1.4'
-gem 'rails-html-sanitizer'
-
+gem 'thor'
+gem 'turbolinks', '~> 5'
 gem 'vega', '~> 0.3.0'
 
 group :development, :test do