release: bump version to 0.44.0

backend/app/services/collectors/vessel_ais.py

@@ -1,7 +1,6 @@
 """BarentsWatch AIS collector for vessel tracking."""
 
 from datetime import UTC, datetime, timedelta
-import os
 from typing import Any
 
 import httpx
@@ -9,13 +8,14 @@ from sqlalchemy import delete, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.models.vessel import VesselPosition, VesselStatic
+from app.services.barentswatch import (
+    BARENTSWATCH_LATEST_URL,
+    fetch_barentswatch_access_token,
+    resolve_barentswatch_config,
+)
 from app.services.collectors.base import BaseCollector
 
 
-BARENTSWATCH_LATEST_URL = "https://live.ais.barentswatch.no/v1/latest/combined"
-BARENTSWATCH_TOKEN_URL = "https://id.barentswatch.no/connect/token"
-
-
 VESSEL_TYPE_NAMES = {
     30: "Fishing",
     35: "Military",
@@ -38,62 +38,9 @@ class VesselAISCollector(BaseCollector):
     def base_url(self) -> str:
         return self._resolved_url or BARENTSWATCH_LATEST_URL
 
-    async def _load_datasource_config(self) -> dict[str, Any]:
-        if not self._db_session:
-            return {}
-        try:
-            from sqlalchemy import select
-            from app.models.datasource_config import DataSourceConfig
-
-            result = await self._db_session.execute(
-                select(DataSourceConfig)
-                .where(DataSourceConfig.name == self.name)
-                .where(DataSourceConfig.is_active.is_(True))
-            )
-            datasource_config = result.scalar_one_or_none()
-        except Exception:
-            return {}
-
-        if not datasource_config:
-            return {}
-        return {
-            "auth_config": datasource_config.auth_config or {},
-            "config": datasource_config.config or {},
-        }
-
     async def _get_access_token(self, client: httpx.AsyncClient) -> str | None:
-        datasource_config = await self._load_datasource_config()
-        auth_config = datasource_config.get("auth_config") or {}
-        config = datasource_config.get("config") or {}
-        client_id = (
-            auth_config.get("client_id")
-            or config.get("client_id")
-            or os.getenv("BARENTSWATCH_CLIENT_ID")
-            or os.getenv("BARRENTSWATCH_CLIENT_ID")
-        )
-        client_secret = (
-            auth_config.get("client_secret")
-            or config.get("client_secret")
-            or os.getenv("BARENTSWATCH_CLIENT_SECRET")
-            or os.getenv("BARRENTSWATCH_CLIENT_SECRET")
-        )
-        if not client_id or not client_secret:
-            return None
-
-        response = await client.post(
-            BARENTSWATCH_TOKEN_URL,
-            data={
-                "client_id": client_id,
-                "client_secret": client_secret,
-                "scope": "ais",
-                "grant_type": "client_credentials",
-            },
-            headers={"Content-Type": "application/x-www-form-urlencoded"},
-        )
-        response.raise_for_status()
-        payload = response.json()
-        token = payload.get("access_token")
-        return str(token) if token else None
+        config = await resolve_barentswatch_config(self._db_session)
+        return await fetch_barentswatch_access_token(client, config)
 
     async def fetch(self) -> list[dict[str, Any]]:
         async with httpx.AsyncClient(timeout=60.0) as client: