python-neva 2.3.0__tar.gz → 2.4.1__tar.gz

{python_neva-2.3.0 → python_neva-2.4.1}/.pre-commit-config.yaml

@@ -26,3 +26,4 @@ repos:
     rev: v1.19.1
     hooks:
       - id: mypy
+        args: [--enable-incomplete-feature=TypeForm]

{python_neva-2.3.0 → python_neva-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-neva
-Version: 2.3.0
+Version: 2.4.1
 Summary: Add your description here
 Requires-Python: >=3.12
 Requires-Dist: aiosqlite>=0.20.0

{python_neva-2.3.0 → python_neva-2.4.1}/neva/arch/application.py

@@ -52,8 +52,12 @@ class Application:
 
                 self.bind(lambda: self.config, interface=ConfigRepository)
 
-        providers_from_file = self.config.get("providers.providers").unwrap_or([])
-        providers_from_app = self.config.get("app.providers").unwrap_or([])
+        providers_from_file: list[type[ServiceProvider]] = self.config.get(
+            "providers.providers", type_=list[type[ServiceProvider]]
+        ).unwrap_or([])
+        providers_from_app = self.config.get(
+            "app.providers", type_=list[type[ServiceProvider]]
+        ).unwrap_or([])
         providers: set[type[ServiceProvider]] = set(providers_from_file).union(
             set(providers_from_app)
         )

{python_neva-2.3.0 → python_neva-2.4.1}/neva/config/repository.py

@@ -7,6 +7,8 @@ nested access and can be frozen to prevent modifications after initialization.
 
 from typing import Any
 
+from typing_extensions import TypeForm
+
 from neva import Err, Ok, Result
 
 
@@ -60,12 +62,18 @@ class ConfigRepository:
         current[keys[-1]] = value
         return Ok(None)
 
-    def get(self, key: str, default: object = None) -> Result[Any, str]:
+    def get[T](
+        self,
+        key: str,
+        default: T | None = None,
+        type_: TypeForm[T] | None = None,
+    ) -> Result[T, str]:
         """Get a configuration value using dot notation.
 
         Args:
             key: Dot-notated key path (e.g., "database.host").
             default: Default value to return if key is not found.
+            type_: Type to cast the value to.
 
         Returns:
             Result containing the configuration value or the default.
@@ -81,7 +89,7 @@ class ConfigRepository:
                         return Ok(default)
                     return Err(f"Config key '{key}' not found")
                 current = current[k]
-            return Ok(current)
+            return Ok(current)  # type: ignore [arg-type]
         except KeyError:
             if default is not None:
                 return Ok(default)

{python_neva-2.3.0 → python_neva-2.4.1}/neva/database/provider.py

@@ -8,7 +8,6 @@ from sqlalchemy.ext.asyncio import create_async_engine
 
 from neva import Err, Ok, Result
 from neva.arch import ServiceProvider
-from neva.config.repository import ConfigRepository
 from neva.database.connection import TransactionContext
 from neva.database.manager import DatabaseManager
 from neva.obs import LogManager
@@ -29,7 +28,7 @@ class DatabaseServiceProvider(ServiceProvider):
         logger: LogManager = self.app.make(LogManager).unwrap()
         db: DatabaseManager = self.app.make(DatabaseManager).unwrap()
         logger.info("Beginning SQLAlchemy initialization...")
-        match self.app.make(ConfigRepository).unwrap().get("database"):
+        match self.app.config.get("database"):
             case Ok(config):
                 connections: dict = config.get("connections", {})
                 for name, conn_config in connections.items():

{python_neva-2.3.0 → python_neva-2.4.1}/neva/security/encryption/encrypter.py

@@ -10,7 +10,6 @@ from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 
 from neva import Err, Ok, Result
 from neva.arch import Application
-from neva.config import ConfigRepository
 from neva.security.encryption.protocol import JsonValue
 
 
@@ -127,18 +126,16 @@ class AesEncrypter:
         Raises:
             ValueError: If no encryption key is configured.
         """
-        config = self._app.make(ConfigRepository).expect(
-            "ConfigRepository not found in container"
-        )
-
-        key = config.get("app.key", default=None).unwrap_or(None)
-        previous_keys = config.get("app.previous_keys", default=[]).unwrap_or([])
-
-        if key is None:
-            msg = "No encryption key configured. Set 'app.key' in configuration."
-            raise ValueError(msg)
-
-        ciphers = [AESGCM(self._parse_key(key))]
+        previous_keys = self._app.config.get(
+            "app.previous_keys", default=[], type_=list[str]
+        ).unwrap_or([])
+
+        match self._app.config.get("app.key", type_=str):
+            case Err():
+                msg = "No encryption key configured. Set 'app.key' in configuration."
+                raise ValueError(msg)
+            case Ok(key):
+                ciphers = [AESGCM(self._parse_key(key))]
 
         for prev_key in previous_keys:
             ciphers.append(AESGCM(self._parse_key(prev_key)))

{python_neva-2.3.0 → python_neva-2.4.1}/neva/security/hashing/hash_manager.py

@@ -1,10 +1,10 @@
 """Hash manager for managing password hashing strategies."""
 
-from typing import override
+from typing import Literal, cast, override
 
-from neva import Option, from_optional
+from neva import Option
 from neva.arch import Application
-from neva.config import ConfigRepository
+from neva.security.hashing.config import Argon2Config, BcryptConfig
 from neva.security.hashing.hashers.argon2 import Argon2Hasher
 from neva.security.hashing.hashers.bcrypt import BcryptHasher
 from neva.security.hashing.hashers.protocol import Hasher
@@ -32,13 +32,7 @@ class HashManager(StrategyResolver[Hasher]):
         Returns:
             Option containing the default hasher name.
         """
-        config_result = self.app.make(ConfigRepository)
-        if config_result.is_err:
-            return from_optional(None)
-
-        config = config_result.unwrap()
-        driver = config.get("hashing.driver", default=None).unwrap_or(None)
-        return from_optional(driver)
+        return self.app.config.get("hashing.driver", type_=str).ok()
 
     def make(
         self,
@@ -113,18 +107,17 @@ class HashManager(StrategyResolver[Hasher]):
         Returns:
             Configured Argon2Hasher instance.
         """
-        config = manager.app.make(ConfigRepository).unwrap()
-        argon_config = config.get("hashing.argon", default={}).unwrap()
-
-        if isinstance(argon_config, dict):
-            return Argon2Hasher(
-                time_cost=argon_config.get("time_cost", 2),
-                memory_cost=argon_config.get("memory_cost", 102400),
-                parallelism=argon_config.get("parallelism", 8),
-                hash_len=argon_config.get("hash_len", 16),
-                salt_len=argon_config.get("salt_len", 16),
-            )
-        return Argon2Hasher()
+        argon_config = manager.app.config.get(
+            "hashing.argon", default={}, type_=Argon2Config
+        ).unwrap()
+
+        return Argon2Hasher(
+            time_cost=cast(int, argon_config.get("time_cost", 2)),
+            memory_cost=cast(int, argon_config.get("memory_cost", 102400)),
+            parallelism=cast(int, argon_config.get("parallelism", 8)),
+            hash_len=cast(int, argon_config.get("hash_len", 16)),
+            salt_len=cast(int, argon_config.get("salt_len", 16)),
+        )
 
     def _create_bcrypt_hasher(self, manager: StrategyResolver[Hasher]) -> BcryptHasher:
         """Create an instance of the Bcrypt hash strategy.
@@ -135,12 +128,11 @@ class HashManager(StrategyResolver[Hasher]):
         Returns:
             Configured BcryptHasher instance.
         """
-        config = manager.app.make(ConfigRepository).unwrap()
-        bcrypt_config = config.get("hashing.bcrypt", default={}).unwrap()
-
-        if isinstance(bcrypt_config, dict):
-            return BcryptHasher(
-                rounds=bcrypt_config.get("rounds", 12),
-                prefix=bcrypt_config.get("prefix", "2b"),
-            )
-        return BcryptHasher()
+        bcrypt_config = manager.app.config.get(
+            "hashing.bcrypt", default={}, type_=BcryptConfig
+        ).unwrap()
+
+        return BcryptHasher(
+            rounds=cast(int, bcrypt_config.get("rounds", 12)),
+            prefix=cast(Literal["2a", "2b"], bcrypt_config.get("prefix", "2b")),
+        )

{python_neva-2.3.0 → python_neva-2.4.1}/pyproject.toml

@@ -7,7 +7,7 @@ packages = ["neva"]
 
 [project]
 name = "python-neva"
-version = "2.3.0"
+version = "2.4.1"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -43,6 +43,12 @@ dev = [
   "ruff>=0.15.6",
 ]
 
+[tool.basedpyright]
+enableExperimentalFeatures = true
+
+[tool.mypy]
+enable_incomplete_feature = [ "TypeForm" ]
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "function"

{python_neva-2.3.0 → python_neva-2.4.1}/uv.lock

@@ -1507,7 +1507,7 @@ wheels = [
 
 [[package]]
 name = "python-neva"
-version = "2.3.0"
+version = "2.4.1"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },