libtimed 0.6.4__tar.gz → 0.7.3__tar.gz

{libtimed-0.6.4 → libtimed-0.7.3}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: libtimed
-Version: 0.6.4
+Version: 0.7.3
 Summary: Library to intreact with timed webapp.
+License-File: LICENSE
 Author: Arthur Deierlein
 Author-email: arthur.deierlein@adfinis.com
 Requires-Python: >=3.10,<4.0
@@ -9,8 +10,10 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: inflection (>=0.5.1,<0.6.0)
-Requires-Dist: keyring (>=24.1.0,<25.0.0)
+Requires-Dist: keyring (>=24.1,<26.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: requests-cache (>=1.1.0,<2.0.0)
 Description-Content-Type: text/markdown

{libtimed-0.6.4 → libtimed-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "libtimed"
-version = "0.6.4"
+version = "0.7.3"
 description = "Library to intreact with timed webapp."
 authors = [
   "Arthur Deierlein <arthur.deierlein@adfinis.com>",
@@ -12,16 +12,15 @@ packages = [{ include = "libtimed", from = "src" }]
 [tool.poetry.dependencies]
 python = "^3.10"
 requests = "^2.31.0"
-keyring = "^24.1.0"
+keyring = ">=24.1,<26.0"
 inflection = "^0.5.1"
 requests-cache = "^1.1.0"
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.3.0"
-pytest = "^7.3.2"
+pytest = ">=7.3.2,<9.0.0"
 pytest-coverage = "^0.0"
 pdbpp = "^0.10.3"
-ruff = "^0.0.282"
+ruff = ">=0.3.4,<0.5.0"
 
 # Dependencies only used in examples
 [tool.poetry.group.example.dependencies]
@@ -29,9 +28,16 @@ pyfzf = "^0.3.1"
 
 
 [tool.ruff]
-line-length = 88
-select = ["F","E","W","I","N", "D", "B", "Q", "C4", "UP", "PT", "T20", "RET", "RUF", "SLF", "SIM", "C90"]
+line-length = 100
 src = ["src", "examples", "test"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+docstring-code-format = true
+
+[tool.ruff.lint]
+select = ["F","E","W","I","N", "D", "B", "Q", "C4", "UP", "PT", "T20", "RET", "RUF", "SLF", "SIM", "C90"]
 ignore = [
     # make docstrings optional
     "D100",
@@ -45,19 +51,37 @@ ignore = [
     "D211",
     "D213",
     "RUF012",
-    # line length is handled by black
+    # line length is handled by formatter
     "E501",
     # disable this for now
     "SLF001",
+    # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
+    "W191",
+    "E111",
+    "E114",
+    "E117",
+    "D206",
+    "D300",
+    "Q000",
+    "Q001",
+    "Q002",
+    "Q003",
+    "COM812",
+    "COM819",
+    "ISC001",
+    "ISC002",
+    # this conflicts for some reason
+    "D203"
 ]
 
-[tool.ruff.mccabe]
+[tool.ruff.lint.mccabe]
 max-complexity = 8
 
-[tool.ruff.extend-per-file-ignores]
+[tool.ruff.lint.extend-per-file-ignores]
 "examples/*.py" = ["T201"]
+"src/libtimed/oidc.py" = ["T201"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["libtimed"]
 combine-as-imports = true
 

{libtimed-0.6.4 → libtimed-0.7.3}/src/libtimed/models.py

@@ -46,16 +46,10 @@ class BaseModel:
     def _deserialize(self, item, included):  # noqa: C901
         for key, value in item["attributes"].items():
             transform = next(
-                (
-                    transform
-                    for name, _, transform in self.__class__.attributes
-                    if name == key
-                ),
+                (transform for name, _, transform in self.__class__.attributes if name == key),
                 None,
             )
-            item["attributes"][key] = (
-                (transform).deserialize(value) if transform else value
-            )
+            item["attributes"][key] = (transform).deserialize(value) if transform else value
         relationships = item.get("relationships")
         if not relationships:
             return item
@@ -79,9 +73,7 @@ class BaseModel:
                             None,
                         )
                         if included_item:
-                            included_model = self.client._type_map[item_type](
-                                self.client
-                            )
+                            included_model = self.client._type_map[item_type](self.client)
                             included_items.append(
                                 included_model._deserialize(included_item, included)
                             )
@@ -130,9 +122,7 @@ class BaseModel:
                 item = self._deserialize(item, resp.get("included", []))
         return resp if raw else resp.get("data")
 
-    def post(
-        self, attributes: dict | None = None, relationships: dict | None = None
-    ) -> Response:
+    def post(self, attributes: dict | None = None, relationships: dict | None = None) -> Response:
         json = self._parse_post_json(attributes, relationships)
         return self.client.session.post(self.url, json=json)
 
@@ -151,9 +141,7 @@ class BaseModel:
     def resource_name(cls):
         return underscore(cls.__name__).replace("_", "-")
 
-    def _parse_post_json(
-        self, attributes: dict | None, relationships: dict | None
-    ) -> dict:
+    def _parse_post_json(self, attributes: dict | None, relationships: dict | None) -> dict:
         return {
             "data": {
                 "attributes": self._parse_attributes(attributes),

{libtimed-0.6.4 → libtimed-0.7.3}/src/libtimed/oidc.py

@@ -6,7 +6,7 @@ import http.server
 import json
 import time
 import webbrowser
-from urllib.parse import urlparse
+from urllib.parse import parse_qs, urlparse
 
 import keyring
 import requests
@@ -19,14 +19,12 @@ class OIDCHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
         url_path = self.path
         # get the "code" parameter from the query string
         try:
-            OIDCHTTPRequestHandler.code = urlparse(url_path).query.split("=")[2]
+            OIDCHTTPRequestHandler.code = parse_qs(urlparse(url_path).query)["code"][0]
         except IndexError:
             self.send_response(400)
             self.send_header("Content-type", "text/html")
             self.end_headers()
-            self.wfile.write(
-                b"<html><body><h1>Authorization failed.</h1></body></html>"
-            )
+            self.wfile.write(b"<html><body><h1>Authorization failed.</h1></body></html>")
             return
         # send the response
         self.send_response(200)
@@ -93,12 +91,17 @@ class OIDCClient:
 
         resp = {}
         while "access_token" not in resp:
-            resp =  requests.post(self.token_endpoint, data={"client_id": self.client_id, "grant_type": "urn:ietf:params:oauth:grant-type:device_code", "device_code": device_code}).json()
+            resp = requests.post(
+                self.token_endpoint,
+                data={
+                    "client_id": self.client_id,
+                    "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
+                    "device_code": device_code,
+                },
+            ).json()
             print(resp)
             time.sleep(5)
-        access_token = resp["access_token"]
-        return access_token
-
+        return resp["access_token"]
 
     def get_token(self):
         # construct the token request
@@ -112,10 +115,8 @@ class OIDCClient:
         token_response = requests.post(self.token_endpoint, data=token_request)
         # check for errors
         if token_response.status_code != 200:
-            print(  # noqa: T201
-                f"Error: {token_response.status_code} {token_response.reason}\n"
-            )
-            print(token_response.text)  # noqa: T201
+            print(f"Error: {token_response.status_code} {token_response.reason}\n")
+            print(token_response.text)
             return False
         # get the access token
         return token_response.json()["access_token"]
@@ -151,7 +152,7 @@ class OIDCClient:
 
         self.autoconfig()
         if self.use_device_flow:
-            if token:= self.start_device_flow():
+            if token := self.start_device_flow():
                 self.keyring_set(token)
                 return token
             return False

{libtimed-0.6.4 → libtimed-0.7.3}/src/libtimed/transforms.py

@@ -6,12 +6,10 @@ TIME_FORMAT = "%H:%M:%S"
 
 
 class SerializationError(ValueError):
-
     """Error raised only inside of Transforms when trying to (de)serialize values."""
 
 
 class BaseTransform:
-
     """Base class for serializers."""
 
     @staticmethod
@@ -26,12 +24,9 @@ class BaseTransform:
 
 
 class Type(BaseTransform):
-
     """Transform for types."""
 
-    def __init__(
-        self, type: type, allow_none: bool = True, pipe: Callable = lambda x: x
-    ):
+    def __init__(self, type: type, allow_none: bool = True, pipe: Callable = lambda x: x):
         self.type = type
         self.pipe = pipe
         self.allow_none = allow_none
@@ -51,7 +46,6 @@ class Type(BaseTransform):
 
 
 class Duration(BaseTransform):
-
     """Transform for durations."""
 
     @staticmethod
@@ -83,7 +77,6 @@ class RelationShipProperty:
 
 
 class Relationship(BaseTransform):
-
     """Transform for relationships. This is very hacky and should be replaced with a better solution."""
 
     def __init__(self, related_model) -> None:
@@ -102,9 +95,7 @@ class Relationship(BaseTransform):
         data = {}
         if isinstance(value, RelationShipProperty):
             if not client:
-                raise SerializationError(
-                    "Client has to be passed when using a property"
-                )
+                raise SerializationError("Client has to be passed when using a property")
             try:
                 data["data"] = getattr(self.related_model(client), value.property_name)
             except AttributeError as e:
@@ -118,9 +109,7 @@ class Relationship(BaseTransform):
 
     def deserialize(self, value: dict) -> dict | None:
         data = value.get("data") or {}
-        if (
-            recieved_type := (data or {}).get("type")
-        ) != self.related_model.resource_name:
+        if (recieved_type := (data or {}).get("type")) != self.related_model.resource_name:
             if recieved_type is None:
                 return None
             raise SerializationError(
@@ -130,7 +119,6 @@ class Relationship(BaseTransform):
 
 
 class Date(BaseTransform):
-
     """Transform for dates."""
 
     @staticmethod
@@ -150,7 +138,6 @@ class Date(BaseTransform):
 
 
 class Time(BaseTransform):
-
     """Transform for times."""
 
     def __init__(self, return_datetime: bool = False):
@@ -175,9 +162,7 @@ class Time(BaseTransform):
         return value.strftime(TIME_FORMAT) if value else None
 
     def deserialize(self, value) -> time | datetime | None:
-        return (
-            self._return_value(datetime.strptime(value, "%H:%M:%S")) if value else None
-        )
+        return self._return_value(datetime.strptime(value, "%H:%M:%S")) if value else None
 
 
 class Enum(BaseTransform):