✨(feature) add global async http client

Author: ChristopherSpelt

backend/bureaublad_api/clients/docs.py

@@ -1,39 +1,47 @@
+"""Docs service client for document management."""
+
 import logging
+from typing import Any
 
 import httpx
-from bureaublad_api.exceptions import ExternalServiceError
 from bureaublad_api.models.note import Note
 from pydantic import TypeAdapter
 
 logger = logging.getLogger(__name__)
 
 
 class DocsClient:
-    def __init__(self, base_url: str, token: str) -> None:
-        self.base_url = base_url
+    def __init__(self, http_client: httpx.AsyncClient, base_url: str, token: str) -> None:
+        self.client = http_client
+        self.base_url = base_url.rstrip("/")
         self.token = token
-        self.client = httpx.Client(
-            headers={"Authorization": f"Bearer {self.token}", "Content-Type": "application/json"}
-        )
 
-    def get_documents(
-        self, path: str = "api/v1.0/documents/", page: int = 1, title: str | None = None, favorite: bool = False
+    async def get_documents(
+        self,
+        path: str = "api/v1.0/documents/",
+        page: int = 1,
+        title: str | None = None,
+        favorite: bool = False,
     ) -> list[Note]:
-        url = httpx.URL(f"{self.base_url}/{path}", params={"page": page})
+        params: dict[str, Any] = {"page": page}
 
         if title:
-            url = url.copy_add_param("title", str(title))
+            params["title"] = title
 
         if favorite:
-            url = url.copy_add_param("favorite", str(favorite))
+            params["favorite"] = str(favorite)
+
+        url = f"{self.base_url}/{path.lstrip('/')}"
+        response = await self.client.get(
+            url,
+            params=params,
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
 
-        response = self.client.request("GET", url)
         if response.status_code != 200:
-            logger.error(f"Docs get_documents failed: status={response.status_code}, url={url}")
-            raise ExternalServiceError("Docs", f"Failed to fetch documents (status {response.status_code})")
+            return TypeAdapter(list[Note]).validate_python([])
 
         results = response.json().get("results", [])
-
         notes: list[Note] = TypeAdapter(list[Note]).validate_python(results)
 
         return notes

backend/bureaublad_api/clients/drive.py

@@ -1,25 +1,39 @@
+import logging
+from typing import Any
+
 import httpx
 from bureaublad_api.models.document import Document
 from pydantic import TypeAdapter
 
+logger = logging.getLogger(__name__)
+
 
 class DriveClient:
-    def __init__(self, base_url: str, token: str) -> None:
-        self.base_url = base_url
+    def __init__(self, http_client: httpx.AsyncClient, base_url: str, token: str) -> None:
+        self.client = http_client
+        self.base_url = base_url.rstrip("/")
         self.token = token
-        self.client = httpx.Client(
-            headers={"Authorization": f"Bearer {self.token}", "Content-Type": "application/json"}
-        )
 
-    def get_documents(
-        self, path: str = "api/v1.0/items/", page: int = 1, title: str | None = None, favorite: bool = False
+    async def get_documents(
+        self,
+        path: str = "api/v1.0/items/",
+        page: int = 1,
+        title: str | None = None,
+        favorite: bool = False,
     ) -> list[Document]:
-        url = httpx.URL(f"{self.base_url}/{path}", params={"page": page})
+        params: dict[str, Any] = {"page": page}
 
         if title:
-            url = url.copy_add_param("title", str(title))
+            params["title"] = title
+
+        url = f"{self.base_url}/{path.lstrip('/')}"
+
+        response = await self.client.get(
+            url,
+            params=params,
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
 
-        response = self.client.request("GET", url)
         if response.status_code != 200:
             return TypeAdapter(list[Document]).validate_python([])
 
@@ -30,16 +44,17 @@ def get_documents(
 
         workspace_id = results[0]["id"]
 
-        item_url = f"{self.base_url}/api/v1.0/items/{workspace_id}/children/"
+        item_path = f"api/v1.0/items/{workspace_id}/children/"
+        item_url = f"{self.base_url}/{item_path.lstrip('/')}"
+        response = await self.client.get(
+            item_url,
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
 
-        response = self.client.request("GET", item_url)
         if response.status_code != 200:
             return TypeAdapter(list[Document]).validate_python([])
 
         results = response.json().get("results", [])
+        documents: list[Document] = TypeAdapter(list[Document]).validate_python(results)
 
-        print(results)
-
-        notes: list[Document] = TypeAdapter(list[Document]).validate_python(results)
-
-        return notes
+        return documents

backend/bureaublad_api/clients/meet.py

@@ -1,33 +1,68 @@
+"""Meet service client for meeting management."""
+
+import logging
+from typing import Any
+
 import httpx
 from bureaublad_api.models.meeting import Meeting
 from pydantic import TypeAdapter
 
+logger = logging.getLogger(__name__)
+
 
 class MeetClient:
-    def __init__(self, base_url: str, token: str) -> None:
-        self.base_url = base_url
+    """Client for Meet service API.
+
+    Handles business logic for fetching and managing meetings.
+    """
+
+    def __init__(self, http_client: httpx.AsyncClient, base_url: str, token: str) -> None:
+        """Initialize MeetClient.
+
+        Args:
+            http_client: Shared httpx.AsyncClient instance
+            base_url: Base URL for the Meet service
+            token: Authentication token for this request
+        """
+        self.client = http_client
+        self.base_url = base_url.rstrip("/")
         self.token = token
-        self.client = httpx.Client(
-            headers={"Authorization": f"Bearer {self.token}", "Content-Type": "application/json"}
-        )
 
-    def get_meetings(
-        self, path: str = "api/v1.0/documents/", page: int = 1, title: str | None = None, favorite: bool = False
+    async def get_meetings(
+        self,
+        path: str = "api/v1.0/documents/",
+        page: int = 1,
+        title: str | None = None,
+        favorite: bool = False,
     ) -> list[Meeting]:
-        url = httpx.URL(f"{self.base_url}/{path}", params={"page": page})
+        """Fetch meetings from Meet service.
 
-        if title:
-            url = url.copy_add_param("title", str(title))
+        Args:
+            path: API endpoint path
+            page: Page number for pagination
+            title: Optional title filter
+            favorite: Whether to filter for favorites only
 
+        Returns:
+            List of Meeting objects
+        """
+        params: dict[str, Any] = {"page": page}
+        if title:
+            params["title"] = title
         if favorite:
-            url = url.copy_add_param("favorite", str(favorite))
+            params["favorite"] = str(favorite)
+
+        url = f"{self.base_url}/{path.lstrip('/')}"
+        response = await self.client.get(
+            url,
+            params=params,
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
 
-        response = self.client.request("GET", url)
         if response.status_code != 200:
             return TypeAdapter(list[Meeting]).validate_python([])
 
         results = response.json().get("results", [])
+        meetings: list[Meeting] = TypeAdapter(list[Meeting]).validate_python(results)
 
-        notes: list[Meeting] = TypeAdapter(list[Meeting]).validate_python(results)
-
-        return notes
+        return meetings

backend/bureaublad_api/clients/ocs.py

@@ -1,3 +1,8 @@
+"""OCS (Open Collaboration Services) client for NextCloud API.
+
+Reference: https://docs.nextcloud.com/server/latest/developer_manual/client_apis/index.html
+"""
+
 import logging
 from typing import cast
 
@@ -10,40 +15,53 @@
 logger = logging.getLogger(__name__)
 
 
-# https://docs.nextcloud.com/server/latest/developer_manual/client_apis/index.html
 class OCSClient:
-    def __init__(self, base_url: str, token: str) -> None:
-        self.base_url = base_url
+    """Client for NextCloud OCS API.
+
+    Handles business logic for activities, file search, calendar search, and task search.
+    """
+
+    def __init__(self, http_client: httpx.AsyncClient, base_url: str, token: str) -> None:
+        """Initialize OCSClient.
+
+        Args:
+            http_client: Shared httpx.AsyncClient instance
+            base_url: Base URL for the OCS service
+            token: Authentication token for this request
+        """
+        self.client = http_client
+        self.base_url = base_url.rstrip("/")
         self.token = token
-        self.client = httpx.Client(
-            headers={
-                "Authorization": f"Bearer {self.token}",
-                "Content-Type": "application/json",
-                "OCS-APIRequest": "true",
-                "Accept": "application/json",
-            }
-        )
 
-    def get_activities(
+    async def get_activities(
         self,
         path: str = "/ocs/v2.php/apps/activity/api/v2/activity",
         limit: int = 6,
         since: int = 0,
         filter: None | str = "files",
     ) -> list[Activity]:
-        url_string = f"{self.base_url}/{path}" if not filter else f"{self.base_url}/{path}/{filter}"
-
-        url = httpx.URL(url_string, params={"format": "json"})
+        url_string = f"{path}/{filter}" if filter else path
 
+        params = {"format": "json"}
         if since:
-            url = url.copy_add_param("since", str(since))
-
+            params["since"] = str(since)
         if limit:
-            url = url.copy_add_param("limit", str(limit))
+            params["limit"] = str(limit)
+
+        url = f"{self.base_url}/{url_string.lstrip('/')}"
+        headers = {
+            "Authorization": f"Bearer {self.token}",
+            "OCS-APIRequest": "true",
+            "Accept": "application/json",
+        }
+        response = await self.client.get(
+            url,
+            params=params,
+            headers=headers,
+        )
 
-        response = self.client.request("GET", url)
         if response.status_code != 200:
-            logger.error(f"OCS activities request failed: status={response.status_code}, url={url}")
+            logger.error(f"OCS activities request failed: status={response.status_code}, url={url_string}")
             raise ExternalServiceError("OCS", f"Failed to fetch activities (status {response.status_code})")
 
         results = response.json().get("ocs", []).get("data", [])
@@ -52,10 +70,21 @@ def get_activities(
 
         return notes
 
-    def search_files(self, term: str, path: str = "ocs/v2.php/search/providers/files/search") -> list[SearchResults]:
-        url = httpx.URL(f"{self.base_url}/{path}", params={"term": term})
+    async def search_files(
+        self, term: str, path: str = "ocs/v2.php/search/providers/files/search"
+    ) -> list[SearchResults]:
+        url = f"{self.base_url}/{path.lstrip('/')}"
+        headers = {
+            "Authorization": f"Bearer {self.token}",
+            "OCS-APIRequest": "true",
+            "Accept": "application/json",
+        }
+        response = await self.client.get(
+            url,
+            params={"term": term},
+            headers=headers,
+        )
 
-        response = self.client.request("GET", url)
         if response.status_code != 200:
             logger.error(f"OCS file search failed: status={response.status_code}, url={url}")
             raise ExternalServiceError("OCS", f"Failed to search files (status {response.status_code})")
@@ -66,12 +95,20 @@ def search_files(self, term: str, path: str = "ocs/v2.php/search/providers/files
         validated = TypeAdapter(list[FileSearchResult]).validate_python(results)
         return cast(list[SearchResults], validated)
 
-    def search_calendar(
+    async def search_calendar(
         self, term: str, path: str = "ocs/v2.php/search/providers/calendar/search"
     ) -> list[SearchResults]:
-        url = httpx.URL(f"{self.base_url}/{path}", params={"term": term})
-
-        response = self.client.request("GET", url)
+        url = f"{self.base_url}/{path.lstrip('/')}"
+        headers = {
+            "Authorization": f"Bearer {self.token}",
+            "OCS-APIRequest": "true",
+            "Accept": "application/json",
+        }
+        response = await self.client.get(
+            url,
+            params={"term": term},
+            headers=headers,
+        )
 
         if response.status_code != 200:
             logger.error(f"OCS calendar search failed: status={response.status_code}, url={url}")
@@ -83,10 +120,21 @@ def search_calendar(
         validated = TypeAdapter(list[FileSearchResult]).validate_python(results)
         return cast(list[SearchResults], validated)
 
-    def search_tasks(self, term: str, path: str = "ocs/v2.php/search/providers/tasks/search") -> list[SearchResults]:
-        url = httpx.URL(f"{self.base_url}/{path}", params={"term": term})
+    async def search_tasks(
+        self, term: str, path: str = "ocs/v2.php/search/providers/tasks/search"
+    ) -> list[SearchResults]:
+        url = f"{self.base_url}/{path.lstrip('/')}"
+        headers = {
+            "Authorization": f"Bearer {self.token}",
+            "OCS-APIRequest": "true",
+            "Accept": "application/json",
+        }
+        response = await self.client.get(
+            url,
+            params={"term": term},
+            headers=headers,
+        )
 
-        response = self.client.request("GET", url)
         if response.status_code != 200:
             logger.error(f"OCS task search failed: status={response.status_code}, url={url}")
             raise ExternalServiceError("OCS", f"Failed to search tasks (status {response.status_code})")