so much stuff lol

app/services/external_api/base_external_service.py

@@ -1,7 +1,8 @@
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Union
 import aiohttp
 import logging
 from app.services.service_registry import ServiceRegistry
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -24,8 +25,9 @@ class BaseExternalService:
         endpoint: str,
         params: Optional[Dict[str, Any]] = None,
         headers: Optional[Dict[str, str]] = None,
-        data: Optional[Dict[str, Any]] = None
-    ) -> Dict[str, Any]:
+        data: Optional[Dict[str, Any]] = None,
+        content_type: str = "application/json"
+    ) -> Union[Dict[str, Any], str]:
         session = await self._get_session()
         url = f"{self.base_url}{endpoint}"
         
@@ -36,9 +38,30 @@ class BaseExternalService:
         try:
             async with session.request(method, url, params=params, headers=headers, json=data) as response:
                 response.raise_for_status()
-                return await response.json()
+                
+                # Get the actual content type from the response
+                response_content_type = response.headers.get('content-type', '').lower()
+                logger.info(f"Making request to {url}")
+                
+                # Get the raw response text first
+                raw_response = await response.text()
+                
+                # Only try to parse as JSON if the content type indicates JSON
+                if 'application/json' in response_content_type or 'text/json' in response_content_type:
+                    try:
+                        # First try to parse the response directly
+                        return await response.json()
+                    except Exception as e:
+                        try:
+                            # If that fails, try parsing the raw text as JSON (in case it's double-encoded)
+                            return json.loads(raw_response)
+                        except Exception as e:
+                            logger.error(f"Failed to parse JSON response: {e}")
+                            return raw_response
+                return raw_response
+                
         except aiohttp.ClientError as e:
-            logger.error(f"API request failed: {str(e)}")
+            logger.error(f"Request failed: {e}")
             raise
         except Exception as e:
             logger.error(f"Unexpected error during API request: {str(e)}")