A platform for community discussion. Free, open, simple.
DEV: Enable Style/AccessModifierDeclarations (#43247)
Alan Guo Xiang Tandfba7a628b91
diff --git a/.rubocop.yml b/.rubocop.ymlindex 7461649db78..246a6e04d19 100644--- a/.rubocop.yml+++ b/.rubocop.yml@@ -51,6 +51,10 @@ RSpec/InstanceVariable:Include:- spec/models/**/*+Style/AccessModifierDeclarations:+ Enabled: true+ AllowModifiersOnSymbols: false+Style/RedundantFreeze:Enabled: truediff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rbindex cda20661eef..fc4bc319fe0 100644--- a/app/controllers/admin/themes_controller.rb+++ b/app/controllers/admin/themes_controller.rb@@ -128,21 +128,6 @@ class Admin::ThemesController < Admin::AdminControllerrender_json_error err.messageend- def create_remote_theme_placeholder(remote, branch:, private_key:)- Theme.transaction do- remote_theme =- RemoteTheme.create!(remote_url: remote, branch: branch, private_key: private_key)-- Theme.create!(- user_id: theme_user&.id || -1,- name: remote.gsub(/\.git\z/, "").split("/").last,- remote_theme: remote_theme,- )- end- end-- private :create_remote_theme_placeholder-def index@themes = Theme.strict_loading.include_relations.order(:name)@@ -437,6 +422,19 @@ class Admin::ThemesController < Admin::AdminControllerprivate+ def create_remote_theme_placeholder(remote, branch:, private_key:)+ Theme.transaction do+ remote_theme =+ RemoteTheme.create!(remote_url: remote, branch: branch, private_key: private_key)++ Theme.create!(+ user_id: theme_user&.id || -1,+ name: remote.gsub(/\.git\z/, "").split("/").last,+ remote_theme: remote_theme,+ )+ end+ end+def ban_in_allowlist_mode!raise Discourse::InvalidAccess if !Theme.allowed_remote_theme_ids.nil?enddiff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rbindex f6110fcd20f..07ba068b7d5 100644--- a/app/helpers/application_helper.rb+++ b/app/helpers/application_helper.rb@@ -407,25 +407,6 @@ module ApplicationHelperresult.join("\n")end- private def generate_twitter_card_metadata(result, opts)- img_url = opts[:x_summary_large_image].presence || opts[:image]-- # Twitter does not allow SVGs, see https://developer.twitter.com/en/docs/twitter-for-websites/cards/overview/markup- if img_url.ends_with?(".svg")- img_url = SiteSetting.site_logo_url.ends_with?(".svg") ? nil : SiteSetting.site_logo_url- end-- if opts[:x_summary_large_image].present? && img_url.present?- result << tag(:meta, name: "twitter:card", content: "summary_large_image")- result << tag(:meta, name: "twitter:image", content: img_url)- elsif opts[:image].present? && img_url.present?- result << tag(:meta, name: "twitter:card", content: "summary")- result << tag(:meta, name: "twitter:image", content: img_url)- else- result << tag(:meta, name: "twitter:card", content: "summary")- end- end-def render_sitelinks_search_tagif current_page?("/") || current_page?(Discourse.base_path)json = {@@ -579,6 +560,25 @@ module ApplicationHelperprivate+ def generate_twitter_card_metadata(result, opts)+ img_url = opts[:x_summary_large_image].presence || opts[:image]++ # Twitter does not allow SVGs, see https://developer.twitter.com/en/docs/twitter-for-websites/cards/overview/markup+ if img_url.ends_with?(".svg")+ img_url = SiteSetting.site_logo_url.ends_with?(".svg") ? nil : SiteSetting.site_logo_url+ end++ if opts[:x_summary_large_image].present? && img_url.present?+ result << tag(:meta, name: "twitter:card", content: "summary_large_image")+ result << tag(:meta, name: "twitter:image", content: img_url)+ elsif opts[:image].present? && img_url.present?+ result << tag(:meta, name: "twitter:card", content: "summary")+ result << tag(:meta, name: "twitter:image", content: img_url)+ else+ result << tag(:meta, name: "twitter:card", content: "summary")+ end+ end+def build_splash_screen_image@splash_screen_image_svg = nildiff --git a/lib/csrf_token_verifier.rb b/lib/csrf_token_verifier.rbindex 8736b749df1..545f450478f 100644--- a/lib/csrf_token_verifier.rb+++ b/lib/csrf_token_verifier.rb@@ -22,7 +22,7 @@ class CSRFTokenVerifierraise InvalidCSRFToken unless verified_request?end- public :form_authenticity_token+ public :form_authenticity_token # rubocop:disable Style/AccessModifierDeclarationsprivatediff --git a/plugins/discourse-ai/lib/completions/endpoints/base.rb b/plugins/discourse-ai/lib/completions/endpoints/base.rbindex 49628f5d14a..7c143194194 100644--- a/plugins/discourse-ai/lib/completions/endpoints/base.rb+++ b/plugins/discourse-ai/lib/completions/endpoints/base.rb@@ -203,6 +203,157 @@ module DiscourseAi)end+ def final_log_update(log)+ # for people that need to override+ end++ def estimated_cost_for(log)+ llm_model.estimated_cost_for_tokens(+ request_tokens: log.request_tokens,+ response_tokens: log.response_tokens,+ cache_read_tokens: log.cache_read_tokens,+ cache_write_tokens: log.cache_write_tokens,+ )+ end++ def default_options+ raise NotImplementedError+ end++ def provider_id+ raise NotImplementedError+ end++ def prompt_size(prompt)+ tokenizer.size(extract_prompt_for_tokenizer(prompt))+ end++ attr_reader :llm_model++ # Extra HTTP headers contributed by registered providers for this+ # request. Endpoints that want them merge the result into their request+ # headers. Provider failures are isolated so they can never break a+ # completion.+ def extra_request_headers+ providers = self.class.request_headers_providers+ return {} if providers.blank?++ context =+ RequestHeaderContext.new(+ llm_model: llm_model,+ feature_name: @feature_name,+ feature_context: @feature_context,+ has_images: @request_has_images,+ streaming: @streaming_mode,+ )++ providers.each_with_object({}) do |provider, headers|+ result = provider.call(context)+ headers.merge!(result.stringify_keys) if result.is_a?(Hash)+ rescue StandardError => e+ Discourse.warn_exception(+ e,+ message: "Discourse AI request header provider raised an error; skipping it",+ )+ end+ end++ protected++ def tokenizer+ llm_model.tokenizer_class+ end++ # Detects whether the translated prompt carries image content, so+ # providers can flag vision requests. Mirrors the OpenAI-compatible+ # shape (messages with an array content holding "image_url" parts) used+ # by the providers that consume this; degrades to false otherwise.+ def prompt_has_images?(translated_prompt)+ return false if !translated_prompt.is_a?(Array)++ translated_prompt.any? do |message|+ content = message[:content] if message.is_a?(Hash)+ content.is_a?(Array) &&+ content.any? { |part| part.is_a?(Hash) && part[:type] == "image_url" }+ end+ rescue StandardError+ false+ end++ # should normalize temperature, max_tokens, stop_words to endpoint specific values+ def normalize_model_params(model_params)+ raise NotImplementedError+ end++ def resolve_thinking_config(_model_params)+ DiscourseAi::Completions::ThinkingConfig.disabled+ end++ def apply_thinking_config_to_model_params(model_params)+ return model_params if thinking_config.blank?++ if thinking_config.reserved_output_tokens+ model_params[:reserved_output_tokens] = thinking_config.reserved_output_tokens+ end++ model_params+ end++ def thinking_configured?+ thinking_config.present? && !thinking_config.unsupported? &&+ (thinking_config.enabled? || thinking_config.explicit_none?)+ end++ def strip_sampling_params_for_thinking!(model_params)+ return model_params if thinking_config.blank?++ model_params.delete(:temperature) if thinking_config.strip_temperature?+ model_params.delete(:top_p) if thinking_config.strip_top_p?+ model_params+ end++ def model_uri+ raise NotImplementedError+ end++ def prepare_payload(_prompt, _model_params)+ raise NotImplementedError+ end++ def provider_model_params(model_params)+ model_params.except(:thinking_effort, :reserved_output_tokens, :provider_output_tokens)+ end++ def prepare_request(_payload)+ raise NotImplementedError+ end++ def decode(_response_raw)+ raise NotImplementedError+ end++ def decode_chunk_finish+ []+ end++ def decode_chunk(_chunk)+ raise NotImplementedError+ end++ def extract_prompt_for_tokenizer(prompt)+ prompt.map { |message| message[:content] || message["content"] || "" }.join("\n")+ end++ def xml_tools_enabled?+ raise NotImplementedError+ end++ def disable_streaming?+ @disable_streaming = !!llm_model.lookup_custom_param("disable_streaming")+ end++ private+def replay_non_streaming_as_streaming!(dialect,user,@@ -501,161 +652,6 @@ module DiscourseAiraise if !cancelledend- private :replay_non_streaming_as_streaming!,- :build_structured_output,- :perform_completion_request_with_retries-- def final_log_update(log)- # for people that need to override- end-- def estimated_cost_for(log)- llm_model.estimated_cost_for_tokens(- request_tokens: log.request_tokens,- response_tokens: log.response_tokens,- cache_read_tokens: log.cache_read_tokens,- cache_write_tokens: log.cache_write_tokens,- )- end-- def default_options- raise NotImplementedError- end-- def provider_id- raise NotImplementedError- end-- def prompt_size(prompt)- tokenizer.size(extract_prompt_for_tokenizer(prompt))- end-- attr_reader :llm_model-- # Extra HTTP headers contributed by registered providers for this- # request. Endpoints that want them merge the result into their request- # headers. Provider failures are isolated so they can never break a- # completion.- def extra_request_headers- providers = self.class.request_headers_providers- return {} if providers.blank?-- context =- RequestHeaderContext.new(- llm_model: llm_model,- feature_name: @feature_name,- feature_context: @feature_context,- has_images: @request_has_images,- streaming: @streaming_mode,- )-- providers.each_with_object({}) do |provider, headers|- result = provider.call(context)- headers.merge!(result.stringify_keys) if result.is_a?(Hash)- rescue StandardError => e- Discourse.warn_exception(- e,- message: "Discourse AI request header provider raised an error; skipping it",- )- end- end-- protected-- def tokenizer- llm_model.tokenizer_class- end-- # Detects whether the translated prompt carries image content, so- # providers can flag vision requests. Mirrors the OpenAI-compatible- # shape (messages with an array content holding "image_url" parts) used- # by the providers that consume this; degrades to false otherwise.- def prompt_has_images?(translated_prompt)- return false if !translated_prompt.is_a?(Array)-- translated_prompt.any? do |message|- content = message[:content] if message.is_a?(Hash)- content.is_a?(Array) &&- content.any? { |part| part.is_a?(Hash) && part[:type] == "image_url" }- end- rescue StandardError- false- end-- # should normalize temperature, max_tokens, stop_words to endpoint specific values- def normalize_model_params(model_params)- raise NotImplementedError- end-- def resolve_thinking_config(_model_params)- DiscourseAi::Completions::ThinkingConfig.disabled- end-- def apply_thinking_config_to_model_params(model_params)- return model_params if thinking_config.blank?-- if thinking_config.reserved_output_tokens- model_params[:reserved_output_tokens] = thinking_config.reserved_output_tokens- end-- model_params- end-- def thinking_configured?- thinking_config.present? && !thinking_config.unsupported? &&- (thinking_config.enabled? || thinking_config.explicit_none?)- end-- def strip_sampling_params_for_thinking!(model_params)- return model_params if thinking_config.blank?-- model_params.delete(:temperature) if thinking_config.strip_temperature?- model_params.delete(:top_p) if thinking_config.strip_top_p?- model_params- end-- def model_uri- raise NotImplementedError- end-- def prepare_payload(_prompt, _model_params)- raise NotImplementedError- end-- def provider_model_params(model_params)- model_params.except(:thinking_effort, :reserved_output_tokens, :provider_output_tokens)- end-- def prepare_request(_payload)- raise NotImplementedError- end-- def decode(_response_raw)- raise NotImplementedError- end-- def decode_chunk_finish- []- end-- def decode_chunk(_chunk)- raise NotImplementedError- end-- def extract_prompt_for_tokenizer(prompt)- prompt.map { |message| message[:content] || message["content"] || "" }.join("\n")- end-- def xml_tools_enabled?- raise NotImplementedError- end-- def disable_streaming?- @disable_streaming = !!llm_model.lookup_custom_param("disable_streaming")- end-- private-def start_completion_log(request_body:,dialect:,diff --git a/spec/fabricators/published_page_fabricator.rb b/spec/fabricators/published_page_fabricator.rbindex 0c090ee5d97..782725df4b3 100644--- a/spec/fabricators/published_page_fabricator.rb+++ b/spec/fabricators/published_page_fabricator.rb@@ -3,5 +3,5 @@Fabricator(:published_page) dotopicslug "published-page-test-#{SecureRandom.hex}"- public false+ public false # rubocop:disable Style/AccessModifierDeclarationsend