Revert "refactor: Enhance error handling in contest filters to log non-fatal warnings for missing categories and unrecognized wikis"

This reverts commit 966e69d.

Author: DiFronzo

ukbot/contest.py

@@ -224,31 +224,14 @@ def extract_rules(self, txt, catignore_page=''):
                 try:
                     filter_inst = filter_tpl.make(self)
                 except RuntimeError as exp:
-                    # Only abort for truly fatal errors (like missing required arguments)
-                    fatal_errors = [
-                        'Too few arguments',
-                        'No category values given',
-                        'No byte limit',
-                        'No "%s" parameter given',
-                        'Could not parse the catignore page',
-                    ]
-                    msg = str(exp)
-                    if any(fe in msg for fe in fatal_errors):
-                        raise InvalidContestPage(
-                            _('Could not parse {{tlx|%(template)s|%(firstarg)s}} template: %(err)s')
-                            % {
-                                'template': filter_template_config['name'],
-                                'firstarg': filter_tpl.anon_params[1],
-                                'err': msg
-                            }
-                        )
-                    # Otherwise, treat as warning and continue
-                    logger.warning('Non-fatal filter error: %s', msg)
-                    try:
-                        self.sites.homesite.errors.append(_('Warning: %(msg)s') % {'msg': msg})
-                    except Exception as e:
-                        logger.warning('Could not attach warning to homesite: %s', e)
-                    continue
+                    raise InvalidContestPage(
+                        _('Could not parse {{tlx|%(template)s|%(firstarg)s}} template: %(err)s')
+                        % {
+                            'template': filter_template_config['name'],
+                            'firstarg': filter_tpl.anon_params[1],
+                            'err': str(exp)
+                        }
+                    )
 
                 nfilters += 1
                 if op == 'OR':

ukbot/filters.py

@@ -237,28 +237,13 @@ def make(cls, tpl: 'FilterTemplate', **kwargs):
         if len(tpl.anon_params) < 3:
             raise RuntimeError(_('No category values given!'))
 
-        # Build category list, catching missing categories as warnings
-        categories = []
-        for cat_name in tpl.anon_params[2:]:
-            if cat_name.strip() == '':
-                continue
-            try:
-                cat_page = tpl.sites.resolve_page(cat_name, 14, True)
-                categories.append(cat_page)
-            except InvalidContestPage as e:
-                logger.warning('Category does not exist: %s', cat_name)
-                try:
-                    self_site = tpl.sites.homesite
-                    self_site.errors.append(_('Warning: Category does not exist: %(cat)s') % {'cat': cat_name})
-                except Exception as ex:
-                    logger.warning('Could not attach warning to homesite: %s', ex)
-                # Do not abort, just skip this category
-                continue
-
         params = {
             'sites': tpl.sites,
             'ignore': cls.get_ignore_list(tpl, kwargs.get('cfg', {}).get('ignore_page')),
-            'categories': categories,
+            'categories': [
+                tpl.sites.resolve_page(cat_name, 14, True)
+                for cat_name in tpl.anon_params[2:] if cat_name.strip() != ''
+            ],
         }
 
         if tpl.has_param('ignore'):
@@ -270,16 +255,6 @@ def make(cls, tpl: 'FilterTemplate', **kwargs):
         if tpl.has_param('maxdepth'):
             params['maxdepth'] = int(tpl.get_param('maxdepth'))
 
-        # If a category is on an unrecognized wiki, warn but do not abort
-        for cat in params['categories']:
-            if not hasattr(cat, 'site') or cat.site.key not in tpl.sites.keys():
-                logger.warning('Category on unrecognized wiki: %s', getattr(cat, 'name', str(cat)))
-                try:
-                    self_site = tpl.sites.homesite
-                    self_site.errors.append(_('Warning: Category on unrecognized wiki: %(cat)s') % {'cat': getattr(cat, 'name', str(cat))})
-                except Exception as e:
-                    logger.warning('Could not attach warning to homesite: %s', e)
-
         return cls(**params)
 
     def __init__(self, sites: 'SiteManager', categories: List[Union['Page', WildcardPage]], maxdepth: int = 5,