pyvikunja 0.16__py3-none-any.whl → 0.18__py3-none-any.whl

pyvikunja/api.py

@@ -1,4 +1,5 @@
 import logging
+from functools import cached_property
 from typing import List, Dict, Any, Optional
 from urllib.parse import urlparse, urlunparse
 
@@ -29,7 +30,11 @@ class VikunjaAPI:
         self.api_base_url = self._normalize_api_base_url(self.host)
         self.headers = {"Authorization": f"Bearer {token}"}
         self.strict_ssl = strict_ssl
-        self.client = httpx.AsyncClient(verify=strict_ssl)
+
+    @cached_property
+    def client(self) -> httpx.AsyncClient:
+        """Lazily instantiate the HTTP client when first accessed."""
+        return httpx.AsyncClient(verify=self.strict_ssl)
 
     @property
     def web_ui_link(self):
@@ -59,14 +64,18 @@ class VikunjaAPI:
             return f"{host}/api/v1"
         return host
 
-
     async def _request(self, method: str, endpoint: str, params: Optional[Dict] = None, data: Optional[Dict] = None) -> \
-    Optional[Any]:
+    Optional[Dict[str, Any]]:
         url = f"{self.api_base_url}{endpoint}"
         try:
             response = await self.client.request(method, url, headers=self.headers, params=params, json=data)
             response.raise_for_status()
-            return response.json()
+
+            # Return JSON data and headers
+            return {
+                "data": response.json(),
+                "headers": response.headers
+            }
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error occurred: {e.response.status_code} | {e.response.text} | URL: {url}")
         except httpx.RequestError as e:
@@ -91,76 +100,105 @@ class VikunjaAPI:
         except httpx.HTTPError as e:
             raise e
 
+    async def get_paginated_data(self, endpoint: str) -> List[Dict[str, Any]]:
+        all_data = []
+        page = 1
+        per_page = 20
+
+        while True:
+            response = await self._request("GET", endpoint, params={"page": page, "per_page": per_page})
+            if not response:
+                break
+
+            all_data.extend(response["data"])
+            total_pages = int(response["headers"].get("x-pagination-total-pages", 1))
+            if page >= total_pages:
+                break
+
+            page += 1
+
+        return all_data
+
     # Projects
-    async def get_projects(self, page: int = 1, per_page: int = 20) -> List[Project]:
-        response = await self._request("GET", "/projects", params={"page": page, "per_page": per_page})
-        return [Project(self, project_data) for project_data in response or []]
+    async def get_projects(self) -> List[Project]:
+        data = await self.get_paginated_data("/projects")
+        return [Project(self, project) for project in data]
 
     async def get_project(self, project_id: int) -> Optional[Project]:
         response = await self._request("GET", f"/projects/{project_id}")
-        return Project(self, response)
+        return Project(self, response['data'])
 
     async def create_project(self, project: Dict) -> Optional[Dict]:
-        return await self._request("PUT", "/projects", data=project)
+        result = await self._request("PUT", "/projects", data=project)
+        return result['data']
 
     async def update_project(self, project_id: int, project: Dict) -> Optional[Dict]:
-        return await self._request("POST", f"/projects/{project_id}", data=project)
+        result = await self._request("POST", f"/projects/{project_id}", data=project)
+        return result['data']
 
     async def delete_project(self, project_id: int) -> Optional[Dict]:
-        return await self._request("DELETE", f"/projects/{project_id}")
+        result = await self._request("DELETE", f"/projects/{project_id}")
+        return result['data']
 
     # Tasks
-    async def get_tasks(self, project_id: int, page: int = 1, per_page: int = 20) -> List[Task]:
-        response = await self._request("GET", f"/projects/{project_id}/tasks",
-                                       params={"page": page, "per_page": per_page})
+    async def get_tasks(self, project_id: int) -> List[Task]:
+        response = await self.get_paginated_data(f"/projects/{project_id}/tasks")
         return [Task(self, task_data) for task_data in response or []]
 
     async def get_task(self, task_id: int) -> Task:
         data = await self._request("GET", f"/tasks/{task_id}")
-        return Task(self, data)
+        return Task(self, data['data'])
 
     async def create_task(self, project_id: int, task: Dict) -> Optional[Dict]:
-        return await self._request("PUT", f"/projects/{project_id}/tasks", data=task)
+        result = await self._request("PUT", f"/projects/{project_id}/tasks", data=task)
+        return result['data']
 
     async def update_task(self, task_id: int, task: Dict) -> Optional[Dict]:
-        return await self._request("POST", f"/tasks/{task_id}", data=task)
+        result = await self._request("POST", f"/tasks/{task_id}", data=task)
+        return result['data']
 
     async def delete_task(self, task_id: int) -> Optional[Dict]:
-        return await self._request("DELETE", f"/tasks/{task_id}")
+        result = await self._request("DELETE", f"/tasks/{task_id}")
+        return result['data']
 
     # Labels
-    async def get_labels(self, page: int = 1, per_page: int = 20) -> List[Label]:
-        response = await self._request("GET", "/labels", params={"page": page, "per_page": per_page})
+    async def get_labels(self) -> List[Label]:
+        response = await self.get_paginated_data("/labels")
         return [Label(label_data) for label_data in response or []]
 
     async def get_label(self, label_id: int) -> Optional[Dict]:
-        return await self._request("GET", f"/labels/{label_id}")
+        result = await self._request("GET", f"/labels/{label_id}")
+        return result['data']
 
     async def create_label(self, label: Dict) -> Optional[Dict]:
-        return await self._request("PUT", "/labels", data=label)
+        result = await self._request("PUT", "/labels", data=label)
+        return result['data']
 
     async def update_label(self, label_id: int, label: Dict) -> Optional[Dict]:
-        return await self._request("PUT", f"/labels/{label_id}", data=label)
+        result = await self._request("PUT", f"/labels/{label_id}", data=label)
+        return result['data']
 
     async def delete_label(self, label_id: int) -> Optional[Dict]:
-        return await self._request("DELETE", f"/labels/{label_id}")
+        result = await self._request("DELETE", f"/labels/{label_id}")
+        return result['data']
 
     # Teams
-    async def get_teams(self, page: int = 1, per_page: int = 20) -> List[Team]:
-        response = await self._request("GET", "/teams", params={"page": page, "per_page": per_page})
+    async def get_teams(self) -> List[Team]:
+        response = await self.get_paginated_data("/teams")
         return [Team(self, team_data) for team_data in response or []]
 
     async def get_team(self, team_id: int) -> Optional[Team]:
         response = await self._request("GET", f"/teams/{team_id}")
-        return Team(self, response)
+        return Team(self, response['data'])
 
     async def create_team(self, team: Dict) -> Optional[Team]:
         response = await self._request("PUT", "/teams", data=team)
-        return Team(self, response)
+        return Team(self, response['data'])
 
     async def update_team(self, team_id: int, team: Dict) -> Optional[Team]:
         response = await self._request("POST", f"/teams/{team_id}", data=team)
-        return Team(self, response)
+        return Team(self, response['data'])
 
     async def delete_team(self, team_id: int) -> Optional[Team]:
-        return await self._request("DELETE", f"/teams/{team_id}")
+        result = await self._request("DELETE", f"/teams/{team_id}")
+        return result['data']

pyvikunja/models/project.py

@@ -15,8 +15,8 @@ class Project(BaseModel):
         self.hex_color: Optional[str] = data.get('hex_color')
         self.owner: 'User' = User(data.get('owner') or {})
 
-    async def get_tasks(self, page: int = 1, per_page: int = 20) -> List['Task']:
-        return await self.api.get_tasks(self.id, page, per_page)
+    async def get_tasks(self) -> List['Task']:
+        return await self.api.get_tasks(self.id)
 
     async def create_task(self, task: Dict) -> 'Task':
         from pyvikunja.models.task import Task

{pyvikunja-0.16.dist-info → pyvikunja-0.18.dist-info}/METADATA

@@ -1,8 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pyvikunja
-Version: 0.16
+Version: 0.18
 Summary: A Python wrapper for Vikunja API
 Author: Joseph Shufflebotham
 License: AGPL
 License-File: LICENSE
 Requires-Dist: httpx==0.28.1
+Dynamic: license-file

{pyvikunja-0.16.dist-info → pyvikunja-0.18.dist-info}/RECORD

@@ -1,15 +1,15 @@
 pyvikunja/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyvikunja/api.py,sha256=P5yQBHmnWaM2OORwkk0Q-1K2eLIqFzwdtnjiEK8BD6o,6999
+pyvikunja/api.py,sha256=30sosl6wNWT6nTa7swLFSv9q9G9AlQ6Rq_FGDH7mLBs,7887
 pyvikunja/models/label.py,sha256=cOOuVYDVDMmK96Ev22EDgWwXljkAonQNL4XsTMay4K4,467
 pyvikunja/models/models.py,sha256=VmnBKs_DhcF1CNE3b2MhH4harwZo1697cMhTXetLGWk,822
-pyvikunja/models/project.py,sha256=viVIe3lVgbh7k05ADDds1cwzvC1vf4tT2vSNjbB7KMk,1179
+pyvikunja/models/project.py,sha256=wFtnyuLTteDUQrUWeImR7DXTI0XYhCSiQGlmwaIzdwM,1128
 pyvikunja/models/task.py,sha256=8KUoN0SuTRkJq_cHdsuIeQHUiNgOiWCLcWFVN9NJH5c,7806
 pyvikunja/models/team.py,sha256=0Z3828Cm3nNuNr1z2on63fLYAVW325_SQKi5RmqXf-I,559
 pyvikunja/models/user.py,sha256=36duFNyGXKzlwqO0d6FA-C1KTCci2sIMU1IBIF-N_LM,310
 pyvikunja/models/enum/repeat_mode.py,sha256=xkDPfYeRz342ovqro1UVBAoegpPgpZQYTnyo2sf6R7I,112
 pyvikunja/models/enum/task_priority.py,sha256=aVz1HEofIqwUkXG0vYm58n_vLNbgqtbvHuQ5K-YQqA0,119
-pyvikunja-0.16.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-pyvikunja-0.16.dist-info/METADATA,sha256=3euyTCR3vuG3-bv1QDux2x68eGDiZKyYkb90I1HeNnI,188
-pyvikunja-0.16.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-pyvikunja-0.16.dist-info/top_level.txt,sha256=WVV9zgxUBuWOkUY1t_U7zI0paWWTVelKYB4vjsiKsks,10
-pyvikunja-0.16.dist-info/RECORD,,
+pyvikunja-0.18.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+pyvikunja-0.18.dist-info/METADATA,sha256=SvUsJ9e0YkFFDAcrVBM37n9ivnciqJdOjTQo5mtWy3s,210
+pyvikunja-0.18.dist-info/WHEEL,sha256=L0N565qmK-3nM2eBoMNFszYJ_MTx03_tQ0CQu1bHLYo,91
+pyvikunja-0.18.dist-info/top_level.txt,sha256=WVV9zgxUBuWOkUY1t_U7zI0paWWTVelKYB4vjsiKsks,10
+pyvikunja-0.18.dist-info/RECORD,,

{pyvikunja-0.16.dist-info → pyvikunja-0.18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any