vavacars-data-utils 1.7.0__tar.gz → 1.7.2__tar.gz

{vavacars_data_utils-1.7.0 → vavacars_data_utils-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vavacars_data_utils
-Version: 1.7.0
+Version: 1.7.2
 Summary: Package with utils
 Home-page: https://dev.azure.com/vavacars/DataScience/_git/Data.Utils
 Author: Vavacars Data Science Team

{vavacars_data_utils-1.7.0 → vavacars_data_utils-1.7.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = vavacars_data_utils
-version = 1.7.0
+version = 1.7.2
 author = Vavacars Data Science Team
 author_email = acg@vava.cars
 description = Package with utils

{vavacars_data_utils-1.7.0 → vavacars_data_utils-1.7.2}/vava_utils/auth/checker.py

@@ -56,26 +56,30 @@ class AuthChecker:
         port: Optional[int] = None,
         user: Optional[str] = None,
         database: Optional[str] = None,
+        password: Optional[str] = None,
         key_vault: Optional[str] = None,
         secret: Optional[str] = None,
     ):
         self.env = env or os.environ.get("API_DEPLOYMENT_ENV", "dev")
         cfg = dict(AUTH_DB_CONFIG.get(self.env, {}))
         # explicit kwargs override the baked-in map - meant for local/testing use only
-        overrides = dict(host=host, port=port, user=user, database=database, key_vault=key_vault, secret=secret)
+        overrides = dict(host=host, port=port, user=user, database=database)
         cfg.update({k: v for k, v in overrides.items() if v is not None})
-        missing = [k for k in ("host", "user", "database", "key_vault", "secret") if not cfg.get(k)]
+        missing = [k for k in ("host", "user", "database") if not cfg.get(k)]
         if missing:
             raise ValueError(f"Missing auth DB configuration for env '{self.env}': {missing}")
 
-        self._db = get_mysql_helper(
-            host=cfg["host"],
-            port=cfg.get("port", 3306),
-            user=cfg["user"],
-            database=cfg["database"],
-            key_vault=cfg["key_vault"],
-            secret=cfg["secret"],
-        )
+        if password:
+            key_vault = secret = None
+        else:
+            key_vault = key_vault or cfg.get("key_vault")
+            secret = secret or cfg.get("secret")
+
+        if (key_vault is None) != (secret is None):
+            raise ValueError("Key Vault credentials require both key_vault and secret")
+
+        cfg.update(password=password, key_vault=key_vault, secret=secret)
+        self._db = get_mysql_helper(**cfg)
         self._cache_ttl = cache_ttl_seconds
         self._cache: Dict[Tuple[str, str, str], Tuple[float, bool]] = {}
 
@@ -146,33 +150,30 @@ class AuthChecker:
 
     def create_user(self, username: str, password: str) -> int:
         """Creates a new user and returns its id. Fails if the username already exists."""
-        with self._db._engine.connect() as conn:
+        with self._db._engine.begin() as conn:
             result = conn.execute(
                 text("INSERT INTO api_users (username, password_hash) VALUES (:username, :password_hash)"),
                 {"username": username, "password_hash": hash_password(password)},
             )
-            conn.commit()
             return result.lastrowid
 
     def set_password(self, username: str, password: str) -> None:
-        with self._db._engine.connect() as conn:
+        with self._db._engine.begin() as conn:
             conn.execute(
                 text("UPDATE api_users SET password_hash = :password_hash WHERE username = :username"),
                 {"password_hash": hash_password(password), "username": username},
             )
-            conn.commit()
 
     def set_active(self, username: str, is_active: bool) -> None:
-        with self._db._engine.connect() as conn:
+        with self._db._engine.begin() as conn:
             conn.execute(
                 text("UPDATE api_users SET is_active = :is_active WHERE username = :username"),
                 {"is_active": is_active, "username": username},
             )
-            conn.commit()
 
     def grant_access(self, username: str, api_name: str) -> None:
         api_name = self._normalize_api_name(api_name)
-        with self._db._engine.connect() as conn:
+        with self._db._engine.begin() as conn:
             conn.execute(
                 text(
                     "INSERT IGNORE INTO api_user_access (user_id, api_name) "
@@ -180,11 +181,10 @@ class AuthChecker:
                 ),
                 {"api_name": api_name, "username": username},
             )
-            conn.commit()
 
     def revoke_access(self, username: str, api_name: str) -> None:
         api_name = self._normalize_api_name(api_name)
-        with self._db._engine.connect() as conn:
+            with self._db._engine.begin() as conn:
             conn.execute(
                 text(
                     "DELETE a FROM api_user_access a JOIN api_users u ON u.id = a.user_id "
@@ -192,7 +192,6 @@ class AuthChecker:
                 ),
                 {"username": username, "api_name": api_name},
             )
-            conn.commit()
 
     @staticmethod
     def _normalize_api_name(api_name: str) -> str:

{vavacars_data_utils-1.7.0 → vavacars_data_utils-1.7.2}/vava_utils/auth/config.py

@@ -15,7 +15,7 @@ AUTH_DB_CONFIG = {
         user="auth_svc_dev",
         database="auth_dev",
         key_vault="kv-ds-tr-dev-v1",
-        secret="authDbPasswordDevV2",
+        secret="auth-helper-dev",
     ),
     "uat": dict(
         host="mysql-vava-ds-tr-dev.mysql.database.azure.com",
@@ -23,15 +23,7 @@ AUTH_DB_CONFIG = {
         user="auth_svc_uat",
         database="auth_uat",
         key_vault="kv-ds-tr-uat-v1",
-        secret="authDbPasswordUatV2",
-    ),
-    "stg": dict(
-        host="mysql-vava-ds-tr-dev.mysql.database.azure.com",
-        port=3306,
-        user="auth_svc_stg",
-        database="auth_stg",
-        key_vault="kv-ds-tr-prod-v1",
-        secret="authDbPasswordStgV2",
+        secret="auth-helper-uat",
     ),
     "prod": dict(
         host="mysql-vava-ds-tr-dev.mysql.database.azure.com",
@@ -39,6 +31,6 @@ AUTH_DB_CONFIG = {
         user="auth_svc",
         database="auth",
         key_vault="kv-ds-tr-prod-v1",
-        secret="authDbPasswordProdV2",
+        secret="auth-helper",
     ),
 }

{vavacars_data_utils-1.7.0 → vavacars_data_utils-1.7.2}/vavacars_data_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vavacars_data_utils
-Version: 1.7.0
+Version: 1.7.2
 Summary: Package with utils
 Home-page: https://dev.azure.com/vavacars/DataScience/_git/Data.Utils
 Author: Vavacars Data Science Team