zrb 1.3.0__tar.gz → 1.4.0__tar.gz

{zrb-1.3.0 → zrb-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.3.0
+Version: 1.4.0
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -24,7 +24,7 @@ Requires-Dist: isort (>=5.13.2,<5.14.0)
 Requires-Dist: libcst (>=1.5.0,<2.0.0)
 Requires-Dist: pdfplumber (>=0.11.4,<0.12.0) ; extra == "rag"
 Requires-Dist: psutil (>=6.1.1,<7.0.0)
-Requires-Dist: pydantic-ai (>=0.0.31,<0.0.32)
+Requires-Dist: pydantic-ai (>=0.0.42,<0.0.43)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: python-jose[cryptography] (>=3.4.0,<4.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
@@ -44,47 +44,49 @@ Zrb allows you to write your automation tasks in Python. For example, you can de
 
 ```python
 import os
-from zrb import cli, LLMTask, CmdTask, StrInput
-from zrb.builtin.llm.tool.file import read_source_code, write_text_file
+from zrb import cli, llm_config, LLMTask, CmdTask, StrInput, Group
+from zrb.builtin.llm.tool.file import read_all_files, write_text_file
 from pydantic_ai.models.openai import OpenAIModel
-
+from pydantic_ai.providers.openai import OpenAIProvider
 
 CURRENT_DIR = os.getcwd()
-OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1"
-OPENROUTER_API_KEY = os.getenv("OPENROUTER_API_KEY", "")
-OPENROUTER_MODEL_NAME = os.getenv(
-    "AGENT_MODEL_NAME", "anthropic/claude-3.7-sonnet"
+
+# Setup default LLM Config
+llm_config.set_default_model(
+    OpenAIModel(
+        model_name="gpt-4o",
+        provider=OpenAIProvider(
+            base_url="https://openrouter.ai/api/v1",
+            api_key=os.getenv("OPENROUTER_API_KEY", "")
+        )
+    )
 )
 
+# Make UML group
+uml_group = cli.add_group(Group(name="uml", description="UML related tasks"))
 
-# Defining a LLM Task to create a Plantuml script based on source code in current directory.
-# User can choose the diagram type. By default it is "state diagram"
-make_uml = cli.add_task(
+# Generate UML script
+make_uml_script = uml_group.add_task(
     LLMTask(
-        name="make-uml",
+        name="make-script",
         description="Creating plantuml diagram based on source code in current directory",
         input=StrInput(name="diagram", default="state diagram"),
-        model=OpenAIModel(
-            OPENROUTER_MODEL_NAME,
-            base_url=OPENROUTER_BASE_URL,
-            api_key=OPENROUTER_API_KEY,
-        ),
         message=(
             f"Read source code in {CURRENT_DIR}, "
             "make a {ctx.input.diagram} in plantuml format. "
             f"Write the script into {CURRENT_DIR}/{{ctx.input.diagram}}.uml"
         ),
         tools=[
-            read_source_code,
+            read_all_files,
             write_text_file,
         ],
     )
 )
 
 # Defining a Cmd Task to transform Plantuml script into a png image.
-make_png = cli.add_task(
+make_uml_image = uml_group.add_task(
     CmdTask(
-        name="make-png",
+        name="make-image",
         description="Creating png based on source code in current directory",
         input=StrInput(name="diagram", default="state diagram"),
         cmd="plantuml -tpng '{ctx.input.diagram}.uml'",
@@ -93,19 +95,19 @@ make_png = cli.add_task(
 )
 
 # Making sure that make_png has make_uml as its dependency.
-make_uml >> make_png
+make_uml_script >> make_uml_image
 ```
 
 Once defined, your automation tasks are immediately accessible from the CLI. You can then invoke the tasks by invoking.
 
 ```bash
-zrb make-png --diagram "state diagram"
+zrb uml make-image --diagram "state diagram"
 ```
 
 Or you can invoke the tasks without parameter.
 
 ```bash
-zrb make-png
+zrb uml make-image
 ```
 
 At this point, Zrb will politely ask you to provide the diagram type.

{zrb-1.3.0 → zrb-1.4.0}/README.md

@@ -9,47 +9,49 @@ Zrb allows you to write your automation tasks in Python. For example, you can de
 
 ```python
 import os
-from zrb import cli, LLMTask, CmdTask, StrInput
-from zrb.builtin.llm.tool.file import read_source_code, write_text_file
+from zrb import cli, llm_config, LLMTask, CmdTask, StrInput, Group
+from zrb.builtin.llm.tool.file import read_all_files, write_text_file
 from pydantic_ai.models.openai import OpenAIModel
-
+from pydantic_ai.providers.openai import OpenAIProvider
 
 CURRENT_DIR = os.getcwd()
-OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1"
-OPENROUTER_API_KEY = os.getenv("OPENROUTER_API_KEY", "")
-OPENROUTER_MODEL_NAME = os.getenv(
-    "AGENT_MODEL_NAME", "anthropic/claude-3.7-sonnet"
+
+# Setup default LLM Config
+llm_config.set_default_model(
+    OpenAIModel(
+        model_name="gpt-4o",
+        provider=OpenAIProvider(
+            base_url="https://openrouter.ai/api/v1",
+            api_key=os.getenv("OPENROUTER_API_KEY", "")
+        )
+    )
 )
 
+# Make UML group
+uml_group = cli.add_group(Group(name="uml", description="UML related tasks"))
 
-# Defining a LLM Task to create a Plantuml script based on source code in current directory.
-# User can choose the diagram type. By default it is "state diagram"
-make_uml = cli.add_task(
+# Generate UML script
+make_uml_script = uml_group.add_task(
     LLMTask(
-        name="make-uml",
+        name="make-script",
         description="Creating plantuml diagram based on source code in current directory",
         input=StrInput(name="diagram", default="state diagram"),
-        model=OpenAIModel(
-            OPENROUTER_MODEL_NAME,
-            base_url=OPENROUTER_BASE_URL,
-            api_key=OPENROUTER_API_KEY,
-        ),
         message=(
             f"Read source code in {CURRENT_DIR}, "
             "make a {ctx.input.diagram} in plantuml format. "
             f"Write the script into {CURRENT_DIR}/{{ctx.input.diagram}}.uml"
         ),
         tools=[
-            read_source_code,
+            read_all_files,
             write_text_file,
         ],
     )
 )
 
 # Defining a Cmd Task to transform Plantuml script into a png image.
-make_png = cli.add_task(
+make_uml_image = uml_group.add_task(
     CmdTask(
-        name="make-png",
+        name="make-image",
         description="Creating png based on source code in current directory",
         input=StrInput(name="diagram", default="state diagram"),
         cmd="plantuml -tpng '{ctx.input.diagram}.uml'",
@@ -58,19 +60,19 @@ make_png = cli.add_task(
 )
 
 # Making sure that make_png has make_uml as its dependency.
-make_uml >> make_png
+make_uml_script >> make_uml_image
 ```
 
 Once defined, your automation tasks are immediately accessible from the CLI. You can then invoke the tasks by invoking.
 
 ```bash
-zrb make-png --diagram "state diagram"
+zrb uml make-image --diagram "state diagram"
 ```
 
 Or you can invoke the tasks without parameter.
 
 ```bash
-zrb make-png
+zrb uml make-image
 ```
 
 At this point, Zrb will politely ask you to provide the diagram type.

{zrb-1.3.0 → zrb-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.3.0"
+version = "1.4.0"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"
@@ -50,7 +50,7 @@ beautifulsoup4 = "^4.12.3"
 fastapi = {extras = ["standard"], version = "^0.115.6"}
 python-jose = {extras = ["cryptography"], version = "^3.4.0"}
 ulid-py = "^1.1.0"
-pydantic-ai = "^0.0.31"
+pydantic-ai = "^0.0.42"
 fastembed = "^0.5.1"
 psutil = "^6.1.1"
 

{zrb-1.3.0 → zrb-1.4.0}/src/zrb/__init__.py

@@ -33,6 +33,7 @@ from zrb.input.option_input import OptionInput
 from zrb.input.password_input import PasswordInput
 from zrb.input.str_input import StrInput
 from zrb.input.text_input import TextInput
+from zrb.llm_config import llm_config
 from zrb.runner.cli import cli
 from zrb.runner.web_config.config_factory import web_config
 from zrb.runner.web_schema.user import User
@@ -101,6 +102,7 @@ assert ContentTransformer
 assert Scaffolder
 assert Scheduler
 assert cli
+assert llm_config
 assert Xcom
 assert web_config
 assert User

{zrb-1.3.0 → zrb-1.4.0}/src/zrb/builtin/llm/llm_chat.py

@@ -2,14 +2,12 @@ import json
 import os
 from typing import Any
 
-from pydantic_ai.models import Model
-
 from zrb.builtin.group import llm_group
 from zrb.builtin.llm.tool.api import get_current_location, get_current_weather
 from zrb.builtin.llm.tool.cli import run_shell_command
 from zrb.builtin.llm.tool.file import (
-    list_file,
-    read_source_code,
+    list_files,
+    read_all_files,
     read_text_file,
     write_text_file,
 )
@@ -24,18 +22,14 @@ from zrb.config import (
     LLM_ALLOW_ACCESS_LOCAL_FILE,
     LLM_ALLOW_ACCESS_SHELL,
     LLM_HISTORY_DIR,
-    LLM_MODEL,
     LLM_SYSTEM_PROMPT,
     SERP_API_KEY,
 )
-from zrb.context.any_context import AnyContext
 from zrb.context.any_shared_context import AnySharedContext
-from zrb.input.any_input import AnyInput
 from zrb.input.bool_input import BoolInput
 from zrb.input.str_input import StrInput
 from zrb.input.text_input import TextInput
 from zrb.task.llm_task import LLMTask
-from zrb.util.attr import get_attr
 from zrb.util.file import read_file, write_file
 from zrb.util.string.conversion import to_pascal_case
 
@@ -90,46 +84,37 @@ def _write_chat_conversation(
     write_file(last_session_file_path, current_session_name)
 
 
-class _LLMChat(LLMTask):
-
-    _default_model: Model | str | None = None
-
-    def set_default_model(self, model: Model | str):
-        self._default_model = model
-
-    @property
-    def inputs(self) -> list[AnyInput]:
-        task_inputs = super().inputs
-        model_input_default = LLM_MODEL if self._default_model is None else "default"
-        return [
+llm_chat: LLMTask = llm_group.add_task(
+    LLMTask(
+        name="llm-chat",
+        input=[
             StrInput(
                 "model",
                 description="LLM Model",
                 prompt="LLM Model",
-                default=model_input_default,
+                default="",
                 allow_positional_parsing=False,
                 always_prompt=False,
+                allow_empty=True,
+            ),
+            StrInput(
+                "base-url",
+                description="LLM API Base URL",
+                prompt="LLM API Base URL",
+                default="",
+                allow_positional_parsing=False,
+                always_prompt=False,
+                allow_empty=True,
+            ),
+            StrInput(
+                "api-key",
+                description="LLM API Key",
+                prompt="LLM API Key",
+                default="",
+                allow_positional_parsing=False,
+                always_prompt=False,
+                allow_empty=True,
             ),
-            *task_inputs,
-        ]
-
-    def _get_model(self, ctx: AnyContext) -> str | Model | None:
-        if ctx.input.model == "default":
-            if self._default_model is not None:
-                return self._default_model
-            return super()._get_model(ctx)
-        model = get_attr(
-            ctx, ctx.input.model, "ollama_chat/llama3.1", auto_render=self._render_model
-        )
-        if isinstance(model, (Model, str)) or model is None:
-            return model
-        raise ValueError("Invalid model")
-
-
-llm_chat: LLMTask = llm_group.add_task(
-    _LLMChat(
-        name="llm-chat",
-        input=[
             TextInput(
                 "system-prompt",
                 description="System prompt",
@@ -156,10 +141,17 @@ llm_chat: LLMTask = llm_group.add_task(
                 always_prompt=False,
             ),
         ],
+        model=lambda ctx: None if ctx.input.model == "" else ctx.input.model,
+        model_base_url=lambda ctx: (
+            None if ctx.input.base_url == "" else ctx.input.base_url
+        ),
+        model_api_key=lambda ctx: (
+            None if ctx.input.api_key == "" else ctx.input.api_key
+        ),
         conversation_history_reader=_read_chat_conversation,
         conversation_history_writer=_write_chat_conversation,
         description="Chat with LLM",
-        system_prompt="{ctx.input['system-prompt']}",
+        system_prompt="{ctx.input.system_prompt}",
         message="{ctx.input.message}",
         retries=0,
     ),
@@ -168,8 +160,8 @@ llm_chat: LLMTask = llm_group.add_task(
 
 
 if LLM_ALLOW_ACCESS_LOCAL_FILE:
-    llm_chat.add_tool(read_source_code)
-    llm_chat.add_tool(list_file)
+    llm_chat.add_tool(read_all_files)
+    llm_chat.add_tool(list_files)
     llm_chat.add_tool(read_text_file)
     llm_chat.add_tool(write_text_file)
 

zrb-1.4.0/src/zrb/builtin/llm/tool/file.py

@@ -0,0 +1,76 @@
+import fnmatch
+import os
+
+from zrb.util.file import read_file, write_file
+
+
+def list_files(
+    directory: str = ".",
+    included_patterns: list[str] = [
+        "*.py",
+        "*.go",
+        "*.js",
+        "*.ts",
+        "*.java",
+        "*.c",
+        "*.cpp",
+    ],
+    excluded_patterns: list[str] = [
+        "venv",
+        ".venv",
+        "node_modules",
+        ".git",
+        "__pycache__",
+    ],
+) -> list[str]:
+    """List all files in a directory that match any of the included glob patterns
+    and do not reside in any directory matching an excluded pattern.
+    Patterns are evaluated using glob-style matching.
+    """
+    all_files: list[str] = []
+    for root, dirs, files in os.walk(directory):
+        for filename in files:
+            if any(fnmatch.fnmatch(filename, pat) for pat in included_patterns):
+                full_path = os.path.join(root, filename)
+                # Check each component of the full path for excluded patterns.
+                if any(
+                    any(fnmatch.fnmatch(part, pat) for pat in excluded_patterns)
+                    for part in os.path.normpath(full_path).split(os.sep)
+                ):
+                    continue
+                all_files.append(full_path)
+    return all_files
+
+
+def read_text_file(file: str) -> str:
+    """Read a text file"""
+    return read_file(os.path.abspath(file))
+
+
+def write_text_file(file: str, content: str):
+    """Write a text file"""
+    return write_file(os.path.abspath(file), content)
+
+
+def read_all_files(
+    directory: str = ".",
+    included_patterns: list[str] = [
+        "*.py",
+        "*.go",
+        "*.js",
+        "*.ts",
+        "*.java",
+        "*.c",
+        "*.cpp",
+    ],
+    excluded_patterns: list[str] = [],
+) -> list[str]:
+    """Read all files in a directory that match any of the included glob patterns
+    and do not match any of the excluded glob patterns.
+    Patterns are evaluated using glob-style matching.
+    """
+    files = list_files(directory, included_patterns, excluded_patterns)
+    for index, file in enumerate(files):
+        content = read_text_file(file)
+        files[index] = f"# {file}\n```\n{content}\n```"
+    return files

{zrb-1.3.0 → zrb-1.4.0}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_task.py

@@ -8,7 +8,7 @@ from my_app_name._zrb.column.add_column_util import (
     update_my_app_name_test_update,
     update_my_app_name_ui,
 )
-from my_app_name._zrb.config import APP_DIR
+from my_app_name._zrb.config import ACTIVATE_VENV_SCRIPT, APP_DIR
 from my_app_name._zrb.format_task import format_my_app_name_code
 from my_app_name._zrb.group import app_create_group
 from my_app_name._zrb.input import (
@@ -17,9 +17,16 @@ from my_app_name._zrb.input import (
     new_column_input,
     new_column_type_input,
 )
-from my_app_name._zrb.util import get_existing_module_names, get_existing_schema_names
+from my_app_name._zrb.util import (
+    cd_module_script,
+    get_existing_module_names,
+    get_existing_schema_names,
+    set_create_migration_db_url_env,
+    set_env,
+)
+from my_app_name._zrb.venv_task import prepare_venv
 
-from zrb import AnyContext, Task, make_task
+from zrb import AnyContext, Cmd, CmdTask, EnvFile, Task, make_task
 
 
 @make_task(
@@ -118,6 +125,34 @@ update_my_app_name_test_delete_task = Task(
 )
 
 
+create_my_app_name_entity_migration = CmdTask(
+    name="create-my-app-name-entity-migration",
+    input=[
+        existing_module_input,
+        existing_entity_input,
+        new_column_input,
+    ],
+    env=EnvFile(path=os.path.join(APP_DIR, "template.env")),
+    cwd=APP_DIR,
+    cmd=[
+        ACTIVATE_VENV_SCRIPT,
+        Cmd(lambda ctx: set_create_migration_db_url_env(ctx.input.module)),
+        Cmd(lambda ctx: set_env("MY_APP_NAME_MODULES", ctx.input.module)),
+        Cmd(lambda ctx: cd_module_script(ctx.input.module)),
+        "alembic upgrade head",
+        Cmd(
+            'alembic revision --autogenerate -m "create_{to_snake_case(ctx.input.entity)}_{to_snake_case(ctx.input.column)}_column"',  # noqa
+        ),
+    ],
+    render_cmd=False,
+    retries=0,
+    upstream=[
+        prepare_venv,
+        update_my_app_name_schema_task,
+    ],
+)
+
+
 add_my_app_name_column = app_create_group.add_task(
     Task(
         name="add-my-app-name-column",
@@ -129,6 +164,7 @@ add_my_app_name_column = app_create_group.add_task(
             update_my_app_name_test_read_task,
             update_my_app_name_test_update_task,
             update_my_app_name_test_delete_task,
+            create_my_app_name_entity_migration,
         ],
         successor=format_my_app_name_code,
         retries=0,

{zrb-1.3.0 → zrb-1.4.0}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/gateway/view/content/my-module/my-entity.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
     class="container"
-    data-page-size='{{ page_size | tojson }}'
-    data-page='{{ page | tojson }}'
-    data-sort='{{ sort | tojson }}'
-    data-filter='{{ filter | tojson }}'
-    data-allow-create='{{ allow_create | tojson }}'
-    data-allow-update='{{ allow_update | tojson }}'
-    data-allow-delete='{{ allow_delete | tojson }}'>
+    data-page-size='{{ page_size | tojson | safe }}'
+    data-page='{{ page | tojson | safe }}'
+    data-sort='{{ sort | tojson | safe }}'
+    data-filter='{{ filter | tojson | safe }}'
+    data-allow-create='{{ allow_create | tojson | safe }}'
+    data-allow-update='{{ allow_update | tojson | safe }}'
+    data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>My Entity</h1>
 
@@ -311,13 +311,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/my-entities", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

{zrb-1.3.0 → zrb-1.4.0}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/permission.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
       class="container"
-      data-page-size='{{ page_size | tojson }}'
-      data-page='{{ page | tojson }}'
-      data-sort='{{ sort | tojson }}'
-      data-filter='{{ filter | tojson }}'
-      data-allow-create='{{ allow_create | tojson }}'
-      data-allow-update='{{ allow_update | tojson }}'
-      data-allow-delete='{{ allow_delete | tojson }}'>
+      data-page-size='{{ page_size | tojson | safe }}'
+      data-page='{{ page | tojson | safe }}'
+      data-sort='{{ sort | tojson | safe }}'
+      data-filter='{{ filter | tojson | safe }}'
+      data-allow-create='{{ allow_create | tojson | safe }}'
+      data-allow-update='{{ allow_update | tojson | safe }}'
+      data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>Permission</h1>
 
@@ -326,13 +326,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/permissions", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

{zrb-1.3.0 → zrb-1.4.0}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/role.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
     class="container"
-    data-page-size='{{ page_size | tojson }}'
-    data-page='{{ page | tojson }}'
-    data-sort='{{ sort | tojson }}'
-    data-filter='{{ filter | tojson }}'
-    data-allow-create='{{ allow_create | tojson }}'
-    data-allow-update='{{ allow_update | tojson }}'
-    data-allow-delete='{{ allow_delete | tojson }}'>
+    data-page-size='{{ page_size | tojson | safe }}'
+    data-page='{{ page | tojson | safe }}'
+    data-sort='{{ sort | tojson | safe }}'
+    data-filter='{{ filter | tojson | safe }}'
+    data-allow-create='{{ allow_create | tojson | safe }}'
+    data-allow-update='{{ allow_update | tojson | safe }}'
+    data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>Role</h1>
 
@@ -251,7 +251,7 @@
             try {
                 const createForm = document.getElementById("crud-create-form");
                 const formData = UTIL.getFormData(createForm);
-                formData.permission_names = JSON.parse(formData.permission_names);
+                formData.permission_names = UTIL.tryParseJSON(formData.permission_names);
                 await UTIL.fetchAPI(this.apiUrl, { method: "POST", body: JSON.stringify(formData) });
                 await this.fetchRows();
                 this.hideCreateForm();
@@ -283,7 +283,7 @@
             try {
                 const updateForm = document.getElementById("crud-update-form");
                 const formData = UTIL.getFormData(updateForm);
-                formData.permission_names = JSON.parse(formData.permission_names);
+                formData.permission_names = UTIL.tryParseJSON(formData.permission_names);
                 await UTIL.fetchAPI(`${this.apiUrl}/${this.state.updatedRowId}`, {
                     method: "PUT",
                     body: JSON.stringify(formData)
@@ -348,13 +348,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/roles", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });