winipedia-utils 0.1.60__tar.gz → 0.1.62__tar.gz

{winipedia_utils-0.1.60 → winipedia_utils-0.1.62}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: winipedia-utils
-Version: 0.1.60
+Version: 0.1.62
 Summary: A package with many utility functions
 License: MIT
 Author: Winipedia

{winipedia_utils-0.1.60 → winipedia_utils-0.1.62}/pyproject.toml

@@ -1,7 +1,7 @@
 # Project section
 [project]
 name = "winipedia-utils"
-version = "0.1.60"
+version = "0.1.62"
 description = "A package with many utility functions"
 readme = "README.md"
 requires-python = ">=3.12,<3.14"

{winipedia_utils-0.1.60 → winipedia_utils-0.1.62}/winipedia_utils/django/__init__.py

@@ -14,9 +14,6 @@ logger.info("Monkeypatched django-stubs")
 if not settings.configured:
     logger.info("Configuring minimal django settings")
     settings.configure(
-        INSTALLED_APPS=[
-            "django.contrib.contenttypes",
-        ],
         DATABASES={
             "default": {
                 "ENGINE": "django.db.backends.sqlite3",

{winipedia_utils-0.1.60 → winipedia_utils-0.1.62}/winipedia_utils/django/bulk.py

@@ -9,9 +9,8 @@ from collections import defaultdict
 from collections.abc import Callable, Generator, Iterable
 from functools import partial
 from itertools import islice
-from typing import Any, Literal, cast, get_args
+from typing import TYPE_CHECKING, Any, Literal, cast, get_args
 
-from django.contrib.contenttypes.fields import GenericForeignKey
 from django.db import router, transaction
 from django.db.models import (
     Field,
@@ -19,7 +18,6 @@ from django.db.models import (
     QuerySet,
 )
 from django.db.models.deletion import Collector
-from django.db.models.fields.related import ForeignObjectRel
 
 from winipedia_utils.concurrent.multithreading import multithread_loop
 from winipedia_utils.django.database import (
@@ -28,6 +26,10 @@ from winipedia_utils.django.database import (
 )
 from winipedia_utils.logging.logger import get_logger
 
+if TYPE_CHECKING:
+    from django.contrib.contenttypes.fields import GenericForeignKey
+    from django.db.models.fields.related import ForeignObjectRel
+
 logger = get_logger(__name__)
 
 MODE_TYPES = Literal["create", "update", "delete"]
@@ -389,7 +391,7 @@ def bulk_create_bulks_in_steps(
 def get_differences_between_bulks(
     bulk1: list[Model],
     bulk2: list[Model],
-    fields: list[Field[Any, Any] | ForeignObjectRel | GenericForeignKey],
+    fields: "list[Field[Any, Any] | ForeignObjectRel | GenericForeignKey]",
 ) -> tuple[list[Model], list[Model], list[Model], list[Model]]:
     """Compare two bulks and return their differences and intersections.
 

{winipedia_utils-0.1.60 → winipedia_utils-0.1.62}/winipedia_utils/django/database.py

@@ -9,7 +9,6 @@ from datetime import datetime
 from graphlib import TopologicalSorter
 from typing import TYPE_CHECKING, Any, Self
 
-from django.contrib.contenttypes.fields import GenericForeignKey
 from django.db import connection
 from django.db.models import DateTimeField, Field, Model
 from django.db.models.fields.related import ForeignKey, ForeignObjectRel
@@ -18,6 +17,7 @@ from django.forms.models import model_to_dict
 from winipedia_utils.logging.logger import get_logger
 
 if TYPE_CHECKING:
+    from django.contrib.contenttypes.fields import GenericForeignKey
     from django.db.models.options import Options
 
 logger = get_logger(__name__)
@@ -51,7 +51,7 @@ def get_model_meta(model: type[Model]) -> "Options[Model]":
 
 def get_fields(
     model: type[Model],
-) -> list[Field[Any, Any] | ForeignObjectRel | GenericForeignKey]:
+) -> "list[Field[Any, Any] | ForeignObjectRel | GenericForeignKey]":
     """Get all fields from a Django model including relationships.
 
     Retrieves all field objects from a Django model, including regular fields,
@@ -83,7 +83,7 @@ def get_fields(
 
 
 def get_field_names(
-    fields: list[Field[Any, Any] | ForeignObjectRel | GenericForeignKey],
+    fields: "list[Field[Any, Any] | ForeignObjectRel | GenericForeignKey]",
 ) -> list[str]:
     """Get the names of all fields from a Django model including relationships.
 
@@ -222,7 +222,7 @@ def execute_sql(
 
 def hash_model_instance(
     instance: Model,
-    fields: list[Field[Any, Any] | ForeignObjectRel | GenericForeignKey],
+    fields: "list[Field[Any, Any] | ForeignObjectRel | GenericForeignKey]",
 ) -> int:
     """Hash a model instance based on its field values.
 

{winipedia_utils-0.1.60 → winipedia_utils-0.1.62}/winipedia_utils/security/keyring.py

@@ -13,7 +13,7 @@ from cryptography.fernet import Fernet
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 
 
-def get_or_create_fernet(service_name: str, username: str) -> Fernet:
+def get_or_create_fernet(service_name: str, username: str) -> tuple[Fernet, bytes]:
     """Get the app secret using keyring.
 
     If it does not exist, create it with a Fernet.
@@ -23,7 +23,7 @@ def get_or_create_fernet(service_name: str, username: str) -> Fernet:
     )
 
 
-def get_or_create_aes_gcm(service_name: str, username: str) -> AESGCM:
+def get_or_create_aes_gcm(service_name: str, username: str) -> tuple[AESGCM, bytes]:
     """Get the app secret using keyring.
 
     If it does not exist, create it with a AESGCM.
@@ -38,17 +38,33 @@ def get_or_create_key[T](
     username: str,
     key_class: Callable[[bytes], T],
     generate_key_func: Callable[..., bytes],
-) -> T:
+) -> tuple[T, bytes]:
     """Get the app secret using keyring.
 
     If it does not exist, create it with the generate_func.
     """
-    service_name = f"{service_name}_{key_class.__name__}"
-    key = keyring.get_password(service_name, username)
+    key = get_key_as_str(service_name, username, key_class)
     if key is None:
         binary_key = generate_key_func()
         key = b64encode(binary_key).decode("ascii")
-        keyring.set_password(service_name, username, key)
+        modified_service_name = make_service_name(service_name, key_class)
+        keyring.set_password(modified_service_name, username, key)
 
     binary_key = b64decode(key)
-    return key_class(binary_key)
+    return key_class(binary_key), binary_key
+
+
+def get_key_as_str[T](
+    service_name: str, username: str, key_class: Callable[[bytes], T]
+) -> str | None:
+    """Get the app secret using keyring.
+
+    If it does not exist, create it with the generate_func.
+    """
+    service_name = make_service_name(service_name, key_class)
+    return keyring.get_password(service_name, username)
+
+
+def make_service_name[T](service_name: str, key_class: Callable[[bytes], T]) -> str:
+    """Make a service name from a service name and a key class."""
+    return f"{service_name}_{key_class.__name__}"