diff --git a/pr_agent/algo/utils.py b/pr_agent/algo/utils.py index 72a0624c51..e14c79550d 100644 --- a/pr_agent/algo/utils.py +++ b/pr_agent/algo/utils.py @@ -30,6 +30,8 @@ from pr_agent.config_loader import get_settings, global_settings from pr_agent.log import get_logger +_SYSTEM_LABELS = {'bug fix', 'tests', 'enhancement', 'documentation', 'other'} + def get_model(model_type: str = "model_weak") -> str: if model_type == "model_weak" and get_settings().get("config.model_weak"): @@ -965,18 +967,15 @@ def get_user_labels(current_labels: List[str] = None): Only keep labels that has been added by the user """ try: - enable_custom_labels = get_settings().config.get('enable_custom_labels', False) - custom_labels = get_settings().get('custom_labels', []) + settings = get_settings() + enable_custom_labels = settings.config.get('enable_custom_labels', False) + custom_labels = set(settings.get('custom_labels', [])) if enable_custom_labels else set() if current_labels is None: current_labels = [] - user_labels = [] - for label in current_labels: - if label.lower() in ['bug fix', 'tests', 'enhancement', 'documentation', 'other']: - continue - if enable_custom_labels: - if label in custom_labels: - continue - user_labels.append(label) + user_labels = [ + label for label in current_labels + if label.lower() not in _SYSTEM_LABELS and (not enable_custom_labels or label not in custom_labels) + ] if user_labels: get_logger().debug(f"Keeping user labels: {user_labels}") except Exception as e: diff --git a/pr_agent/config_loader.py b/pr_agent/config_loader.py index f19f10672b..9b93486246 100644 --- a/pr_agent/config_loader.py +++ b/pr_agent/config_loader.py @@ -5,35 +5,38 @@ from dynaconf import Dynaconf from starlette_context import context -PR_AGENT_TOML_KEY = 'pr-agent' +PR_AGENT_TOML_KEY = "pr-agent" current_dir = dirname(abspath(__file__)) global_settings = Dynaconf( envvar_prefix=False, merge_enabled=True, - settings_files=[join(current_dir, f) for f in [ - "settings/configuration.toml", - "settings/ignore.toml", - "settings/generated_code_ignore.toml", - "settings/language_extensions.toml", - "settings/pr_reviewer_prompts.toml", - "settings/pr_questions_prompts.toml", - "settings/pr_line_questions_prompts.toml", - "settings/pr_description_prompts.toml", - "settings/code_suggestions/pr_code_suggestions_prompts.toml", - "settings/code_suggestions/pr_code_suggestions_prompts_not_decoupled.toml", - "settings/code_suggestions/pr_code_suggestions_reflect_prompts.toml", - "settings/pr_information_from_user_prompts.toml", - "settings/pr_update_changelog_prompts.toml", - "settings/pr_custom_labels.toml", - "settings/pr_add_docs.toml", - "settings/custom_labels.toml", - "settings/pr_help_prompts.toml", - "settings/pr_help_docs_prompts.toml", - "settings/pr_help_docs_headings_prompts.toml", - "settings/.secrets.toml", - "settings_prod/.secrets.toml", - ]] + settings_files=[ + join(current_dir, f) + for f in [ + "settings/configuration.toml", + "settings/ignore.toml", + "settings/generated_code_ignore.toml", + "settings/language_extensions.toml", + "settings/pr_reviewer_prompts.toml", + "settings/pr_questions_prompts.toml", + "settings/pr_line_questions_prompts.toml", + "settings/pr_description_prompts.toml", + "settings/code_suggestions/pr_code_suggestions_prompts.toml", + "settings/code_suggestions/pr_code_suggestions_prompts_not_decoupled.toml", + "settings/code_suggestions/pr_code_suggestions_reflect_prompts.toml", + "settings/pr_information_from_user_prompts.toml", + "settings/pr_update_changelog_prompts.toml", + "settings/pr_custom_labels.toml", + "settings/pr_add_docs.toml", + "settings/custom_labels.toml", + "settings/pr_help_prompts.toml", + "settings/pr_help_docs_prompts.toml", + "settings/pr_help_docs_headings_prompts.toml", + "settings/.secrets.toml", + "settings_prod/.secrets.toml", + ] + ], ) @@ -81,7 +84,7 @@ def _find_pyproject() -> Optional[Path]: pyproject_path = _find_pyproject() if pyproject_path is not None: - get_settings().load_file(pyproject_path, env=f'tool.{PR_AGENT_TOML_KEY}') + get_settings().load_file(pyproject_path, env=f"tool.{PR_AGENT_TOML_KEY}") def apply_secrets_manager_config(): @@ -90,15 +93,17 @@ def apply_secrets_manager_config(): """ try: # Dynamic imports to avoid circular dependency (secret_providers imports config_loader) - from pr_agent.secret_providers import get_secret_provider from pr_agent.log import get_logger + from pr_agent.secret_providers import get_secret_provider secret_provider = get_secret_provider() if not secret_provider: return - if (hasattr(secret_provider, 'get_all_secrets') and - get_settings().get("CONFIG.SECRET_PROVIDER") == 'aws_secrets_manager'): + if ( + hasattr(secret_provider, "get_all_secrets") + and get_settings().get("CONFIG.SECRET_PROVIDER") == "aws_secrets_manager" + ): try: secrets = secret_provider.get_all_secrets() if secrets: @@ -109,6 +114,7 @@ def apply_secrets_manager_config(): except Exception as e: try: from pr_agent.log import get_logger + get_logger().debug(f"Secret provider not configured: {e}") except: # Fail completely silently if log module is not available @@ -123,14 +129,17 @@ def apply_secrets_to_config(secrets: dict): # Dynamic import to avoid potential circular dependency from pr_agent.log import get_logger except: + def get_logger(): class DummyLogger: - def debug(self, msg): pass + def debug(self, msg): + pass + return DummyLogger() for key, value in secrets.items(): - if '.' in key: # nested key like "openai.key" - parts = key.split('.') + if "." in key: # nested key like "openai.key" + parts = key.split(".") if len(parts) == 2: section, setting = parts section_upper = section.upper() diff --git a/pr_agent/log/__init__.py b/pr_agent/log/__init__.py index 1d02fec79f..f4136be413 100644 --- a/pr_agent/log/__init__.py +++ b/pr_agent/log/__init__.py @@ -1,4 +1,5 @@ import os + os.environ["AUTO_CAST_FOR_DYNACONF"] = "false" import json import logging @@ -42,7 +43,7 @@ def setup_logger(level: str = "INFO", fmt: LoggingFormat = LoggingFormat.CONSOLE colorize=False, serialize=True, ) - elif fmt == LoggingFormat.CONSOLE: # does not print the 'extra' fields + elif fmt == LoggingFormat.CONSOLE: # does not print the 'extra' fields logger.remove(None) logger.add(sys.stdout, level=level, colorize=True, filter=inv_analytics_filter)