chore: switch internal call sites to canonical class names

Phase 2 left a number of tests and examples calling the deprecated
``AsyncNextcloud`` / ``AsyncNextcloudApp`` / ``AsyncTalkBot`` / ``atalk_bot_msg``
aliases that now just point at the canonical async classes. The aliases stay
in place for users (and remain covered by ``tests/_install_async.py`` and
``tests/_install_only_enabled_handler_async.py`` which are the contract
tests for the backward-compat surface), but internal call sites should not
look like they need them.

* tests/actual_tests/misc_test.py — Async{Nextcloud,NextcloudApp} -> {Nextcloud,NextcloudApp}
* tests/actual_tests/talk_bot_test.py — AsyncTalkBot -> TalkBot
* examples/as_client/files/{listing,upload,find,download}.py — AsyncNextcloud -> Nextcloud
* examples/as_app/talk_bot{,_ai}/lib/main.py — atalk_bot_msg -> talk_bot_msg

Fix the ``examples/as_app/to_gif`` ExApp, which was a real regression: every
``nc.log`` / ``nc.files.*`` / ``nc.notifications.*`` / ``nc.ui.*`` call became
an unawaited coroutine after Phase 2. Convert ``convert_video_to_gif`` and
``enabled_handler`` to coroutines, await every call site, and offload the
CPU/IO-heavy ``cv2`` + ``imageio`` + ``pygifsicle`` pipeline to a sync helper
that runs via ``asyncio.to_thread`` so the event loop stays responsive.

Author: Review

examples/as_app/talk_bot/lib/main.py

@@ -8,7 +8,7 @@
 from fastapi import BackgroundTasks, Depends, FastAPI, Response
 
 from nc_py_api import NextcloudApp, talk_bot
-from nc_py_api.ex_app import AppAPIAuthMiddleware, atalk_bot_msg, run_app, set_handlers
+from nc_py_api.ex_app import AppAPIAuthMiddleware, run_app, set_handlers, talk_bot_msg
 
 
 # The same stuff as for usual External Applications
@@ -69,7 +69,7 @@ def currency_talk_bot_process_request(message: talk_bot.TalkBotMessage):
 
 @APP.post("/currency_talk_bot")
 async def currency_talk_bot(
-    message: Annotated[talk_bot.TalkBotMessage, Depends(atalk_bot_msg)],
+    message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_msg)],
     background_tasks: BackgroundTasks,
 ):
     # As during converting, we do not process converting locally, we perform this in background, in the background task.

examples/as_app/talk_bot_ai/lib/main.py

@@ -11,10 +11,10 @@
 from nc_py_api import NextcloudApp, talk_bot
 from nc_py_api.ex_app import (
     AppAPIAuthMiddleware,
-    atalk_bot_msg,
     get_model_path,
     run_app,
     set_handlers,
+    talk_bot_msg,
 )
 
 
@@ -41,7 +41,7 @@ def ai_talk_bot_process_request(message: talk_bot.TalkBotMessage):
 
 @APP.post("/ai_talk_bot")
 async def ai_talk_bot(
-    message: Annotated[talk_bot.TalkBotMessage, Depends(atalk_bot_msg)],
+    message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_msg)],
     background_tasks: BackgroundTasks,
 ):
     if message.object_name == "message":

examples/as_app/to_gif/lib/main.py

@@ -1,5 +1,6 @@
 """Simplest example of files_dropdown_menu + notification."""
 
+import asyncio
 import tempfile
 from contextlib import asynccontextmanager
 from os import path
@@ -26,46 +27,51 @@ async def lifespan(app: FastAPI):
 APP.add_middleware(AppAPIAuthMiddleware)
 
 
-def convert_video_to_gif(input_file: FsNode, nc: NextcloudApp):
+def _build_gif(in_path: str, out_path: str) -> None:
+    """Synchronous CPU/IO-heavy work — extracted so it can run via :func:`asyncio.to_thread`."""
+    cap = cv2.VideoCapture(in_path)
+    image_lst = []
+    previous_frame = None
+    skip = 0
+    while True:
+        skip += 1
+        _ret, frame = cap.read()
+        if frame is None:
+            break
+        if skip == 2:
+            skip = 0
+            continue
+        if previous_frame is not None:
+            diff = numpy.mean(previous_frame != frame)
+            if diff < 0.91:
+                continue
+        frame_rgb = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
+        image_lst.append(frame_rgb)
+        previous_frame = frame
+        if len(image_lst) > 60:
+            break
+    cap.release()
+    imageio.mimsave(out_path, image_lst)
+    optimize(out_path)
+
+
+async def convert_video_to_gif(input_file: FsNode, nc: NextcloudApp) -> None:
     save_path = path.splitext(input_file.user_path)[0] + ".gif"
-    nc.log(LogLvl.WARNING, f"Processing:{input_file.user_path} -> {save_path}")
+    await nc.log(LogLvl.WARNING, f"Processing:{input_file.user_path} -> {save_path}")
     try:
         with tempfile.NamedTemporaryFile(mode="w+b") as tmp_in:
-            nc.files.download2stream(input_file, tmp_in)
-            nc.log(LogLvl.WARNING, "File downloaded")
+            await nc.files.download2stream(input_file, tmp_in)
+            await nc.log(LogLvl.WARNING, "File downloaded")
             tmp_in.flush()
-            cap = cv2.VideoCapture(tmp_in.name)
             with tempfile.NamedTemporaryFile(mode="w+b", suffix=".gif") as tmp_out:
-                image_lst = []
-                previous_frame = None
-                skip = 0
-                while True:
-                    skip += 1
-                    _ret, frame = cap.read()
-                    if frame is None:
-                        break
-                    if skip == 2:
-                        skip = 0
-                        continue
-                    if previous_frame is not None:
-                        diff = numpy.mean(previous_frame != frame)
-                        if diff < 0.91:
-                            continue
-                    frame_rgb = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
-                    image_lst.append(frame_rgb)
-                    previous_frame = frame
-                    if len(image_lst) > 60:
-                        break
-                cap.release()
-                imageio.mimsave(tmp_out.name, image_lst)
-                optimize(tmp_out.name)
-                nc.log(LogLvl.WARNING, "GIF is ready")
-                nc.files.upload_stream(save_path, tmp_out)
-                nc.log(LogLvl.WARNING, "Result uploaded")
-                nc.notifications.create(f"{input_file.name} finished!", f"{save_path} is waiting for you!")
-    except Exception as e:
-        nc.log(LogLvl.ERROR, str(e))
-        nc.notifications.create("Error occurred", "Error information was written to log file")
+                await asyncio.to_thread(_build_gif, tmp_in.name, tmp_out.name)
+                await nc.log(LogLvl.WARNING, "GIF is ready")
+                await nc.files.upload_stream(save_path, tmp_out)
+                await nc.log(LogLvl.WARNING, "Result uploaded")
+                await nc.notifications.create(f"{input_file.name} finished!", f"{save_path} is waiting for you!")
+    except Exception as e:  # noqa: BLE001
+        await nc.log(LogLvl.ERROR, str(e))
+        await nc.notifications.create("Error occurred", "Error information was written to log file")
 
 
 @APP.post("/video_to_gif")
@@ -79,18 +85,18 @@ async def video_to_gif(
     return responses.Response()
 
 
-def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
+async def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
     print(f"enabled={enabled}")
     try:
         if enabled:
-            nc.ui.files_dropdown_menu.register_ex(
+            await nc.ui.files_dropdown_menu.register_ex(
                 "to_gif",
                 "To GIF",
                 "/video_to_gif",
                 mime="video",
                 icon="img/icon.svg",
             )
-    except Exception as e:
+    except Exception as e:  # noqa: BLE001
         return str(e)
     return ""
 

examples/as_client/files/download.py

@@ -8,7 +8,7 @@
 
 async def main():
     # run this example after ``files_upload.py`` or adjust the image file path.
-    nc = nc_py_api.AsyncNextcloud(nextcloud_url="http://nextcloud.local", nc_auth_user="admin", nc_auth_pass="admin")
+    nc = nc_py_api.Nextcloud(nextcloud_url="http://nextcloud.local", nc_auth_user="admin", nc_auth_pass="admin")
     rgb_image = await nc.files.download("RGB.png")
     Image.open(BytesIO(rgb_image)).show()  # wrap `bytes` into BytesIO for Pillow
 

examples/as_client/files/find.py

@@ -5,7 +5,7 @@
 
 async def main():
     # create Nextcloud client instance class
-    nc = nc_py_api.AsyncNextcloud(nextcloud_url="http://nextcloud.local", nc_auth_user="admin", nc_auth_pass="admin")
+    nc = nc_py_api.Nextcloud(nextcloud_url="http://nextcloud.local", nc_auth_user="admin", nc_auth_pass="admin")
 
     print("Searching for all files which names ends with `.txt`:")
     result = await nc.files.find(["like", "name", "%.txt"])

examples/as_client/files/listing.py

@@ -5,7 +5,7 @@
 
 async def main():
     # create Nextcloud client instance class
-    nc = nc_py_api.AsyncNextcloud(nextcloud_url="http://nextcloud.local", nc_auth_user="admin", nc_auth_pass="admin")
+    nc = nc_py_api.Nextcloud(nextcloud_url="http://nextcloud.local", nc_auth_user="admin", nc_auth_pass="admin")
 
     async def list_dir(directory):
         # usual recursive traversing over directories

examples/as_client/files/upload.py

@@ -7,7 +7,7 @@
 
 
 async def main():
-    nc = nc_py_api.AsyncNextcloud(nextcloud_url="http://nextcloud.local", nc_auth_user="admin", nc_auth_pass="admin")
+    nc = nc_py_api.Nextcloud(nextcloud_url="http://nextcloud.local", nc_auth_user="admin", nc_auth_pass="admin")
     buf = BytesIO()
     Image.merge(
         "RGB",

tests/actual_tests/misc_test.py

@@ -6,8 +6,8 @@
 from niquests import PreparedRequest, Response
 
 from nc_py_api import (
-    AsyncNextcloud,
-    AsyncNextcloudApp,
+    Nextcloud,
+    NextcloudApp,
     NextcloudException,
     ex_app,
 )
@@ -113,7 +113,7 @@ async def test_verify_version_async(anc_app):
 
 @pytest.mark.asyncio(scope="session")
 async def test_init_adapter_dav_async(anc_any):
-    new_nc = AsyncNextcloud() if isinstance(anc_any, AsyncNextcloud) else AsyncNextcloudApp()
+    new_nc = Nextcloud() if isinstance(anc_any, Nextcloud) else NextcloudApp()
     new_nc._session.init_adapter_dav()
     old_adapter = getattr(new_nc._session, "adapter_dav", None)
     assert old_adapter is not None
@@ -125,17 +125,15 @@ async def test_init_adapter_dav_async(anc_any):
 
 @pytest.mark.asyncio(scope="session")
 async def test_no_initial_connection_async(anc_any):
-    new_nc = AsyncNextcloud() if isinstance(anc_any, AsyncNextcloud) else AsyncNextcloudApp()
+    new_nc = Nextcloud() if isinstance(anc_any, Nextcloud) else NextcloudApp()
     assert not new_nc._session._capabilities
     _ = await new_nc.srv_version
     assert new_nc._session._capabilities
 
 
 @pytest.mark.asyncio(scope="session")
 async def test_ocs_timeout_async(anc_any):
-    new_nc = (
-        AsyncNextcloud(npa_timeout=0.01) if isinstance(anc_any, AsyncNextcloud) else AsyncNextcloudApp(npa_timeout=0.01)
-    )
+    new_nc = Nextcloud(npa_timeout=0.01) if isinstance(anc_any, Nextcloud) else NextcloudApp(npa_timeout=0.01)
     with pytest.raises(NextcloudException) as e:
         if await new_nc.weather_status.set_location(latitude=41.896655, longitude=12.488776):
             await new_nc.weather_status.get_forecast()
@@ -153,7 +151,7 @@ async def test_public_ocs_async(anc_any):
 
 @pytest.mark.asyncio(scope="session")
 async def test_perform_login_async(anc_any):
-    new_nc = AsyncNextcloud() if isinstance(anc_any, AsyncNextcloud) else AsyncNextcloudApp()
+    new_nc = Nextcloud() if isinstance(anc_any, Nextcloud) else NextcloudApp()
     assert not new_nc._session._capabilities
     await new_nc.perform_login()
     assert new_nc._session._capabilities

tests/actual_tests/talk_bot_test.py

@@ -58,7 +58,7 @@ async def test_chat_bot_receive_message_async(anc_app):
     if await anc_app.talk.bots_available is False:
         pytest.skip("Need Talk bots support")
     niquests.delete(f"{'http'}://{environ.get('APP_HOST', '127.0.0.1')}:{environ['APP_PORT']}/reset_bot_secret")
-    talk_bot_inst = talk_bot.AsyncTalkBot("/talk_bot_coverage", "Coverage bot", "Desc")
+    talk_bot_inst = talk_bot.TalkBot("/talk_bot_coverage", "Coverage bot", "Desc")
     await talk_bot_inst.enabled_handler(True, anc_app)
     conversation = await anc_app.talk.create_conversation(talk.ConversationType.GROUP, "admin")
     try: