Refactor category retrieval: Update get_category_for_route to get_category_from_service for improved service label handling and fallback logic

Author: karam-ajaj

app.py

@@ -718,18 +718,24 @@ def get_icon_for_route(route_name, service_name, rule):
 
     return default_icon, icon_url
 
-def get_category_for_route(route_name, service_name):
-    """Determine category for a route based on rules."""
-    category_config = config.get('categories', {})
+def get_category_from_service(service_name, services_payload):
+    """Find category from the corresponding service labels."""
+    if not service_name or not services_payload:
+        return None
 
-    for rule_config in category_config.get('rules', []):
-        pattern = rule_config.get('pattern')
-        category = rule_config.get('category')
-        if not pattern or not category:
-            continue
-        if re.search(pattern, route_name, re.IGNORECASE) or (service_name and re.search(pattern, service_name, re.IGNORECASE)):
-            return category
-            
+    service_data = services_payload.get(f"{service_name}@swarm")
+    if not service_data:
+        return None
+
+    labels_dict = service_data.get('labels', {})
+    if not isinstance(labels_dict, dict):
+        return None
+
+    for key, value in labels_dict.items():
+        lowered = key.lower()
+        if any(lowered == candidate.lower() for candidate in CATEGORY_LABEL_KEYS):
+            if isinstance(value, str) and value.strip():
+                return value.strip()
     return None
 
 def extract_category(router_data):
@@ -775,6 +781,12 @@ def get_routes():
         traefik_url = config['traefik']['api_url']
         request_timeout = config['traefik'].get('timeout', 5)
 
+        # Fetch services to get access to service-level labels
+        services_endpoint = f"{traefik_url}/http/services"
+        services_response = requests.get(services_endpoint, timeout=request_timeout)
+        services_response.raise_for_status()
+        services_payload = services_response.json()
+
         base_endpoint = f"{traefik_url}/http/routers"
         payloads = fetch_router_payloads(base_endpoint, request_timeout)
 
@@ -783,30 +795,29 @@ def get_routes():
             for router_name, router_data in iter_router_entries(payload):
                 safe_name = router_name or router_data.get('name') or 'unknown'
                 display_name = normalize_route_name(safe_name)
+                service_name = router_data.get('service')
                 icon_value, icon_url = get_icon_for_route(
                     display_name,
-                    router_data.get('service'),
+                    service_name,
                     router_data.get('rule', '')
                 )
 
-                labels = (router_data.get('labels')
-                          or router_data.get('metadata', {}).get('labels')
-                          or {})
-
-                if not matches_label_filters(labels):
-                    continue
+                route_category = extract_category(router_data) or get_category_for_route(display_name, service_name)
+                # Fallback to service-level labels if no router-level category is found
+                if not route_category:
+                    route_category = get_category_from_service(service_name, services_payload)
 
                 route = {
                     'name': display_name,
                     'rule': router_data.get('rule', 'N/A'),
-                    'service': router_data.get('service', 'N/A'),
+                    'service': service_name,
                     'status': router_data.get('status', 'unknown'),
                     'priority': router_data.get('priority', 0),
                     'entryPoints': router_data.get('entryPoints', []),
                     'icon': icon_value,
                     'iconUrl': icon_url,
                     'url': infer_route_url(router_data.get('rule', ''), router_data.get('entryPoints')),
-                    'category': extract_category(router_data) or get_category_for_route(display_name, router_data.get('service')),
+                    'category': route_category,
                     'rawName': safe_name
                 }
                 if is_excluded(route['name'], raw_name=safe_name):