Merge pull request #42 from danfimov/fix-bugs

fix: multiple bugs

Author: danfimov

taskiq_dashboard/api/application.py

@@ -1,4 +1,5 @@
 import contextlib
+import pathlib
 import typing as tp
 
 import fastapi
@@ -65,7 +66,7 @@ def get_application() -> fastapi.FastAPI:
     app.include_router(router=event_router)
     app.include_router(router=action_router)
     app.include_router(router=schedule_router)
-    app.mount('/static', StaticFiles(directory='taskiq_dashboard/api/static'), name='static')
+    app.mount('/static', StaticFiles(directory=pathlib.Path(__file__).parent / 'static'), name='static')
     app.add_middleware(AccessTokenMiddleware)
     setup_dishka(container=dependencies.container, app=app)
     return app

taskiq_dashboard/api/routers/task.py

@@ -102,11 +102,8 @@ async def task_details(
     """
     Display detailed information for a specific task.
     """
-    # Get task by ID
     task = await repository.get_task_by_id(task_id)
-
     if task is None:
-        # If task is not found, return 404 page
         return jinja_templates.TemplateResponse(
             name='404.html',
             context={
@@ -115,16 +112,15 @@ async def task_details(
             },
             status_code=404,
         )
-
-    # Convert task to JSON for the frontend
-    task_json = json.dumps(task.model_dump(mode='json'))
-
+    result_json = None
+    if task.result:
+        result_json = json.dumps(task.result, indent=2, ensure_ascii=False)
     return jinja_templates.TemplateResponse(
         name='task_details.html',
         context={
             'request': request,
             'task': task,
-            'task_json': task_json,
+            'task_result': result_json,
             'enable_actions': request.app.state.broker is not None,
             'enable_additional_actions': False,  # Placeholder for future features like retries with different args
         },

taskiq_dashboard/api/templates.py

@@ -1,4 +1,6 @@
+import pathlib
+
 from fastapi.templating import Jinja2Templates
 
 
-jinja_templates = Jinja2Templates(directory='taskiq_dashboard/api/templates')
+jinja_templates = Jinja2Templates(directory=pathlib.Path(__file__).parent / 'templates')

taskiq_dashboard/api/templates/partial/task_list_item.html

@@ -23,7 +23,12 @@
         </span>
     </td>
     <td class="px-6 py-4 group-hover:bg-ctp-blue-100/20 w-auto">{{ task.worker }}</td>
-    <td class="px-6 py-4 group-hover:bg-ctp-blue-100/20 w-min">{{ task.started_at.strftime('%Y-%m-%d %H:%M:%S') }}</td>
+
+    {% if task.started_at %}
+        <td class="px-6 py-4 group-hover:bg-ctp-blue-100/20 w-min">{{ task.started_at.strftime('%Y-%m-%d %H:%M:%S') }}</td>
+    {% else %}
+        <td class="px-6 py-4 group-hover:bg-ctp-blue-100/20 w-min">-</td>
+    {% endif %}
     <td class="px-6 py-4 group-hover:bg-ctp-blue-100/20 w-min">
         {{ task.finished_at.strftime('%Y-%m-%d %H:%M:%S') if task.finished_at else '-' }}
     </td>

taskiq_dashboard/api/templates/task_details.html

@@ -116,7 +116,11 @@ <h3>Task ID</h3>
             <div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-6">
                 <div>
                     <h3 class="mb-2">Started at</h3>
-                    <p class="font-light">{{ task.started_at.strftime('%Y-%m-%d %H:%M:%S') }}</p>
+                    {% if task.started_at %}
+                        <p class="font-light">{{ task.started_at.strftime('%Y-%m-%d %H:%M:%S') }}</p>
+                    {% else %}
+                        <p class="font-light">Not started yet</p>
+                    {% endif %}
                 </div>
                 <div>
                     <h3 class="mb-2">Finished at</h3>
@@ -189,9 +193,9 @@ <h2 class="font-bold text-xl">Task result</h2>
 
             <div class="mb-4">
                 <h3 class="mb-2 font-normal">Result</h3>
-                {% if task.result %}
+                {% if task_result %}
                     <div class="bg-ctp-base rounded p-4 overflow-x-auto">
-                        <pre class="whitespace-pre-wrap text-sm">{{ task.result | tojson(indent=2) }}</pre>
+                        <pre class="whitespace-pre-wrap text-sm">{{ task_result | safe }}</pre>
                     </div>
                 {% elif task.status == 0 %}
                     <p class="font-light text-ctp-subtext0">Task is still in progress</p>

taskiq_dashboard/domain/dto/task.py

@@ -19,7 +19,7 @@ class Task(pydantic.BaseModel):
     kwargs: dict[str, tp.Any] = pydantic.Field(default_factory=dict)
     labels: dict[str, tp.Any] = pydantic.Field(default_factory=dict)
 
-    result: dict | pydantic.Json | None = None
+    result: dict | list | pydantic.Json | None = None
     error: str | None = None
 
     queued_at: datetime.datetime | None = None
@@ -36,7 +36,7 @@ class QueuedTask(pydantic.BaseModel):
     kwargs: dict[str, tp.Any] = pydantic.Field(default_factory=dict)
     labels: dict[str, tp.Any] = pydantic.Field(default_factory=dict)
     task_name: str
-    worker: str
+    worker: str | None
     queued_at: datetime.datetime
 
     model_config = pydantic.ConfigDict(

taskiq_dashboard/infrastructure/services/task_service.py

@@ -66,7 +66,7 @@ async def create_task(
             id=task_id,
             name=task_arguments.task_name,
             status=TaskStatus.QUEUED.value,
-            worker=task_arguments.worker,
+            worker=task_arguments.worker or '',
             args=task_arguments.args,
             kwargs=task_arguments.kwargs,
             labels=task_arguments.labels,
@@ -91,7 +91,7 @@ async def update_task(
                 kwargs=task_arguments.kwargs,
                 labels=task_arguments.labels,
                 name=task_arguments.task_name,
-                worker=task_arguments.worker,
+                worker=task_arguments.worker or '',
             )
         else:
             task_status = TaskStatus.FAILURE if task_arguments.error is not None else TaskStatus.COMPLETED

taskiq_dashboard/infrastructure/settings.py

@@ -121,6 +121,7 @@ class Settings(pydantic_settings.BaseSettings):
         env_prefix='TASKIQ_DASHBOARD__',
         env_file=('conf/.env', os.getenv('ENV_FILE', '.env')),
         env_file_encoding='utf-8',
+        extra='ignore',
     )
 
 

taskiq_dashboard/interface/application.py

@@ -13,7 +13,7 @@ class TaskiqDashboard:
     def __init__(
         self,
         api_token: str,
-        storage_type: str = 'sqlite',
+        storage_type: tp.Literal['sqlite', 'postgres'] = 'sqlite',
         database_dsn: str = 'sqlite+aiosqlite:///taskiq_dashboard.db',
         broker: AsyncBroker | None = None,
         scheduler: TaskiqScheduler | None = None,
@@ -31,7 +31,7 @@ def __init__(
         """
         self.settings = get_settings()
         self.settings.api.token = SecretStr(api_token)
-
+        self.settings.storage_type = storage_type
         if storage_type == 'sqlite':
             self.settings.sqlite = SqliteSettings(dsn=database_dsn)  # type: ignore[call-arg]
         else: