nc-py-api 0.20.2__py3-none-any.whl → 0.21.1__py3-none-any.whl

nc_py_api/__init__.py

@@ -2,6 +2,7 @@
 
 from . import ex_app, options
 from ._exceptions import (
+    ModelFetchError,
     NextcloudException,
     NextcloudExceptionNotFound,
     NextcloudMissingCapabilities,

nc_py_api/_exceptions.py

@@ -1,6 +1,6 @@
 """Exceptions for the Nextcloud API."""
 
-from httpx import Response, codes
+from niquests import HTTPError, Response
 
 
 class NextcloudException(Exception):
@@ -60,6 +60,12 @@ def check_error(response: Response, info: str = ""):
         else:
             phrase = "Unknown error"
         raise NextcloudException(status_code, reason=phrase, info=info)
-    if not codes.is_error(status_code):
-        return
-    raise NextcloudException(status_code, reason=codes(status_code).phrase, info=info)
+
+    try:
+        response.raise_for_status()
+    except HTTPError as e:
+        raise NextcloudException(status_code, reason=response.reason, info=info) from e
+
+
+class ModelFetchError(Exception):
+    """Exception raised when model fetching fails."""

nc_py_api/_session.py

@@ -10,9 +10,11 @@ from dataclasses import dataclass
 from enum import IntEnum
 from json import loads
 from os import environ
+from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
 
-from httpx import AsyncClient, Client, Headers, Limits, ReadTimeout, Request, Response
-from httpx import __version__ as httpx_version
+from niquests import AsyncSession, ReadTimeout, Request, Response, Session
+from niquests import __version__ as niquests_version
+from niquests.structures import CaseInsensitiveDict
 from starlette.requests import HTTPConnection
 
 from . import options
@@ -49,6 +51,13 @@ class ServerVersion(typing.TypedDict):
     """Indicates if the subscription has extended support"""
 
 
+@dataclass
+class Limits:
+    max_keepalive_connections: int | None = 20
+    max_connections: int | None = 100
+    keepalive_expiry: int | float | None = 5
+
+
 @dataclass
 class RuntimeOptions:
     xdebug_session: str
@@ -134,11 +143,11 @@ class AppConfig(BasicConfig):
 
 
 class NcSessionBase(ABC):
-    adapter: AsyncClient | Client
-    adapter_dav: AsyncClient | Client
+    adapter: AsyncSession | Session
+    adapter_dav: AsyncSession | Session
     cfg: BasicConfig
     custom_headers: dict
-    response_headers: Headers
+    response_headers: CaseInsensitiveDict
     _user: str
     _capabilities: dict
 
@@ -150,7 +159,7 @@ class NcSessionBase(ABC):
         self.limits = Limits(max_keepalive_connections=20, max_connections=20, keepalive_expiry=60.0)
         self.init_adapter()
         self.init_adapter_dav()
-        self.response_headers = Headers()
+        self.response_headers = CaseInsensitiveDict()
         self._ocs_regexp = re.compile(r"/ocs/v[12]\.php/|/apps/groupfolders/")
 
     def init_adapter(self, restart=False) -> None:
@@ -172,7 +181,7 @@ class NcSessionBase(ABC):
                 self.adapter_dav.cookies.set("XDEBUG_SESSION", options.XDEBUG_SESSION)
 
     @abstractmethod
-    def _create_adapter(self, dav: bool = False) -> AsyncClient | Client:
+    def _create_adapter(self, dav: bool = False) -> AsyncSession | Session:
         pass  # pragma: no cover
 
     @property
@@ -187,8 +196,8 @@ class NcSessionBase(ABC):
 
 
 class NcSessionBasic(NcSessionBase, ABC):
-    adapter: Client
-    adapter_dav: Client
+    adapter: Session
+    adapter_dav: Session
 
     def ocs(
         self,
@@ -206,9 +215,7 @@ class NcSessionBasic(NcSessionBase, ABC):
         info = f"request: {method} {path}"
         nested_req = kwargs.pop("nested_req", False)
         try:
-            response = self.adapter.request(
-                method, path, content=content, json=json, params=params, files=files, **kwargs
-            )
+            response = self.adapter.request(method, path, data=content, json=json, params=params, files=files, **kwargs)
         except ReadTimeout:
             raise NextcloudException(408, info=info) from None
 
@@ -281,18 +288,18 @@ class NcSessionBasic(NcSessionBase, ABC):
             return {
                 "base_url": self.cfg.dav_endpoint,
                 "timeout": self.cfg.options.timeout_dav,
-                "event_hooks": {"request": [], "response": [self._response_event]},
+                "event_hooks": {"pre_request": [], "response": [self._response_event]},
             }
         return {
             "base_url": self.cfg.endpoint,
             "timeout": self.cfg.options.timeout,
-            "event_hooks": {"request": [self._request_event_ocs], "response": [self._response_event]},
+            "event_hooks": {"pre_request": [self._request_event_ocs], "response": [self._response_event]},
         }
 
     def _request_event_ocs(self, request: Request) -> None:
         str_url = str(request.url)
         if re.search(self._ocs_regexp, str_url) is not None:  # this is OCS call
-            request.url = request.url.copy_merge_params({"format": "json"})
+            request.url = patch_param(request.url, "format", "json")
             request.headers["Accept"] = "application/json"
 
     def _response_event(self, response: Response) -> None:
@@ -305,15 +312,15 @@ class NcSessionBasic(NcSessionBase, ABC):
 
     def download2fp(self, url_path: str, fp, dav: bool, params=None, **kwargs):
         adapter = self.adapter_dav if dav else self.adapter
-        with adapter.stream("GET", url_path, params=params, headers=kwargs.get("headers")) as response:
+        with adapter.get(url_path, params=params, headers=kwargs.get("headers"), stream=True) as response:
             check_error(response)
-            for data_chunk in response.iter_bytes(chunk_size=kwargs.get("chunk_size", 5 * 1024 * 1024)):
+            for data_chunk in response.iter_raw(chunk_size=kwargs.get("chunk_size", -1)):
                 fp.write(data_chunk)
 
 
 class AsyncNcSessionBasic(NcSessionBase, ABC):
-    adapter: AsyncClient
-    adapter_dav: AsyncClient
+    adapter: AsyncSession
+    adapter_dav: AsyncSession
 
     async def ocs(
         self,
@@ -332,7 +339,7 @@ class AsyncNcSessionBasic(NcSessionBase, ABC):
         nested_req = kwargs.pop("nested_req", False)
         try:
             response = await self.adapter.request(
-                method, path, content=content, json=json, params=params, files=files, **kwargs
+                method, path, data=content, json=json, params=params, files=files, **kwargs
             )
         except ReadTimeout:
             raise NextcloudException(408, info=info) from None
@@ -350,7 +357,7 @@ class AsyncNcSessionBasic(NcSessionBase, ABC):
                 and ocs_meta["statuscode"] == 403
                 and str(ocs_meta["message"]).lower().find("password confirmation is required") != -1
             ):
-                await self.adapter.aclose()
+                await self.adapter.close()
                 self.init_adapter(restart=True)
                 return await self.ocs(
                     method, path, **kwargs, content=content, json=json, params=params, nested_req=True
@@ -408,18 +415,18 @@ class AsyncNcSessionBasic(NcSessionBase, ABC):
             return {
                 "base_url": self.cfg.dav_endpoint,
                 "timeout": self.cfg.options.timeout_dav,
-                "event_hooks": {"request": [], "response": [self._response_event]},
+                "event_hooks": {"pre_request": [], "response": [self._response_event]},
             }
         return {
             "base_url": self.cfg.endpoint,
             "timeout": self.cfg.options.timeout,
-            "event_hooks": {"request": [self._request_event_ocs], "response": [self._response_event]},
+            "event_hooks": {"pre_request": [self._request_event_ocs], "response": [self._response_event]},
         }
 
     async def _request_event_ocs(self, request: Request) -> None:
         str_url = str(request.url)
         if re.search(self._ocs_regexp, str_url) is not None:  # this is OCS call
-            request.url = request.url.copy_merge_params({"format": "json"})
+            request.url = patch_param(request.url, "format", "json")
             request.headers["Accept"] = "application/json"
 
     async def _response_event(self, response: Response) -> None:
@@ -432,10 +439,12 @@ class AsyncNcSessionBasic(NcSessionBase, ABC):
 
     async def download2fp(self, url_path: str, fp, dav: bool, params=None, **kwargs):
         adapter = self.adapter_dav if dav else self.adapter
-        async with adapter.stream("GET", url_path, params=params, headers=kwargs.get("headers")) as response:
-            check_error(response)
-            async for data_chunk in response.aiter_bytes(chunk_size=kwargs.get("chunk_size", 5 * 1024 * 1024)):
-                fp.write(data_chunk)
+        response = await adapter.get(url_path, params=params, headers=kwargs.get("headers"), stream=True)
+
+        check_error(response)
+
+        async for data_chunk in await response.iter_raw(chunk_size=kwargs.get("chunk_size", -1)):
+            fp.write(data_chunk)
 
 
 class NcSession(NcSessionBasic):
@@ -445,15 +454,20 @@ class NcSession(NcSessionBasic):
         self.cfg = Config(**kwargs)
         super().__init__()
 
-    def _create_adapter(self, dav: bool = False) -> AsyncClient | Client:
-        return Client(
-            follow_redirects=True,
-            limits=self.limits,
-            verify=self.cfg.options.nc_cert,
-            **self._get_adapter_kwargs(dav),
-            auth=self.cfg.auth,
+    def _create_adapter(self, dav: bool = False) -> AsyncSession | Session:
+        session_kwargs = self._get_adapter_kwargs(dav)
+        hooks = session_kwargs.pop("event_hooks")
+
+        session = Session(
+            keepalive_delay=self.limits.keepalive_expiry, pool_maxsize=self.limits.max_connections, **session_kwargs
         )
 
+        session.auth = self.cfg.auth
+        session.verify = self.cfg.options.nc_cert
+        session.hooks.update(hooks)
+
+        return session
+
 
 class AsyncNcSession(AsyncNcSessionBasic):
     cfg: Config
@@ -462,21 +476,28 @@ class AsyncNcSession(AsyncNcSessionBasic):
         self.cfg = Config(**kwargs)
         super().__init__()
 
-    def _create_adapter(self, dav: bool = False) -> AsyncClient | Client:
-        return AsyncClient(
-            follow_redirects=True,
-            limits=self.limits,
-            verify=self.cfg.options.nc_cert,
-            **self._get_adapter_kwargs(dav),
-            auth=self.cfg.auth,
+    def _create_adapter(self, dav: bool = False) -> AsyncSession | Session:
+        session_kwargs = self._get_adapter_kwargs(dav)
+        hooks = session_kwargs.pop("event_hooks")
+
+        session = AsyncSession(
+            keepalive_delay=self.limits.keepalive_expiry,
+            pool_maxsize=self.limits.max_connections,
+            **session_kwargs,
         )
 
+        session.verify = self.cfg.options.nc_cert
+        session.auth = self.cfg.auth
+        session.hooks.update(hooks)
+
+        return session
+
 
 class NcSessionAppBasic(ABC):
     cfg: AppConfig
     _user: str
-    adapter: AsyncClient | Client
-    adapter_dav: AsyncClient | Client
+    adapter: AsyncSession | Session
+    adapter_dav: AsyncSession | Session
 
     def __init__(self, **kwargs):
         self.cfg = AppConfig(**kwargs)
@@ -505,22 +526,29 @@ class NcSessionAppBasic(ABC):
 class NcSessionApp(NcSessionAppBasic, NcSessionBasic):
     cfg: AppConfig
 
-    def _create_adapter(self, dav: bool = False) -> AsyncClient | Client:
-        r = self._get_adapter_kwargs(dav)
-        r["event_hooks"]["request"].append(self._add_auth)
-        return Client(
-            follow_redirects=True,
-            limits=self.limits,
-            verify=self.cfg.options.nc_cert,
-            **r,
-            headers={
-                "AA-VERSION": self.cfg.aa_version,
-                "EX-APP-ID": self.cfg.app_name,
-                "EX-APP-VERSION": self.cfg.app_version,
-                "user-agent": f"ExApp/{self.cfg.app_name}/{self.cfg.app_version} (httpx/{httpx_version})",
-            },
+    def _create_adapter(self, dav: bool = False) -> AsyncSession | Session:
+        session_kwargs = self._get_adapter_kwargs(dav)
+        session_kwargs["event_hooks"]["pre_request"].append(self._add_auth)
+
+        hooks = session_kwargs.pop("event_hooks")
+
+        session = Session(
+            keepalive_delay=self.limits.keepalive_expiry,
+            pool_maxsize=self.limits.max_connections,
+            **session_kwargs,
         )
 
+        session.verify = self.cfg.options.nc_cert
+        session.headers = {
+            "AA-VERSION": self.cfg.aa_version,
+            "EX-APP-ID": self.cfg.app_name,
+            "EX-APP-VERSION": self.cfg.app_version,
+            "user-agent": f"ExApp/{self.cfg.app_name}/{self.cfg.app_version} (niquests/{niquests_version})",
+        }
+        session.hooks.update(hooks)
+
+        return session
+
     def _add_auth(self, request: Request):
         request.headers.update(
             {"AUTHORIZATION-APP-API": b64encode(f"{self._user}:{self.cfg.app_secret}".encode("UTF=8"))}
@@ -530,23 +558,39 @@ class NcSessionApp(NcSessionAppBasic, NcSessionBasic):
 class AsyncNcSessionApp(NcSessionAppBasic, AsyncNcSessionBasic):
     cfg: AppConfig
 
-    def _create_adapter(self, dav: bool = False) -> AsyncClient | Client:
-        r = self._get_adapter_kwargs(dav)
-        r["event_hooks"]["request"].append(self._add_auth)
-        return AsyncClient(
-            follow_redirects=True,
-            limits=self.limits,
-            verify=self.cfg.options.nc_cert,
-            **r,
-            headers={
-                "AA-VERSION": self.cfg.aa_version,
-                "EX-APP-ID": self.cfg.app_name,
-                "EX-APP-VERSION": self.cfg.app_version,
-                "User-Agent": f"ExApp/{self.cfg.app_name}/{self.cfg.app_version} (httpx/{httpx_version})",
-            },
+    def _create_adapter(self, dav: bool = False) -> AsyncSession | Session:
+        session_kwargs = self._get_adapter_kwargs(dav)
+        session_kwargs["event_hooks"]["pre_request"].append(self._add_auth)
+
+        hooks = session_kwargs.pop("event_hooks")
+
+        session = AsyncSession(
+            keepalive_delay=self.limits.keepalive_expiry,
+            pool_maxsize=self.limits.max_connections,
+            **session_kwargs,
         )
+        session.verify = self.cfg.options.nc_cert
+        session.headers = {
+            "AA-VERSION": self.cfg.aa_version,
+            "EX-APP-ID": self.cfg.app_name,
+            "EX-APP-VERSION": self.cfg.app_version,
+            "User-Agent": f"ExApp/{self.cfg.app_name}/{self.cfg.app_version} (niquests/{niquests_version})",
+        }
+        session.hooks.update(hooks)
+
+        return session
 
     async def _add_auth(self, request: Request):
         request.headers.update(
             {"AUTHORIZATION-APP-API": b64encode(f"{self._user}:{self.cfg.app_secret}".encode("UTF=8"))}
         )
+
+
+def patch_param(url: str, key: str, value: str) -> str:
+    parts = urlsplit(url)
+    query = dict(parse_qsl(parts.query, keep_blank_values=True))
+    query[key] = value
+
+    new_query = urlencode(query, doseq=True)
+
+    return urlunsplit((parts.scheme, parts.netloc, parts.path, new_query, parts.fragment))

nc_py_api/_version.py

@@ -1,3 +1,3 @@
 """Version of nc_py_api."""
 
-__version__ = "0.20.2"
+__version__ = "0.21.1"

nc_py_api/calendar_api.py

@@ -23,7 +23,7 @@ try:
             if body:
                 body = body.replace(b"\n", b"\r\n").replace(b"\r\r\n", b"\r\n")
             r = self._session.adapter_dav.request(
-                method, url if isinstance(url, str) else str(url), content=body, headers=headers
+                method, url if isinstance(url, str) else str(url), data=body, headers=headers
             )
             return DAVResponse(r)
 

nc_py_api/ex_app/integration_fastapi.py

@@ -7,9 +7,10 @@ import hashlib
 import json
 import os
 import typing
+from traceback import format_exc
 from urllib.parse import urlparse
 
-import httpx
+import niquests
 from fastapi import (
     BackgroundTasks,
     Depends,
@@ -22,10 +23,10 @@ from fastapi.responses import JSONResponse, PlainTextResponse
 from starlette.requests import HTTPConnection, Request
 from starlette.types import ASGIApp, Receive, Scope, Send
 
+from .._exceptions import ModelFetchError
 from .._misc import get_username_secret_from_headers
 from ..nextcloud import AsyncNextcloudApp, NextcloudApp
 from ..talk_bot import TalkBotMessage
-from .defs import LogLvl
 from .misc import persistent_storage
 
 
@@ -70,9 +71,24 @@ def set_handlers(
 
         .. note:: When this parameter is ``False``, the provision of ``models_to_fetch`` is not allowed.
 
-    :param models_to_fetch: Dictionary describing which models should be downloaded during `init`.
+    :param models_to_fetch: Dictionary describing which models should be downloaded during `init` of the form:
+        .. code-block:: python
+            {
+                "model_url_1": {
+                    "save_path": "path_or_filename_to_save_the_model_to",
+                },
+                "huggingface_model_name_1": {
+                    "max_workers": 4,
+                    "cache_dir": "path_to_cache_dir",
+                    "revision": "revision_to_fetch",
+                    ...
+                },
+                ...
+            }
+
 
         .. note:: ``huggingface_hub`` package should be present for automatic models fetching.
+                  All model options are optional and can be left empty.
 
     :param map_app_static: Should be folders ``js``, ``css``, ``l10n``, ``img`` automatically mounted in FastAPI or not.
 
@@ -121,73 +137,98 @@ def __map_app_static_folders(fast_api_app: FastAPI):
 
 
 def fetch_models_task(nc: NextcloudApp, models: dict[str, dict], progress_init_start_value: int) -> None:
-    """Use for cases when you want to define custom `/init` but still need to easy download models."""
+    """Use for cases when you want to define custom `/init` but still need to easy download models.
+
+    :param nc: NextcloudApp instance.
+    :param models_to_fetch: Dictionary describing which models should be downloaded of the form:
+        .. code-block:: python
+            {
+                "model_url_1": {
+                    "save_path": "path_or_filename_to_save_the_model_to",
+                },
+                "huggingface_model_name_1": {
+                    "max_workers": 4,
+                    "cache_dir": "path_to_cache_dir",
+                    "revision": "revision_to_fetch",
+                    ...
+                },
+                ...
+            }
+
+        .. note:: ``huggingface_hub`` package should be present for automatic models fetching.
+                  All model options are optional and can be left empty.
+
+    :param progress_init_start_value: Integer value defining from which percent the progress should start.
+
+    :raises ModelFetchError: in case of a model download error.
+    :raises NextcloudException: in case of a network error reaching the Nextcloud server.
+    """
     if models:
         current_progress = progress_init_start_value
         percent_for_each = min(int((100 - progress_init_start_value) / len(models)), 99)
         for model in models:
-            if model.startswith(("http://", "https://")):
-                models[model]["path"] = __fetch_model_as_file(
-                    current_progress, percent_for_each, nc, model, models[model]
-                )
-            else:
-                models[model]["path"] = __fetch_model_as_snapshot(
-                    current_progress, percent_for_each, nc, model, models[model]
-                )
-            current_progress += percent_for_each
+            try:
+                if model.startswith(("http://", "https://")):
+                    models[model]["path"] = __fetch_model_as_file(
+                        current_progress, percent_for_each, nc, model, models[model]
+                    )
+                else:
+                    models[model]["path"] = __fetch_model_as_snapshot(
+                        current_progress, percent_for_each, nc, model, models[model]
+                    )
+                current_progress += percent_for_each
+            except BaseException as e:  # noqa pylint: disable=broad-exception-caught
+                nc.set_init_status(current_progress, f"Downloading of '{model}' failed: {e}: {format_exc()}")
+                raise ModelFetchError(f"Downloading of '{model}' failed.") from e
     nc.set_init_status(100)
 
 
 def __fetch_model_as_file(
     current_progress: int, progress_for_task: int, nc: NextcloudApp, model_path: str, download_options: dict
-) -> str | None:
+) -> str:
     result_path = download_options.pop("save_path", urlparse(model_path).path.split("/")[-1])
-    try:
-        with httpx.stream("GET", model_path, follow_redirects=True) as response:
-            if not response.is_success:
-                nc.log(LogLvl.ERROR, f"Downloading of '{model_path}' returned {response.status_code} status.")
-                return None
-            downloaded_size = 0
-            linked_etag = ""
-            for each_history in response.history:
-                linked_etag = each_history.headers.get("X-Linked-ETag", "")
-                if linked_etag:
-                    break
-            if not linked_etag:
-                linked_etag = response.headers.get("X-Linked-ETag", response.headers.get("ETag", ""))
-            total_size = int(response.headers.get("Content-Length"))
-            try:
-                existing_size = os.path.getsize(result_path)
-            except OSError:
-                existing_size = 0
-            if linked_etag and total_size == existing_size:
-                with builtins.open(result_path, "rb") as file:
-                    sha256_hash = hashlib.sha256()
-                    for byte_block in iter(lambda: file.read(4096), b""):
-                        sha256_hash.update(byte_block)
-                    if f'"{sha256_hash.hexdigest()}"' == linked_etag:
-                        nc.set_init_status(min(current_progress + progress_for_task, 99))
-                        return None
-
-            with builtins.open(result_path, "wb") as file:
-                last_progress = current_progress
-                for chunk in response.iter_bytes(5 * 1024 * 1024):
-                    downloaded_size += file.write(chunk)
-                    if total_size:
-                        new_progress = min(current_progress + int(progress_for_task * downloaded_size / total_size), 99)
-                        if new_progress != last_progress:
-                            nc.set_init_status(new_progress)
-                            last_progress = new_progress
-
-        return result_path
-    except Exception as e:  # noqa pylint: disable=broad-exception-caught
-        nc.log(LogLvl.ERROR, f"Downloading of '{model_path}' raised an exception: {e}")
-
-    return None
+    with niquests.get(model_path, stream=True) as response:
+        if not response.ok:
+            raise ModelFetchError(
+                f"Downloading of '{model_path}' failed, returned ({response.status_code}) {response.text}"
+            )
+        downloaded_size = 0
+        linked_etag = ""
+        for each_history in response.history:
+            linked_etag = each_history.headers.get("X-Linked-ETag", "")
+            if linked_etag:
+                break
+        if not linked_etag:
+            linked_etag = response.headers.get("X-Linked-ETag", response.headers.get("ETag", ""))
+        total_size = int(response.headers.get("Content-Length"))
+        try:
+            existing_size = os.path.getsize(result_path)
+        except OSError:
+            existing_size = 0
+        if linked_etag and total_size == existing_size:
+            with builtins.open(result_path, "rb") as file:
+                sha256_hash = hashlib.sha256()
+                for byte_block in iter(lambda: file.read(4096), b""):
+                    sha256_hash.update(byte_block)
+                if f'"{sha256_hash.hexdigest()}"' == linked_etag:
+                    nc.set_init_status(min(current_progress + progress_for_task, 99))
+                    return result_path
+
+        with builtins.open(result_path, "wb") as file:
+            last_progress = current_progress
+            for chunk in response.iter_raw(-1):
+                downloaded_size += file.write(chunk)
+                if total_size:
+                    new_progress = min(current_progress + int(progress_for_task * downloaded_size / total_size), 99)
+                    if new_progress != last_progress:
+                        nc.set_init_status(new_progress)
+                        last_progress = new_progress
+
+    return result_path
 
 
 def __fetch_model_as_snapshot(
-    current_progress: int, progress_for_task, nc: NextcloudApp, mode_name: str, download_options: dict
+    current_progress: int, progress_for_task, nc: NextcloudApp, model_name: str, download_options: dict
 ) -> str:
     from huggingface_hub import snapshot_download  # noqa isort:skip pylint: disable=C0415 disable=E0401
     from tqdm import tqdm  # noqa isort:skip pylint: disable=C0415 disable=E0401
@@ -200,7 +241,7 @@ def __fetch_model_as_snapshot(
     workers = download_options.pop("max_workers", 2)
     cache = download_options.pop("cache_dir", persistent_storage())
     return snapshot_download(
-        mode_name, tqdm_class=TqdmProgress, **download_options, max_workers=workers, cache_dir=cache
+        model_name, tqdm_class=TqdmProgress, **download_options, max_workers=workers, cache_dir=cache
     )
 
 

nc_py_api/files/_files.py

@@ -9,7 +9,7 @@ from urllib.parse import unquote
 from xml.etree import ElementTree
 
 import xmltodict
-from httpx import Response
+from niquests import Response
 
 from .._exceptions import NextcloudException, check_error
 from .._misc import check_capabilities, clear_from_params_empty

nc_py_api/files/files.py

@@ -5,7 +5,7 @@ import os
 from pathlib import Path
 from urllib.parse import quote
 
-from httpx import Headers
+from niquests.structures import CaseInsensitiveDict
 
 from .._exceptions import NextcloudException, NextcloudExceptionNotFound, check_error
 from .._misc import random_string, require_capabilities
@@ -80,7 +80,7 @@ class FilesAPI:
         # `req` possible keys: "name", "mime", "last_modified", "size", "favorite", "fileid"
         root = build_find_request(req, path, self._session.user, self._session.capabilities)
         webdav_response = self._session.adapter_dav.request(
-            "SEARCH", "", content=element_tree_as_str(root), headers={"Content-Type": "text/xml"}
+            "SEARCH", "", data=element_tree_as_str(root), headers={"Content-Type": "text/xml"}
         )
         request_info = f"find: {self._session.user}, {req}, {path}"
         return lf_parse_webdav_response(self._session.cfg.dav_url_suffix, webdav_response, request_info)
@@ -133,7 +133,7 @@ class FilesAPI:
         """
         path = path.user_path if isinstance(path, FsNode) else path
         full_path = dav_get_obj_path(self._session.user, path)
-        response = self._session.adapter_dav.put(quote(full_path), content=content)
+        response = self._session.adapter_dav.put(quote(full_path), data=content)
         check_error(response, f"upload: user={self._session.user}, path={path}, size={len(content)}")
         return FsNode(full_path.strip("/"), **etag_fileid_from_response(response))
 
@@ -215,7 +215,7 @@ class FilesAPI:
             self._session.user, path_dest.user_path if isinstance(path_dest, FsNode) else path_dest
         )
         dest = self._session.cfg.dav_endpoint + quote(full_dest_path)
-        headers = Headers({"Destination": dest, "Overwrite": "T" if overwrite else "F"}, encoding="utf-8")
+        headers = CaseInsensitiveDict({"Destination": dest.encode("utf-8"), "Overwrite": "T" if overwrite else "F"})
         response = self._session.adapter_dav.request(
             "MOVE",
             quote(dav_get_obj_path(self._session.user, path_src)),
@@ -237,7 +237,7 @@ class FilesAPI:
             self._session.user, path_dest.user_path if isinstance(path_dest, FsNode) else path_dest
         )
         dest = self._session.cfg.dav_endpoint + quote(full_dest_path)
-        headers = Headers({"Destination": dest, "Overwrite": "T" if overwrite else "F"}, encoding="utf-8")
+        headers = CaseInsensitiveDict({"Destination": dest.encode("utf-8"), "Overwrite": "T" if overwrite else "F"})
         response = self._session.adapter_dav.request(
             "COPY",
             quote(dav_get_obj_path(self._session.user, path_src)),
@@ -257,7 +257,7 @@ class FilesAPI:
         """
         root = build_list_by_criteria_req(properties, tags, self._session.capabilities)
         webdav_response = self._session.adapter_dav.request(
-            "REPORT", dav_get_obj_path(self._session.user), content=element_tree_as_str(root)
+            "REPORT", dav_get_obj_path(self._session.user), data=element_tree_as_str(root)
         )
         request_info = f"list_files_by_criteria: {self._session.user}"
         check_error(webdav_response, request_info)
@@ -272,7 +272,7 @@ class FilesAPI:
         path = path.user_path if isinstance(path, FsNode) else path
         root = build_setfav_req(value)
         webdav_response = self._session.adapter_dav.request(
-            "PROPPATCH", quote(dav_get_obj_path(self._session.user, path)), content=element_tree_as_str(root)
+            "PROPPATCH", quote(dav_get_obj_path(self._session.user, path)), data=element_tree_as_str(root)
         )
         check_error(webdav_response, f"setfav: path={path}, value={value}")
 
@@ -293,7 +293,7 @@ class FilesAPI:
         path = path.user_path if isinstance(path, FsNode) else path
 
         dest = self._session.cfg.dav_endpoint + f"/trashbin/{self._session.user}/restore/{restore_name}"
-        headers = Headers({"Destination": dest}, encoding="utf-8")
+        headers = CaseInsensitiveDict({"Destination": dest.encode("utf-8")})
         response = self._session.adapter_dav.request(
             "MOVE",
             quote(f"/trashbin/{self._session.user}/{path}"),
@@ -336,7 +336,7 @@ class FilesAPI:
         """
         require_capabilities("files.versioning", self._session.capabilities)
         dest = self._session.cfg.dav_endpoint + f"/versions/{self._session.user}/restore/{file_object.name}"
-        headers = Headers({"Destination": dest}, encoding="utf-8")
+        headers = CaseInsensitiveDict({"Destination": dest.encode("utf-8")})
         response = self._session.adapter_dav.request(
             "MOVE",
             quote(f"/versions/{self._session.user}/{file_object.user_path}"),
@@ -347,7 +347,7 @@ class FilesAPI:
     def list_tags(self) -> list[SystemTag]:
         """Returns list of the avalaible Tags."""
         root = build_list_tag_req()
-        response = self._session.adapter_dav.request("PROPFIND", "/systemtags", content=element_tree_as_str(root))
+        response = self._session.adapter_dav.request("PROPFIND", "/systemtags", data=element_tree_as_str(root))
         return build_list_tags_response(response)
 
     def get_tags(self, file_id: FsNode | int) -> list[SystemTag]:
@@ -389,7 +389,7 @@ class FilesAPI:
         tag_id = tag_id.tag_id if isinstance(tag_id, SystemTag) else tag_id
         root = build_update_tag_req(name, user_visible, user_assignable)
         response = self._session.adapter_dav.request(
-            "PROPPATCH", f"/systemtags/{tag_id}", content=element_tree_as_str(root)
+            "PROPPATCH", f"/systemtags/{tag_id}", data=element_tree_as_str(root)
         )
         check_error(response)
 
@@ -466,7 +466,7 @@ class FilesAPI:
         webdav_response = self._session.adapter_dav.request(
             "PROPFIND",
             quote(dav_path),
-            content=element_tree_as_str(root),
+            data=element_tree_as_str(root),
             headers={"Depth": "infinity" if depth == -1 else str(depth)},
         )
         return build_listdir_response(
@@ -478,7 +478,9 @@ class FilesAPI:
         _dav_path = quote(dav_get_obj_path(self._session.user, _tmp_path, root_path="/uploads"))
         _v2 = bool(self._session.cfg.options.upload_chunk_v2 and chunk_size >= 5 * 1024 * 1024)
         full_path = dav_get_obj_path(self._session.user, path)
-        headers = Headers({"Destination": self._session.cfg.dav_endpoint + quote(full_path)}, encoding="utf-8")
+        headers = CaseInsensitiveDict(
+            {"Destination": (self._session.cfg.dav_endpoint + quote(full_path)).encode("utf-8")}
+        )
         if _v2:
             response = self._session.adapter_dav.request("MKCOL", _dav_path, headers=headers)
         else:
@@ -494,11 +496,11 @@ class FilesAPI:
                 end_bytes = start_bytes + len(piece)
                 if _v2:
                     response = self._session.adapter_dav.put(
-                        _dav_path + "/" + str(chunk_number), content=piece, headers=headers
+                        _dav_path + "/" + str(chunk_number), data=piece, headers=headers
                     )
                 else:
                     _filename = str(start_bytes).rjust(15, "0") + "-" + str(end_bytes).rjust(15, "0")
-                    response = self._session.adapter_dav.put(_dav_path + "/" + _filename, content=piece)
+                    response = self._session.adapter_dav.put(_dav_path + "/" + _filename, data=piece)
                 check_error(
                     response,
                     f"upload_stream(v={_v2}): user={self._session.user}, path={path}, cur_size={end_bytes}",

nc_py_api/files/files_async.py

@@ -5,7 +5,7 @@ import os
 from pathlib import Path
 from urllib.parse import quote
 
-from httpx import Headers
+from niquests.structures import CaseInsensitiveDict
 
 from .._exceptions import NextcloudException, NextcloudExceptionNotFound, check_error
 from .._misc import random_string, require_capabilities
@@ -82,7 +82,7 @@ class AsyncFilesAPI:
         # `req` possible keys: "name", "mime", "last_modified", "size", "favorite", "fileid"
         root = build_find_request(req, path, await self._session.user, await self._session.capabilities)
         webdav_response = await self._session.adapter_dav.request(
-            "SEARCH", "", content=element_tree_as_str(root), headers={"Content-Type": "text/xml"}
+            "SEARCH", "", data=element_tree_as_str(root), headers={"Content-Type": "text/xml"}
         )
         request_info = f"find: {await self._session.user}, {req}, {path}"
         return lf_parse_webdav_response(self._session.cfg.dav_url_suffix, webdav_response, request_info)
@@ -137,7 +137,7 @@ class AsyncFilesAPI:
         """
         path = path.user_path if isinstance(path, FsNode) else path
         full_path = dav_get_obj_path(await self._session.user, path)
-        response = await self._session.adapter_dav.put(quote(full_path), content=content)
+        response = await self._session.adapter_dav.put(quote(full_path), data=content)
         check_error(response, f"upload: user={await self._session.user}, path={path}, size={len(content)}")
         return FsNode(full_path.strip("/"), **etag_fileid_from_response(response))
 
@@ -219,7 +219,7 @@ class AsyncFilesAPI:
             await self._session.user, path_dest.user_path if isinstance(path_dest, FsNode) else path_dest
         )
         dest = self._session.cfg.dav_endpoint + quote(full_dest_path)
-        headers = Headers({"Destination": dest, "Overwrite": "T" if overwrite else "F"}, encoding="utf-8")
+        headers = CaseInsensitiveDict({"Destination": dest.encode("utf-8"), "Overwrite": "T" if overwrite else "F"})
         response = await self._session.adapter_dav.request(
             "MOVE",
             quote(dav_get_obj_path(await self._session.user, path_src)),
@@ -241,7 +241,7 @@ class AsyncFilesAPI:
             await self._session.user, path_dest.user_path if isinstance(path_dest, FsNode) else path_dest
         )
         dest = self._session.cfg.dav_endpoint + quote(full_dest_path)
-        headers = Headers({"Destination": dest, "Overwrite": "T" if overwrite else "F"}, encoding="utf-8")
+        headers = CaseInsensitiveDict({"Destination": dest.encode("utf-8"), "Overwrite": "T" if overwrite else "F"})
         response = await self._session.adapter_dav.request(
             "COPY",
             quote(dav_get_obj_path(await self._session.user, path_src)),
@@ -261,7 +261,7 @@ class AsyncFilesAPI:
         """
         root = build_list_by_criteria_req(properties, tags, await self._session.capabilities)
         webdav_response = await self._session.adapter_dav.request(
-            "REPORT", dav_get_obj_path(await self._session.user), content=element_tree_as_str(root)
+            "REPORT", dav_get_obj_path(await self._session.user), data=element_tree_as_str(root)
         )
         request_info = f"list_files_by_criteria: {await self._session.user}"
         check_error(webdav_response, request_info)
@@ -276,7 +276,7 @@ class AsyncFilesAPI:
         path = path.user_path if isinstance(path, FsNode) else path
         root = build_setfav_req(value)
         webdav_response = await self._session.adapter_dav.request(
-            "PROPPATCH", quote(dav_get_obj_path(await self._session.user, path)), content=element_tree_as_str(root)
+            "PROPPATCH", quote(dav_get_obj_path(await self._session.user, path)), data=element_tree_as_str(root)
         )
         check_error(webdav_response, f"setfav: path={path}, value={value}")
 
@@ -302,7 +302,7 @@ class AsyncFilesAPI:
         path = path.user_path if isinstance(path, FsNode) else path
 
         dest = self._session.cfg.dav_endpoint + f"/trashbin/{await self._session.user}/restore/{restore_name}"
-        headers = Headers({"Destination": dest}, encoding="utf-8")
+        headers = CaseInsensitiveDict({"Destination": dest.encode("utf-8")})
         response = await self._session.adapter_dav.request(
             "MOVE",
             quote(f"/trashbin/{await self._session.user}/{path}"),
@@ -345,7 +345,7 @@ class AsyncFilesAPI:
         """
         require_capabilities("files.versioning", await self._session.capabilities)
         dest = self._session.cfg.dav_endpoint + f"/versions/{await self._session.user}/restore/{file_object.name}"
-        headers = Headers({"Destination": dest}, encoding="utf-8")
+        headers = CaseInsensitiveDict({"Destination": dest.encode("utf-8")})
         response = await self._session.adapter_dav.request(
             "MOVE",
             quote(f"/versions/{await self._session.user}/{file_object.user_path}"),
@@ -356,7 +356,7 @@ class AsyncFilesAPI:
     async def list_tags(self) -> list[SystemTag]:
         """Returns list of the avalaible Tags."""
         root = build_list_tag_req()
-        response = await self._session.adapter_dav.request("PROPFIND", "/systemtags", content=element_tree_as_str(root))
+        response = await self._session.adapter_dav.request("PROPFIND", "/systemtags", data=element_tree_as_str(root))
         return build_list_tags_response(response)
 
     async def get_tags(self, file_id: FsNode | int) -> list[SystemTag]:
@@ -398,7 +398,7 @@ class AsyncFilesAPI:
         tag_id = tag_id.tag_id if isinstance(tag_id, SystemTag) else tag_id
         root = build_update_tag_req(name, user_visible, user_assignable)
         response = await self._session.adapter_dav.request(
-            "PROPPATCH", f"/systemtags/{tag_id}", content=element_tree_as_str(root)
+            "PROPPATCH", f"/systemtags/{tag_id}", data=element_tree_as_str(root)
         )
         check_error(response)
 
@@ -435,7 +435,7 @@ class AsyncFilesAPI:
             quote(full_path),
             headers={"X-User-Lock": "1", "X-User-Lock-Type": str(lock_type.value)},
         )
-        check_error(response, f"lock: user={self._session.user}, path={full_path}")
+        check_error(response, f"lock: user={await self._session.user}, path={full_path}")
 
     async def unlock(self, path: FsNode | str) -> None:
         """Unlocks the file.
@@ -449,7 +449,7 @@ class AsyncFilesAPI:
             quote(full_path),
             headers={"X-User-Lock": "1"},
         )
-        check_error(response, f"unlock: user={self._session.user}, path={full_path}")
+        check_error(response, f"unlock: user={await self._session.user}, path={full_path}")
 
     async def _file_change_tag_state(self, file_id: FsNode | int, tag_id: SystemTag | int, tag_state: bool) -> None:
         fs_object = file_id.info.fileid if isinstance(file_id, FsNode) else file_id
@@ -475,7 +475,7 @@ class AsyncFilesAPI:
         webdav_response = await self._session.adapter_dav.request(
             "PROPFIND",
             quote(dav_path),
-            content=element_tree_as_str(root),
+            data=element_tree_as_str(root),
             headers={"Depth": "infinity" if depth == -1 else str(depth)},
         )
         return build_listdir_response(
@@ -487,7 +487,9 @@ class AsyncFilesAPI:
         _dav_path = quote(dav_get_obj_path(await self._session.user, _tmp_path, root_path="/uploads"))
         _v2 = bool(self._session.cfg.options.upload_chunk_v2 and chunk_size >= 5 * 1024 * 1024)
         full_path = dav_get_obj_path(await self._session.user, path)
-        headers = Headers({"Destination": self._session.cfg.dav_endpoint + quote(full_path)}, encoding="utf-8")
+        headers = CaseInsensitiveDict(
+            {"Destination": (self._session.cfg.dav_endpoint + quote(full_path)).encode("utf-8")}
+        )
         if _v2:
             response = await self._session.adapter_dav.request("MKCOL", _dav_path, headers=headers)
         else:
@@ -502,11 +504,11 @@ class AsyncFilesAPI:
                 end_bytes = start_bytes + len(piece)
                 if _v2:
                     response = await self._session.adapter_dav.put(
-                        _dav_path + "/" + str(chunk_number), content=piece, headers=headers
+                        _dav_path + "/" + str(chunk_number), data=piece, headers=headers
                     )
                 else:
                     _filename = str(start_bytes).rjust(15, "0") + "-" + str(end_bytes).rjust(15, "0")
-                    response = await self._session.adapter_dav.put(_dav_path + "/" + _filename, content=piece)
+                    response = await self._session.adapter_dav.put(_dav_path + "/" + _filename, data=piece)
                 check_error(
                     response,
                     f"upload_stream(v={_v2}): user={await self._session.user}, path={path}, cur_size={end_bytes}",

nc_py_api/loginflow_v2.py

@@ -5,7 +5,7 @@ import json
 import time
 from dataclasses import dataclass
 
-import httpx
+import niquests
 
 from ._exceptions import check_error
 from ._session import AsyncNcSession, NcSession
@@ -156,6 +156,6 @@ class _AsyncLoginFlowV2API:
         return r_model
 
 
-def _res_to_json(response: httpx.Response) -> dict:
+def _res_to_json(response: niquests.Response) -> dict:
     check_error(response)
     return json.loads(response.text)

nc_py_api/nextcloud.py

@@ -4,7 +4,7 @@ import contextlib
 import typing
 from abc import ABC
 
-from httpx import Headers
+from niquests.structures import CaseInsensitiveDict
 
 from ._exceptions import NextcloudExceptionNotFound
 from ._misc import check_capabilities, require_capabilities
@@ -112,8 +112,8 @@ class _NextcloudBasic(ABC):  # pylint: disable=too-many-instance-attributes
         self._session.update_server_info()
 
     @property
-    def response_headers(self) -> Headers:
-        """Returns the `HTTPX headers <https://www.python-httpx.org/api/#headers>`_ from the last response."""
+    def response_headers(self) -> CaseInsensitiveDict:
+        """Returns the `Niquests headers <https://www.python-httpx.org/api/#headers>`_ from the last response."""
         return self._session.response_headers
 
     @property
@@ -216,8 +216,8 @@ class _AsyncNextcloudBasic(ABC):  # pylint: disable=too-many-instance-attributes
         await self._session.update_server_info()
 
     @property
-    def response_headers(self) -> Headers:
-        """Returns the `HTTPX headers <https://www.python-httpx.org/api/#headers>`_ from the last response."""
+    def response_headers(self) -> CaseInsensitiveDict:
+        """Returns the `Niquests headers <https://www.python-httpx.org/api/#headers>`_ from the last response."""
         return self._session.response_headers
 
     @property

nc_py_api/notes.py

@@ -5,7 +5,7 @@ import datetime
 import json
 import typing
 
-import httpx
+import niquests
 
 from ._exceptions import check_error
 from ._misc import check_capabilities, clear_from_params_empty, require_capabilities
@@ -367,6 +367,6 @@ class _AsyncNotesAPI:
         check_error(await self._session.adapter.put(self._ep_base + "/settings", json=params))
 
 
-def _res_to_json(response: httpx.Response) -> dict:
+def _res_to_json(response: niquests.Response) -> dict:
     check_error(response)
     return json.loads(response.text) if response.status_code != 304 else {}

nc_py_api/options.py

@@ -33,22 +33,13 @@ NPA_NC_CERT: bool | str
 SSL certificates (a.k.a CA bundle) used to  verify the identity of requested hosts. Either **True** (default CA bundle),
 a path to an SSL certificate file, or **False** (which will disable verification)."""
 str_val = environ.get("NPA_NC_CERT", "True")
-# https://github.com/encode/httpx/issues/302
-# when "httpx" will switch to use "truststore" by default - uncomment next line
-# NPA_NC_CERT = True
+
+NPA_NC_CERT = True
+
 if str_val.lower() in ("false", "0"):
     NPA_NC_CERT = False
 elif str_val.lower() not in ("true", "1"):
     NPA_NC_CERT = str_val
-else:
-    # Temporary workaround, see comment above.
-    # Use system certificate stores
-
-    import ssl
-
-    import truststore
-
-    NPA_NC_CERT = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
 
 CHUNKED_UPLOAD_V2 = environ.get("CHUNKED_UPLOAD_V2", True)
 """Option to enable/disable **version 2** chunked upload(better Object Storages support).

nc_py_api/talk_bot.py

@@ -7,7 +7,7 @@ import json
 import os
 import typing
 
-import httpx
+import niquests
 
 from . import options
 from ._misc import random_string
@@ -117,7 +117,7 @@ class TalkBot:
 
     def send_message(
         self, message: str, reply_to_message: int | TalkBotMessage, silent: bool = False, token: str = ""
-    ) -> tuple[httpx.Response, str]:
+    ) -> tuple[niquests.Response, str]:
         """Send a message and returns a "reference string" to identify the message again in a "get messages" request.
 
         :param message: The message to say.
@@ -127,7 +127,7 @@ class TalkBot:
         :param silent: Flag controlling if the message should create a chat notifications for the users.
         :param token: Token of the conversation.
             Can be empty if ``reply_to_message`` is :py:class:`~nc_py_api.talk_bot.TalkBotMessage`.
-        :returns: Tuple, where fist element is :py:class:`httpx.Response` and second is a "reference string".
+        :returns: Tuple, where fist element is :py:class:`niquests.Response` and second is a "reference string".
         :raises ValueError: in case of an invalid usage.
         :raises RuntimeError: in case of a broken installation.
         """
@@ -143,7 +143,7 @@ class TalkBot:
         }
         return self._sign_send_request("POST", f"/{token}/message", params, message), reference_id
 
-    def react_to_message(self, message: int | TalkBotMessage, reaction: str, token: str = "") -> httpx.Response:
+    def react_to_message(self, message: int | TalkBotMessage, reaction: str, token: str = "") -> niquests.Response:
         """React to a message.
 
         :param message: Message ID or :py:class:`~nc_py_api.talk_bot.TalkBotMessage` to react to.
@@ -162,7 +162,7 @@ class TalkBot:
         }
         return self._sign_send_request("POST", f"/{token}/reaction/{message_id}", params, reaction)
 
-    def delete_reaction(self, message: int | TalkBotMessage, reaction: str, token: str = "") -> httpx.Response:
+    def delete_reaction(self, message: int | TalkBotMessage, reaction: str, token: str = "") -> niquests.Response:
         """Removes reaction from a message.
 
         :param message: Message ID or :py:class:`~nc_py_api.talk_bot.TalkBotMessage` to remove reaction from.
@@ -181,7 +181,7 @@ class TalkBot:
         }
         return self._sign_send_request("DELETE", f"/{token}/reaction/{message_id}", params, reaction)
 
-    def _sign_send_request(self, method: str, url_suffix: str, data: dict, data_to_sign: str) -> httpx.Response:
+    def _sign_send_request(self, method: str, url_suffix: str, data: dict, data_to_sign: str) -> niquests.Response:
         secret = get_bot_secret(self.callback_url)
         if secret is None:
             raise RuntimeError("Can't find the 'secret' of the bot. Has the bot been installed?")
@@ -189,7 +189,8 @@ class TalkBot:
         hmac_sign = hmac.new(secret, talk_bot_random.encode("UTF-8"), digestmod=hashlib.sha256)
         hmac_sign.update(data_to_sign.encode("UTF-8"))
         nc_app_cfg = BasicConfig()
-        with httpx.Client(verify=nc_app_cfg.options.nc_cert) as client:
+        with niquests.Session() as client:
+            client.verify = nc_app_cfg.options.nc_cert
             return client.request(
                 method,
                 url=nc_app_cfg.endpoint + "/ocs/v2.php/apps/spreed/api/v1/bot" + url_suffix,
@@ -234,7 +235,7 @@ class AsyncTalkBot:
 
     async def send_message(
         self, message: str, reply_to_message: int | TalkBotMessage, silent: bool = False, token: str = ""
-    ) -> tuple[httpx.Response, str]:
+    ) -> tuple[niquests.Response, str]:
         """Send a message and returns a "reference string" to identify the message again in a "get messages" request.
 
         :param message: The message to say.
@@ -244,7 +245,7 @@ class AsyncTalkBot:
         :param silent: Flag controlling if the message should create a chat notifications for the users.
         :param token: Token of the conversation.
             Can be empty if ``reply_to_message`` is :py:class:`~nc_py_api.talk_bot.TalkBotMessage`.
-        :returns: Tuple, where fist element is :py:class:`httpx.Response` and second is a "reference string".
+        :returns: Tuple, where fist element is :py:class:`niquests.Response` and second is a "reference string".
         :raises ValueError: in case of an invalid usage.
         :raises RuntimeError: in case of a broken installation.
         """
@@ -260,7 +261,9 @@ class AsyncTalkBot:
         }
         return await self._sign_send_request("POST", f"/{token}/message", params, message), reference_id
 
-    async def react_to_message(self, message: int | TalkBotMessage, reaction: str, token: str = "") -> httpx.Response:
+    async def react_to_message(
+        self, message: int | TalkBotMessage, reaction: str, token: str = ""
+    ) -> niquests.Response:
         """React to a message.
 
         :param message: Message ID or :py:class:`~nc_py_api.talk_bot.TalkBotMessage` to react to.
@@ -279,7 +282,7 @@ class AsyncTalkBot:
         }
         return await self._sign_send_request("POST", f"/{token}/reaction/{message_id}", params, reaction)
 
-    async def delete_reaction(self, message: int | TalkBotMessage, reaction: str, token: str = "") -> httpx.Response:
+    async def delete_reaction(self, message: int | TalkBotMessage, reaction: str, token: str = "") -> niquests.Response:
         """Removes reaction from a message.
 
         :param message: Message ID or :py:class:`~nc_py_api.talk_bot.TalkBotMessage` to remove reaction from.
@@ -298,7 +301,9 @@ class AsyncTalkBot:
         }
         return await self._sign_send_request("DELETE", f"/{token}/reaction/{message_id}", params, reaction)
 
-    async def _sign_send_request(self, method: str, url_suffix: str, data: dict, data_to_sign: str) -> httpx.Response:
+    async def _sign_send_request(
+        self, method: str, url_suffix: str, data: dict, data_to_sign: str
+    ) -> niquests.Response:
         secret = await aget_bot_secret(self.callback_url)
         if secret is None:
             raise RuntimeError("Can't find the 'secret' of the bot. Has the bot been installed?")
@@ -306,7 +311,9 @@ class AsyncTalkBot:
         hmac_sign = hmac.new(secret, talk_bot_random.encode("UTF-8"), digestmod=hashlib.sha256)
         hmac_sign.update(data_to_sign.encode("UTF-8"))
         nc_app_cfg = BasicConfig()
-        async with httpx.AsyncClient(verify=nc_app_cfg.options.nc_cert) as aclient:
+        async with niquests.AsyncSession() as aclient:
+            aclient.verify = nc_app_cfg.options.nc_cert
+
             return await aclient.request(
                 method,
                 url=nc_app_cfg.endpoint + "/ocs/v2.php/apps/spreed/api/v1/bot" + url_suffix,

nc_py_api/users.py

@@ -207,6 +207,10 @@ class _UsersAPI:
         """Disables user on the Nextcloud server."""
         self._session.ocs("PUT", f"{self._ep_base}/{user_id}/disable")
 
+    def wipe(self, user_id: str) -> None:
+        """Disconnects user from the Nextcloud server and deletes all local data stored on the user's devices."""
+        self._session.ocs("POST", f"/ocs/v2.php/cloud/users/{user_id}/wipe")
+
     def resend_welcome_email(self, user_id: str) -> None:
         """Send welcome email for specified user again."""
         self._session.ocs("POST", f"{self._ep_base}/{user_id}/welcome")

{nc_py_api-0.20.2.dist-info → nc_py_api-0.21.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nc-py-api
-Version: 0.20.2
+Version: 0.21.1
 Summary: Nextcloud Python Framework
 Project-URL: Changelog, https://github.com/cloud-py-api/nc_py_api/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://cloud-py-api.github.io/nc_py_api/
@@ -31,10 +31,9 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Requires-Dist: fastapi>=0.109.2
-Requires-Dist: httpx>=0.25.2
+Requires-Dist: niquests<4,>=3
 Requires-Dist: pydantic>=2.1.1
 Requires-Dist: python-dotenv>=1
-Requires-Dist: truststore==0.10
 Requires-Dist: xmltodict>=0.13
 Provides-Extra: app
 Requires-Dist: uvicorn[standard]>=0.23.2; extra == 'app'

{nc_py_api-0.20.2.dist-info → nc_py_api-0.21.1.dist-info}/RECORD

@@ -1,31 +1,31 @@
-nc_py_api/__init__.py,sha256=FOju0DYizwYYzWBgID8Ebx0GeId-faNqd4Z_3K0216o,439
+nc_py_api/__init__.py,sha256=S5IytGqp8PkWnmcZXRFPSVEwfeb4iZ8xPeCmSf4sTFQ,460
 nc_py_api/_deffered_error.py,sha256=BpEe_tBqflwfj2Zolb67nhW-K16XX-WbcY2IH_6u8fo,319
-nc_py_api/_exceptions.py,sha256=7vbUECaLmD7RJBCU27t4fuP6NmQK6r4508u_gS4szhI,2298
+nc_py_api/_exceptions.py,sha256=_4k-uzpKdW5_WjqVE_saoGFJ1YqWx7W6kr-wgpBume0,2414
 nc_py_api/_misc.py,sha256=dUzCP9VmyhtICTsn1aexlFAYUioBm40k6Zh-YE5WwCY,3333
 nc_py_api/_preferences.py,sha256=OtovFZuGHnHYKjdDjSnUappO795tW8Oxj7qVaejHWpQ,2479
 nc_py_api/_preferences_ex.py,sha256=Y6sDBrFJc7lk8BoDUfjC_iwOfjSbPPNPpcSxsL1fyIM,6391
-nc_py_api/_session.py,sha256=8CjrT0ZDTg8cugRkukxUHGA_O7UsiwleawZ_KyEI6n0,20664
+nc_py_api/_session.py,sha256=u45U4USdgbegBj3oAnm-OErFng2fAyleH1dWgshJSso,22018
 nc_py_api/_talk_api.py,sha256=0Uo7OduYniuuX3UQPb468RyGJJ-PWBCgJ5HoPuz5Qa0,51068
 nc_py_api/_theming.py,sha256=hTr3nuOemSuRFZaPy9iXNmBM7rDgQHECH43tHMWGqEY,1870
-nc_py_api/_version.py,sha256=rf1wT5GKIXVuBGABQqd82PICMV7siLu9r7a1l9gHq4E,52
+nc_py_api/_version.py,sha256=qWD6wPKnxx25NaWUPbzrV-OCufP6NS2579oj1jEc-ak,52
 nc_py_api/activity.py,sha256=t9VDSnnaXRNOvALqOSGCeXSQZ-426pCOMSfQ96JHys4,9574
 nc_py_api/apps.py,sha256=Us2y2lszdxXlD8t6kxwd5_Nrrmazc0EvZXIH9O-ol80,9315
-nc_py_api/calendar_api.py,sha256=-T6CJ8cRbJZTLtxSEDWuuYpD29DMJGCTfLONmtxZV9w,1445
-nc_py_api/loginflow_v2.py,sha256=UjkK3gMouzNrIS7BFhjbmB_9m4fP2UY5sfpmvJ2EXWk,5760
-nc_py_api/nextcloud.py,sha256=C3lnns8Dx34wXsOoN4vwOc0Sm5rA8CgH4UtxNNKFyKc,22793
-nc_py_api/notes.py,sha256=ljO3TOe-Qg0bJ0mlFQwjg--Pxmj-XFknoLbcbJmII0A,15106
+nc_py_api/calendar_api.py,sha256=a2Q5EGf5_swWPYkUbHnoEg6h1S9KTEUQD7f7DljGHYY,1442
+nc_py_api/loginflow_v2.py,sha256=QgR99Q59Q1My5U_PeLFkIAvEKhX_H7bIRrBZdddvmo4,5766
+nc_py_api/nextcloud.py,sha256=cKdsw0n_yFNdI-N8IIVIQKkSqmEzJnQtLBVqo24EVdM,22849
+nc_py_api/notes.py,sha256=aM0SLVGKv8nBv_qI3z8sN08Z2721wLJUmEdwlo2EK1g,15112
 nc_py_api/notifications.py,sha256=WgzV21TuLOhLk-UEjhBSbMsIi2isa5MmAx6cbe0pc2Y,9187
-nc_py_api/options.py,sha256=ZKJqVLhWVwJ6YxAKzGWlPXJhd1vg9GluyFzr-jX4Jp0,2038
+nc_py_api/options.py,sha256=W9RSLTtltW1W-Y3iSllRr2-VikFB5wARSiBEaAcw-AI,1719
 nc_py_api/talk.py,sha256=OZFemYkDOaM6o4xAK3EvQbjMFiK75E5qnsCDyihIElg,29368
-nc_py_api/talk_bot.py,sha256=_RuImwb3jYvUKX3ywcX095ucOjECCxsuc59heIxNoTM,16725
+nc_py_api/talk_bot.py,sha256=QXaKKwIRRcOAnqoJgfzK3ub0aDPTUmTkagls-a0XZW0,16840
 nc_py_api/user_status.py,sha256=I101nwYS8X1WvC8AnLa2f3qJUCPDPHrbq-ke0h1VT4E,13282
-nc_py_api/users.py,sha256=SQG8Agplaxy7XJgguK-rxV-azpc-QdktbDmLmQtJkXo,15476
+nc_py_api/users.py,sha256=_TUot3XdI2VDAwpUo33IOG_JsrgOrYzfY6KJRsWQcD0,15710
 nc_py_api/users_groups.py,sha256=IPxw-Ks5NjCm6r8_HC9xmf3IYptH00ulITbp5iazhAo,6289
 nc_py_api/weather_status.py,sha256=wAkjuJPjxc0Rxe4za0BzfwB0XeUmkCXoisJtTH3-qdQ,7582
 nc_py_api/webhooks.py,sha256=BGHRtankgbUkcqBRJTFShjRLpaVoFNcjLsrVitoNziM,8083
 nc_py_api/ex_app/__init__.py,sha256=6Lwid4bBXOSrZf_ocf5m8qkkO1OgYxG0GTs4q6Nw72o,691
 nc_py_api/ex_app/defs.py,sha256=FaQInH3jLugKxDUqpwrXdkMT-lBxmoqWmXJXc11fa6A,727
-nc_py_api/ex_app/integration_fastapi.py,sha256=848ugedpEsQ-0vGPLfF5VlgQxETPMQl_aQN-erJf4CE,11058
+nc_py_api/ex_app/integration_fastapi.py,sha256=mWMG8VrX_Q9yFw5hA3Wp996lyrybPnxTIT8sxp4GBrk,12636
 nc_py_api/ex_app/logger.py,sha256=nAHLObuPvl3UBLrlqZulgoxxVaAJ661iP4F6bTW-V-Y,1475
 nc_py_api/ex_app/misc.py,sha256=c7B0uE8isaIi4SQbxURGUuWjZaaXiLg3Ov6cqvRYplE,2298
 nc_py_api/ex_app/occ_commands.py,sha256=hb2BJuvFKIigvLycSCyAe9v6hedq4Gfu2junQZTaK_M,5219
@@ -41,12 +41,12 @@ nc_py_api/ex_app/ui/settings.py,sha256=VyGly-rCYMw9Zw7cTYRYilXXKe7f6tesTAW83X5gH
 nc_py_api/ex_app/ui/top_menu.py,sha256=oCgGtIoMYbp-5iN5aXEbT7Q88HtccR7hg6IBFgbbyX4,5118
 nc_py_api/ex_app/ui/ui.py,sha256=OqFHKn6oIZli8T1wnv6YtQ4glNfeNb90WwGCvtWI1Z4,1632
 nc_py_api/files/__init__.py,sha256=aN6Lhc0km5eAIGFA8YoG-xXDOzIJILV2izCzHeC-a78,17949
-nc_py_api/files/_files.py,sha256=0jJ1yoq_wZUiB6pXrEG4iUhImcANEO5gXoqmUrJF_ws,14297
-nc_py_api/files/files.py,sha256=7x4hfnVa2y1R5bxK9f8cdggi1gPnpUYnsBj0e4p-4qc,24926
-nc_py_api/files/files_async.py,sha256=nyDeWiGx_8CHuVrNThSgfZy0l-WlC4El-TzJONo0TsM,25773
+nc_py_api/files/_files.py,sha256=t7KBZE3fHmfVk0WZuQF9usCMY_b4rzX1ct1aIZx3RYw,14300
+nc_py_api/files/files.py,sha256=A05iT_s5cYMK1MtarqdjTZP9QA1l_SiINq805VLrzuY,24999
+nc_py_api/files/files_async.py,sha256=GoTPswMgozcx3Vkbj4YSitNeP7vpPJ4lIbrCnj77rP4,25858
 nc_py_api/files/sharing.py,sha256=VRZCl-TYK6dbu9rUHPs3_jcVozu1EO8bLGZwoRpiLsU,14439
-nc_py_api-0.20.2.dist-info/METADATA,sha256=ehwNyvLLh9FU2Mq5ykO1hKgiE6dHmDgpQ3agBA6CdxY,8055
-nc_py_api-0.20.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nc_py_api-0.20.2.dist-info/licenses/AUTHORS,sha256=B2Q9q9XH3PAxJp0V3GiKQc1l0z7vtGDpDHqda-ISWKM,616
-nc_py_api-0.20.2.dist-info/licenses/LICENSE.txt,sha256=OLEMh401fAumGHfRSna365MLIfnjdTcdOHZ6QOzMjkg,1551
-nc_py_api-0.20.2.dist-info/RECORD,,
+nc_py_api-0.21.1.dist-info/METADATA,sha256=E0ZErYs8U1KOkOVjx_s1Gp4mExqOV6flkh-1Wm63qZI,8024
+nc_py_api-0.21.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nc_py_api-0.21.1.dist-info/licenses/AUTHORS,sha256=B2Q9q9XH3PAxJp0V3GiKQc1l0z7vtGDpDHqda-ISWKM,616
+nc_py_api-0.21.1.dist-info/licenses/LICENSE.txt,sha256=OLEMh401fAumGHfRSna365MLIfnjdTcdOHZ6QOzMjkg,1551
+nc_py_api-0.21.1.dist-info/RECORD,,