exercism-config 0.131.0 → 0.133.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 022a04eecafa535e9bdc8c6b9318ec6d6cfbffc4a52414a3865ef2f60e924497
-  data.tar.gz: cf41e3c8c92f94299eb4b8fd421883548c323a059127901a2b5ef6aacc8e72f2
+  metadata.gz: 54034ae264aab2f8c06d15e19777cb8e4d77db325a567370e832f5df74b21eef
+  data.tar.gz: b8deba140712b3133104b1fd03cead4441ae2632b2fb0d9417c122b04aa2b943
 SHA512:
-  metadata.gz: aa6b5336b973c833c469b574f211c1b662b9ab45bc4cdd0318a61fae74c8c4008580660817f5272828d851df10dec6d63abc785817220676d2f17755952e8664
-  data.tar.gz: c98758723a9a86d477a7110248c4f8d20bd8a0a5d891f64a75dfe9648d1d99962232eac13efb8cda21a689d725b2d903907feb0fe01ab257c8449fb9e928ca9f
+  metadata.gz: '078267a2c405d101523090e73b5f97a268046d566a5de03c0fa07f2a163a6464c417dc555ed27fcaa6da8bd5d2a5ee073ca920fc3db4d19660ccd8ac5f15be8b'
+  data.tar.gz: aa752572631779e6d298f2a5b2492ce5fefc194880b131881368cae16f0c564bd30e91fb4e885a65d5a4c7fb28bac8221da947cc0932fc6b9350e936e8045750

data/README.md

@@ -25,6 +25,7 @@ Exercism.config.tooling_orchestrator_url
 Exercism.config.language_server_url
 Exercism.config.opensearch_host
 Exercism.config.paypal_api_url
+Exercism.config.assistant_chat_url
 
 # Secrets
 Exercism.secrets.github_access_token
@@ -61,6 +62,8 @@ Exercism.secrets.paypal_premium_yearly_plan_id
 Exercism.secrets.paypal_lifetime_insiders_hosted_button_id
 Exercism.secrets.chatgpt_access_token
 Exercism.secrets.sparkpost_api_key
+Exercism.secrets.assistant_chat_jwt_secret
+Exercism.secrets.assistant_chat_hmac_secret
 Exercism.secrets.openai_api_key
 Exercism.secrets.openai_tags_model
 

data/exercism_config.gemspec

@@ -43,6 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'aws-sdk-ecr'
   spec.add_development_dependency 'aws-sdk-s3'
   spec.add_development_dependency 'aws-sdk-sesv2'
+  spec.add_development_dependency 'connection_pool'
   spec.add_development_dependency 'discourse_api'
   spec.add_development_dependency 'opensearch-ruby', '2.1.0'
   spec.add_development_dependency 'redis', '~> 5.1'

data/lib/exercism/redis_pool.rb

@@ -0,0 +1,54 @@
+module Exercism
+  # A registry of pooled Redis clients, keyed by name.
+  #
+  # Clients used to be built per call, which turned out to be expensive rather
+  # than merely wasteful. Redis::Cluster is eager: RedisClient::Cluster#initialize
+  # builds its router inline, and the router does topology discovery and opens
+  # node connections there and then. Because nothing held a reference to the
+  # client afterwards, every command paid a connect plus a full slot-map fetch
+  # and then threw the connection away - putting a handshake on the critical
+  # path of every tooling job state transition, and (because the orchestrator
+  # does the same on each idle poll) accounting for ~96% of our ElastiCache
+  # ECPU bill.
+  #
+  # A single shared client would fix the churn, but Redis serialises every
+  # command through an internal Monitor, so sharing one across the
+  # orchestrator's and Sidekiq's threads would trade connection cost for
+  # contention. Hence a pool.
+  module RedisPool
+    DEFAULT_SIZE = 5
+    DEFAULT_TIMEOUT = 5
+
+    @mutex = Mutex.new
+    @pools = {}
+    @pid = nil
+
+    # Returns the pool for +key+, building it from the block on first use.
+    # The returned object quacks like a Redis client: ConnectionPool::Wrapper
+    # checks a connection out for the duration of each method call.
+    def self.for(key, &)
+      require 'connection_pool'
+
+      @mutex.synchronize do
+        reset_after_fork!
+
+        @pools[key] ||= ConnectionPool::Wrapper.new(size:, timeout: DEFAULT_TIMEOUT, &)
+      end
+    end
+
+    def self.size
+      Integer(ENV.fetch('EXERCISM_REDIS_POOL_SIZE', DEFAULT_SIZE))
+    end
+
+    # A pool must never be shared across a fork - parent and child would write
+    # down each other's sockets - so pools are scoped to the pid and rebuilt
+    # from scratch in the child.
+    def self.reset_after_fork!
+      return if @pid == Process.pid
+
+      @pools = {}
+      @pid = Process.pid
+    end
+    private_class_method :reset_after_fork!
+  end
+end

data/lib/exercism.rb

@@ -13,9 +13,10 @@ module Exercism
     @secrets ||= ExercismConfig::RetrieveSecrets.()
   end
 
-  def self.redis_tooling_client = redis_client(config.tooling_redis_url)
-  def self.redis_git_cache_client = redis_client(config.git_cache_redis_url)
-  def self.redis_cache_client = redis_client(config.cache_redis_url)
+  # Pooled rather than built per call - see Exercism::RedisPool for why.
+  def self.redis_tooling_client = RedisPool.for(:tooling) { redis_client(config.tooling_redis_url) }
+  def self.redis_git_cache_client = RedisPool.for(:git_cache) { redis_client(config.git_cache_redis_url) }
+  def self.redis_cache_client = RedisPool.for(:cache) { redis_client(config.cache_redis_url) }
 
   def self.redis_client(url)
     require 'redis'

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = '0.131.0'.freeze
+  VERSION = '0.133.0'.freeze
 end

data/settings/ci.yml

@@ -6,7 +6,7 @@ anycable_rpc_host: 127.0.0.1:50051
 tooling_redis_url: redis://127.0.0.1:6379/3
 snippet_generator_url: http://127.0.0.1:3024/extract_snippet
 lines_of_code_counter_url: http://127.0.0.1:3025/count_lines_of_code
-chatgpt_proxy_url: http://127.0.0.1:3026/ask_chatgpt
+assistant_chat_url: http://127.0.0.1:3027
 tooling_cloudwatch_jobs_log_group_name: "/tooling-jobs"
 tooling_cloudwatch_jobs_log_stream_name: "general"
 

data/settings/local.yml

@@ -6,7 +6,7 @@ anycable_rpc_host: 127.0.0.1:50051
 tooling_redis_url: redis://127.0.0.1:6379/3
 snippet_generator_url: http://local.exercism.io:3024/extract_snippet
 lines_of_code_counter_url: http://local.exercism.io:3025/count_lines_of_code
-chatgpt_proxy_url: http://local.exercism.io:3026/ask_chatgpt
+assistant_chat_url: http://local.exercism.io:3027
 tooling_cloudwatch_jobs_log_group_name: "/tooling-jobs"
 tooling_cloudwatch_jobs_log_stream_name: "general"
 

data/settings/secrets.yml

@@ -54,3 +54,9 @@ github_solution_syncer_private_key: "SOME-RSA-PRIVATE-KEY"
 
 cloudflare_zone_id: "fake-cloudflare-zone-id"
 cloudflare_api_token: "fake-cloudflare-api-token"
+
+# Assistant chat (shared with the llm-chat-proxy Cloudflare Worker).
+# These MUST match the worker's values byte-for-byte or every assistant
+# message is rejected. Locally the worker reads them from its .dev.vars.
+assistant_chat_jwt_secret: "some-assistant-chat-jwt-secret"
+assistant_chat_hmac_secret: "some-assistant-chat-hmac-secret"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism-config
 version: !ruby/object:Gem::Version
-  version: 0.131.0
+  version: 0.133.0
 platform: ruby
 authors:
 - Jeremy Walker
@@ -191,6 +191,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: discourse_api
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +307,7 @@ files:
 - lib/exercism-config.rb
 - lib/exercism.rb
 - lib/exercism/config.rb
+- lib/exercism/redis_pool.rb
 - lib/exercism/secrets.rb
 - lib/exercism/tooling_job.rb
 - lib/exercism_config/determine_environment.rb