feat: refactor provider name generation to use incremental naming & enforce unique constraints

api/core/helper/name_generator.py

@@ -0,0 +1,42 @@
+import logging
+import re
+from collections.abc import Sequence
+from typing import Any
+
+from core.tools.entities.tool_entities import CredentialType
+
+logger = logging.getLogger(__name__)
+
+
+def generate_provider_name(
+    providers: Sequence[Any], credential_type: CredentialType, fallback_context: str = "provider"
+) -> str:
+    try:
+        return generate_incremental_name(
+            [provider.name for provider in providers],
+            f"{credential_type.get_name()}",
+        )
+    except Exception as e:
+        logger.warning(f"Error generating next provider name for {fallback_context}: {str(e)}")
+        return f"{credential_type.get_name()} 1"
+
+
+def generate_incremental_name(
+    names: Sequence[str],
+    default_pattern: str,
+) -> str:
+    pattern = rf"^{re.escape(default_pattern)}\s+(\d+)$"
+    numbers = []
+
+    for name in names:
+        if not name:
+            continue
+        match = re.match(pattern, name.strip())
+        if match:
+            numbers.append(int(match.group(1)))
+
+    if not numbers:
+        return f"{default_pattern} 1"
+
+    max_number = max(numbers)
+    return f"{default_pattern} {max_number + 1}"

api/core/helper/provider_name_generator.py

@@ -1,35 +0,0 @@
-import logging
-import re
-from collections.abc import Sequence
-from typing import Any
-
-from core.tools.entities.tool_entities import CredentialType
-
-logger = logging.getLogger(__name__)
-
-
-def generate_provider_name(
-    providers: Sequence[Any], 
-    credential_type: CredentialType, 
-    fallback_context: str = "provider"
-) -> str:
-    try:
-        default_pattern = f"{credential_type.get_name()}"
-
-        pattern = rf"^{re.escape(default_pattern)}\s+(\d+)$"
-        numbers = []
-
-        for provider in providers:
-            if provider.name:
-                match = re.match(pattern, provider.name.strip())
-                if match:
-                    numbers.append(int(match.group(1)))
-
-        if not numbers:
-            return f"{default_pattern} 1"
-
-        max_number = max(numbers)
-        return f"{default_pattern} {max_number + 1}"
-    except Exception as e:
-        logger.warning(f"Error generating next provider name for {fallback_context}: {str(e)}")
-        return f"{credential_type.get_name()} 1"