chore: commit remaining workspace changes

backend/src/core/utils/network.py

@@ -101,7 +101,8 @@ class APIClient:
     def __init__(self, config: Dict[str, Any], verify_ssl: bool = True, timeout: int = DEFAULT_TIMEOUT):
         with belief_scope("__init__"):
             app_logger.info("[APIClient.__init__][Entry] Initializing APIClient.")
-        self.base_url: str = config.get("base_url", "")
+        self.base_url: str = self._normalize_base_url(config.get("base_url", ""))
+        self.api_base_url: str = f"{self.base_url}/api/v1"
         self.auth = config.get("auth")
         self.request_settings = {"verify_ssl": verify_ssl, "timeout": timeout}
         self.session = self._init_session()
@@ -156,6 +157,34 @@ class APIClient:
         return session
     # [/DEF:_init_session:Function]
 
+    # [DEF:_normalize_base_url:Function]
+    # @PURPOSE: Normalize Superset environment URL to base host/path without trailing slash and /api/v1 suffix.
+    # @PRE: raw_url can be empty.
+    # @POST: Returns canonical base URL suitable for building API endpoints.
+    # @RETURN: str
+    def _normalize_base_url(self, raw_url: str) -> str:
+        normalized = str(raw_url or "").strip().rstrip("/")
+        if normalized.lower().endswith("/api/v1"):
+            normalized = normalized[:-len("/api/v1")]
+        return normalized.rstrip("/")
+    # [/DEF:_normalize_base_url:Function]
+
+    # [DEF:_build_api_url:Function]
+    # @PURPOSE: Build absolute Superset API URL for endpoint using canonical /api/v1 base.
+    # @PRE: endpoint is relative path or absolute URL.
+    # @POST: Returns full URL without accidental duplicate slashes.
+    # @RETURN: str
+    def _build_api_url(self, endpoint: str) -> str:
+        normalized_endpoint = str(endpoint or "").strip()
+        if normalized_endpoint.startswith("http://") or normalized_endpoint.startswith("https://"):
+            return normalized_endpoint
+        if not normalized_endpoint.startswith("/"):
+            normalized_endpoint = f"/{normalized_endpoint}"
+        if normalized_endpoint.startswith("/api/v1/") or normalized_endpoint == "/api/v1":
+            return f"{self.base_url}{normalized_endpoint}"
+        return f"{self.api_base_url}{normalized_endpoint}"
+    # [/DEF:_build_api_url:Function]
+
     # [DEF:authenticate:Function]
     # @PURPOSE: Выполняет аутентификацию в Superset API и получает access и CSRF токены.
     # @PRE: self.auth and self.base_url must be valid.
@@ -166,7 +195,7 @@ class APIClient:
         with belief_scope("authenticate"):
             app_logger.info("[authenticate][Enter] Authenticating to %s", self.base_url)
             try:
-                login_url = f"{self.base_url}/security/login"
+                login_url = f"{self.api_base_url}/security/login"
                 # Log the payload keys and values (masking password)
                 masked_auth = {k: ("******" if k == "password" else v) for k, v in self.auth.items()}
                 app_logger.info(f"[authenticate][Debug] Login URL: {login_url}")
@@ -180,7 +209,7 @@ class APIClient:
                 response.raise_for_status()
                 access_token = response.json()["access_token"]
                 
-                csrf_url = f"{self.base_url}/security/csrf_token/"
+                csrf_url = f"{self.api_base_url}/security/csrf_token/"
                 csrf_response = self.session.get(csrf_url, headers={"Authorization": f"Bearer {access_token}"}, timeout=self.request_settings["timeout"])
                 csrf_response.raise_for_status()
                 
@@ -224,7 +253,7 @@ class APIClient:
     # @RETURN: `requests.Response` если `raw_response=True`, иначе `dict`.
     # @THROW: SupersetAPIError, NetworkError и их подклассы.
     def request(self, method: str, endpoint: str, headers: Optional[Dict] = None, raw_response: bool = False, **kwargs) -> Union[requests.Response, Dict[str, Any]]:
-        full_url = f"{self.base_url}{endpoint}"
+        full_url = self._build_api_url(endpoint)
         _headers = self.headers.copy()
         if headers:
             _headers.update(headers)
@@ -288,7 +317,7 @@ class APIClient:
     # @THROW: SupersetAPIError, NetworkError, TypeError.
     def upload_file(self, endpoint: str, file_info: Dict[str, Any], extra_data: Optional[Dict] = None, timeout: Optional[int] = None) -> Dict:
         with belief_scope("upload_file"):
-            full_url = f"{self.base_url}{endpoint}"
+            full_url = self._build_api_url(endpoint)
             _headers = self.headers.copy()
             _headers.pop('Content-Type', None)