Merge remote-tracking branch 'origin/pre-commit-ci-update-config' into pre-commit-ci-update-config

# Conflicts:
#	.pre-commit-config.yaml

Author: bigcat88

.pre-commit-config.yaml

@@ -41,7 +41,7 @@ repos:
     -   id: pyproject-fmt
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.9.3
     hooks:
     -   id: ruff
 

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.18.2 - 2025-01-19]
+
+### Changed
+
+- Default "User-Agent" for ExApps now set to `ExApp/appid/version (httpx/version)`. #329
+- `System Trust Store` from now are used by default. #328
+
+## [0.18.1 - 2025-01-14]
+
+### Fixed
+
+- Chunked Upload V2 not working on Nextcloud 30 and later. #324 Thanks to @DrZoidberg09
+
 ## [0.18.0 - 2024-10-09]
 
 ### Added

nc_py_api/_session.py

@@ -12,6 +12,7 @@
 from os import environ
 
 from httpx import AsyncClient, Client, Headers, Limits, ReadTimeout, Request, Response
+from httpx import __version__ as httpx_version
 from starlette.requests import HTTPConnection
 
 from . import options
@@ -511,6 +512,7 @@ def _create_adapter(self, dav: bool = False) -> AsyncClient | Client:
                 "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})",
             },
         )
 
@@ -535,6 +537,7 @@ def _create_adapter(self, dav: bool = False) -> AsyncClient | Client:
                 "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})",
             },
         )
 

nc_py_api/_version.py

@@ -1,3 +1,3 @@
 """Version of nc_py_api."""
 
-__version__ = "0.18.0"
+__version__ = "0.18.2"

nc_py_api/files/files.py

@@ -485,7 +485,8 @@ def __upload_stream(self, path: str, fp, chunk_size: int) -> FsNode:
             response = self._session.adapter_dav.request("MKCOL", _dav_path)
         check_error(response)
         try:
-            start_bytes = end_bytes = chunk_number = 0
+            start_bytes = end_bytes = 0
+            chunk_number = 1
             while True:
                 piece = fp.read(chunk_size)
                 if not piece:

nc_py_api/options.py

@@ -33,11 +33,22 @@
 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")
-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
 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).

pyproject.toml

@@ -49,6 +49,7 @@ dependencies = [
   "httpx>=0.25.2",
   "pydantic>=2.1.1",
   "python-dotenv>=1",
+  "truststore==0.10",
   "xmltodict>=0.13",
 ]
 optional-dependencies.app = [

tests/actual_tests/files_test.py

@@ -1159,6 +1159,7 @@ async def test_create_update_delete_tag_async(anc_any):
 
 
 def test_get_assign_unassign_tag(nc_any):
+
     with contextlib.suppress(NextcloudExceptionNotFound):
         nc_any.files.delete_tag(nc_any.files.tag_by_name("test_nc_py_api"))
     with contextlib.suppress(NextcloudExceptionNotFound):
@@ -1174,6 +1175,10 @@ def test_get_assign_unassign_tag(nc_any):
     new_file = nc_any.files.upload("/test_dir_tmp/tag_test.txt", content=b"")
     new_file = nc_any.files.by_id(new_file)
     assert nc_any.files.get_tags(new_file) == []
+
+    if nc_any.srv_version["major"] > 30:
+        pytest.skip("Skip temporary on master branch")
+
     assert len(nc_any.files.list_by_criteria(tags=[tag1])) == 0
     nc_any.files.assign_tag(new_file, tag1)
     assert isinstance(nc_any.files.get_tags(new_file)[0], SystemTag)
@@ -1206,6 +1211,10 @@ async def test_get_assign_unassign_tag_async(anc_any):
     new_file = await anc_any.files.upload("/test_dir_tmp/tag_test.txt", content=b"")
     new_file = await anc_any.files.by_id(new_file)
     assert await anc_any.files.get_tags(new_file) == []
+
+    if (await anc_any.srv_version)["major"] > 30:
+        pytest.skip("Skip temporary on master branch")
+
     assert len(await anc_any.files.list_by_criteria(tags=[tag1])) == 0
     await anc_any.files.assign_tag(new_file, tag1)
     assert isinstance((await anc_any.files.get_tags(new_file))[0], SystemTag)