nc-py-api 0.19.0__py3-none-any.whl → 0.19.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- nc_py_api/_session.py +6 -0
- nc_py_api/_version.py +1 -1
- nc_py_api/ex_app/uvicorn_fastapi.py +15 -1
- nc_py_api/nextcloud.py +8 -2
- {nc_py_api-0.19.0.dist-info → nc_py_api-0.19.2.dist-info}/METADATA +1 -1
- {nc_py_api-0.19.0.dist-info → nc_py_api-0.19.2.dist-info}/RECORD +9 -9
- {nc_py_api-0.19.0.dist-info → nc_py_api-0.19.2.dist-info}/WHEEL +0 -0
- {nc_py_api-0.19.0.dist-info → nc_py_api-0.19.2.dist-info}/licenses/AUTHORS +0 -0
- {nc_py_api-0.19.0.dist-info → nc_py_api-0.19.2.dist-info}/licenses/LICENSE.txt +0 -0
nc_py_api/_session.py
CHANGED
|
@@ -197,6 +197,7 @@ class NcSessionBasic(NcSessionBase, ABC):
|
|
|
197
197
|
*,
|
|
198
198
|
content: bytes | str | typing.Iterable[bytes] | typing.AsyncIterable[bytes] | None = None,
|
|
199
199
|
json: dict | list | None = None,
|
|
200
|
+
response_type: str | None = None,
|
|
200
201
|
params: dict | None = None,
|
|
201
202
|
files: dict | None = None,
|
|
202
203
|
**kwargs,
|
|
@@ -215,6 +216,8 @@ class NcSessionBasic(NcSessionBase, ABC):
|
|
|
215
216
|
if response.status_code == 204: # NO_CONTENT
|
|
216
217
|
return []
|
|
217
218
|
response_data = loads(response.text)
|
|
219
|
+
if response_type == "json":
|
|
220
|
+
return response_data
|
|
218
221
|
ocs_meta = response_data["ocs"]["meta"]
|
|
219
222
|
if ocs_meta["status"] != "ok":
|
|
220
223
|
if (
|
|
@@ -319,6 +322,7 @@ class AsyncNcSessionBasic(NcSessionBase, ABC):
|
|
|
319
322
|
*,
|
|
320
323
|
content: bytes | str | typing.Iterable[bytes] | typing.AsyncIterable[bytes] | None = None,
|
|
321
324
|
json: dict | list | None = None,
|
|
325
|
+
response_type: str | None = None,
|
|
322
326
|
params: dict | None = None,
|
|
323
327
|
files: dict | None = None,
|
|
324
328
|
**kwargs,
|
|
@@ -337,6 +341,8 @@ class AsyncNcSessionBasic(NcSessionBase, ABC):
|
|
|
337
341
|
if response.status_code == 204: # NO_CONTENT
|
|
338
342
|
return []
|
|
339
343
|
response_data = loads(response.text)
|
|
344
|
+
if response_type == "json":
|
|
345
|
+
return response_data
|
|
340
346
|
ocs_meta = response_data["ocs"]["meta"]
|
|
341
347
|
if ocs_meta["status"] != "ok":
|
|
342
348
|
if (
|
nc_py_api/_version.py
CHANGED
|
@@ -22,4 +22,18 @@ def run_app(
|
|
|
22
22
|
:param args: Any args to pass to **uvicorn.run**.
|
|
23
23
|
:param kwargs: Any **kwargs** to pass to **uvicorn.run**, except ``host`` and ``port``.
|
|
24
24
|
"""
|
|
25
|
-
|
|
25
|
+
if environ.get("HP_SHARED_KEY"):
|
|
26
|
+
uvicorn.run(
|
|
27
|
+
uvicorn_app,
|
|
28
|
+
*args,
|
|
29
|
+
uds=environ.get("HP_EXAPP_SOCK", "/tmp/exapp.sock"),
|
|
30
|
+
**kwargs,
|
|
31
|
+
)
|
|
32
|
+
else:
|
|
33
|
+
uvicorn.run(
|
|
34
|
+
uvicorn_app,
|
|
35
|
+
*args,
|
|
36
|
+
host=environ.get("APP_HOST", "127.0.0.1"),
|
|
37
|
+
port=int(environ["APP_PORT"]),
|
|
38
|
+
**kwargs,
|
|
39
|
+
)
|
nc_py_api/nextcloud.py
CHANGED
|
@@ -137,11 +137,14 @@ class _NextcloudBasic(ABC): # pylint: disable=too-many-instance-attributes
|
|
|
137
137
|
*,
|
|
138
138
|
content: bytes | str | typing.Iterable[bytes] | typing.AsyncIterable[bytes] | None = None,
|
|
139
139
|
json: dict | list | None = None,
|
|
140
|
+
response_type: str | None = None,
|
|
140
141
|
params: dict | None = None,
|
|
141
142
|
**kwargs,
|
|
142
143
|
):
|
|
143
144
|
"""Performs OCS call and returns OCS response payload data."""
|
|
144
|
-
return self._session.ocs(
|
|
145
|
+
return self._session.ocs(
|
|
146
|
+
method, path, content=content, json=json, response_type=response_type, params=params, **kwargs
|
|
147
|
+
)
|
|
145
148
|
|
|
146
149
|
def download_log(self, fp) -> None:
|
|
147
150
|
"""Downloads Nextcloud log file. Requires Admin privileges."""
|
|
@@ -238,11 +241,14 @@ class _AsyncNextcloudBasic(ABC): # pylint: disable=too-many-instance-attributes
|
|
|
238
241
|
*,
|
|
239
242
|
content: bytes | str | typing.Iterable[bytes] | typing.AsyncIterable[bytes] | None = None,
|
|
240
243
|
json: dict | list | None = None,
|
|
244
|
+
response_type: str | None = None,
|
|
241
245
|
params: dict | None = None,
|
|
242
246
|
**kwargs,
|
|
243
247
|
):
|
|
244
248
|
"""Performs OCS call and returns OCS response payload data."""
|
|
245
|
-
return await self._session.ocs(
|
|
249
|
+
return await self._session.ocs(
|
|
250
|
+
method, path, content=content, json=json, response_type=response_type, params=params, **kwargs
|
|
251
|
+
)
|
|
246
252
|
|
|
247
253
|
async def download_log(self, fp) -> None:
|
|
248
254
|
"""Downloads Nextcloud log file. Requires Admin privileges."""
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: nc-py-api
|
|
3
|
-
Version: 0.19.
|
|
3
|
+
Version: 0.19.2
|
|
4
4
|
Summary: Nextcloud Python Framework
|
|
5
5
|
Project-URL: Changelog, https://github.com/cloud-py-api/nc_py_api/blob/main/CHANGELOG.md
|
|
6
6
|
Project-URL: Documentation, https://cloud-py-api.github.io/nc_py_api/
|
|
@@ -4,15 +4,15 @@ nc_py_api/_exceptions.py,sha256=7vbUECaLmD7RJBCU27t4fuP6NmQK6r4508u_gS4szhI,2298
|
|
|
4
4
|
nc_py_api/_misc.py,sha256=dUzCP9VmyhtICTsn1aexlFAYUioBm40k6Zh-YE5WwCY,3333
|
|
5
5
|
nc_py_api/_preferences.py,sha256=OtovFZuGHnHYKjdDjSnUappO795tW8Oxj7qVaejHWpQ,2479
|
|
6
6
|
nc_py_api/_preferences_ex.py,sha256=tThj6U0ZZMaBZ-jUkjrbaI0xDnafWsBowQKsC6gjOQs,7179
|
|
7
|
-
nc_py_api/_session.py,sha256=
|
|
7
|
+
nc_py_api/_session.py,sha256=jqvZ-HJOV7f1PJr1tWPGcYGLKqhxLhfr0zMzNYtSGnU,20660
|
|
8
8
|
nc_py_api/_talk_api.py,sha256=0Uo7OduYniuuX3UQPb468RyGJJ-PWBCgJ5HoPuz5Qa0,51068
|
|
9
9
|
nc_py_api/_theming.py,sha256=hTr3nuOemSuRFZaPy9iXNmBM7rDgQHECH43tHMWGqEY,1870
|
|
10
|
-
nc_py_api/_version.py,sha256=
|
|
10
|
+
nc_py_api/_version.py,sha256=IfQ3_oR_eCaAPVpP4i7ZXXZ5f_ghVyuoae34M2rFTW8,52
|
|
11
11
|
nc_py_api/activity.py,sha256=t9VDSnnaXRNOvALqOSGCeXSQZ-426pCOMSfQ96JHys4,9574
|
|
12
12
|
nc_py_api/apps.py,sha256=Us2y2lszdxXlD8t6kxwd5_Nrrmazc0EvZXIH9O-ol80,9315
|
|
13
13
|
nc_py_api/calendar_api.py,sha256=-T6CJ8cRbJZTLtxSEDWuuYpD29DMJGCTfLONmtxZV9w,1445
|
|
14
14
|
nc_py_api/loginflow_v2.py,sha256=UjkK3gMouzNrIS7BFhjbmB_9m4fP2UY5sfpmvJ2EXWk,5760
|
|
15
|
-
nc_py_api/nextcloud.py,sha256=
|
|
15
|
+
nc_py_api/nextcloud.py,sha256=4Z_2wKkvyNxbrFkEUi-EABzxG31jW4YsszwT9Xdz0hI,23195
|
|
16
16
|
nc_py_api/notes.py,sha256=ljO3TOe-Qg0bJ0mlFQwjg--Pxmj-XFknoLbcbJmII0A,15106
|
|
17
17
|
nc_py_api/notifications.py,sha256=WgzV21TuLOhLk-UEjhBSbMsIi2isa5MmAx6cbe0pc2Y,9187
|
|
18
18
|
nc_py_api/options.py,sha256=ZKJqVLhWVwJ6YxAKzGWlPXJhd1vg9GluyFzr-jX4Jp0,2038
|
|
@@ -31,7 +31,7 @@ nc_py_api/ex_app/logger.py,sha256=nAHLObuPvl3UBLrlqZulgoxxVaAJ661iP4F6bTW-V-Y,14
|
|
|
31
31
|
nc_py_api/ex_app/misc.py,sha256=c7B0uE8isaIi4SQbxURGUuWjZaaXiLg3Ov6cqvRYplE,2298
|
|
32
32
|
nc_py_api/ex_app/occ_commands.py,sha256=hb2BJuvFKIigvLycSCyAe9v6hedq4Gfu2junQZTaK_M,5219
|
|
33
33
|
nc_py_api/ex_app/persist_transformers_cache.py,sha256=ZoEBb1RnNaQrtxK_CjSZ8LZ36Oakz2Xciau_ZpNp8Ic,213
|
|
34
|
-
nc_py_api/ex_app/uvicorn_fastapi.py,sha256=
|
|
34
|
+
nc_py_api/ex_app/uvicorn_fastapi.py,sha256=elTpRa5oVfHuXvDZ57tDfHb2700PfHagfectfIMo1Xs,1036
|
|
35
35
|
nc_py_api/ex_app/providers/__init__.py,sha256=jmUBdbAgzUCdYyHl8V5UCNYJI-FFpxPQQ4iEAoURKQs,43
|
|
36
36
|
nc_py_api/ex_app/providers/providers.py,sha256=uGo02dXpxlMOtBpPr_gH4ZPt7foQx_MB5iTlJHEllNA,786
|
|
37
37
|
nc_py_api/ex_app/providers/task_processing.py,sha256=h-H3fGK30c9M-VUpk7I9WGc730t9OCoSZ6vf7lB7xdA,9874
|
|
@@ -46,8 +46,8 @@ nc_py_api/files/_files.py,sha256=l1oGcXIKmuhlNthXkwL8qbINQgiMJ9wmFega9IP-wNk,138
|
|
|
46
46
|
nc_py_api/files/files.py,sha256=7x4hfnVa2y1R5bxK9f8cdggi1gPnpUYnsBj0e4p-4qc,24926
|
|
47
47
|
nc_py_api/files/files_async.py,sha256=nyDeWiGx_8CHuVrNThSgfZy0l-WlC4El-TzJONo0TsM,25773
|
|
48
48
|
nc_py_api/files/sharing.py,sha256=VRZCl-TYK6dbu9rUHPs3_jcVozu1EO8bLGZwoRpiLsU,14439
|
|
49
|
-
nc_py_api-0.19.
|
|
50
|
-
nc_py_api-0.19.
|
|
51
|
-
nc_py_api-0.19.
|
|
52
|
-
nc_py_api-0.19.
|
|
53
|
-
nc_py_api-0.19.
|
|
49
|
+
nc_py_api-0.19.2.dist-info/METADATA,sha256=Kh7LhFby1VbKb5JouSSHVJfw9LL4PZDyV6z42k01hic,8055
|
|
50
|
+
nc_py_api-0.19.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
|
51
|
+
nc_py_api-0.19.2.dist-info/licenses/AUTHORS,sha256=B2Q9q9XH3PAxJp0V3GiKQc1l0z7vtGDpDHqda-ISWKM,616
|
|
52
|
+
nc_py_api-0.19.2.dist-info/licenses/LICENSE.txt,sha256=OLEMh401fAumGHfRSna365MLIfnjdTcdOHZ6QOzMjkg,1551
|
|
53
|
+
nc_py_api-0.19.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|