aiohttp-msal 1.0.7__tar.gz → 1.0.8__tar.gz

aiohttp_msal-1.0.8/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2022-2025 kellerza
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{aiohttp_msal-1.0.7 → aiohttp_msal-1.0.8}/PKG-INFO

@@ -1,24 +1,44 @@
 Metadata-Version: 2.3
 Name: aiohttp-msal
-Version: 1.0.7
+Version: 1.0.8
 Summary: Helper Library to use the Microsoft Authentication Library (MSAL) with aiohttp
 Keywords: aiohttp,asyncio,msal,oauth
 Author: Johann Kellerman
 Author-email: Johann Kellerman <kellerza@gmail.com>
-License: MIT
+License: The MIT License (MIT)
+         
+         Copyright (c) 2022-2025 kellerza
+         
+         Permission is hereby granted, free of charge, to any person obtaining a copy
+         of this software and associated documentation files (the "Software"), to deal
+         in the Software without restriction, including without limitation the rights
+         to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+         copies of the Software, and to permit persons to whom the Software is
+         furnished to do so, subject to the following conditions:
+         
+         The above copyright notice and this permission notice shall be included in all
+         copies or substantial portions of the Software.
+         
+         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+         SOFTWARE.
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3 :: Only
-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: aiohttp>=3.11.18,<3.13
-Requires-Dist: aiohttp-session>=2.12.1,<3
+Requires-Dist: aiohttp-session[aioredis]>=2.12.1,<3
 Requires-Dist: attrs>=25.3,<26
 Requires-Dist: msal>=1.32.3,<2
 Requires-Dist: aiohttp-session[aioredis]>=2.12.1,<3 ; extra == 'aioredis'
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Project-URL: Homepage, https://github.com/kellerza/aiohttp_msal
 Provides-Extra: aioredis
 Description-Content-Type: text/markdown
@@ -135,8 +155,6 @@ def main()
 ```bash
 uv sync --all-extras
 uv tool install ruff
-uv tool install codespell
-uv tool install pyproject-fmt
 uv tool install prek
 prek install  # add pre-commit hooks
 ```

{aiohttp_msal-1.0.7 → aiohttp_msal-1.0.8}/README.md

@@ -110,8 +110,6 @@ def main()
 ```bash
 uv sync --all-extras
 uv tool install ruff
-uv tool install codespell
-uv tool install pyproject-fmt
 uv tool install prek
 prek install  # add pre-commit hooks
 ```

{aiohttp_msal-1.0.7 → aiohttp_msal-1.0.8}/pyproject.toml

@@ -1,28 +1,28 @@
 [build-system]
 build-backend = "uv_build"
-requires = [ "uv-build" ]  # >=0.5.15,<0.6
+requires = [ "uv-build>=0.8.20,<0.9" ]
 
 [project]
 name = "aiohttp-msal"
-version = "1.0.7"
+version = "1.0.8"
 description = "Helper Library to use the Microsoft Authentication Library (MSAL) with aiohttp"
 readme = "README.md"
 keywords = [ "aiohttp", "asyncio", "msal", "oauth" ]
-license = { text = "MIT" }
+license = { file = "LICENSE" }
 authors = [ { name = "Johann Kellerman", email = "kellerza@gmail.com" } ]
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Developers",
   "Natural Language :: English",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
   "aiohttp>=3.11.18,<3.13",
-  "aiohttp-session>=2.12.1,<3",
+  "aiohttp-session[aioredis]>=2.12.1,<3",
   "attrs>=25.3,<26",
   "msal>=1.32.3,<2",
 ]
@@ -31,7 +31,9 @@ urls.Homepage = "https://github.com/kellerza/aiohttp_msal"
 
 [dependency-groups]
 dev = [
+  "codespell",
   "mypy",
+  "pyproject-fmt",
   "pytest",
   "pytest-aiohttp",
   "pytest-asyncio",
@@ -73,8 +75,7 @@ lint.ignore = [
 lint.isort.no-lines-before = [ "future", "standard-library" ]
 
 [tool.codespell]
-skip = [ "build/*", "*.json", "*.csv", "**/node_modules/*", "./s2-js/dist/*" ]
-#ignore-words-list = []
+skip = [ "build/*" ]
 
 [tool.pytest.ini_options]
 pythonpath = [ ".", "src" ]
@@ -125,5 +126,4 @@ match = "main"
 [tool.semantic_release.commit_parser_options]
 major_tags = [ ":boom:" ]
 minor_tags = [ ":rocket:" ]
-# patch_tags = [ ":ambulance:", ":lock:", ":bug:", ":dolphin:" ]
-patch_tags = [ "" ] # always patch
+patch_tags = [ "" ]         # always patch

{aiohttp_msal-1.0.7 → aiohttp_msal-1.0.8}/src/aiohttp_msal/__init__.py

@@ -4,7 +4,7 @@ import logging
 from collections.abc import Awaitable, Callable
 from functools import wraps
 from inspect import getfullargspec, iscoroutinefunction
-from typing import TypeVar, TypeVarTuple, cast
+from typing import cast
 
 from aiohttp import ClientSession, web
 from aiohttp_session import get_session
@@ -16,15 +16,12 @@ from aiohttp_msal.utils import retry
 
 _LOG = logging.getLogger(__name__)
 
-_T = TypeVar("_T")
-Ts = TypeVarTuple("Ts")
 
-
-def msal_session(
+def msal_session[T, *Ts](
     *callbacks: Callable[[AsyncMSAL], bool | Awaitable[bool]],
     at_least_one: bool | None = False,
 ) -> Callable[
-    [Callable[[*Ts, AsyncMSAL], Awaitable[_T]]], Callable[[*Ts], Awaitable[_T]]
+    [Callable[[*Ts, AsyncMSAL], Awaitable[T]]], Callable[[*Ts], Awaitable[T]]
 ]:
     """Session decorator.
 
@@ -32,10 +29,10 @@ def msal_session(
     """
 
     def check_session(
-        func: Callable[[*Ts, AsyncMSAL], Awaitable[_T]],
-    ) -> Callable[[*Ts], Awaitable[_T]]:
+        func: Callable[[*Ts, AsyncMSAL], Awaitable[T]],
+    ) -> Callable[[*Ts], Awaitable[T]]:
         @wraps(func)
-        async def wrapper(*args: *Ts) -> _T:
+        async def wrapper(*args: *Ts) -> T:
             if len(args) < 1:
                 raise AssertionError("Requires a Request as the first parameter")
             request = cast(web.Request, args[0])
@@ -104,12 +101,13 @@ async def app_init_redis_session(
     else:
         await check_proxy()
 
-    _LOG.info("Connect to Redis %s", ENV.REDIS)
-    try:
-        ENV.database = from_url(ENV.REDIS)
-        # , encoding="utf-8", decode_responses=True
-    except ConnectionRefusedError as err:
-        raise ConnectionError("Could not connect to REDIS server") from err
+    if ENV.database is None:
+        _LOG.info("Connect to Redis %s", ENV.REDIS)
+        try:
+            ENV.database = from_url(ENV.REDIS)
+            # , encoding="utf-8", decode_responses=True
+        except ConnectionRefusedError as err:
+            raise ConnectionError("Could not connect to REDIS server") from err
 
     storage = redis_storage.RedisStorage(
         ENV.database,
@@ -120,8 +118,8 @@ async def app_init_redis_session(
         secure=True,
         domain=ENV.DOMAIN,
         cookie_name=ENV.COOKIE_NAME,
-        encoder=ENV.dumps,
-        decoder=ENV.loads,
+        encoder=ENV.json_dumps,
+        decoder=ENV.json_loads,
     )
     _setup(app, storage)
 
@@ -129,13 +127,13 @@ async def app_init_redis_session(
 @retry
 async def check_proxy() -> None:
     """Test if we have Internet connectivity through proxies etc."""
-    try:
-        async with ClientSession(trust_env=True) as cses:
-            async with cses.get("http://httpbin.org/get") as resp:
+    print("Check Internet connectivity for OAuth", end="", flush=True)
+    async with ClientSession(trust_env=True) as cses:
+        for url in ("https://www.google.com", "http://httpbin.org/get"):
+            async with cses.get(url) as resp:
                 if resp.ok:
+                    print(" ... ok", flush=True)
                     return
-                raise ConnectionError(await resp.text())
-    except Exception as err:
-        raise ConnectionError(
-            "No connection to the Internet. Required for OAuth. Check your Proxy?"
-        ) from err
+    raise ConnectionError(
+        "No connection to the Internet. Required for OAuth. Check your Proxy?"
+    )

{aiohttp_msal-1.0.7 → aiohttp_msal-1.0.8}/src/aiohttp_msal/msal_async.py

@@ -9,7 +9,7 @@ import asyncio
 import logging
 from collections.abc import Callable
 from functools import cached_property, partialmethod
-from typing import Any, ClassVar, Literal, Self, TypeVar, Unpack, cast
+from typing import Any, ClassVar, Literal, Self, Unpack, cast
 
 import attrs
 from aiohttp import web
@@ -37,8 +37,6 @@ HTTP_PATCH = "patch"
 HTTP_DELETE = "delete"
 HTTP_ALLOWED = [HTTP_GET, HTTP_POST, HTTP_PUT, HTTP_PATCH, HTTP_DELETE]
 
-T = TypeVar("T")
-
 
 @attrs.define(slots=False)
 class AsyncMSAL:
@@ -219,7 +217,7 @@ class AsyncMSAL:
         elif method in [HTTP_POST, HTTP_PUT, HTTP_PATCH]:
             headers["Content-type"] = "application/json"
             if "data" in kwargs:
-                kwargs["data"] = ENV.dumps(kwargs["data"])  # auto convert to json
+                kwargs["data"] = ENV.json_dumps(kwargs["data"])  # auto convert to json
 
         if not AsyncMSAL.client_session:
             AsyncMSAL.client_session = ClientSession(trust_env=True)

{aiohttp_msal-1.0.7 → aiohttp_msal-1.0.8}/src/aiohttp_msal/redis_tools.py

@@ -5,7 +5,7 @@ import logging
 import time
 from collections.abc import AsyncGenerator
 from contextlib import AsyncExitStack, asynccontextmanager
-from typing import Any, TypeVar
+from typing import Any
 
 from redis.asyncio import Redis, from_url
 
@@ -56,7 +56,7 @@ async def session_iter(
         sval = await redis.get(key)
         created, ses = 0, {}
         try:
-            val = ENV.loads(sval)  # type: ignore[arg-type]
+            val = ENV.json_loads(sval)  # type: ignore[arg-type]
             created = int(val["created"])
             ses = val["session"]
         except Exception:
@@ -103,7 +103,7 @@ async def invalid_sessions(redis: Redis, /) -> None:
         if sval is None:
             continue
         try:
-            val: dict = ENV.loads(sval)
+            val: dict = ENV.json_loads(sval)
             assert isinstance(val["created"], int)
             assert isinstance(val["session"], dict)
         except Exception as err:
@@ -111,10 +111,7 @@ async def invalid_sessions(redis: Redis, /) -> None:
             await redis.delete(key)
 
 
-T = TypeVar("T", bound=AsyncMSAL)
-
-
-def async_msal_factory(
+def async_msal_factory[T: AsyncMSAL](
     cls: type[T], key: str, created: int, session: dict[str, Any], /
 ) -> T:
     """Create a AsyncMSAL session with a save_callback.
@@ -126,7 +123,7 @@ def async_msal_factory(
     async def async_save_cache(_: dict) -> None:
         """Save the token cache to Redis."""
         async with get_redis() as rd2:
-            await rd2.set(key, ENV.dumps({"created": created, "session": session}))
+            await rd2.set(key, ENV.json_dumps({"created": created, "session": session}))
 
     def save_cache(*args: Any) -> None:
         """Save the token cache to Redis."""
@@ -138,7 +135,7 @@ def async_msal_factory(
     return cls(session, save_callback=save_cache)
 
 
-async def get_session(
+async def get_session[T: AsyncMSAL](
     cls: type[T],
     email: str,
     /,
@@ -166,7 +163,7 @@ async def redis_get_json(key: str) -> list[Any] | dict[str, Any] | None:
     """Get a key from redis."""
     res = await ENV.database.get(key)
     if isinstance(res, str | bytes | bytearray):
-        return ENV.loads(res)
+        return ENV.json_loads(res)
     if res is not None:
         _LOG.warning("Unexpected type for %s: %s", key, type(res))
     return None

{aiohttp_msal-1.0.7 → aiohttp_msal-1.0.8}/src/aiohttp_msal/settings.py

@@ -43,8 +43,10 @@ class MSALSettings(SettingsBase):
     database: "Redis" = attrs.field(init=False, default=None)
     """Store the Redis connection when using app_init_redis_session()."""
 
-    dumps: Callable[[Any], str] = attrs.field(default=json.dumps)
-    loads: Callable[[str | bytes | bytearray], Any] = attrs.field(default=json.loads)
+    json_dumps: Callable[[Any], str] = attrs.field(default=json.dumps)
+    json_loads: Callable[[str | bytes | bytearray], Any] = attrs.field(
+        default=json.loads
+    )
 
 
 ENV = MSALSettings()

{aiohttp_msal-1.0.7 → aiohttp_msal-1.0.8}/src/aiohttp_msal/utils.py

@@ -3,13 +3,10 @@
 import asyncio
 from collections.abc import Awaitable, Callable
 from functools import partial, wraps
-from typing import Any, ParamSpec, TypeVar
+from typing import Any
 
-T = TypeVar("T")
-P = ParamSpec("P")
 
-
-def async_wrap(
+def async_wrap[T](
     func: Callable[..., T],
 ) -> Callable[..., Awaitable[T]]:
     """Wrap a function doing I/O to run in an executor thread."""
@@ -49,17 +46,7 @@ class dict_property(property):
             getattr(instance, self.dict_name, {}).__setitem__(self.prop_name, value)
 
 
-# def dict_property(dict_name: str, prop_name: str) -> property:
-#     """Create properties for a dictionary."""
-#     return property(
-#         fget=lambda self: str(getattr(self, dict_name).get(prop_name, "")),
-#         fset=lambda self, v: getattr(self, dict_name).set(prop_name, v),
-#         fdel=lambda self: getattr(self, dict_name).pop(prop_name, None),
-#         doc=f'self.{dict_name}["{prop_name}"]',
-#     )
-
-
-def retry(func: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]:
+def retry[T, **P](func: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]:
     """Retry if tenacity is installed."""
 
     @wraps(func)