python-easyverein 0.2.4__tar.gz → 0.2.7__tar.gz

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-easyverein
-Version: 0.2.4
+Version: 0.2.7
 Summary: Python library to interact with the EasyVerein API
 Author: Daniel Herrmann
 Author-email: daniel.herrmann1@gmail.com

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/__init__.py

@@ -2,7 +2,7 @@
 Middleware for FastAPI that supports authenticating users against Keycloak
 """
 
-__version__ = "0.2.4"
+__version__ = "0.2.7"
 
 # Export EasyVerein API directly
 from .api import EasyvereinAPI  # noqa: F401

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/api.py

@@ -1,6 +1,7 @@
 """
 Main EasyVerein API class
 """
+
 import logging
 
 from .core.client import EasyvereinClient
@@ -19,6 +20,7 @@ class EasyvereinAPI:
         api_version="v1.7",
         base_url: str = "https://hexa.easyverein.com/api/",
         logger: logging.Logger = None,
+        auto_retry=False,
     ):
         """
         Constructor setting API key and logger. Test
@@ -31,7 +33,9 @@ class EasyvereinAPI:
         else:
             self.logger = logging.getLogger("easyverein")
 
-        self.c = EasyvereinClient(api_key, api_version, base_url, self.logger, self)
+        self.c = EasyvereinClient(
+            api_key, api_version, base_url, self.logger, self, auto_retry
+        )
 
         # Add methods
 

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/core/client.py

@@ -1,10 +1,12 @@
 """
 Main EasyVerein API class
 """
+
 from __future__ import annotations
 
 import logging
 from pathlib import Path
+from time import sleep
 from typing import TYPE_CHECKING, Any, TypeVar
 
 import requests
@@ -35,6 +37,7 @@ class EasyvereinClient:
         base_url,
         logger: logging.Logger,
         instance: EasyvereinAPI,
+        auto_retry=False,
     ):
         """
         Constructor setting API key and logger
@@ -44,6 +47,7 @@ class EasyvereinClient:
         self.api_version = api_version
         self.logger = logger
         self.api_instance = instance
+        self.auto_retry = auto_retry
 
     def _get_header(self):
         """
@@ -118,10 +122,21 @@ class EasyvereinClient:
                 "Request returned status code 429, too many requests. Wait %d seconds",
                 retry_after,
             )
-            raise EasyvereinAPITooManyRetriesException(
-                f"Too many requests, please wait {retry_after} seconds and try again.",
-                retry_after=retry_after,
-            )
+            if self.auto_retry:
+                self.logger.warning("Retrying after %d seconds sleep.", retry_after)
+                sleep(retry_after)
+                if files:
+                    for v in files.values():
+                        v.seek(
+                            0
+                        )  # reset file seek, as it has been moved by the previous call
+
+                return self._do_request(method, url, binary, data, headers, files)
+            else:
+                raise EasyvereinAPITooManyRetriesException(
+                    f"Too many requests, please wait {retry_after} seconds and try again.",
+                    retry_after=retry_after,
+                )
 
         if res.status_code == 404:
             self.logger.warning("Request returned status code 404, resource not found")

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/core/protocol.py

@@ -9,21 +9,16 @@ from .client import EasyvereinClient
 # noinspection PyPropertyDefinition
 class IsEVClientProtocol(Protocol):
     @property
-    def logger(self) -> logging.Logger:
-        ...
+    def logger(self) -> logging.Logger: ...
 
     @property
-    def c(self) -> EasyvereinClient:
-        ...
+    def c(self) -> EasyvereinClient: ...
 
     @property
-    def endpoint_name(self) -> str:
-        ...
+    def endpoint_name(self) -> str: ...
 
     @property
-    def model_class(self) -> TypeVar:
-        ...
+    def model_class(self) -> TypeVar: ...
 
     @property
-    def return_type(self) -> Type[BaseModel]:
-        ...
+    def return_type(self) -> Type[BaseModel]: ...

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/core/types.py

@@ -1,6 +1,7 @@
 """
 Custom types used for model validation
 """
+
 import datetime
 import json
 from typing import Annotated

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/models/contact_details.py

@@ -1,6 +1,7 @@
 """
 Contact Details related models
 """
+
 from __future__ import annotations
 
 from typing import Any, Literal

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/models/custom_field.py

@@ -1,6 +1,7 @@
 """
 Member related models
 """
+
 from __future__ import annotations
 
 from typing import Literal
@@ -36,9 +37,9 @@ class CustomFieldBase(EasyVereinBase):
     color: HexColor = None
     short: str | None = Field(default=None, max_length=4)
     orderSequence: PositiveIntWithZero | None = None
-    settings_type: Literal[
-        "t", "f", "z", "d", "c", "r", "s", "a", "b", "m"
-    ] | None = None
+    settings_type: Literal["t", "f", "z", "d", "c", "r", "s", "a", "b", "m"] | None = (
+        None
+    )
     """
     Settings type defines which type of field this custom field should be. Possible values:
 
@@ -55,9 +56,12 @@ class CustomFieldBase(EasyVereinBase):
 
     If type is set to s or a, the possible options need to be defined in the additional field
     """
-    kind: Literal[
-        "a", "b", "ba", "ca", "iv", "t", "u", "ic", "c", "e", "h", "j", "i", "k"
-    ] | None = None
+    kind: (
+        Literal[
+            "a", "b", "ba", "ca", "iv", "t", "u", "ic", "c", "e", "h", "j", "i", "k"
+        ]
+        | None
+    ) = None
     """
     Kind defines in which context this custom field is used. Unfortunately only some possible values are
     documented in the API spec:

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/models/invoice.py

@@ -1,6 +1,7 @@
 """
 Invoice related models
 """
+
 from __future__ import annotations
 
 from typing import Literal
@@ -42,9 +43,18 @@ class InvoiceBase(EasyVereinBase):
     taxName: str | None = None
     relatedAddress: ContactDetails | EasyVereinReference | None = None
     path: EasyVereinReference | None = None
-    kind: Literal[
-        "balance", "donation", "membership", "revenue", "expense", "cancel", "credit"
-    ] | None = None
+    kind: (
+        Literal[
+            "balance",
+            "donation",
+            "membership",
+            "revenue",
+            "expense",
+            "cancel",
+            "credit",
+        ]
+        | None
+    ) = None
     # TODO: Add reference to BillingAccount once implemented
     selectionAcc: EasyVereinReference | None = None
     refNumber: str | None = None

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/models/invoice_item.py

@@ -1,6 +1,7 @@
 """
 Invoice Item model
 """
+
 from __future__ import annotations
 
 from typing import Annotated

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/models/member.py

@@ -1,6 +1,7 @@
 """
 Member related models
 """
+
 from __future__ import annotations
 
 from typing import Literal
@@ -73,7 +74,7 @@ class MemberBase(EasyVereinBase):
     """
     Alias for `_applicationDate` field. See [Pydantic Models](../usage.md#pydantic-models) for details.
     """
-    applicationWasAcceptedAt: DateTime | None = Field(
+    applicationWasAcceptedAt: Date | None = Field(
         default=None, alias="_applicationWasAcceptedAt"
     )
     """
@@ -178,13 +179,13 @@ class MemberFilter(BaseModel):
     applicationDate__isnull: Date = Field(
         default=None, serialization_alias="_applicationDate__isnull"
     )
-    applicationWasAcceptedAt: DateTime = Field(
+    applicationWasAcceptedAt: Date = Field(
         default=None, serialization_alias="_applicationWasAcceptedAt"
     )
-    applicationWasAcceptedAt__gte: DateTime = Field(
+    applicationWasAcceptedAt__gte: Date = Field(
         default=None, serialization_alias="_applicationWasAcceptedAt__gte"
     )
-    applicationWasAcceptedAt__lte: DateTime = Field(
+    applicationWasAcceptedAt__lte: Date = Field(
         default=None, serialization_alias="_applicationWasAcceptedAt__lte"
     )
     applicationWasAcceptedAt__isnull: bool = Field(

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/models/mixins/empty_strings_mixin.py

@@ -2,6 +2,7 @@
 This module contains a generic plugin for Pydantic models that removes
 empty strings and converts them to None.
 """
+
 from typing import Any
 
 from pydantic import model_validator

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/models/mixins/required_attributes.py

@@ -1,6 +1,7 @@
 """
 This module contains a class factory returning a Mixin class
 """
+
 from typing import Self
 
 from pydantic import BaseModel, model_validator

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/modules/contact_details.py

@@ -1,6 +1,7 @@
 """
 All methods related to contact details
 """
+
 import logging
 
 from ..core.client import EasyvereinClient

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/modules/custom_field.py

@@ -1,6 +1,7 @@
 """
 All methods related to custom fields
 """
+
 import logging
 
 from ..core.client import EasyvereinClient

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/modules/invoice.py

@@ -1,4 +1,6 @@
 import logging
+import re
+import urllib
 from pathlib import Path
 from typing import List
 
@@ -169,4 +171,10 @@ class InvoiceMixin(
                 "Unable to obtain a valid path for given invoice."
             )
 
-        return self.c.fetch_file(path)
+        # Fix for unencoded characters - should probably be fixed in easyverein API
+        m = re.fullmatch(r"^(.*\&path=)(.*)(&storedInS3=True)$", path.unicode_string())
+        url_components = list(m.groups())
+        if "%" not in url_components[1]:
+            url_components[1] = urllib.parse.quote(url_components[1])
+
+        return self.c.fetch_file("".join(url_components))

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/modules/invoice_item.py

@@ -1,6 +1,7 @@
 """
 All methods related to invoices
 """
+
 import logging
 
 from ..core.client import EasyvereinClient

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/modules/member.py

@@ -1,6 +1,7 @@
 """
 All methods related to invoices
 """
+
 import logging
 
 from ..core.client import EasyvereinClient

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/easyverein/modules/member_custom_field.py

@@ -1,6 +1,7 @@
 """
 All methods related to invoices
 """
+
 import logging
 
 from ..core.client import EasyvereinClient

{python_easyverein-0.2.4 → python_easyverein-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-easyverein"
-version = "0.2.4"
+version = "0.2.7"
 description = "Python library to interact with the EasyVerein API"
 authors = ["Daniel Herrmann <daniel.herrmann1@gmail.com>"]
 readme = "README.md"