nc-py-api 0.11.0__tar.gz → 0.12.0__tar.gz

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.12.0 - 2024-04-02]
+
+Update with new features only for `NextcloudApp` class. #233
+
+### Added
+
+- `ex_app.get_computation_device` function for retrieving GPU type(only with AppAPI `2.4.0`+).
+- `ex_app.integration_fastapi.fetch_models_task` are now public function, added `progress_init_start_value` param.
+- Global authentication when used now sets `request.scope["username"]` for easy use.
+
+### Changed
+
+- `UiActionFileInfo` class marked as deprecated, instead `ActionFileInfo` class should be used.
+
 ## [0.11.0 - 2024-02-17]
 
 ### Added

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: nc-py-api
-Version: 0.11.0
+Version: 0.12.0
 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/

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/nc_py_api/_session.py

@@ -123,7 +123,7 @@ class AppConfig(BasicConfig):
         super().__init__(**kwargs)
         self.aa_version = self._get_config_value("aa_version", raise_not_found=False, **kwargs)
         if not self.aa_version:
-            self.aa_version = "1.0.0"
+            self.aa_version = "2.2.0"
         self.app_name = self._get_config_value("app_id", **kwargs)
         self.app_version = self._get_config_value("app_version", **kwargs)
         self.app_secret = self._get_config_value("app_secret", **kwargs)
@@ -459,7 +459,7 @@ class NcSessionAppBasic(ABC):
         self.cfg = AppConfig(**kwargs)
         super().__init__(**kwargs)
 
-    def sign_check(self, request: HTTPConnection) -> None:
+    def sign_check(self, request: HTTPConnection) -> str:
         headers = {
             "AA-VERSION": request.headers.get("AA-VERSION", ""),
             "EX-APP-ID": request.headers.get("EX-APP-ID", ""),
@@ -474,13 +474,10 @@ class NcSessionAppBasic(ABC):
         if headers["EX-APP-ID"] != self.cfg.app_name:
             raise ValueError(f"Invalid EX-APP-ID:{headers['EX-APP-ID']} != {self.cfg.app_name}")
 
-        our_version = self.adapter.headers.get("EX-APP-VERSION", "")
-        if headers["EX-APP-VERSION"] != our_version:
-            raise ValueError(f"Invalid EX-APP-VERSION:{headers['EX-APP-VERSION']} <=> {our_version}")
-
-        app_secret = get_username_secret_from_headers(headers)[1]
+        username, app_secret = get_username_secret_from_headers(headers)
         if app_secret != self.cfg.app_secret:
             raise ValueError(f"Invalid App secret:{app_secret} != {self.cfg.app_secret}")
+        return username
 
 
 class NcSessionApp(NcSessionAppBasic, NcSessionBasic):

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/nc_py_api/_version.py

@@ -1,3 +1,3 @@
 """Version of nc_py_api."""
 
-__version__ = "0.11.0"
+__version__ = "0.12.0"

nc_py_api-0.12.0/nc_py_api/ex_app/__init__.py

@@ -0,0 +1,24 @@
+"""All possible ExApp stuff for NextcloudApp that can be used."""
+
+from ..files import ActionFileInfo
+from .defs import FileSystemEventNotification, LogLvl
+from .integration_fastapi import (
+    AppAPIAuthMiddleware,
+    anc_app,
+    atalk_bot_msg,
+    nc_app,
+    set_handlers,
+    talk_bot_msg,
+)
+from .misc import (
+    get_computation_device,
+    get_model_path,
+    persistent_storage,
+    verify_version,
+)
+from .ui.settings import SettingsField, SettingsFieldType, SettingsForm
+from .uvicorn_fastapi import run_app
+
+
+class UiActionFileInfo(ActionFileInfo):
+    """``Deprecated``: use :py:class:`~nc_py_api.ex_app.ActionFileInfo` instead."""

nc_py_api-0.12.0/nc_py_api/ex_app/defs.py

@@ -0,0 +1,37 @@
+"""Additional definitions for NextcloudApp."""
+
+import enum
+
+from pydantic import BaseModel
+
+from ..files import ActionFileInfo
+
+
+class LogLvl(enum.IntEnum):
+    """Log levels."""
+
+    DEBUG = 0
+    """Debug log level"""
+    INFO = 1
+    """Informational log level"""
+    WARNING = 2
+    """Warning log level. ``Default``"""
+    ERROR = 3
+    """Error log level"""
+    FATAL = 4
+    """Fatal log level"""
+
+
+class FileSystemEventData(BaseModel):
+    """FileSystem events format."""
+
+    target: ActionFileInfo
+    source: ActionFileInfo | None = None
+
+
+class FileSystemEventNotification(BaseModel):
+    """AppAPI event notification common data."""
+
+    event_type: str
+    event_subtype: str
+    event_data: FileSystemEventData

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/nc_py_api/ex_app/integration_fastapi.py

@@ -103,7 +103,7 @@ def set_handlers(
 
         @fast_api_app.post("/init")
         async def init_callback(b_tasks: BackgroundTasks, nc: typing.Annotated[NextcloudApp, Depends(nc_app)]):
-            b_tasks.add_task(__fetch_models_task, nc, models_to_fetch if models_to_fetch else {})
+            b_tasks.add_task(fetch_models_task, nc, models_to_fetch if models_to_fetch else {}, 0)
             return JSONResponse(content={})
 
     if map_app_static:
@@ -120,10 +120,11 @@ def __map_app_static_folders(fast_api_app: FastAPI):
             fast_api_app.mount(f"/{mnt_dir}", staticfiles.StaticFiles(directory=mnt_dir_path), name=mnt_dir)
 
 
-def __fetch_models_task(nc: NextcloudApp, models: dict[str, dict]) -> None:
+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."""
     if models:
-        current_progress = 0
-        percent_for_each = min(int(100 / len(models)), 99)
+        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://")):
                 __fetch_model_as_file(current_progress, percent_for_each, nc, model, models[model])
@@ -206,9 +207,9 @@ def __request_sign_check_if_needed(request: HTTPConnection, nextcloud_app: Nextc
         _request_sign_check(request, nextcloud_app)
 
 
-def _request_sign_check(request: HTTPConnection, nextcloud_app: NextcloudApp | AsyncNextcloudApp) -> None:
+def _request_sign_check(request: HTTPConnection, nextcloud_app: NextcloudApp | AsyncNextcloudApp) -> str:
     try:
-        nextcloud_app._session.sign_check(request)  # noqa pylint: disable=protected-access
+        return nextcloud_app._session.sign_check(request)  # noqa pylint: disable=protected-access
     except ValueError as e:
         print(e)
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED) from None
@@ -238,7 +239,7 @@ class AppAPIAuthMiddleware:
         url_path = conn.url.path.lstrip("/")
         if not fnmatch.filter(self._disable_for, url_path):
             try:
-                _request_sign_check(conn, AsyncNextcloudApp())
+                scope["username"] = _request_sign_check(conn, AsyncNextcloudApp())
             except HTTPException as exc:
                 response = self._on_error(exc.status_code, exc.detail)
                 await response(scope, receive, send)

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/nc_py_api/ex_app/misc.py

@@ -50,3 +50,8 @@ def get_model_path(model_name: str) -> str:
     from huggingface_hub import snapshot_download  # noqa isort:skip pylint: disable=C0415 disable=E0401
 
     return snapshot_download(model_name, local_files_only=True, cache_dir=persistent_storage())
+
+
+def get_computation_device() -> str:
+    """Returns computation device(`ROCM` or `CUDA`) if it is defined in the environment variable."""
+    return os.environ.get("COMPUTE_DEVICE", "")

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/nc_py_api/ex_app/ui/files_actions.py

@@ -1,15 +1,10 @@
 """Nextcloud API for working with drop-down file's menu."""
 
 import dataclasses
-import datetime
-import os
-
-from pydantic import BaseModel
 
 from ..._exceptions import NextcloudExceptionNotFound
 from ..._misc import require_capabilities
 from ..._session import AsyncNcSessionApp, NcSessionApp
-from ...files import FsNode, permissions_to_str
 
 
 @dataclasses.dataclass
@@ -63,61 +58,6 @@ class UiFileActionEntry:
         return f"<{self.__class__.__name__} name={self.name}, mime={self.mime}, handler={self.action_handler}>"
 
 
-class UiActionFileInfo(BaseModel):
-    """File Information Nextcloud sends to the External Application."""
-
-    fileId: int
-    """FileID without Nextcloud instance ID"""
-    name: str
-    """Name of the file/directory"""
-    directory: str
-    """Directory relative to the user's home directory"""
-    etag: str
-    mime: str
-    fileType: str
-    """**file** or **dir**"""
-    size: int
-    """size of file/directory"""
-    favorite: str
-    """**true** or **false**"""
-    permissions: int
-    """Combination of :py:class:`~nc_py_api.files.FilePermissions` values"""
-    mtime: int
-    """Last modified time"""
-    userId: str
-    """The ID of the user performing the action."""
-    shareOwner: str | None
-    """If the object is shared, this is a display name of the share owner."""
-    shareOwnerId: str | None
-    """If the object is shared, this is the owner ID of the share."""
-    instanceId: str | None
-    """Nextcloud instance ID."""
-
-    def to_fs_node(self) -> FsNode:
-        """Returns usual :py:class:`~nc_py_api.files.FsNode` created from this class."""
-        user_path = os.path.join(self.directory, self.name).rstrip("/")
-        is_dir = bool(self.fileType.lower() == "dir")
-        if is_dir:
-            user_path += "/"
-        full_path = os.path.join(f"files/{self.userId}", user_path.lstrip("/"))
-        file_id = str(self.fileId).rjust(8, "0")
-
-        permissions = "S" if self.shareOwnerId else ""
-        permissions += permissions_to_str(self.permissions, is_dir)
-        return FsNode(
-            full_path,
-            etag=self.etag,
-            size=self.size,
-            content_length=0 if is_dir else self.size,
-            permissions=permissions,
-            favorite=bool(self.favorite.lower() == "true"),
-            file_id=file_id + self.instanceId if self.instanceId else file_id,
-            fileid=self.fileId,
-            last_modified=datetime.datetime.utcfromtimestamp(self.mtime).replace(tzinfo=datetime.timezone.utc),
-            mimetype=self.mime,
-        )
-
-
 class _UiFilesActionsAPI:
     """API for the drop-down menu in Nextcloud **Files app**, avalaible as **nc.ui.files_dropdown_menu.<method>**."""
 

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/nc_py_api/files/__init__.py

@@ -4,8 +4,11 @@ import dataclasses
 import datetime
 import email.utils
 import enum
+import os
 import warnings
 
+from pydantic import BaseModel
+
 from .. import _misc
 
 
@@ -461,3 +464,58 @@ class Share:
             f"{self.share_type.name}: `{self.path}` with id={self.share_id}"
             f" from {self.share_owner} to {self.share_with}"
         )
+
+
+class ActionFileInfo(BaseModel):
+    """Information Nextcloud sends to the External Application about File Nodes affected in action."""
+
+    fileId: int
+    """FileID without Nextcloud instance ID"""
+    name: str
+    """Name of the file/directory"""
+    directory: str
+    """Directory relative to the user's home directory"""
+    etag: str
+    mime: str
+    fileType: str
+    """**file** or **dir**"""
+    size: int
+    """size of file/directory"""
+    favorite: str
+    """**true** or **false**"""
+    permissions: int
+    """Combination of :py:class:`~nc_py_api.files.FilePermissions` values"""
+    mtime: int
+    """Last modified time"""
+    userId: str
+    """The ID of the user performing the action."""
+    shareOwner: str | None = None
+    """If the object is shared, this is a display name of the share owner."""
+    shareOwnerId: str | None = None
+    """If the object is shared, this is the owner ID of the share."""
+    instanceId: str | None = None
+    """Nextcloud instance ID."""
+
+    def to_fs_node(self) -> FsNode:
+        """Returns usual :py:class:`~nc_py_api.files.FsNode` created from this class."""
+        user_path = os.path.join(self.directory, self.name).rstrip("/")
+        is_dir = bool(self.fileType.lower() == "dir")
+        if is_dir:
+            user_path += "/"
+        full_path = os.path.join(f"files/{self.userId}", user_path.lstrip("/"))
+        file_id = str(self.fileId).rjust(8, "0")
+
+        permissions = "S" if self.shareOwnerId else ""
+        permissions += permissions_to_str(self.permissions, is_dir)
+        return FsNode(
+            full_path,
+            etag=self.etag,
+            size=self.size,
+            content_length=0 if is_dir else self.size,
+            permissions=permissions,
+            favorite=bool(self.favorite.lower() == "true"),
+            file_id=file_id + self.instanceId if self.instanceId else file_id,
+            fileid=self.fileId,
+            last_modified=datetime.datetime.utcfromtimestamp(self.mtime).replace(tzinfo=datetime.timezone.utc),
+            mimetype=self.mime,
+        )

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/nc_py_api/files/files.py

@@ -333,7 +333,7 @@ class FilesAPI:
         headers = Headers({"Destination": dest}, encoding="utf-8")
         response = self._session.adapter_dav.request(
             "MOVE",
-            f"/versions/{self._session.user}/{file_object.user_path}",
+            quote(f"/versions/{self._session.user}/{file_object.user_path}"),
             headers=headers,
         )
         check_error(response, f"restore_version: user={self._session.user}, src={file_object.user_path}")
@@ -813,7 +813,7 @@ class AsyncFilesAPI:
         headers = Headers({"Destination": dest}, encoding="utf-8")
         response = await self._session.adapter_dav.request(
             "MOVE",
-            f"/versions/{await self._session.user}/{file_object.user_path}",
+            quote(f"/versions/{await self._session.user}/{file_object.user_path}"),
             headers=headers,
         )
         check_error(response, f"restore_version: user={await self._session.user}, src={file_object.user_path}")

{nc_py_api-0.11.0 → nc_py_api-0.12.0}/pyproject.toml

@@ -118,7 +118,7 @@ lint.extend-ignore = ["D107", "D105", "D203", "D213", "D401", "I001", "RUF100"]
 "nc_py_api/ex_app/__init__.py" = ["F401"]
 
 [tool.ruff.lint.extend-per-file-ignores]
-"benchmarks/**/*.py" = ["D", "SIM"]
+"benchmarks/**/*.py" = ["D", "SIM", "S311"]
 "docs/**/*.py" = ["D"]
 "examples/**/*.py" = ["D", "S106", "S311"]
 "tests/**/*.py" = ["D", "E402", "S", "UP"]

nc_py_api-0.11.0/nc_py_api/ex_app/__init__.py

@@ -1,15 +0,0 @@
-"""All possible ExApp stuff for NextcloudApp that can be used."""
-
-from .defs import ApiScope, LogLvl
-from .integration_fastapi import (
-    AppAPIAuthMiddleware,
-    anc_app,
-    atalk_bot_msg,
-    nc_app,
-    set_handlers,
-    talk_bot_msg,
-)
-from .misc import get_model_path, persistent_storage, verify_version
-from .ui.files_actions import UiActionFileInfo
-from .ui.settings import SettingsField, SettingsFieldType, SettingsForm
-from .uvicorn_fastapi import run_app

nc_py_api-0.11.0/nc_py_api/ex_app/defs.py

@@ -1,49 +0,0 @@
-"""Additional definitions for NextcloudApp."""
-
-import enum
-
-
-class LogLvl(enum.IntEnum):
-    """Log levels."""
-
-    DEBUG = 0
-    """Debug log level"""
-    INFO = 1
-    """Informational log level"""
-    WARNING = 2
-    """Warning log level. ``Default``"""
-    ERROR = 3
-    """Error log level"""
-    FATAL = 4
-    """Fatal log level"""
-
-
-class ApiScope(enum.IntEnum):
-    """Defined API scopes."""
-
-    SYSTEM = 2
-    """Allows access to the System APIs."""
-    FILES = 10
-    """Allows access to the Nextcloud file base."""
-    FILES_SHARING = 11
-    """Allows access to APIs that provide File Sharing."""
-    USER_INFO = 30
-    """Allows access to APIs that work with users."""
-    USER_STATUS = 31
-    """Allows access to APIs that work with users statuses."""
-    NOTIFICATIONS = 32
-    """Allows access to APIs that provide Notifications."""
-    WEATHER_STATUS = 33
-    """Allows access to APIs that provide Weather status."""
-    TALK = 50
-    """Allows access to Talk API endpoints."""
-    TALK_BOT = 60
-    """Allows to register Talk Bots."""
-    AI_PROVIDERS = 61
-    """Allows to register AI providers."""
-    ACTIVITIES = 110
-    """Activity App endpoints."""
-    NOTES = 120
-    """Notes App endpoints."""
-    ALL = 9999
-    """All endpoints allowed."""