Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Add normalizer name to tasks #1985

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Feature: Add normalizer name to tasks #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb7822
Include normalizer name in task list result set
TwistMeister Oct 19, 2023
dfb1b7f
Update client.py
TwistMeister Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mula/scheduler/models/normalizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
import uuid
from typing import Optional

from pydantic import BaseModel
from pydantic import BaseModel, Field


class Normalizer(BaseModel):
"""Normalizer representation."""

id: str
name: Optional[str] = None
version: Optional[str] = None
name: Optional[str] = Field(default=None)
version: Optional[str] = Field(default=None)


class NormalizerMeta(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion mula/scheduler/schedulers/normalizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def push_task(self, normalizer: Plugin, raw_data: RawData, caller: str = "") ->
caller: The name of the function that called this function, used for logging.
"""
task = NormalizerTask(
normalizer=Normalizer(id=normalizer.id),
normalizer=Normalizer.parse_obj(normalizer.dict()),
raw_data=raw_data,
)

Expand Down
7 changes: 2 additions & 5 deletions rocky/katalogus/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,19 +200,16 @@ def parse_boefje(boefje: Dict) -> Boefje:


def parse_normalizer(normalizer: Dict) -> Normalizer:
# TODO: give normalizers a proper name in backend
name = normalizer["id"].replace("_", " ").replace("kat ", "").title()

consumes = set(normalizer["consumes"])
produces = set()
with contextlib.suppress(StopIteration):
consumes.add(f"normalizer/{name.lower()}")
consumes.add(f"normalizer/{normalizer.get('name') or normalizer['id']}")
produces.add(type_by_name(normalizer["produces"]))

return Normalizer(
id=normalizer["id"],
repository_id=normalizer["repository_id"],
name=name or normalizer["id"],
name=normalizer.get("name") or normalizer["id"],
description=normalizer["description"],
enabled=normalizer["enabled"],
type=normalizer["type"],
Expand Down
6 changes: 2 additions & 4 deletions rocky/katalogus/views/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,9 @@ class NormalizerMixin(OctopoesView):
this mixin provides the method to construct the normalizer task for that data and run it.
"""

def run_normalizer(self, normalizer: KATalogusNormalizer, raw_data: RawData) -> None:
def run_normalizer(self, katalogus_normalizer: KATalogusNormalizer, raw_data: RawData) -> None:
normalizer_task = NormalizerTask(
id=uuid4(),
normalizer=Normalizer.parse_obj(normalizer.dict()),
raw_data=raw_data,
id=uuid4().hex, normalizer=Normalizer.parse_obj(katalogus_normalizer.dict()), raw_data=raw_data
)

task = QueuePrioritizedItem(id=normalizer_task.id, priority=1, data=normalizer_task)
Expand Down
2 changes: 1 addition & 1 deletion rocky/rocky/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Normalizer(BaseModel):
"""Normalizer representation."""

id: Optional[str]
name: Optional[str]
name: Optional[str] = Field(default=None)
version: Optional[str] = Field(default=None)


Expand Down
11 changes: 10 additions & 1 deletion rocky/rocky/templates/tasks/normalizers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,16 @@ <h1>{% translate "Normalizers" %}</h1>
<tbody>
{% for task in object_list %}
<tr data-task-id="{{ task.id }}">
<td>{{ task.p_item.data.normalizer.id }}</td>
<td>
<a href="{% url 'normalizer_detail' organization_code=organization.code plugin_id=task.p_item.data.normalizer.id %}">
{{ task.p_item.data.normalizer.name }}
{% comment %} {% if task.p_item.data.normalizer.name %}
{{ task.p_item.data.normalizer.name }}
{% else %}
{{ task.p_item.data.normalizer.id }}
{% endif %} {% endcomment %}
</a>
</td>
<td class="nowrap">
{% if task.status.value == "pending" or task.status.value == "queued" %}
<i class="icon queued"></i>&nbsp;{{ task.status.value|capfirst }}
Expand Down