zrb 1.7.4__py3-none-any.whl → 1.8.0__py3-none-any.whl

zrb/runner/web_util/token.py

@@ -1,27 +1,27 @@
 from datetime import datetime, timedelta, timezone
 
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_auth_config import WebAuthConfig
 from zrb.runner.web_schema.token import Token
 from zrb.runner.web_util.user import get_user_by_credentials
 
 
 def generate_tokens_by_credentials(
-    web_config: WebConfig, username: str, password: str
+    web_auth_config: WebAuthConfig, username: str, password: str
 ) -> Token | None:
-    if not web_config.enable_auth:
-        user = web_config.default_user
+    if not web_auth_config.enable_auth:
+        user = web_auth_config.default_user
     else:
-        user = get_user_by_credentials(web_config, username, password)
+        user = get_user_by_credentials(web_auth_config, username, password)
     if user is None:
         return None
-    access_token = _generate_access_token(web_config, user.username)
-    refresh_token = _generate_refresh_token(web_config, user.username)
+    access_token = _generate_access_token(web_auth_config, user.username)
+    refresh_token = _generate_refresh_token(web_auth_config, user.username)
     return Token(
         access_token=access_token, refresh_token=refresh_token, token_type="bearer"
     )
 
 
-def regenerate_tokens(web_config: WebConfig, refresh_token: str) -> Token:
+def regenerate_tokens(web_auth_config: WebAuthConfig, refresh_token: str) -> Token:
     from fastapi import HTTPException
     from jose import jwt
 
@@ -29,7 +29,7 @@ def regenerate_tokens(web_config: WebConfig, refresh_token: str) -> Token:
     try:
         payload = jwt.decode(
             refresh_token,
-            web_config.secret_key,
+            web_auth_config.secret_key,
             options={"require_exp": True, "require_sub": True},
         )
     except Exception:
@@ -39,12 +39,12 @@ def regenerate_tokens(web_config: WebConfig, refresh_token: str) -> Token:
     username: str = payload.get("sub")
     if username is None:
         raise HTTPException(status_code=401, detail="Invalid refresh token")
-    user = web_config.find_user_by_username(username)
+    user = web_auth_config.find_user_by_username(username)
     if user is None:
         raise HTTPException(status_code=401, detail="User not found")
     # Create new token
-    new_access_token = _generate_access_token(web_config, username)
-    new_refresh_token = _generate_refresh_token(web_config, username)
+    new_access_token = _generate_access_token(web_auth_config, username)
+    new_refresh_token = _generate_refresh_token(web_auth_config, username)
     return Token(
         access_token=new_access_token,
         refresh_token=new_refresh_token,
@@ -52,21 +52,21 @@ def regenerate_tokens(web_config: WebConfig, refresh_token: str) -> Token:
     )
 
 
-def _generate_access_token(web_config: WebConfig, username: str) -> str:
+def _generate_access_token(web_auth_config: WebAuthConfig, username: str) -> str:
     from jose import jwt
 
     expire = datetime.now(timezone.utc) + timedelta(
-        minutes=web_config.access_token_expire_minutes
+        minutes=web_auth_config.access_token_expire_minutes
     )
     to_encode = {"sub": username, "exp": expire, "type": "access"}
-    return jwt.encode(to_encode, web_config.secret_key)
+    return jwt.encode(to_encode, web_auth_config.secret_key)
 
 
-def _generate_refresh_token(web_config: WebConfig, username: str) -> str:
+def _generate_refresh_token(web_auth_config: WebAuthConfig, username: str) -> str:
     from jose import jwt
 
     expire = datetime.now(timezone.utc) + timedelta(
-        minutes=web_config.refresh_token_expire_minutes
+        minutes=web_auth_config.refresh_token_expire_minutes
     )
     to_encode = {"sub": username, "exp": expire, "type": "refresh"}
-    return jwt.encode(to_encode, web_config.secret_key)
+    return jwt.encode(to_encode, web_auth_config.secret_key)

zrb/runner/web_util/user.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_auth_config import WebAuthConfig
 from zrb.runner.web_schema.user import User
 
 if TYPE_CHECKING:
@@ -9,53 +9,55 @@ if TYPE_CHECKING:
 
 
 def get_user_by_credentials(
-    web_config: WebConfig, username: str, password: str
+    web_auth_config: WebAuthConfig, username: str, password: str
 ) -> User | None:
-    user = web_config.find_user_by_username(username)
+    user = web_auth_config.find_user_by_username(username)
     if user is None or not user.is_password_match(password):
         return None
     return user
 
 
 async def get_user_from_request(
-    web_config: WebConfig, request: "Request"
+    web_auth_config: WebAuthConfig, request: "Request"
 ) -> User | None:
     from fastapi.security import OAuth2PasswordBearer
 
-    if not web_config.enable_auth:
-        return web_config.default_user
+    if not web_auth_config.enable_auth:
+        return web_auth_config.default_user
     # Normally we use "Depends"
     get_bearer_token = OAuth2PasswordBearer(tokenUrl="/api/v1/login", auto_error=False)
     bearer_token = await get_bearer_token(request)
-    token_user = _get_user_from_token(web_config, bearer_token)
+    token_user = _get_user_from_token(web_auth_config, bearer_token)
     if token_user is not None:
         return token_user
-    cookie_user = _get_user_from_cookie(web_config, request)
+    cookie_user = _get_user_from_cookie(web_auth_config, request)
     if cookie_user is not None:
         return cookie_user
-    return web_config.default_user
+    return web_auth_config.default_user
 
 
-def _get_user_from_cookie(web_config: WebConfig, request: "Request") -> User | None:
-    token = request.cookies.get(web_config.access_token_cookie_name)
+def _get_user_from_cookie(
+    web_auth_config: WebAuthConfig, request: "Request"
+) -> User | None:
+    token = request.cookies.get(web_auth_config.access_token_cookie_name)
     if token:
-        return _get_user_from_token(web_config, token)
+        return _get_user_from_token(web_auth_config, token)
     return None
 
 
-def _get_user_from_token(web_config: WebConfig, token: str) -> User | None:
+def _get_user_from_token(web_auth_config: WebAuthConfig, token: str) -> User | None:
     try:
         from jose import jwt
 
         payload = jwt.decode(
             token,
-            web_config.secret_key,
+            web_auth_config.secret_key,
             options={"require_sub": True, "require_exp": True},
         )
         username: str = payload.get("sub")
         if username is None:
             return None
-        user = web_config.find_user_by_username(username)
+        user = web_auth_config.find_user_by_username(username)
         if user is None:
             return None
         return user

zrb/util/string/format.py

@@ -19,21 +19,18 @@ def fstring_format(template: str, data: dict[str, Any]) -> str:
         ValueError: If an expression in the template fails to evaluate or the
             template is invalid.
     """
+    # Step 1: Replace escaped braces with unique tokens (temporary)
+    template = template.replace("{{", "\u0000").replace("}}", "\u0001")
 
-    def replace_expr(match):
-        """
-        Helper function to evaluate a single expression found in the template.
-        """
+    # Step 2: Replace real expressions {expr}
+    def eval_expr(match: re.Match) -> str:
         expr = match.group(1)
         try:
-            result = eval(expr, {}, data)
-            return str(result)
+            return str(eval(expr, {}, data))
         except Exception as e:
-            raise ValueError(f"Failed to evaluate expression: {expr}: {e}")
-
-    # Use regex to find and replace all expressions in curly braces
-    pattern = r"\{([^}]+)\}"
-    try:
-        return re.sub(pattern, replace_expr, template)
-    except Exception as e:
-        raise ValueError(f"Failed to parse template: {template}: {e}")
+            raise ValueError(f"Error evaluating expression '{expr}': {e}")
+
+    rendered = re.sub(r"\{([^{}]+)\}", eval_expr, template)
+
+    # Step 3: Restore escaped braces
+    return rendered.replace("\u0000", "{").replace("\u0001", "}")

{zrb-1.7.4.dist-info → zrb-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.7.4
+Version: 1.8.0
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.7.4.dist-info → zrb-1.8.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zrb/__init__.py,sha256=JgYNwsKYVzYzpoFXRn_LwuNFreMffPEvoSehTZisp4M,3103
+zrb/__init__.py,sha256=e0fZglzFsjO-jz0HhHaBV5Vm0e3MZJBtXcrgDOPESB0,3103
 zrb/__main__.py,sha256=Kr_AkgmwBEycQcPVkZmrNh4hp2g62G-7ZXeOhJg0Qis,2603
 zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
@@ -148,26 +148,26 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/images/android-chrome-192x192.png,sha256=4NN-TGVL3y3MVbms7kCgD-Udp5XmQ6cwmWqRFYib0qw,12463
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/images/android-chrome-512x512.png,sha256=PE5DCXqmMtNvwDWfHxVoRIy36mrTmq4IDv-YPgz4mvg,34025
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/images/favicon-32x32.png,sha256=KHE2CBnJAxS81xzoPxdfYA17nJxvoOf6yM2UPaKIT7E,1402
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.amber.min.css,sha256=8cF9dTD4aYLVLn_GdHe5iwl7FBVWEX3AyViuf_A9PNc,82218
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.blue.min.css,sha256=rZaP3bJyScz6-0dUInIdIyc6qP4ScZkBBxX2LCXV4e4,82210
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.cyan.min.css,sha256=zN4eQ0n5b2ooiMup_P4F2tUNf8JvlnZnUUvhXnwBkHA,82200
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.fuchsia.min.css,sha256=ecP3r5jfzqjzZBSG53v3LJLAqz5Z0UWuMg2BsXD33YI,82209
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.green.min.css,sha256=wKuyGRehVqkh9KJYevU6UYK7vrW2AZdjehVRBhiy26o,82194
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.grey.min.css,sha256=U3q94w27RRMQ0C4o-LMspRG2zx68FFxi42eQxDc78yw,82236
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.indigo.min.css,sha256=gt0vz3JYANwfviNyiC9cQ8PsOJTwFzZ1zoQhT9z8GPU,82211
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.jade.min.css,sha256=huFPPU__cOeh4IiJoTqR0gDhnj0LUG7eYMUV65fHo-w,82193
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.lime.min.css,sha256=D-VyV6nPNG1Jdb8yBxUzwUE0bwuenzqhiCJqQQKZQs8,82217
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.min.css,sha256=3V_VWRr9ge4h3MEXrYXAFNw_HxncLXt9EB6grMKSdMI,82194
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.orange.min.css,sha256=Ndbf_RoTxhDNVaofJp6_GUGtdB-8XImJ4GS1oCYPVFY,82200
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.pink.min.css,sha256=LqX5Qd7UFQ2GPLmyMToQFfuxx-7qXvY5g5C6g-Dh3t4,82208
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.pumpkin.min.css,sha256=XYaffJhxOX5Q1ZRkQKQpecNkRUFgqU3rlw0hGGp46PQ,82217
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.purple.min.css,sha256=ugBx_XOtOaCtXQegW1KMk_Rwd4fRqresbggF_wMwCGQ,82211
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.red.min.css,sha256=PhRN54GQjJwiSeMiLZVOWAxbT5aOhCc8VNchTuZg5KI,82200
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.sand.min.css,sha256=gsmvJ3u7_wNZ1kvJKiISWBpxMVMFV32tXOzoIGg6RUY,82235
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.slate.min.css,sha256=VbzLFd2cYK9nvJ3yDYaSJdtU_VbSXWo-4BYXbgew9js,82211
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.violet.min.css,sha256=z8fP6YMWH12oq-NPDVG2OXdza2K0K7k4RYWuxHCqzH8,82211
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.yellow.min.css,sha256=mOkvNiE272UAgO8cVewJjU9BYidLxDZ97IcYodW--Ik,82218
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.zinc.min.css,sha256=s8SdVQv4fX3W0LbfKDgUDczWcCyUfRbZhpyYtLdASC0,82212
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.amber.min.css,sha256=CuU4QUuZB9g7Kp-UCpLhiFMaeWp27YHk9yWhiTrOUEQ,83343
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.blue.min.css,sha256=xz-TxXSV6YYZphxO8ls-z_5KA4bMSL7GAbd3b3m-PDw,83335
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.cyan.min.css,sha256=u1NSuxSlsKvV9ussgvRauHZDvMGo3IKPDVERUHcXKOg,83325
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.fuchsia.min.css,sha256=vm_phDygepr5Xcg00WqE4rZ56fOBVUculHkjcueM-S8,83334
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.green.min.css,sha256=rV1-95jjXPKW3ZO3SlbaMcq-6a0s_B0kDBJ7qgt1iCQ,83319
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.grey.min.css,sha256=Ylj3e-TYOeRUunW1Ob2fm65arWG_p3yNfEQODgFQC2I,83361
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.indigo.min.css,sha256=P_dc3oTHZJFUnhp8ZClMLIPLL5IjHqRGkvn_xpiXqBE,83336
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.jade.min.css,sha256=3DiFxHhfBOO9RYRp7sDRi8BxwrHx0v1zXoPQDf6VcbM,83318
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.lime.min.css,sha256=3GwkX3UHmC5jhWsglefOT591IzvpBUDONWV5v8aT5vM,83342
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.min.css,sha256=-8mmP8n8n3LRL9f8mAbhH6n3euT5ytFGsnADoRGbo9s,83319
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.orange.min.css,sha256=FJkqb3R8_Tr1QBzi9s270L_s0KZ8atjjmd7IRiEVHDc,83325
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.pink.min.css,sha256=3Z7D2ZpOVZHsDDelMrMEvkP4XFRwWfO1NYmE95jHaQM,83333
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.pumpkin.min.css,sha256=uM0Ft6sePS2OP1Km-EgzpHfuy8bOEDliYG157T5dCvg,83342
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.purple.min.css,sha256=RYpEcxJ3OXN7QhcBQx909A96zqMAdJ1UmrHp41rdCVM,83336
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.red.min.css,sha256=gd9J5L13xwfLhjSpkd2DI4cJf5evsYOj9xUrW4tAJtw,83325
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.sand.min.css,sha256=x0qk2Es5GAOw649GmeozgnPyPTKih3aFO9-f1a6Yipk,83360
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.slate.min.css,sha256=KDDpOhFoPtzVXRKOyE2EIzeuBB5Z6jlaL5FQ34Cmemg,83336
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.violet.min.css,sha256=DJmQkSpAPHjaSXeT-MITZ6ENJa0eyyizTR00wt3bXHc,83336
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.yellow.min.css,sha256=_UXLKrhEsXonQ-VthBNB7zHUEcV67KDAE-SiDR1SrlU,83371
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.zinc.min.css,sha256=C9KHUa2PomYXZg2-rbpDPDYkuL_ZZTwFS-uj1Zo7azE,83337
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/template/default.html,sha256=Lg4vONCLOx8PSORFitg8JZa-4dp-pyUvKSVzCJEFsB8,4048
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/requirements.txt,sha256=jSLXX-ZOElSG69qjx5yVcpg6X_QJoisNDUYpCv2ldH8,195
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -216,7 +216,7 @@ zrb/callback/callback.py,sha256=mk_RIHuWi-oP5b81jfhzU6fruhsIjhRtKpwh2yYmsiM,3876
 zrb/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/cmd/cmd_result.py,sha256=L8bQJzWCpcYexIxHBNsXj2pT3BtLmWex0iJSMkvimOA,597
 zrb/cmd/cmd_val.py,sha256=7Doowyg6BK3ISSGBLt-PmlhzaEkBjWWm51cED6fAUOQ,1014
-zrb/config.py,sha256=ZQKSNZmMfCyxTq7_4eCVzn_XsbMd7SlErjxAdB3wwoA,8708
+zrb/config.py,sha256=rvCymdWpVKfwa1XlLNbFMxz2kkJyzqvqoqv5R8_zLDY,9584
 zrb/content_transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/content_transformer/any_content_transformer.py,sha256=v8ZUbcix1GGeDQwB6OKX_1TjpY__ksxWVeqibwa_iZA,850
 zrb/content_transformer/content_transformer.py,sha256=STl77wW-I69QaGzCXjvkppngYFLufow8ybPLSyAvlHs,2404
@@ -245,56 +245,74 @@ zrb/input/option_input.py,sha256=TQB82ko5odgzkULEizBZi0e9TIHEbIgvdP0AR3RhA74,213
 zrb/input/password_input.py,sha256=szBojWxSP9QJecgsgA87OIYwQrY2AQ3USIKdDZY6snU,1465
 zrb/input/str_input.py,sha256=NevZHX9rf1g8eMatPyy-kUX3DglrVAQpzvVpKAzf7bA,81
 zrb/input/text_input.py,sha256=6T3MngWdUs0u0ZVs5Dl11w5KS7nN1RkgrIR_zKumzPM,3695
-zrb/llm_config.py,sha256=h3LyjoOunc-2FxOOyCwM6Xcll3iXDykvvbV6xob-iB8,12244
+zrb/llm_config.py,sha256=GtwPqBtKDq5_vazOZF8cMRZK_7dK0I5nnwnMWPuzrMA,12242
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/runner/cli.py,sha256=knWItZ0fm25gy4hjSgjliCtMSP2i3m2N8rNpS8B9csQ,7034
+zrb/runner/cli.py,sha256=AbLTNqFy5FuyGQOWOjHZGaBC8e2yuE_Dx1sBdnisR18,6984
 zrb/runner/common_util.py,sha256=JDMcwvQ8cxnv9kQrAoKVLA40Q1omfv-u5_d5MvvwHeE,1373
-zrb/runner/web_app.py,sha256=y7lA9urDg1ImZHFzhzogjVMVa9K8E-uSbMK_aNXYstM,2620
-zrb/runner/web_config/config.py,sha256=0wR58KreAmawGGfamm0GLZY344HaXs7qfDgHLavBDwo,3125
-zrb/runner/web_config/config_factory.py,sha256=GIvAwQKY_jkAb_IVt179KvphqHPY7gfBiQrZmELVQdQ,636
+zrb/runner/web_app.py,sha256=pydxJakSMsopvWWzkWLtMz7NyRORiS1KHKuG0jIF6N0,2792
+zrb/runner/web_auth_config.py,sha256=LwEDcfH0W57Z8SQIl8i-JpVibofB72gmzjPFiwUznQs,6361
 zrb/runner/web_route/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/runner/web_route/docs_route.py,sha256=06QfDITvXTRphZWI0qlxbDfnB-44_eZpE-xotwKsvY8,514
-zrb/runner/web_route/error_page/serve_default_404.py,sha256=y2gVZPPjGp5J9uRH6JpoboaFI3DMP-WmCjH6fWx5UBM,1056
-zrb/runner/web_route/error_page/show_error_page.py,sha256=8U3jbBYVJIdYjR1AVCBfrmfLQ4dE4MbHwA3AovtIab4,1275
-zrb/runner/web_route/error_page/view.html,sha256=h58zKnB170h2BTczBtD8CoECEEdXpojWMBbL_KwS4yU,1204
+zrb/runner/web_route/docs_route.py,sha256=Ftv4BbxnF_GZs2cJwen4hV7Z_UKQassFugB_bePdrPw,543
+zrb/runner/web_route/error_page/serve_default_404.py,sha256=srQSyOHoTZLScSvSUQnzUAVFOFSO_NQ2XEQZSvPd05c,1072
+zrb/runner/web_route/error_page/show_error_page.py,sha256=ck5u_LQiLHtgzwpVgX9Xs_60zPonfnoefXDYYBoR3gI,1301
+zrb/runner/web_route/error_page/view.html,sha256=iYH52t2CQ9_ubgweELwnUXtqzhleC0Nv1oa9ecREM64,544
 zrb/runner/web_route/home_page/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/runner/web_route/home_page/home_page_route.py,sha256=r_Mfmz2I5MmhQRMQ_0hWoNNucXNhxH6dl8rlA7yRIYY,2556
+zrb/runner/web_route/home_page/home_page_route.py,sha256=dVOlQ_Nk5wQZkkRCC43aiACQRGAxzzCRYfTYRRHnm3M,2606
 zrb/runner/web_route/home_page/view.html,sha256=oWvirSGh74ABHHDPYboQueZI6_xMeMLDf5LZNLZO52k,422
-zrb/runner/web_route/login_api_route.py,sha256=AAK6DmQQrFi1Rg_Y5qF_ss11tzDMnziPXYILEb-vlb4,1125
-zrb/runner/web_route/login_page/login_page_route.py,sha256=BZ3aeVT7mNY1MgBvSjGCO77Lfnh9yBcOIajSbjgOo30,1695
+zrb/runner/web_route/login_api_route.py,sha256=xzo8GyybsNJmnmo6GD08zmVjD9nWpckOnSxH92HqxkU,1151
+zrb/runner/web_route/login_page/login_page_route.py,sha256=Cs0VtIbu9Sq0Or2d7TRrT2d0_85y_XxsvBmPBzi9OsQ,1929
 zrb/runner/web_route/login_page/view.html,sha256=KLHZWm5MxcGCOQjeq_JtXMTLvDX8JyphSBbK6DDrkg8,1139
-zrb/runner/web_route/logout_api_route.py,sha256=ZlP1fi1RoNajLrm5ojo2o905TaE8OCB2soGhbLJ-2OE,612
-zrb/runner/web_route/logout_page/logout_page_route.py,sha256=oAeNXkwKFSUUby8F-i3WN7BZgIsAv5Lp8HYdLXAlsxQ,1740
+zrb/runner/web_route/logout_api_route.py,sha256=VS5OvngwoAE5SXolWtEmja1vXpqSLQu8E-wiq5weeDA,633
+zrb/runner/web_route/logout_page/logout_page_route.py,sha256=JAzBJzgMR-deKJOaE_8VXnzA0RJdTS_rpUBRTmwobg4,1974
 zrb/runner/web_route/logout_page/view.html,sha256=P1S9cv7eXMbwUZTPfP4sshBNI-m9nWhLP-mrmtoEHCs,742
-zrb/runner/web_route/node_page/group/show_group_page.py,sha256=QL_AawyOdmMQLyhS3lIF5Ko0vhuDH02QN-93rjxCVTQ,1943
+zrb/runner/web_route/node_page/group/show_group_page.py,sha256=IBwCU8HykybPII89sCWvYXdM-OaBvSaQqixgBhdsPOg,1953
 zrb/runner/web_route/node_page/group/view.html,sha256=3d1O2Vqc2PzxY-_xWt0Rsb2mG1yrvQ1TuaZXuYGolJw,566
-zrb/runner/web_route/node_page/node_page_route.py,sha256=LYi60eZ5ZGgykTIeSQk5Hn9OYjh3ocYgBIAue7Bznvw,2268
+zrb/runner/web_route/node_page/node_page_route.py,sha256=7UjYGgtlDK6t2RR0ILmXwkZk04a1HJKOhDr09h46Rzw,2284
 zrb/runner/web_route/node_page/task/partial/input.html,sha256=X2jy0q7TLQGP853exZMed0lqPezL3gzn6mnhB5QKfkc,178
-zrb/runner/web_route/node_page/task/show_task_page.py,sha256=uZB7r5uQvG4OJwtGUu7DaTU-8qgSsVEf3nY8KaTE4TI,3344
+zrb/runner/web_route/node_page/task/show_task_page.py,sha256=Fmov5Byqj10Rbkl-IXxZDoKt0L7rMP9TjMIcq2oNtmk,3355
 zrb/runner/web_route/node_page/task/view.html,sha256=mp_DeoPXhWPypAbKSZ6iTIDVlTRUQzIuJfDExxOWBWc,2598
-zrb/runner/web_route/refresh_token_api_route.py,sha256=QGulCGN2vhDXuf-U4bPSJjbTcz40ixP8937hSOiy_Mo,1478
-zrb/runner/web_route/static/global_template.html,sha256=M00b1F-Y31vx6xQVGMVGkSJzCrQHWHe9zI_WSffS6Ck,999
+zrb/runner/web_route/refresh_token_api_route.py,sha256=UFrSwNxpbDRHQiDIRhtVndRNlwsMIRZOkL4glK5sS6c,1504
+zrb/runner/web_route/static/global_template.html,sha256=fK5eBs4cH5zb_JhcWANygtnf0PMY4HAkFmN3hZI3rE4,1298
 zrb/runner/web_route/static/refresh-token.template.js,sha256=AWXhdxTMyuzBZoMftH7BjlU2CMIafwqWcbkZoiUEE50,1074
 zrb/runner/web_route/static/resources/common.css,sha256=Kk8o0mcArKTOxPllR0ecaa0ZRVVig0CG0KvLXIqmGJo,517
 zrb/runner/web_route/static/resources/common.js,sha256=e0OEhQBA1cMuGtj9yQQT2O053ysngcJTL-jW0b1gvoY,813
 zrb/runner/web_route/static/resources/favicon-32x32.png,sha256=yu9AIU4k_qD4YHpul6XwJgOxIbmu0thv9ymm2QOsrAk,1456
 zrb/runner/web_route/static/resources/login/event.js,sha256=1-NxaUwU-X7Tu2RAwVkzU7gngS0OdooH7Ple4_KDrh4,1135
 zrb/runner/web_route/static/resources/logout/event.js,sha256=MfZxrTa2yL49Lbh7cCZDdqsIcf9e1q3W8-WjmZXV5pA,692
-zrb/runner/web_route/static/resources/pico.min.css,sha256=_Esfkjs_U_igYn-tXBUaK3AEKb7d4l9DlmaOiw9bXfI,82214
+zrb/runner/web_route/static/resources/pico-css/pico.amber.min.css,sha256=CuU4QUuZB9g7Kp-UCpLhiFMaeWp27YHk9yWhiTrOUEQ,83343
+zrb/runner/web_route/static/resources/pico-css/pico.blue.min.css,sha256=xz-TxXSV6YYZphxO8ls-z_5KA4bMSL7GAbd3b3m-PDw,83335
+zrb/runner/web_route/static/resources/pico-css/pico.cyan.min.css,sha256=u1NSuxSlsKvV9ussgvRauHZDvMGo3IKPDVERUHcXKOg,83325
+zrb/runner/web_route/static/resources/pico-css/pico.fuchsia.min.css,sha256=vm_phDygepr5Xcg00WqE4rZ56fOBVUculHkjcueM-S8,83334
+zrb/runner/web_route/static/resources/pico-css/pico.green.min.css,sha256=rV1-95jjXPKW3ZO3SlbaMcq-6a0s_B0kDBJ7qgt1iCQ,83319
+zrb/runner/web_route/static/resources/pico-css/pico.grey.min.css,sha256=Ylj3e-TYOeRUunW1Ob2fm65arWG_p3yNfEQODgFQC2I,83361
+zrb/runner/web_route/static/resources/pico-css/pico.indigo.min.css,sha256=P_dc3oTHZJFUnhp8ZClMLIPLL5IjHqRGkvn_xpiXqBE,83336
+zrb/runner/web_route/static/resources/pico-css/pico.jade.min.css,sha256=3DiFxHhfBOO9RYRp7sDRi8BxwrHx0v1zXoPQDf6VcbM,83318
+zrb/runner/web_route/static/resources/pico-css/pico.lime.min.css,sha256=3GwkX3UHmC5jhWsglefOT591IzvpBUDONWV5v8aT5vM,83342
+zrb/runner/web_route/static/resources/pico-css/pico.min.css,sha256=-8mmP8n8n3LRL9f8mAbhH6n3euT5ytFGsnADoRGbo9s,83319
+zrb/runner/web_route/static/resources/pico-css/pico.orange.min.css,sha256=FJkqb3R8_Tr1QBzi9s270L_s0KZ8atjjmd7IRiEVHDc,83325
+zrb/runner/web_route/static/resources/pico-css/pico.pink.min.css,sha256=3Z7D2ZpOVZHsDDelMrMEvkP4XFRwWfO1NYmE95jHaQM,83333
+zrb/runner/web_route/static/resources/pico-css/pico.pumpkin.min.css,sha256=uM0Ft6sePS2OP1Km-EgzpHfuy8bOEDliYG157T5dCvg,83342
+zrb/runner/web_route/static/resources/pico-css/pico.purple.min.css,sha256=RYpEcxJ3OXN7QhcBQx909A96zqMAdJ1UmrHp41rdCVM,83336
+zrb/runner/web_route/static/resources/pico-css/pico.red.min.css,sha256=gd9J5L13xwfLhjSpkd2DI4cJf5evsYOj9xUrW4tAJtw,83325
+zrb/runner/web_route/static/resources/pico-css/pico.sand.min.css,sha256=x0qk2Es5GAOw649GmeozgnPyPTKih3aFO9-f1a6Yipk,83360
+zrb/runner/web_route/static/resources/pico-css/pico.slate.min.css,sha256=KDDpOhFoPtzVXRKOyE2EIzeuBB5Z6jlaL5FQ34Cmemg,83336
+zrb/runner/web_route/static/resources/pico-css/pico.violet.min.css,sha256=DJmQkSpAPHjaSXeT-MITZ6ENJa0eyyizTR00wt3bXHc,83336
+zrb/runner/web_route/static/resources/pico-css/pico.yellow.min.css,sha256=_UXLKrhEsXonQ-VthBNB7zHUEcV67KDAE-SiDR1SrlU,83371
+zrb/runner/web_route/static/resources/pico-css/pico.zinc.min.css,sha256=C9KHUa2PomYXZg2-rbpDPDYkuL_ZZTwFS-uj1Zo7azE,83337
 zrb/runner/web_route/static/resources/session/common-util.js,sha256=t7_s5DXgMyZlT8L8LYZTkzOT6vWVeZvmCKjt-bflQY0,2117
 zrb/runner/web_route/static/resources/session/current-session.js,sha256=tzUdK7qJKnMBGlIaMZJIPc2oeL5csk1JTBbjTsjhrFA,7008
 zrb/runner/web_route/static/resources/session/event.js,sha256=X5OlSHefK0SDB9VkFCRyBKE_Pb7mqM319mW9jRGoDOk,4716
 zrb/runner/web_route/static/resources/session/past-session.js,sha256=RwGJYKSp75K8NZ-iZP58XppWgdzkiKFaiC5wgcMLxDo,5470
-zrb/runner/web_route/static/static_route.py,sha256=BxFXIhKqkPtSBVkuf6Uho8yLph_EqDTLTVB0KG2-Pbo,1539
-zrb/runner/web_route/task_input_api_route.py,sha256=WgkqprftYrtyq9YK0TVr1lQNQF30kEeyEaT6lRGkGLY,1751
-zrb/runner/web_route/task_session_api_route.py,sha256=WbDK7-XgpEKftItBXhmVrJw7Nph7BFXlr5TrMr76f6s,6008
+zrb/runner/web_route/static/static_route.py,sha256=YRGKD7qiFuvciSRNewvo6oK0JLHQ_cK74eXWjffoQ70,1555
+zrb/runner/web_route/task_input_api_route.py,sha256=k5nQiJCL2ud6BhxaPGSbpK86XvMbsFliqTQ1FpEd-8Q,1767
+zrb/runner/web_route/task_session_api_route.py,sha256=YGMT8pN28XNVQ8StYm5xIiLH770XJhmKORHsqsfjnFY,6029
 zrb/runner/web_schema/session.py,sha256=NwbuS2Sv-CXO52nU-EZv8OMlD4vgCQWNeLC_dT0FK7I,92
 zrb/runner/web_schema/token.py,sha256=Y7XCPS4WzrxslTDtHeLcPTTUpmWhPOkRcl4b99zrC7c,185
 zrb/runner/web_schema/user.py,sha256=Kp10amg4i-f8Y-4czogv1YN7rwy0HdbePFiuovYu1ts,1018
-zrb/runner/web_util/cookie.py,sha256=h0Ux94GxZgSF7mth1mMv2acxaYkU8iVhu6TICFLYxdE,1054
+zrb/runner/web_util/cookie.py,sha256=1_oRRGziv3wAvaEDV5uCKdwWxvEI8EcW6wHW5NpBcDE,1085
 zrb/runner/web_util/html.py,sha256=TuUHjX3eKCBzoa7TYdMt8dfWWy06idauyCaG66X4Ygc,1838
-zrb/runner/web_util/token.py,sha256=X77-M-M0Yv_sGcnBtjbuAbnBK4Kg4qhf8paJTbanIL4,2584
-zrb/runner/web_util/user.py,sha256=XupVVe-IybL10bUKfEg1SfSf1mTIc4Wv2PoJCn-NNAc,1967
+zrb/runner/web_util/token.py,sha256=6Yqp6mQJJMAOsSkAN-6dvtdiQbAv5xtll9jOmNYzbUY,2687
+zrb/runner/web_util/user.py,sha256=vE61pDjHoaHw9K0YAv1Gu2zWX2WkM2aWG-8776_aAiM,2061
 zrb/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/session/any_session.py,sha256=x57mS15E-AfUjdVxwOWEzCBjW32zjer7WoeBw0guoDc,5266
 zrb/session/session.py,sha256=aDaLV1tuE7PhcC17LMk6c7KiSs7yX7QXI9O-Z4MMZO8,9967
@@ -365,12 +383,12 @@ zrb/util/load.py,sha256=DK0KYSlu48HCoGPqnW1IxnE3pHrZSPCstfz8Fjyqqv8,2140
 zrb/util/run.py,sha256=FPRCCvl5g6GuDvHTkaV95CFDlqxQ-5FZb2-F-Jz1fnI,485
 zrb/util/string/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/string/conversion.py,sha256=sMmstzbrNgLvWAQukqoXz45JtsNpJrniudAtzJaQlYw,6240
-zrb/util/string/format.py,sha256=52kLmW2o8AzL-Cm2l8pXBNeELm8MRjRIppeQ6IetWio,1225
+zrb/util/string/format.py,sha256=MwWGAwSdtOgR_2uz-JCXlg_q-uRYUUI-G8CGkfdgqik,1198
 zrb/util/string/name.py,sha256=SXEfxJ1-tDOzHqmSV8kvepRVyMqs2XdV_vyoh_9XUu0,1584
 zrb/util/todo.py,sha256=VGISej2KQZERpornK-8X7bysp4JydMrMUTnG8B0-liI,20708
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.7.4.dist-info/METADATA,sha256=-C9uLHUST6zakEUGga9poKISERqL6VWDctrjCU6f8h8,8385
-zrb-1.7.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.7.4.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.7.4.dist-info/RECORD,,
+zrb-1.8.0.dist-info/METADATA,sha256=UO-2C_syFn5vfZHq_IBrPT4Zgw3QFSJAzWOw1yx5Fng,8385
+zrb-1.8.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.8.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.8.0.dist-info/RECORD,,

zrb/runner/web_config/config.py

@@ -1,91 +0,0 @@
-from typing import Callable
-
-from zrb.runner.web_schema.user import User
-from zrb.task.any_task import AnyTask
-
-
-class WebConfig:
-    def __init__(
-        self,
-        port: int,
-        secret_key: str,
-        access_token_expire_minutes: int,
-        refresh_token_expire_minutes: int,
-        access_token_cookie_name: str,
-        refresh_token_cookie_name: str,
-        enable_auth: bool,
-        super_admin_username: str,
-        super_admin_password: str,
-        guest_username: str,
-        guest_accessible_tasks: list[AnyTask | str] = [],
-        find_user_by_username: Callable[[str], User | None] | None = None,
-    ):
-        self.secret_key = secret_key
-        self.access_token_expire_minutes = access_token_expire_minutes
-        self.refresh_token_expire_minutes = refresh_token_expire_minutes
-        self.access_token_cookie_name = access_token_cookie_name
-        self.refresh_token_cookie_name = refresh_token_cookie_name
-        self.enable_auth = enable_auth
-        self.port = port
-        self._user_list = []
-        self.super_admin_username = super_admin_username
-        self.super_admin_password = super_admin_password
-        self.guest_username = guest_username
-        self.guest_accessible_tasks = guest_accessible_tasks
-        self._find_user_by_username = find_user_by_username
-
-    @property
-    def default_user(self) -> User:
-        if self.enable_auth:
-            return User(
-                username=self.guest_username,
-                password="",
-                is_guest=True,
-                accessible_tasks=self.guest_accessible_tasks,
-            )
-        return User(
-            username=self.guest_username,
-            password="",
-            is_guest=True,
-            is_super_admin=True,
-        )
-
-    @property
-    def super_admin(self) -> User:
-        return User(
-            username=self.super_admin_username,
-            password=self.super_admin_password,
-            is_super_admin=True,
-        )
-
-    @property
-    def user_list(self) -> list[User]:
-        if not self.enable_auth:
-            return [self.default_user]
-        return self._user_list + [self.super_admin, self.default_user]
-
-    def set_guest_accessible_tasks(self, tasks: list[AnyTask | str]):
-        self.guest_accessible_tasks = tasks
-
-    def set_find_user_by_username(
-        self, find_user_by_username: Callable[[str], User | None]
-    ):
-        self._find_user_by_username = find_user_by_username
-
-    def append_user(self, user: User):
-        duplicates = [
-            existing_user
-            for existing_user in self.user_list
-            if existing_user.username == user.username
-        ]
-        if len(duplicates) > 0:
-            raise ValueError(f"User already exists {user.username}")
-        self._user_list.append(user)
-
-    def find_user_by_username(self, username: str) -> User | None:
-        user = None
-        if self._find_user_by_username is not None:
-            user = self._find_user_by_username(username)
-        if user is None:
-            user = next((u for u in self.user_list if u.username == username), None)
-        return user

zrb/runner/web_config/config_factory.py

@@ -1,15 +0,0 @@
-from zrb.config import CFG
-from zrb.runner.web_config.config import WebConfig
-
-web_config = WebConfig(
-    port=CFG.WEB_HTTP_PORT,
-    secret_key=CFG.WEB_SECRET_KEY,
-    access_token_expire_minutes=CFG.WEB_AUTH_ACCESS_TOKEN_EXPIRE_MINUTES,
-    refresh_token_expire_minutes=CFG.WEB_AUTH_REFRESH_TOKEN_EXPIRE_MINUTES,
-    access_token_cookie_name=CFG.WEB_ACCESS_TOKEN_COOKIE_NAME,
-    refresh_token_cookie_name=CFG.WEB_REFRESH_TOKEN_COOKIE_NAME,
-    enable_auth=CFG.WEB_ENABLE_AUTH,
-    super_admin_username=CFG.WEB_SUPER_ADMIN_USERNAME,
-    super_admin_password=CFG.WEB_SUPER_ADMIN_PASSWORD,
-    guest_username=CFG.WEB_GUEST_USERNAME,
-)