eetlijst-python 0.0.7__tar.gz → 0.0.9__tar.gz

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eetlijst-python
-Version: 0.0.7
+Version: 0.0.9
 Summary: Python rewrite of the Eetlijst GraphQL client
 Requires-Python: <3.15,>=3.14
 Description-Content-Type: text/markdown
@@ -76,3 +76,9 @@ Build the package:
 ```
 python -m build
 ```
+
+Publish from local:
+
+```
+python -m twine upload dist/*
+```

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/README.md

@@ -61,3 +61,9 @@ Build the package:
 ```
 python -m build
 ```
+
+Publish from local:
+
+```
+python -m twine upload dist/*
+```

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "eetlijst-python"
-version = "0.0.7"
+version = "0.0.9"
 description = "Python rewrite of the Eetlijst GraphQL client"
 readme = "README.md"
 requires-python = ">=3.14,<3.15"

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/eetlijst.py

@@ -31,13 +31,10 @@ class Eetlijst:
         ws_origin: Optional[str] = None,
         ws_connection_init_payload: Optional[dict[str, Any]] = None,
     ):
-        client_headers = dict(headers) if headers else {}
-        if api_key:
-            client_headers["Authorization"] = f"Bearer {api_key}"
-
+        self._api_key = api_key
         self._client = GraphQlClient(
             url=url or "https://api.eetlijst.nl/v1/graphql",
-            headers=client_headers,
+            headers=headers,
             http_client=http_client,
             ws_url=ws_url,
             ws_headers=ws_headers,
@@ -45,17 +42,17 @@ class Eetlijst:
             ws_connection_init_payload=ws_connection_init_payload,
         )
 
-        self.app = App(self._client)
+        self.app = App(self._client, self._api_key)
 
-        event_attendance = EventAttendance(self._client)
-        self.events = Events(self._client, event_attendance)
+        event_attendance = EventAttendance(self._client, self._api_key)
+        self.events = Events(self._client, self._api_key, event_attendance)
 
-        group_users = GroupUsers(self._client)
-        group_list = GroupList(self._client)
-        self.groups = Groups(self._client, group_users, group_list)
+        group_users = GroupUsers(self._client, self._api_key)
+        group_list = GroupList(self._client, self._api_key)
+        self.groups = Groups(self._client, self._api_key, group_users, group_list)
 
-        settlements = Settlements(self._client)
-        self.expenses = Expenses(self._client, settlements)
+        settlements = Settlements(self._client, self._api_key)
+        self.expenses = Expenses(self._client, self._api_key, settlements)
 
-        self.users = Users(self._client)
+        self.users = Users(self._client, self._api_key)
         self.me = Me(api_key, self.users)

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/app/app.py

@@ -1,18 +1,16 @@
 from dataclasses import dataclass
 
-from eetlijst_py.generated import GraphQlClient
-
 from eetlijst_py.exceptions import EetlijstException
 
 from eetlijst_py.services.app.transformers import transform_app_status
+from eetlijst_py.services.base import BaseService
 
 
 @dataclass
-class App:
-    _client: GraphQlClient
+class App(BaseService):
 
     async def status(self):
-        result = await self._client.app_status()
+        result = await self._client.app_status(headers=self._get_headers())
 
         if not result or not result.eetschema_app_status:
             raise EetlijstException("App status not found")

eetlijst_python-0.0.9/src/eetlijst_py/services/base.py

@@ -0,0 +1,20 @@
+from dataclasses import dataclass
+from typing import Optional
+
+from eetlijst_py.generated import GraphQlClient
+
+
+@dataclass
+class BaseService:
+    _client: GraphQlClient
+    _api_key: str
+
+    def _get_headers(
+        self, custom_headers: Optional[dict[str, str]] = None
+    ) -> dict[str, str]:
+        headers = {"Authorization": f"Bearer {self._api_key}"}
+
+        if custom_headers:
+            headers.update(custom_headers)
+
+        return headers

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/event_attendance/event_attendance.py

@@ -1,6 +1,5 @@
 from dataclasses import dataclass
 
-from eetlijst_py.generated import GraphQlClient
 from eetlijst_py.generated.base_model import UNSET, UnsetType
 from eetlijst_py.generated.enums import AttendanceStatus
 from eetlijst_py.generated.input_types import (
@@ -10,6 +9,8 @@ from eetlijst_py.generated.input_types import (
     eetschema_event_attendees_set_input,
 )
 
+from eetlijst_py.services.base import BaseService
+
 from .transformers import (
     transform_attendance,
     transform_update_attendance,
@@ -29,15 +30,19 @@ class EventAttendceUpdate(eetschema_event_attendees_set_input):
 
 
 @dataclass
-class EventAttendance:
-    _client: GraphQlClient
+class EventAttendance(BaseService):
 
     async def get(
         self,
         event_id: str,
         user_id: str,
     ):
-        result = await self._client.get_attendance(event_id, user_id)
+        result = await self._client.get_attendance(
+            event_id,
+            user_id,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_attendance(result.eetschema_event_attendees_by_pk)
 
     async def all(
@@ -46,7 +51,13 @@ class EventAttendance:
         order: list[eetschema_event_attendees_order_by] | UnsetType | None = UNSET,
         limit: int | UnsetType | None = UNSET,
     ):
-        result = await self._client.all_attendances(where, order, limit)
+        result = await self._client.all_attendances(
+            where,
+            order,
+            limit,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return [
             transform_attendance(attendee)
             for attendee in result.eetschema_event_attendees
@@ -56,11 +67,21 @@ class EventAttendance:
         return await self.update_many([data])
 
     async def update(self, data: EventAttendceUpdate):
-        result = await self._client.update_attendance(data.event_id, data.user_id, data)
+        result = await self._client.update_attendance(
+            data.event_id,
+            data.user_id,
+            data,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_update_attendance(result)
 
     async def update_many(self, data: list[eetschema_event_attendees_insert_input]):
-        result = await self._client.update_many_attendance(data)
+        result = await self._client.update_many_attendance(
+            data,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_update_many_attendance(result)
 
     async def comment(self, user_id: str, event_id: str, comment: str | None):

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/events/events.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-from eetlijst_py.generated import GraphQlClient, order_by
+from eetlijst_py.generated import order_by
 from eetlijst_py.generated.input_types import (
     eetschema_event_bool_exp,
     eetschema_event_order_by,
@@ -9,6 +9,7 @@ from eetlijst_py.generated.input_types import (
     uuid_comparison_exp,
 )
 
+from eetlijst_py.services.base import BaseService
 from eetlijst_py.services.event_attendance import EventAttendance
 
 from eetlijst_py.utils.datetime import current_datetime, format_date
@@ -21,14 +22,14 @@ from .transformers import (
 
 
 @dataclass
-class Events:
-    _client: GraphQlClient
+class Events(BaseService):
     attendance: EventAttendance
 
     async def populate_dinners(self, group_id: str, date: datetime | str):
         result = await self._client.automatic_events(
             group_id,
             format_date(date),
+            headers=self._get_headers(),
         )
         return transform_automatic_events(result)
 
@@ -42,6 +43,7 @@ class Events:
             event_id,
             include_attendees,
             include_expenses,
+            headers=self._get_headers(),
         )
         return transform_event(result.eetschema_event_by_pk)
 
@@ -73,6 +75,7 @@ class Events:
             limit,
             include_attendees,
             include_expenses,
+            headers=self._get_headers(),
         )
         return [transform_event(event) for event in result.eetschema_event]
 
@@ -88,6 +91,7 @@ class Events:
             data,
             include_attendees,
             include_expenses,
+            headers=self._get_headers(),
         )
         return transform_update_event(result)
 

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/expenses/expenses.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from eetlijst_py.generated import GraphQlClient, order_by
+from eetlijst_py.generated import order_by
 from eetlijst_py.generated.input_types import (
     Boolean_comparison_exp,
     eetschema_expense_bool_exp,
@@ -12,6 +12,7 @@ from eetlijst_py.generated.input_types import (
     uuid_comparison_exp,
 )
 
+from eetlijst_py.services.base import BaseService
 from eetlijst_py.services.expenses.transformers import (
     transform_create_expense,
     transform_expense,
@@ -22,13 +23,13 @@ from eetlijst_py.services.settlements import Settlements
 
 
 @dataclass
-class Expenses:
-    _client: GraphQlClient
+class Expenses(BaseService):
     settlements: Settlements
 
     async def get(self, expense_id: str):
         result = await self._client.all_expenses(
-            where=eetschema_expense_bool_exp(id=uuid_comparison_exp(_eq=expense_id))
+            where=eetschema_expense_bool_exp(id=uuid_comparison_exp(_eq=expense_id)),
+            headers=self._get_headers(),
         )
 
         return transform_expense(result.eetschema_expense[0])
@@ -61,18 +62,20 @@ class Expenses:
             where=where_data,
             order=order_data,
             limit=limit,
+            headers=self._get_headers(),
         )
 
         return [transform_expense(expense) for expense in result.eetschema_expense]
 
     async def create(self, data: eetschema_expense_insert_input):
-        result = await self._client.create_expense(*data)
+        result = await self._client.create_expense(*data, headers=self._get_headers())
         return transform_create_expense(result)
 
     async def update(self, expense_id: str, data: eetschema_expense_set_input):
         result = await self._client.update_expense(
             expense_id=expense_id,
             set_=data,
+            headers=self._get_headers(),
         )
 
         return transform_update_expense(result)
@@ -85,6 +88,7 @@ class Expenses:
         await self._client.update_expense_distribution(
             expense_id=expense_id,
             objects=data,
+            headers=self._get_headers(),
         )
 
     async def delete(self, expense_id: str):
@@ -94,5 +98,9 @@ class Expenses:
         )
 
     async def group_total(self, group_id: str):
-        result = await self._client.group_total_expense(group_id=group_id)
+        result = await self._client.group_total_expense(
+            group_id=group_id,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_group_total_expense(result)

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/group_list/group_list.py

@@ -1,7 +1,6 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from eetlijst_py.generated import GraphQlClient
 from eetlijst_py.generated.input_types import (
     eetschema_list_bool_exp,
     eetschema_list_insert_input,
@@ -12,6 +11,7 @@ from eetlijst_py.generated.input_types import (
 
 from eetlijst_py.exceptions import EetlijstException
 
+from eetlijst_py.services.base import BaseService
 from eetlijst_py.services.group_list.transformers import (
     transform_create_list_item,
     transform_create_many_list_items,
@@ -21,12 +21,12 @@ from eetlijst_py.services.group_list.transformers import (
 
 
 @dataclass
-class GroupList:
-    _client: GraphQlClient
+class GroupList(BaseService):
 
     async def get(self, item_id: str):
         result = await self._client.list_items(
-            where=eetschema_list_bool_exp(id=uuid_comparison_exp(_eq=item_id))
+            where=eetschema_list_bool_exp(id=uuid_comparison_exp(_eq=item_id)),
+            headers=self._get_headers(),
         )
 
         return transform_list_item(result.eetschema_list[0])
@@ -53,22 +53,28 @@ class GroupList:
             where=where_data,
             order=order,
             limit=limit,
+            headers=self._get_headers(),
         )
 
         return [transform_list_item(item) for item in result.eetschema_list]
 
     async def create_item(self, data: eetschema_list_insert_input):
-        result = await self._client.create_list_item(*data)
+        result = await self._client.create_list_item(*data, headers=self._get_headers())
         return transform_create_list_item(result)
 
     async def create_many_items(self, items: list[eetschema_list_insert_input]):
-        result = await self._client.create_many_list_items(items=items)
+        result = await self._client.create_many_list_items(
+            items=items,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_create_many_list_items(result)
 
     async def update_item(self, item_id: str, data: eetschema_list_set_input):
         result = await self._client.update_list_item(
             id=item_id,
             set_=data,
+            headers=self._get_headers(),
         )
         return transform_update_list_item(result)
 

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/group_users/group_users.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Optional, TypedDict, Union
 
-from eetlijst_py.generated import GraphQlClient, order_by
+from eetlijst_py.generated import order_by
 from eetlijst_py.generated.input_types import (
     Boolean_comparison_exp,
     String_comparison_exp,
@@ -12,6 +12,7 @@ from eetlijst_py.generated.input_types import (
     uuid_comparison_exp,
 )
 
+from eetlijst_py.services.base import BaseService
 from eetlijst_py.services.group_users.transformers import (
     transform_all_users_in_group,
     transform_get_user_in_group,
@@ -27,12 +28,13 @@ class UserOrderItem(TypedDict):
 
 
 @dataclass
-class GroupUsers:
-    _client: GraphQlClient
+class GroupUsers(BaseService):
 
     async def get(self, group_id: str, user_id: str):
         result = await self._client.get_user_in_group(
-            group_id=group_id, user_id=user_id
+            group_id=group_id,
+            user_id=user_id,
+            headers=self._get_headers(),
         )
         return transform_get_user_in_group(result)
 
@@ -67,12 +69,19 @@ class GroupUsers:
             where=where_data,
             order=order_data,
             limit=limit,
+            headers=self._get_headers(),
         )
 
         return transform_all_users_in_group(result)
 
     async def add(self, group_id: str, user_id: str, invite_id: str):
-        result = await self._client.join_group(group_id, user_id, invite_id)
+        result = await self._client.join_group(
+            group_id,
+            user_id,
+            invite_id,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_join_group(result)
 
     async def update(
@@ -82,7 +91,10 @@ class GroupUsers:
         data: eetschema_users_in_group_set_input,
     ):
         result = await self._client.update_user_in_group(
-            group_id=group_id, user_id=user_id, set_=data
+            group_id=group_id,
+            user_id=user_id,
+            set_=data,
+            headers=self._get_headers(),
         )
 
         return transform_update_user_in_group(result)
@@ -91,7 +103,11 @@ class GroupUsers:
         self,
         updates: list[eetschema_users_in_group_updates],
     ):
-        result = await self._client.update_users_in_group(updates=updates)
+        result = await self._client.update_users_in_group(
+            updates=updates,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_update_users_in_group(result)
 
     async def remove(self, group_id: str, user_id: str):

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/groups/groups.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, List, Optional
 
-from eetlijst_py.generated import GraphQlClient, order_by
+from eetlijst_py.generated import order_by
 from eetlijst_py.generated.input_types import (
     String_comparison_exp,
     eetschema_group_order_by,
@@ -10,6 +10,7 @@ from eetlijst_py.generated.input_types import (
     eetschema_users_in_group_order_by,
 )
 
+from eetlijst_py.services.base import BaseService
 from eetlijst_py.services.group_list import GroupList
 from eetlijst_py.services.groups.transformers import (
     GroupResult,
@@ -24,8 +25,7 @@ if TYPE_CHECKING:
 
 
 @dataclass
-class Groups:
-    _client: GraphQlClient
+class Groups(BaseService):
     users: GroupUsers
     list: GroupList
 
@@ -34,7 +34,11 @@ class Groups:
         group_id: str,
         include_users: bool = False,
     ) -> GroupResult:
-        result = await self._client.get_group(group_id=group_id)
+        result = await self._client.get_group(
+            group_id=group_id,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_get_group(result, include_users=include_users)
 
     async def all(
@@ -66,12 +70,18 @@ class Groups:
             limit=limit,
             include_users=include_users,
             include_inactive_users=include_inactive_users,
+            headers=self._get_headers(),
         )
 
         return transform_all_groups(result, include_users=include_users)
 
     async def create(self, name: str, user_id: str) -> GroupResult:
-        result = await self._client.create_group(name=name, user_id=user_id)
+        result = await self._client.create_group(
+            name=name,
+            user_id=user_id,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_create_group(result)
 
     async def update(
@@ -80,5 +90,6 @@ class Groups:
         result = await self._client.update_group(
             group_id=group_id,
             set_=data,
+            headers=self._get_headers(),
         )
         return transform_update_group(result)

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/groups/transformers.py

@@ -46,7 +46,7 @@ class GroupResult(BaseModel):
     invite_open: bool
     description: Optional[str]
     summary: list[GroupSummaryResult]
-    users: list[UserInGroupResult] = []
+    users: list[UserInGroupResult]
 
 
 def transform_group(

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/settlements/settlements.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from datetime import datetime, timezone
 from typing import List, Optional, TypedDict
 
-from eetlijst_py.generated import GraphQlClient, order_by
+from eetlijst_py.generated import order_by
 from eetlijst_py.generated.fragments import ExpenseFields
 from eetlijst_py.generated.input_types import (
     Boolean_comparison_exp,
@@ -16,6 +16,7 @@ from eetlijst_py.generated.input_types import (
     uuid_comparison_exp,
 )
 
+from eetlijst_py.services.base import BaseService
 from eetlijst_py.services.expenses.transformers import (
     transform_create_expense,
     transform_update_expense,
@@ -41,14 +42,14 @@ class SettleResult(TypedDict):
 
 
 @dataclass
-class Settlements:
-    _client: GraphQlClient
+class Settlements(BaseService):
 
     async def get(self, settlement_id: str) -> Optional[SettlementResult]:
         result = await self._client.all_settlements(
             where=eetschema_settlements_bool_exp(
-                id=uuid_comparison_exp(_eq=settlement_id)
-            )
+                id=uuid_comparison_exp(_eq=settlement_id),
+            ),
+            headers=self._get_headers(),
         )
 
         return transform_settlement(result.eetschema_settlements[0])
@@ -73,11 +74,16 @@ class Settlements:
             where=where_data,
             order=order_data,
             limit=limit,
+            headers=self._get_headers(),
         )
         return [transform_settlement(s) for s in result.eetschema_settlements]
 
     async def create(self, group_id: str) -> SettlementResult:
-        result = await self._client.create_settlement(group_id=group_id)
+        result = await self._client.create_settlement(
+            group_id=group_id,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_create_settlement(result)
 
     async def settle(
@@ -110,6 +116,7 @@ class Settlements:
         result = await self._client.settle_unsettled_expenses(
             settlement_id=settlement_id,
             where=where_data,
+            headers=self._get_headers(),
         )
         settled = transform_settle_unsettled_expenses(result)
 
@@ -141,12 +148,14 @@ class Settlements:
                     description=description,
                     settlement_expense_id=settlement_id,
                     data=distribution_data,
+                    headers=self._get_headers(),
                 )
                 created_expense = transform_create_expense(created_raw)
 
                 updated_raw = await self._client.update_expense(
                     expense_id=created_expense.id,
                     set_=eetschema_expense_set_input(settled_id=settlement_id),
+                    headers=self._get_headers(),
                 )
                 return transform_update_expense(updated_raw)
 
@@ -221,5 +230,6 @@ class Settlements:
         result = await self._client.settlement_expenses(
             where=where_data,
             order=order_data,
+            headers=self._get_headers(),
         )
         return transform_settlement_expenses(result)

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/users/transformers.py

@@ -29,7 +29,7 @@ class UserResult(BaseModel):
     profile_image_url: Optional[str] = None
     order_of_buttom_bar: Optional[str] = None
     funnel_lead: Optional[str] = None
-    cook_points_imports: list[CookPointsImportResult] = []
+    cook_points_imports: list[CookPointsImportResult]
 
 
 class UserPrivateResult(UserFieldsPrivate):

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_py/services/users/users.py

@@ -1,9 +1,10 @@
 from dataclasses import dataclass
 
-from eetlijst_py.generated import GraphQlClient
 from eetlijst_py.generated.base_model import UNSET, UnsetType
 from eetlijst_py.generated.input_types import eetschema_user_set_input
 
+from eetlijst_py.services.base import BaseService
+
 from .transformers import (
     transform_get_user,
     transform_remove_account_reasons,
@@ -12,17 +13,21 @@ from .transformers import (
 
 
 @dataclass
-class Users:
-    _client: GraphQlClient
+class Users(BaseService):
 
     async def get(self, user_id: str):
-        result = await self._client.get_user(user_id=user_id)
+        result = await self._client.get_user(
+            user_id=user_id,
+            headers=self._get_headers(),
+            headers=self._get_headers(),
+        )
         return transform_get_user(result)
 
     async def update(self, user_id: str, data: eetschema_user_set_input):
         result = await self._client.update_user(
             user_id=user_id,
             set_=data,
+            headers=self._get_headers(),
         )
         return transform_update_user(result)
 
@@ -40,5 +45,6 @@ class Users:
             reason_to_remove_account_text,
             reason_to_remove_account_selection,
             reason_to_remove_account_selection_all_options,
+            headers=self._get_headers(),
         )
         return transform_remove_account_reasons(result)

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eetlijst-python
-Version: 0.0.7
+Version: 0.0.9
 Summary: Python rewrite of the Eetlijst GraphQL client
 Requires-Python: <3.15,>=3.14
 Description-Content-Type: text/markdown
@@ -76,3 +76,9 @@ Build the package:
 ```
 python -m build
 ```
+
+Publish from local:
+
+```
+python -m twine upload dist/*
+```

{eetlijst_python-0.0.7 → eetlijst_python-0.0.9}/src/eetlijst_python.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ src/eetlijst_py/generated/update_user.py
 src/eetlijst_py/generated/update_user_in_group.py
 src/eetlijst_py/generated/update_users_in_group.py
 src/eetlijst_py/services/__init__.py
+src/eetlijst_py/services/base.py
 src/eetlijst_py/services/app/__init__.py
 src/eetlijst_py/services/app/app.py
 src/eetlijst_py/services/app/transformers.py