winipedia-utils 0.1.59__py3-none-any.whl → 0.1.61__py3-none-any.whl

winipedia_utils/os/os.py

@@ -11,11 +11,12 @@ from pathlib import Path
 from typing import Any
 
 
-def which_with_raise(cmd: str) -> str:
+def which_with_raise(cmd: str, *, raise_error: bool = True) -> str | None:
     """Give the path to the given command.
 
     Args:
         cmd: The command to find
+        raise_error: Whether to raise an error if the command is not found
 
     Returns:
         The path to the command
@@ -27,7 +28,8 @@ def which_with_raise(cmd: str) -> str:
     path = shutil.which(cmd)
     if path is None:
         msg = f"Command {cmd} not found"
-        raise FileNotFoundError(msg)
+        if raise_error:
+            raise FileNotFoundError(msg)
     return path
 
 

winipedia_utils/projects/poetry/poetry.py

@@ -11,7 +11,8 @@ from winipedia_utils.os.os import run_subprocess, which_with_raise
 
 logger = get_logger(__name__)
 
-POETRY_PATH = which_with_raise("poetry")
+
+POETRY_PATH = which_with_raise("poetry", raise_error=False) or "poetry"
 
 POETRY_RUN_ARGS = [POETRY_PATH, "run"]
 

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__}"

{winipedia_utils-0.1.59.dist-info → winipedia_utils-0.1.61.dist-info}/METADATA

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

{winipedia_utils-0.1.59.dist-info → winipedia_utils-0.1.61.dist-info}/RECORD

@@ -33,11 +33,11 @@ winipedia_utils/oop/mixins/__init__.py,sha256=PDK-cJcdRUfDUCz36qQ5pmMW07G133WtN4
 winipedia_utils/oop/mixins/meta.py,sha256=ajSlKTDqNYbPc3vAin84dWVG3R7ZaBEwga1e3Mzm-Gw,11309
 winipedia_utils/oop/mixins/mixin.py,sha256=sFImqDFX0TtdAAYHgepVT_UqJ50juvDdwGG9vMNa3PE,1438
 winipedia_utils/os/__init__.py,sha256=WSLt7tb6HqWRlCGGIEwRfVksF0sLJNeEW3iZeJhGWk0,47
-winipedia_utils/os/os.py,sha256=ITuiLLfjGBV2jH8tHQfwVzsICT-jY1zUxtwu3ASJBG4,1690
+winipedia_utils/os/os.py,sha256=CXPVnagfj3dXlc8OIv1DirJpin8oaGXWetnmx2lULE4,1831
 winipedia_utils/projects/__init__.py,sha256=6oTiSlUMAwO5xnH4SGVnvspzKcxrxo9kn1L4xkjq1p8,53
 winipedia_utils/projects/poetry/__init__.py,sha256=0yNMuu9KmM19od4VBxBV3HLK-RdCsa0e2Zhg33J7RmQ,60
 winipedia_utils/projects/poetry/config.py,sha256=ghJzlNDVrSfG5Mg0JjnL9Xmz6fVD-rAHl41tjbFUBb8,2993
-winipedia_utils/projects/poetry/poetry.py,sha256=5jyUSMxhCZ7pz9bOaz5E9r7Da9qIrGOp6wcBzI1y7Cg,932
+winipedia_utils/projects/poetry/poetry.py,sha256=QoQ-b8NgMiWaqq85gs2HZh_436VpNqKzGogrWPS5DrU,965
 winipedia_utils/projects/project.py,sha256=2nz1Hh51A-shjgdPCgiDw-ODrVtOtiHEHQnMPjAJZ-A,1587
 winipedia_utils/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 winipedia_utils/pyside/__init__.py,sha256=knliQxknKWqxCEfxlI1K02OtbBfnTkYUZFqyYcLJNDI,52
@@ -72,7 +72,7 @@ winipedia_utils/resources/svgs/plus_icon.svg,sha256=CHjIzOUbDH4xHlwX5MbTsdL0Hnku
 winipedia_utils/resources/svgs/svg.py,sha256=-Dw6m7cm9CHT2076oZIMx7kTQw0v_ifJajXzWcpUtI0,430
 winipedia_utils/security/__init__.py,sha256=ZBa72J6MNtYumBFMoVc0ia4jsoS7oNgjaTCW0xDb6EI,53
 winipedia_utils/security/cryptography.py,sha256=zfxSDo7aE9ecmZNC6URMSEUYRpOuJ1iESg-WCSS5HP0,822
-winipedia_utils/security/keyring.py,sha256=35bCXBmsFWyd7Ja2w9zHElayABeRZEaNXoEDDRb8ItQ,1698
+winipedia_utils/security/keyring.py,sha256=AKpIGRh7RAWzzdIjTLZRXndxgbsX5DJxdHaRk40zw7o,2343
 winipedia_utils/setup.py,sha256=F4NneO0wVTf7JCXLorWjTOdJl36N5fLSksoWMe4p86o,1650
 winipedia_utils/testing/__init__.py,sha256=kXhB5xw02ec5xpcW_KV--9CBKdyCjnuR-NZzAJ5tq0g,51
 winipedia_utils/testing/assertions.py,sha256=0JF4mqVTnLQ1qkAL_FuTwyN_idr00rvVlta7aDdnUXA,851
@@ -94,7 +94,7 @@ winipedia_utils/testing/tests/base/utils/utils.py,sha256=dUPDrgAxlfREQb33zz23Mfz
 winipedia_utils/testing/tests/conftest.py,sha256=8RounBlI8Jq1aLaLNpv84MW4ne8Qq0aavQextDOp5ng,920
 winipedia_utils/text/__init__.py,sha256=j2bwtK6kyeHI6SnoBjpRju0C1W2n2paXBDlNjNtaUxA,48
 winipedia_utils/text/string.py,sha256=pK_VQXxSZa8HqHY1a6oMKfmN-OKteFE32eZaweCI22E,3508
-winipedia_utils-0.1.59.dist-info/LICENSE,sha256=3PrKJ2CWNrnyyHaC_r0wPDSukVWgmjOxHr__eQVH7cw,1087
-winipedia_utils-0.1.59.dist-info/METADATA,sha256=4K38KbFyGfL0RsYd_HPKO2ze9bAITq-m7WKLYt2OGwM,12576
-winipedia_utils-0.1.59.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-winipedia_utils-0.1.59.dist-info/RECORD,,
+winipedia_utils-0.1.61.dist-info/LICENSE,sha256=3PrKJ2CWNrnyyHaC_r0wPDSukVWgmjOxHr__eQVH7cw,1087
+winipedia_utils-0.1.61.dist-info/METADATA,sha256=i3pkb0PrD_YIkUnxzzeexIYtSQZ98BATj7GNLT_EFnk,12576
+winipedia_utils-0.1.61.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+winipedia_utils-0.1.61.dist-info/RECORD,,