python-neva 2.2.1__py3-none-any.whl → 2.4.0__py3-none-any.whl

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)
         )

neva/config/repository.py

@@ -60,12 +60,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_: type[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 +87,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)

neva/database/manager.py

@@ -10,6 +10,7 @@ from neva import Nothing, Option, Some
 from neva.database.connection import ConnectionManager, TransactionContext
 from neva.database.transaction import BoundTransaction, Transaction
 from neva.obs import LogManager
+from neva.obs.instrumentation.sqlalchemy import instrument
 
 
 @final
@@ -30,6 +31,7 @@ class DatabaseManager:
             name: The connection name.
             engine: The async engine.
         """
+        instrument(engine)
         self._engines[name] = engine
         self._session_factories[name] = async_sessionmaker(
             bind=engine,

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():

neva/obs/instrumentation/__init__.py

@@ -0,0 +1 @@
+"""Various OTel instrumentation."""

neva/obs/instrumentation/sqlalchemy.py

@@ -0,0 +1,15 @@
+"""SQLAlchemy instrumentation."""
+
+from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
+from sqlalchemy import Engine
+from sqlalchemy.ext.asyncio import AsyncEngine
+
+
+def instrument(engine: AsyncEngine | Engine) -> None:
+    """Instrument SQLAlchemy engine."""
+    match engine:
+        case AsyncEngine():
+            to_instrument = engine.sync_engine
+        case Engine():
+            to_instrument = engine
+    SQLAlchemyInstrumentor().instrument(engine=to_instrument)

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)))

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.2.1.dist-info → python_neva-2.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-neva
-Version: 2.2.1
+Version: 2.4.0
 Summary: Add your description here
 Requires-Python: >=3.12
 Requires-Dist: aiosqlite>=0.20.0
@@ -9,6 +9,7 @@ Requires-Dist: cryptography>=46.0.3
 Requires-Dist: dishka>=1.7.2
 Requires-Dist: fastapi[all]>=0.129.0
 Requires-Dist: faststream>=0.6.6
+Requires-Dist: opentelemetry-instrumentation-sqlalchemy>=0.62b0
 Requires-Dist: pwdlib[argon2,bcrypt]>=0.3.0
 Requires-Dist: pyinstrument>=5.1.1
 Requires-Dist: sqlalchemy[asyncio]>=2.0.0

{python_neva-2.2.1.dist-info → python_neva-2.4.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ neva/__init__.py,sha256=Pj77_FvqTS-Xn0C1MZE34zTzl5QQcIyF1Zne64L37So,333
 neva/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 neva/arch/__init__.py,sha256=ZKMZ3u-pxVRRQcbqIF2L4F5IUclRcRVNe83hnN5YYeo,470
 neva/arch/app.py,sha256=devhJqAmssWCdhvT7d-mE6vyUuEXX5rIY06oIoR21QE,4451
-neva/arch/application.py,sha256=9bJCGKXX82xSN5LxmvGLYNSzbc8CgmWEk3DS9JqTMT8,5953
+neva/arch/application.py,sha256=pBoN8ExT1_MXjeJhrRNdp_S3KdB7a9qf_Hc_sHNRei4,6096
 neva/arch/config.py,sha256=R8_wMKTwX8vTFqfQhgglDQ9PfB6Yo6mx6OnKg8bnIWw,1042
 neva/arch/facade.py,sha256=4aTOFuBwM58gn1FR7X1mOoKdi37J10OjPOpLVnCTCw8,7915
 neva/arch/faststream.py,sha256=1eUQRh3ahmQ6T991iHpxMeItDI53mEFq_30krIagNmM,2361
@@ -10,12 +10,12 @@ neva/arch/service_provider.py,sha256=g9tvlBNpGxdJ6yL9w6L-oPLzC6AV_Z6vLDR-TW3Kqz0
 neva/config/__init__.py,sha256=Ygfnh-MRRKYDdf54_LeMSHwmck5VpNHTdnnMtGEFLtU,121
 neva/config/base_providers.py,sha256=fK4feZWLzchpQ_xaeumtR9P2JK5nuk8Vq5O7JWkGyO8,908
 neva/config/loader.py,sha256=ZIcx8oYIi2r4wv1G_Q7_a6nG7wARyzjiZ2wF43t3B2I,3942
-neva/config/repository.py,sha256=B7iWgJLtOIwdmp7I0y9ISgl3g_Xc60tUe-ofDUKM6fg,4827
+neva/config/repository.py,sha256=RlErYZfNBQQkwId3zXs3wjgcKR-uhUxNtNjh_3r9cD4,4972
 neva/database/__init__.py,sha256=3yYnEe8HQM86tURyAhTbMtE7AXubIEMN3GuwxkkT-bk,508
 neva/database/config.py,sha256=bVKUqlrYDFrURqg_FbntPXyVkbOUPSVXQJTKjyucjL0,451
 neva/database/connection.py,sha256=et1fvGxa2iHTJ8yzAv9VIYqfD4GtGaV0KQUW97SdLHQ,7107
-neva/database/manager.py,sha256=lgW0rd6CHQKNUSfIR25mTMIalu13HZD7Vklyfq6Tl10,4425
-neva/database/provider.py,sha256=R-K4aFCgF8Ewu6I_-BXo874IYgQgI3b8qYPsGe7ArFA,1785
+neva/database/manager.py,sha256=tQFHj2HZzo3oxdWyWNQlv5277I7vh7vDlEEiUyAKjDs,4511
+neva/database/provider.py,sha256=GvWZjT3f4BEzQFY9yB2QHciw2NXGoy6L-d1CbP6vPa4,1708
 neva/database/transaction.py,sha256=yQuFDhdXipUWac3zx4rVy6R6XUB_xPT_CLoQ-26223Y,5933
 neva/events/__init__.py,sha256=xwIAXNcOASpuCY4DJpshZc1gtxQHimzwy-s7c-4QuiQ,746
 neva/events/dispatcher.py,sha256=3xMhxE5uQBY7648jp75NkRwu09lqYo7ymmfSvnl6kT0,2850
@@ -24,6 +24,8 @@ neva/events/event_registry.py,sha256=jucYOUjCERz-ICdPiDrxYw_ySvmPJOcRzYKCgka29qY
 neva/events/listener.py,sha256=AMfi24R_WA_-mVg0fxfOrwY6EV8kO1wU5YpAFPvGrus,1825
 neva/events/provider.py,sha256=ilPW_-zaLMrh-cgWphLe_aqvs00LNp93OOMFFpIppyE,767
 neva/obs/__init__.py,sha256=dVzgljk9Hvo44LI34RcwbDyT42_z4nSnFVmL4GLbKD0,331
+neva/obs/instrumentation/__init__.py,sha256=SfIAvuCs-L0kEzOxUJ4aOIkhbydCe7qBwWtGeDELVA0,36
+neva/obs/instrumentation/sqlalchemy.py,sha256=kwk43NthFi4mPMhDJI55rxt9YPOY_mwOkr2E-cD64ZY,497
 neva/obs/logging/__init__.py,sha256=gIYBAzMK7-wPGEpA_kYKvJPT3hYN99OcCc9UuHFeiHk,251
 neva/obs/logging/manager.py,sha256=ktd3muBGU3e1KuBK6tSU5faRJRliPwmknuqJ2EYeFBk,2422
 neva/obs/logging/provider.py,sha256=lt5oma5eV6mjN4C5iFhyYf0BmI9BMbFVBJJNSy2XOkg,638
@@ -33,11 +35,11 @@ neva/obs/middleware/profiler.py,sha256=ovx3s-39WpNtu2KhzVMWyIJa6OLrSVDuL56xyDA-v
 neva/security/__init__.py,sha256=Dhh3ZsseP6biWgRQY4hYKkoYFCR7ehhxz4VBqN8e02k,440
 neva/security/provider.py,sha256=20ZPKp4SxYV7pN1TN1yx-RIHken2TEHJBpaVjIFRxYI,499
 neva/security/encryption/__init__.py,sha256=eVWW-qk03vy7Bn-sNQ2WJHWZI6tPJOkknJz8llc1m0M,288
-neva/security/encryption/encrypter.py,sha256=_yo_jTU7yg3YloxvzjyUJBuXb-WAbnyYVTzuCF9F8JA,5238
+neva/security/encryption/encrypter.py,sha256=E2DvTsG_756L75K1IUeYlEzazKn4Eqk1psryCk7HEHE,5156
 neva/security/encryption/protocol.py,sha256=H_JSt8IBH_AVkgccltY_4dGtcmESt4o76W0vxszBikM,839
 neva/security/hashing/__init__.py,sha256=k3SviEvtJLjBXTkR5I6w9YMPw6Q-LIoE1wGNz3GYvOE,374
 neva/security/hashing/config.py,sha256=ltj7_GW44gSg2N0i8CEYaw6Y6xUfzwsr4zXk5ic_sJI,624
-neva/security/hashing/hash_manager.py,sha256=ViFtbaKrbFLWJ6OpajFByqpmZ8YAnZfy_3Jatm0aWZ0,4866
+neva/security/hashing/hash_manager.py,sha256=7Oy2gOUZvzRbMsD3unvE1HFDjcHvB-U3Gl84kd3Lbz4,4568
 neva/security/hashing/hashers/__init__.py,sha256=Zn_Q2tj_8lhhwJRZ7RXeJLYujd-3j7Rr8JQO2sSGgJs,44
 neva/security/hashing/hashers/argon2.py,sha256=pJqTl3_oCJCjJarnQwNSFRznlaijjbjdDVpC0DXDoSg,1402
 neva/security/hashing/hashers/bcrypt.py,sha256=H_15r-z9DYkd4HEbTz0QA4NHVBiFDXEqHkngP3HMSBY,1083
@@ -72,6 +74,6 @@ neva/testing/fakes.py,sha256=ffAAZC7WymuutVYk3vefuPDUvpNHav2QV2lj-Gw0Kic,2666
 neva/testing/fixtures.py,sha256=-l_Drw6nXTD_cKpfg1Z1pmsXnaD3NM2kihdRHxSkfzE,1657
 neva/testing/http.py,sha256=9oKNzaz38nCKkL-ZUF5CRWFPqpNmXkqbYcoukC509_Q,494
 neva/testing/test_case.py,sha256=FzXBHctkVkFNu46S5lnt7iRX91TLPLfL1Lzgn-iU-_E,3325
-python_neva-2.2.1.dist-info/METADATA,sha256=XhKt4y0UPn7sq-dj0xaKMi_gHIe3RB3TzLwrEtQfKcQ,627
-python_neva-2.2.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_neva-2.2.1.dist-info/RECORD,,
+python_neva-2.4.0.dist-info/METADATA,sha256=XyVNgtWT8cYqCGaFuRTgviKMZTOF7aKJaGTZz8nkUWc,691
+python_neva-2.4.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_neva-2.4.0.dist-info/RECORD,,