Chris Coutinho
8e7191e0ea
The default 5s timeout was too short for Nextcloud Cookbook app to fetch and process recipes from external URLs, causing intermittent test failures with ReadTimeout errors. Fixes intermittent CI failures in cookbook import tests.
138 lines
4.5 KiB
Python
138 lines
4.5 KiB
Python
import logging
|
|
import os
|
|
|
|
from httpx import (
|
|
AsyncBaseTransport,
|
|
AsyncClient,
|
|
AsyncHTTPTransport,
|
|
Auth,
|
|
BasicAuth,
|
|
Request,
|
|
Response,
|
|
Timeout,
|
|
)
|
|
|
|
from ..controllers.notes_search import NotesSearchController
|
|
from .calendar import CalendarClient
|
|
from .contacts import ContactsClient
|
|
from .cookbook import CookbookClient
|
|
from .deck import DeckClient
|
|
from .groups import GroupsClient
|
|
from .notes import NotesClient
|
|
from .sharing import SharingClient
|
|
from .tables import TablesClient
|
|
from .webdav import WebDAVClient
|
|
from .users import UsersClient
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
async def log_request(request: Request):
|
|
logger.debug(
|
|
"Request event hook: %s %s - Waiting for content",
|
|
request.method,
|
|
request.url,
|
|
)
|
|
logger.debug("Request body: %s", request.content)
|
|
logger.debug("Headers: %s", request.headers)
|
|
|
|
|
|
async def log_response(response: Response):
|
|
await response.aread()
|
|
logger.debug("Response [%s] %s", response.status_code, response.text)
|
|
|
|
|
|
class AsyncDisableCookieTransport(AsyncBaseTransport):
|
|
"""This Transport disable cookies from accumulating in the httpx AsyncClient
|
|
|
|
Thanks to: https://github.com/encode/httpx/issues/2992#issuecomment-2133258994
|
|
"""
|
|
|
|
def __init__(self, transport: AsyncBaseTransport):
|
|
self.transport = transport
|
|
|
|
async def handle_async_request(self, request: Request) -> Response:
|
|
response = await self.transport.handle_async_request(request)
|
|
response.headers.pop("set-cookie", None)
|
|
return response
|
|
|
|
|
|
class NextcloudClient:
|
|
"""Main Nextcloud client that orchestrates all app clients."""
|
|
|
|
def __init__(self, base_url: str, username: str, auth: Auth | None = None):
|
|
self.username = username
|
|
self._client = AsyncClient(
|
|
base_url=base_url,
|
|
auth=auth,
|
|
transport=AsyncDisableCookieTransport(AsyncHTTPTransport()),
|
|
event_hooks={"request": [log_request], "response": [log_response]},
|
|
timeout=Timeout(
|
|
30.0
|
|
), # 30 second timeout for all operations including recipe imports
|
|
)
|
|
|
|
# Initialize app clients
|
|
self.notes = NotesClient(self._client, username)
|
|
self.webdav = WebDAVClient(self._client, username)
|
|
self.tables = TablesClient(self._client, username)
|
|
self.calendar = CalendarClient(self._client, username)
|
|
self.contacts = ContactsClient(self._client, username)
|
|
self.cookbook = CookbookClient(self._client, username)
|
|
self.deck = DeckClient(self._client, username)
|
|
self.users = UsersClient(self._client, username)
|
|
self.groups = GroupsClient(self._client, username)
|
|
self.sharing = SharingClient(self._client, username)
|
|
|
|
# Initialize controllers
|
|
self._notes_search = NotesSearchController()
|
|
|
|
@classmethod
|
|
def from_env(cls):
|
|
logger.info("Creating NC Client using env vars")
|
|
|
|
host = os.environ["NEXTCLOUD_HOST"]
|
|
username = os.environ["NEXTCLOUD_USERNAME"]
|
|
password = os.environ["NEXTCLOUD_PASSWORD"]
|
|
# Pass username to constructor
|
|
return cls(base_url=host, username=username, auth=BasicAuth(username, password))
|
|
|
|
@classmethod
|
|
def from_token(cls, base_url: str, token: str, username: str):
|
|
"""Create NextcloudClient with OAuth bearer token.
|
|
|
|
Args:
|
|
base_url: Nextcloud base URL
|
|
token: OAuth access token
|
|
username: Nextcloud username
|
|
|
|
Returns:
|
|
NextcloudClient configured with bearer token authentication
|
|
"""
|
|
from ..auth import BearerAuth
|
|
|
|
logger.info(f"Creating NC Client for user '{username}' using OAuth token")
|
|
return cls(base_url=base_url, username=username, auth=BearerAuth(token))
|
|
|
|
async def capabilities(self):
|
|
response = await self._client.get(
|
|
"/ocs/v2.php/cloud/capabilities",
|
|
headers={"OCS-APIRequest": "true", "Accept": "application/json"},
|
|
)
|
|
response.raise_for_status()
|
|
|
|
return response.json()
|
|
|
|
async def notes_search_notes(self, *, query: str):
|
|
"""Search notes using token-based matching with relevance ranking."""
|
|
all_notes = await self.notes.get_all_notes()
|
|
return self._notes_search.search_notes(all_notes, query)
|
|
|
|
def _get_webdav_base_path(self) -> str:
|
|
"""Helper to get the base WebDAV path for the authenticated user."""
|
|
return f"/remote.php/dav/files/{self.username}"
|
|
|
|
async def close(self):
|
|
"""Close the HTTP client."""
|
|
await self._client.aclose()
|