zrb 1.0.0a12__py3-none-any.whl → 1.0.0a14__py3-none-any.whl

zrb/builtin/project/add/fastapp_template/config.py

@@ -2,15 +2,15 @@ import os
 
 APP_PATH = os.path.dirname(__file__)
 
-APP_MODE = os.getenv("APP_NAME_MODE", "monolith")
+APP_MODE = os.getenv("MY_APP_NAME_MODE", "monolith")
 APP_MODULES = [
     module.strip()
-    for module in os.getenv("APP_NAME_MODULES", "").split(",")
+    for module in os.getenv("MY_APP_NAME_MODULES", "").split(",")
     if module.strip() != ""
 ]
-APP_PORT = int(os.getenv("APP_NAME_PORT", "3000"))
+APP_PORT = int(os.getenv("MY_APP_NAME_PORT", "3000"))
 APP_COMMUNICATION = os.getenv(
-    "APP_NAME_COMMUNICATION", "direct" if APP_MODE == "monolith" else "api"
+    "MY_APP_NAME_COMMUNICATION", "direct" if APP_MODE == "monolith" else "api"
 )
 APP_REPOSITORY_TYPE = os.getenv("APP_REPOSITORY_TYPE", "db")
 APP_DB_URL = os.getenv(
@@ -21,9 +21,9 @@ APP_DB_URL = os.getenv(
         else f"sqlite:///{APP_PATH}/{APP_MODULES[0]}_microservices.db"
     ),
 )
-APP_AUTH_SUPER_USER = os.getenv("APP_NAME_AUTH_SUPER_USER", "admin")
+APP_AUTH_SUPER_USER = os.getenv("MY_APP_NAME_AUTH_SUPER_USER", "admin")
 APP_AUTH_SUPER_USER_PASSWORD = os.getenv(
-    "APP_NAME_AUTH_SUPER_USER_PASSWORD", "secure-password"
+    "MY_APP_NAME_AUTH_SUPER_USER_PASSWORD", "my-secure-password"
 )
 
-APP_AUTH_BASE_URL = os.getenv("APP_NAME_AUTH_BASE_URL", "http://localhost:3001")
+APP_AUTH_BASE_URL = os.getenv("MY_APP_NAME_AUTH_BASE_URL", "http://localhost:3001")

zrb/builtin/project/add/fastapp_template/module/auth/client/any_client.py

@@ -0,0 +1,27 @@
+from abc import ABC, abstractmethod
+
+from fastapp_template.schema.user import UserCreate, UserResponse, UserUpdate
+
+
+class BaseClient(ABC):
+    @abstractmethod
+    async def get_user_by_id(self, user_id: str) -> UserResponse:
+        pass
+
+    @abstractmethod
+    async def get_all_users(self) -> list[UserResponse]:
+        pass
+
+    @abstractmethod
+    async def create_user(
+        self, data: UserCreate | list[UserCreate]
+    ) -> UserResponse | list[UserResponse]:
+        pass
+
+    @abstractmethod
+    async def update_user(self, user_id: str, data: UserUpdate) -> UserResponse:
+        pass
+
+    @abstractmethod
+    async def delete_user(self, user_id: str) -> UserResponse:
+        pass

zrb/builtin/project/add/fastapp_template/module/auth/client/api_client.py

@@ -1,6 +1,6 @@
 from fastapp_template.config import APP_AUTH_BASE_URL
-from fastapp_template.module.auth.client.base_client import BaseClient
-from fastapp_template.module.auth.service.user.usecase import user_usecase
+from fastapp_template.module.auth.client.any_client import BaseClient
+from fastapp_template.module.auth.service.user.user_usecase import user_usecase
 
 
 class APIClient(user_usecase.as_api_client(base_url=APP_AUTH_BASE_URL), BaseClient):

zrb/builtin/project/add/fastapp_template/module/auth/client/direct_client.py

@@ -1,5 +1,5 @@
-from fastapp_template.module.auth.client.base_client import BaseClient
-from fastapp_template.module.auth.service.user.usecase import user_usecase
+from fastapp_template.module.auth.client.any_client import BaseClient
+from fastapp_template.module.auth.service.user.user_usecase import user_usecase
 
 
 class DirectClient(user_usecase.as_direct_client(), BaseClient):

zrb/builtin/project/add/fastapp_template/module/auth/client/factory.py

@@ -1,6 +1,6 @@
 from fastapp_template.config import APP_COMMUNICATION
+from fastapp_template.module.auth.client.any_client import BaseClient
 from fastapp_template.module.auth.client.api_client import APIClient
-from fastapp_template.module.auth.client.base_client import BaseClient
 from fastapp_template.module.auth.client.direct_client import DirectClient
 
 if APP_COMMUNICATION == "direct":

zrb/builtin/project/add/fastapp_template/module/auth/route.py

@@ -1,7 +1,7 @@
 from fastapp_template.common.app import app
 from fastapp_template.common.schema import BasicResponse
 from fastapp_template.config import APP_MODE, APP_MODULES
-from fastapp_template.module.auth.service.user.usecase import user_usecase
+from fastapp_template.module.auth.service.user.user_usecase import user_usecase
 
 if APP_MODE == "microservices" and "auth" in APP_MODULES:
 

zrb/builtin/project/add/fastapp_template/module/auth/service/user/repository/factory.py

@@ -1,9 +1,9 @@
 from fastapp_template.common.db_engine import engine
 from fastapp_template.config import APP_REPOSITORY_TYPE
-from fastapp_template.module.auth.service.user.repository.db_repository import (
+from fastapp_template.module.auth.service.user.repository.user_db_repository import (
     UserDBRepository,
 )
-from fastapp_template.module.auth.service.user.repository.repository import (
+from fastapp_template.module.auth.service.user.repository.user_repository import (
     UserRepository,
 )
 

zrb/builtin/project/add/fastapp_template/module/auth/service/user/repository/{db_repository.py → user_db_repository.py}

@@ -1,6 +1,6 @@
-from fastapp_template.common.db_repository import BaseDBRepository
+from fastapp_template.common.base_db_repository import BaseDBRepository
 from fastapp_template.common.error import NotFoundError
-from fastapp_template.module.auth.service.user.repository.repository import (
+from fastapp_template.module.auth.service.user.repository.user_repository import (
     UserRepository,
 )
 from fastapp_template.schema.user import User, UserCreate, UserResponse, UserUpdate

zrb/builtin/project/add/fastapp_template/module/auth/service/user/{usecase.py → user_usecase.py}

@@ -1,21 +1,28 @@
-from fastapp_template.common.usecase import BaseUsecase
+from fastapp_template.common.base_usecase import BaseUsecase
 from fastapp_template.module.auth.service.user.repository.factory import user_repository
+from fastapp_template.module.auth.service.user.repository.user_repository import (
+    UserRepository,
+)
 from fastapp_template.schema.user import UserCreate, UserResponse, UserUpdate
 
 
 class UserUsecase(BaseUsecase):
 
+    def __init__(self, user_repository: UserRepository):
+        super().__init__()
+        self.user_repository = user_repository
+
     @BaseUsecase.route(
         "/api/v1/users/{user_id}", methods=["get"], response_model=UserResponse
     )
     async def get_user_by_id(self, user_id: str) -> UserResponse:
-        return await user_repository.get_by_id(user_id)
+        return await self.user_repository.get_by_id(user_id)
 
     @BaseUsecase.route(
         "/api/v1/users", methods=["get"], response_model=list[UserResponse]
     )
     async def get_all_users(self) -> list[UserResponse]:
-        return await user_repository.get_all()
+        return await self.user_repository.get_all()
 
     @BaseUsecase.route(
         "/api/v1/users",
@@ -26,20 +33,20 @@ class UserUsecase(BaseUsecase):
         self, data: UserCreate | list[UserCreate]
     ) -> UserResponse | list[UserResponse]:
         if isinstance(data, UserCreate):
-            return await user_repository.create(data)
-        return await user_repository.create_bulk(data)
+            return await self.user_repository.create(data)
+        return await self.user_repository.create_bulk(data)
 
     @BaseUsecase.route(
         "/api/v1/users/{user_id}", methods=["put"], response_model=UserResponse
     )
     async def update_user(self, user_id: str, data: UserUpdate) -> UserResponse:
-        return await user_repository.update(user_id, data)
+        return await self.user_repository.update(user_id, data)
 
     @BaseUsecase.route(
         "/api/v1/users/{user_id}", methods=["delete"], response_model=UserResponse
     )
     async def delete_user(self, user_id: str) -> UserResponse:
-        return await user_repository.delete(user_id)
+        return await self.user_repository.delete(user_id)
 
 
-user_usecase = UserUsecase()
+user_usecase = UserUsecase(user_repository=user_repository)

zrb/builtin/project/add/fastapp_template/requirements.txt

@@ -1,6 +1,5 @@
-fastapi[standard]==0.115.4
-aiosqlite==0.20.0
-alembic==1.14.0
-sqlmodel==0.0.22
-ulid-py==1.1.0
-passlib==1.7.4
+fastapi[standard]~=0.115.5
+alembic~=1.14.0
+sqlmodel~=0.0.22
+ulid-py~=1.1.0
+passlib~=1.7.4

zrb/builtin/project/add/fastapp_template/schema/permission.py

@@ -0,0 +1,31 @@
+import datetime
+
+import ulid
+from sqlmodel import Field, SQLModel
+
+
+class PermissionBase(SQLModel):
+    name: str
+
+
+class PermissionCreate(PermissionBase):
+    description: str
+
+
+class PermissionUpdate(SQLModel):
+    name: str | None = None
+    description: str | None = None
+
+
+class PermissionResponse(PermissionBase):
+    id: str
+
+
+class Permission(SQLModel, table=True):
+    id: str = Field(default_factory=lambda: ulid.new().str, primary_key=True)
+    created_at: datetime.datetime | None
+    created_by: str | None
+    updated_at: datetime.datetime | None
+    updated_by: str | None
+    name: str
+    description: str

zrb/builtin/project/add/fastapp_template/template.env

@@ -1,2 +1,2 @@
-export APP_NAME_MODE=monolith
-export APP_NAME_PORT=3000
+export MY_APP_NAME_MODE=monolith
+export MY_APP_NAME_PORT=3000

zrb/builtin/project/create/create.py

@@ -18,7 +18,7 @@ scaffold_project = Scaffolder(
             default_str=lambda _: os.getcwd(),
         ),
         StrInput(
-            name="project-name",
+            name="project",
             description="Project name",
             prompt="Project name",
             default_str=lambda ctx: os.path.basename(ctx.input["project-dir"]),
@@ -27,7 +27,7 @@ scaffold_project = Scaffolder(
     source_path=os.path.join(_DIR, "project-template"),
     render_source_path=False,
     destination_path="{ctx.input['project-dir']}",
-    transform_content={"Project Name": "{ctx.input['project-name'].title()}"},
+    transform_content={"Project Name": "{ctx.input.project.title()}"},
     retries=0,
 )
 

zrb/builtin/project/create/project-template/zrb_init.py

@@ -1,7 +1,3 @@
 import os
 
-from zrb import load_file
-
 _DIR = os.path.dirname(__file__)
-
-assert load_file

zrb/builtin/todo.py

@@ -41,11 +41,13 @@ from zrb.util.todo import (
             name="project",
             description="Task project",
             prompt="Task project (space separated)",
+            allow_empty=True,
         ),
         StrInput(
             name="context",
             description="Task context",
             prompt="Task context (space separated)",
+            allow_empty=True,
         ),
     ],
     description="➕ Add todo",
@@ -175,10 +177,12 @@ def archive_todo(ctx: AnyContext):
     archive_file_path = os.path.join(TODO_DIR, "archive.txt")
     if not os.path.isdir(TODO_DIR):
         os.make_dirs(TODO_DIR, exist_ok=True)
+    # Get archived todo list
     archived_todo_list = []
     if os.path.isfile(archive_file_path):
         archived_todo_list = load_todo_list(archive_file_path)
     archived_todo_list += new_archived_todo_list
+    # Save the new todo list and add the archived ones
     save_todo_list(archive_file_path, archived_todo_list)
     save_todo_list(todo_file_path, working_todo_list)
     return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
@@ -241,9 +245,23 @@ def log_todo(ctx: AnyContext):
     log_work.append(
         {"log": ctx.input.log, "duration": ctx.input.duration, "start": ctx.input.start}
     )
+    # save todo with log work
     with open(log_work_file_path, "w") as f:
         f.write(json.dumps(log_work, indent=2))
-    return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
+    # get log work list
+    task_id = todo_task.keyval.get("id", "")
+    log_work_path = os.path.join(TODO_DIR, "log-work", f"{task_id}.json")
+    log_work_list = []
+    if os.path.isfile(log_work_path):
+        with open(log_work_path, "r") as f:
+            log_work_list = json.loads(f.read())
+    return "\n".join(
+        [
+            get_visual_todo_list(todo_list, TODO_VISUAL_FILTER),
+            "",
+            get_visual_todo_card(todo_task, log_work_list),
+        ]
+    )
 
 
 def _get_default_start() -> str:
@@ -284,4 +302,3 @@ def _get_todo_txt_content() -> str:
         return ""
     with open(todo_file_path, "r") as f:
         return f.read()
-        return f.read()

zrb/config.py

@@ -47,8 +47,7 @@ INIT_SCRIPTS = (
 )
 LOGGING_LEVEL = _get_log_level(os.getenv("ZRB_LOGGING_LEVEL", "WARNING"))
 LOAD_BUILTIN = to_boolean(os.getenv("ZRB_LOAD_BUILTIN", "1"))
-ENV_PREFIX = os.getenv("ZRB_ENV", "")
-SHOW_PROMPT = to_boolean(os.getenv("ZRB_SHOW_PROMPT", "1"))
+SHOW_TIME = to_boolean(os.getenv("ZRB_SHOW_TIME", "1"))
 WARN_UNRECOMMENDED_COMMAND = to_boolean(
     os.getenv("ZRB_WARN_UNRECOMMENDED_COMMAND", "1")
 )

zrb/content_transformer/content_transformer.py

@@ -11,7 +11,10 @@ class ContentTransformer(AnyContentTransformer):
     def __init__(
         self,
         match: list[str] | str | Callable[[AnyContext, str], bool],
-        transform: dict[str, str] | Callable[[AnyContext, str], str],
+        transform: (
+            dict[str, str | Callable[[AnyContext], str]]
+            | Callable[[AnyContext, str], str]
+        ),
         auto_render: bool = True,
     ):
         self._match = match
@@ -34,7 +37,7 @@ class ContentTransformer(AnyContentTransformer):
         if callable(self._transform_file):
             return self._transform_file(ctx, file_path)
         transform_map = {
-            keyword: ctx.render(replacement) if self._auto_render else replacement
+            keyword: self._get_str_replacement(ctx, replacement)
             for keyword, replacement in self._transform_file.items()
         }
         with open(file_path, "r") as f:
@@ -43,3 +46,12 @@ class ContentTransformer(AnyContentTransformer):
             content = content.replace(keyword, replacement)
         with open(file_path, "w") as f:
             f.write(content)
+
+    def _get_str_replacement(
+        self, ctx: AnyContext, replacement: str | Callable[[AnyContext], str]
+    ) -> str:
+        if callable(replacement):
+            return replacement(ctx)
+        if self._auto_render:
+            return ctx.render(replacement)
+        return replacement

zrb/context/context.py

@@ -1,22 +1,23 @@
 import datetime
 import logging
-import re
 import sys
 from typing import Any, TextIO
 
+from zrb.config import SHOW_TIME
 from zrb.context.any_context import AnyContext
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.dot_dict.dot_dict import DotDict
 from zrb.session.any_session import AnySession
-from zrb.util.cli.style import stylize, stylize_error, stylize_log, stylize_warning
+from zrb.util.cli.style import (
+    remove_style,
+    stylize,
+    stylize_error,
+    stylize_log,
+    stylize_warning,
+)
 from zrb.util.string.conversion import to_boolean
 
 
-def _remove_ansi_escape_sequences(text):
-    ansi_escape = re.compile(r"\x1B[@-_][0-?]*[ -/]*[@-~]")
-    return ansi_escape.sub("", text)
-
-
 class Context(AnyContext):
     def __init__(
         self, shared_ctx: AnySharedContext, task_name: str, color: int, icon: str
@@ -111,10 +112,12 @@ class Context(AnyContext):
         else:
             attempt_status = f"{self._attempt}/{self._max_attempt}".ljust(5)
         now = datetime.datetime.now()
-        formatted_time = now.strftime("%y%m%d %H:%M:%S.%f")[:19]
-        prefix = f"{formatted_time} {attempt_status} {padded_styled_task_name} ⬤ "
+        formatted_time = (
+            now.strftime("%y%m%d %H:%M:%S.%f")[:19] + " " if SHOW_TIME else ""
+        )
+        prefix = f"{formatted_time}{attempt_status} {padded_styled_task_name} ⬤ "
         message = sep.join([f"{value}" for value in values])
-        self.append_to_shared_log(_remove_ansi_escape_sequences(f"{prefix} {message}"))
+        self.append_to_shared_log(remove_style(f"{prefix} {message}"))
         stylized_prefix = stylize(prefix, color=color)
         print(f"{stylized_prefix} {message}", sep=sep, end=end, file=file, flush=flush)
 

zrb/input/base_input.py

@@ -66,7 +66,8 @@ class BaseInput(AnyInput):
         default_value = self._get_default_str(shared_ctx)
         if default_value != "":
             prompt_message = f"{prompt_message} [{default_value}]"
-        value = input(f"{prompt_message}: ")
+        print(f"{prompt_message}: ", end="")
+        value = input()
         if value.strip() == "":
             value = default_value
         return value

zrb/runner/cli.py

@@ -82,13 +82,24 @@ class Cli(Group):
         shared_ctx = SharedContext(args=args)
         for task_input in task.inputs:
             if task_input.name in str_kwargs:
-                continue
-            if arg_index < len(args):
+                # Update shared context for next input default value
+                task_input.update_shared_context(
+                    shared_ctx, str_kwargs[task_input.name]
+                )
+            elif arg_index < len(args):
                 run_kwargs[task_input.name] = args[arg_index]
+                # Update shared context for next input default value
+                task_input.update_shared_context(
+                    shared_ctx, run_kwargs[task_input.name]
+                )
                 arg_index += 1
-                continue
-            str_value = task_input.prompt_cli_str(shared_ctx)
-            run_kwargs[task_input.name] = str_value
+            else:
+                str_value = task_input.prompt_cli_str(shared_ctx)
+                run_kwargs[task_input.name] = str_value
+                # Update shared context for next input default value
+                task_input.update_shared_context(
+                    shared_ctx, run_kwargs[task_input.name]
+                )
         return run_kwargs
 
     def _show_task_info(self, task: AnyTask):

zrb/runner/web_app.py

@@ -64,7 +64,7 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
         # Avoid capturing '/ui' itself
         if not path:
             raise HTTPException(status_code=404, detail="Not Found")
-        args = path.split("/")
+        args = path.strip("/").split("/")
         node, node_path, residual_args = extract_node_from_args(root_group, args)
         url = f"/ui/{'/'.join(node_path)}/"
         if isinstance(node, AnyTask):
@@ -82,7 +82,7 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
         """
         Creating new session
         """
-        args = path.split("/")
+        args = path.strip("/").split("/")
         node, _, residual_args = extract_node_from_args(root_group, args)
         if isinstance(node, AnyTask):
             session_name = residual_args[0] if residual_args else None
@@ -107,7 +107,7 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
         """
         Getting existing session or sessions
         """
-        args = path.split("/")
+        args = path.strip("/").split("/")
         node, _, residual_args = extract_node_from_args(root_group, args)
         if isinstance(node, AnyTask) and residual_args:
             if residual_args[0] == "list":

zrb/runner/web_controller/task_ui/controller.py

@@ -1,5 +1,6 @@
 import os
 
+from zrb.context.shared_context import SharedContext
 from zrb.group.any_group import AnyGroup
 from zrb.session.any_session import AnySession
 from zrb.task.any_task import AnyTask
@@ -45,12 +46,13 @@ def handle_task_ui(
     ui_url_parts = list(api_url_parts)
     ui_url_parts[1] = "ui"
     ui_url = "/".join(ui_url_parts)
-    task_inputs = "\n".join(
-        [
+    # Assemble task inputs
+    input_html_list = []
+    for task_input in task.inputs:
+        task_input.update_shared_context(ctx)
+        input_html_list.append(
             fstring_format(_TASK_INPUT_TEMPLATE, {"task_input": task_input, "ctx": ctx})
-            for task_input in task.inputs
-        ]
-    )
+        )
     session_name = args[0] if len(args) > 0 else ""
     return HTMLResponse(
         fstring_format(
@@ -62,7 +64,7 @@ def handle_task_ui(
                 "root_description": root_group.description,
                 "url": url,
                 "parent_url": parent_url,
-                "task_inputs": task_inputs,
+                "task_inputs": "\n".join(input_html_list),
                 "api_url": api_url,
                 "ui_url": ui_url,
                 "main_script": _MAIN_SCRIPT,

zrb/session/session.py

@@ -28,6 +28,7 @@ from zrb.util.cli.style import (
     ICONS,
     MAGENTA,
     YELLOW,
+    remove_style,
 )
 from zrb.util.group import get_node_path
 from zrb.util.string.name import get_random_name
@@ -165,7 +166,9 @@ class Session(AnySession):
             main_task_name=self._main_task.name,
             path=self.task_path,
             final_result=(
-                f"{self.final_result}" if self.final_result is not None else ""
+                remove_style(f"{self.final_result}")
+                if self.final_result is not None
+                else ""
             ),
             finished=self.is_terminated,
             log=self.shared_ctx.shared_log,

zrb/task/scaffolder.py

@@ -92,8 +92,8 @@ class Scaffolder(BaseTask):
         destination_path = self._get_destination_path(ctx)
         self._copy_path(ctx, source_path, destination_path)
         transformers = self._get_content_transformers()
-        file_paths = self._get_all_file_paths(destination_path)
-        for file_path in file_paths:
+        file_path_list = self._get_all_file_paths(destination_path)
+        for file_path in file_path_list:
             for transformer in transformers:
                 if transformer.match(ctx, file_path):
                     try:
@@ -118,14 +118,10 @@ class Scaffolder(BaseTask):
                         dest_dir, self._transform_path(ctx, file_name)
                     )
                     shutil.copy2(src_file, dest_file)
-                    ctx.log_info(f"Copied and renamed {src_file} to {dest_file}")
+                    ctx.log_info(f"Copied {src_file} to {dest_file}")
         else:
-            dest_file = os.path.join(
-                destination_path,
-                self._transform_path(ctx, os.path.basename(source_path)),
-            )
-            shutil.copy2(source_path, dest_file)
-            ctx.log_info(f"Copied and renamed {source_path} to {dest_file}")
+            shutil.copy2(source_path, destination_path)
+            ctx.log_info(f"Copied {source_path} to {destination_path}")
 
     def _transform_path(self, ctx: AnyContext, file_path: str):
         if callable(self._path_transformer):
@@ -139,6 +135,8 @@ class Scaffolder(BaseTask):
         """
         Returns a list of absolute file paths for all files in the given path, recursively.
         """
+        if os.path.isfile(path):
+            return [os.path.abspath(path)]
         file_paths = []
         for root, _, files in os.walk(path):
             for file in files:

zrb/util/cli/style.py

@@ -1,3 +1,5 @@
+import re
+
 BLACK = 30
 RED = 31
 GREEN = 32
@@ -118,6 +120,11 @@ ICONS = [
 ]
 
 
+def remove_style(text):
+    ansi_escape = re.compile(r"\x1B[@-_][0-?]*[ -/]*[@-~]")
+    return ansi_escape.sub("", text)
+
+
 def stylize(
     text: str,
     color: int | None = None,

zrb/util/codemod/add_code_to_module.py

@@ -0,0 +1,12 @@
+def add_code_to_module(source_code: str, new_code: str) -> str:
+    lines = source_code.splitlines()
+    last_import_index = -1
+    for i, line in enumerate(lines):
+        stripped_line = line.strip()
+        if stripped_line.startswith("import") or stripped_line.startswith("from"):
+            last_import_index = i
+        elif stripped_line and not stripped_line.startswith("#"):
+            break
+    if last_import_index != -1:
+        lines.insert(last_import_index + 1, new_code)
+    return "\n".join(lines)

zrb/util/load.py

@@ -9,33 +9,33 @@ from typing import Any
 pattern = re.compile("[^a-zA-Z0-9]")
 
 
-def load_zrb_init(dir_path: str | None = None):
+def load_zrb_init(dir_path: str | None = None) -> Any | None:
     if dir_path is None:
         dir_path = os.getcwd()
     script_path = os.path.join(dir_path, "zrb_init.py")
     if os.path.isfile(script_path):
-        load_file(script_path, -1)
-        return
+        return load_file(script_path, -1)
     new_dir_path = os.path.dirname(dir_path)
     if new_dir_path == dir_path:
         return
-    load_zrb_init(new_dir_path)
+    return load_zrb_init(new_dir_path)
 
 
-@lru_cache()
-def load_file(script_path: str, sys_path_index: int = 0):
+@lru_cache
+def load_file(script_path: str, sys_path_index: int = 0) -> Any | None:
     if not os.path.isfile(script_path):
-        return
+        return None
+    module_name = pattern.sub("", script_path)
     # Append script dir path
     script_dir_path = os.path.dirname(script_path)
     if script_dir_path not in sys.path:
         sys.path.insert(sys_path_index, script_dir_path)
     # Add script dir path to Python path
     os.environ["PYTHONPATH"] = _get_new_python_path(script_dir_path)
-    module_name = pattern.sub("", script_path)
     spec = importlib.util.spec_from_file_location(module_name, script_path)
     module = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(module)
+    return module
 
 
 def _get_new_python_path(dir_path: str) -> str:
@@ -47,7 +47,6 @@ def _get_new_python_path(dir_path: str) -> str:
     return ":".join([current_python_path, dir_path])
 
 
-@lru_cache()
 def load_module(module_name: str) -> Any:
     module = importlib.import_module(module_name)
     return module