wbcore 1.59.5__py2.py3-none-any.whl → 1.59.6__py2.py3-none-any.whl

wbcore/metadata/configs/buttons/buttons.py

@@ -11,7 +11,7 @@ from wbcore.serializers import ListSerializer, RepresentationSerializer, Seriali
 from wbcore.utils.urls import get_parse_endpoint, get_urlencode_endpoint
 
 from .bases import ButtonConfig, ButtonTypeMixin, ButtonUrlMixin
-from .enums import ButtonType, HyperlinkTarget
+from .enums import ButtonType
 
 
 @dataclass
@@ -71,12 +71,6 @@ class WidgetButton(ButtonTypeMixin, ButtonUrlMixin, ButtonConfig):
 @dataclass
 class HyperlinkButton(ButtonTypeMixin, ButtonUrlMixin, ButtonConfig):
     button_type = ButtonType.HYPERLINK
-    target: HyperlinkTarget = HyperlinkTarget.BLANK
-
-    def serialize(self, request, **kwargs):
-        res = super().serialize(request, **kwargs)
-        res["target"] = self.target.value
-        return res
 
     def __hash__(self):
         if self.key:

wbcore/metadata/configs/buttons/enums.py

@@ -66,10 +66,3 @@ class ButtonType(Enum):
     HYPERLINK = "hyperlink"
     WIDGET = "widget"
     ACTION = "action"
-
-
-class HyperlinkTarget(Enum):
-    BLANK = "_blank"
-    SELF = "_self"
-    PARENT = "_parent"
-    TOP = "_top"

wbcore/metadata/tests/test_buttons.py

@@ -11,7 +11,7 @@ from wbcore.metadata.configs.buttons import (
     HyperlinkButton,
     WidgetButton,
 )
-from wbcore.metadata.configs.buttons.enums import ButtonDefaultColor, HyperlinkTarget
+from wbcore.metadata.configs.buttons.enums import ButtonDefaultColor
 from wbcore.metadata.configs.display.instance_display import create_simple_display
 from wbcore.metadata.utils import prefix_key
 
@@ -31,7 +31,6 @@ class TestDropDownButton:
         assert serialized_btn["icon"] == button.icon
         assert serialized_btn["title"] == button.title
         assert serialized_btn["color"] == button.color
-        assert serialized_btn["level"] == button.color
         assert serialized_btn["buttons"] == [button.buttons[0].serialize(rf)]
         assert serialized_btn["type"] == DropDownButton.button_type.value
 
@@ -43,7 +42,6 @@ class TestDropDownButton:
         assert serialized_btn["icon"] == button.icon
         assert serialized_btn["title"] == button.title
         assert serialized_btn["color"] == button.color
-        assert serialized_btn["level"] == button.color
         assert serialized_btn["buttons"] == [nested_button.serialize(rf, key_prefix=key_prefix)]
         assert serialized_btn["type"] == DropDownButton.button_type.value
         assert serialized_btn["buttons"][0]["key"] == prefix_key(nested_button.key, key_prefix)
@@ -78,7 +76,6 @@ class TestWidgetButton:
         assert serialized_btn["icon"] == key_button.icon
         assert serialized_btn["title"] == key_button.title
         assert serialized_btn["color"] == key_button.color
-        assert serialized_btn["level"] == key_button.color
         assert serialized_btn["key"] == key_button.key
         assert serialized_btn["type"] == self.button_class.button_type.value
 
@@ -89,7 +86,6 @@ class TestWidgetButton:
         assert serialized_btn["icon"] == key_button.icon
         assert serialized_btn["title"] == key_button.title
         assert serialized_btn["color"] == key_button.color
-        assert serialized_btn["level"] == key_button.color
         assert serialized_btn["type"] == self.button_class.button_type.value
         assert serialized_btn["key"] == prefix_key(key_button.key, key_prefix)
 
@@ -104,7 +100,6 @@ class TestWidgetButton:
         assert serialized_btn["icon"] == endpoint_button.icon
         assert serialized_btn["title"] == endpoint_button.title
         assert serialized_btn["color"] == endpoint_button.color
-        assert serialized_btn["level"] == endpoint_button.color
         assert serialized_btn["endpoint"] == endpoint_button.endpoint
         assert serialized_btn["type"] == self.button_class.button_type.value
 
@@ -118,18 +113,11 @@ class TestWidgetButton:
 class TestHyperlinkButtonutton(TestWidgetButton):
     button_class = HyperlinkButton
 
-    def test_serialize(self, rf, key_button):
-        super().test_serialize(rf, key_button)
-        key_button.target = random.choice(list(HyperlinkTarget))
-        serialized_btn = key_button.serialize(rf)
-        assert serialized_btn["target"] == key_button.target.value
-
     def test_serialize_endpoint_button(self, rf, endpoint_button):
         serialized_btn = endpoint_button.serialize(rf)
         assert serialized_btn["icon"] == endpoint_button.icon
         assert serialized_btn["title"] == endpoint_button.title
         assert serialized_btn["color"] == endpoint_button.color
-        assert serialized_btn["level"] == endpoint_button.color
         assert serialized_btn["endpoint"] == endpoint_button.endpoint
         assert serialized_btn["type"] == self.button_class.button_type.value
 

wbcore/serializers/fields/fields.py

@@ -13,7 +13,7 @@ from wbcore.signals import (
 from wbcore.utils.importlib import parse_signal_received_for_module
 
 from .mixins import WBCoreSerializerFieldMixin
-from .text import TextField
+from .text import StringRelatedField
 from .types import WBCoreType
 
 logger = logging.getLogger(__name__)
@@ -155,6 +155,8 @@ class AdditionalResourcesField(WBCoreSerializerFieldMixin, serializers.ReadOnlyF
 
 
 class HyperlinkField(WBCoreSerializerFieldMixin, serializers.ReadOnlyField):
+    field_type = WBCoreType.HYPERLINK.value
+
     def __init__(self, *args, **kwargs):
         self.reverse_name = kwargs.pop("reverse_name")
         self.id_field_name = kwargs.pop("id_field_name", "id")
@@ -178,7 +180,7 @@ class SlugRelatedField(WBCoreSerializerFieldMixin, serializers.SlugRelatedField)
 
 
 class SerializerMethodField(WBCoreSerializerFieldMixin, serializers.SerializerMethodField):
-    def __init__(self, method_name=None, field_class=TextField, **kwargs):
+    def __init__(self, method_name=None, field_class=StringRelatedField, **kwargs):
         self.field_class = field_class
         self.initkwargs = kwargs
         super().__init__(method_name, **kwargs)

wbcore/serializers/fields/types.py

@@ -31,6 +31,7 @@ class WBCoreType(Enum):
     URL = "url"
     SPARKLINE = "sparkline"
     LANGUAGE = "language"
+    HYPERLINK = "hyperlink"
 
 
 class ReturnContentType(Enum):

wbcore/test/tests.py

@@ -3,7 +3,7 @@ from django.conf import settings
 from django.db import models
 
 from wbcore import serializers, viewsets
-from wbcore.pandas.views import PandasAPIViewSet
+from wbcore.contrib.pandas.views import PandasAPIViewSet
 
 from .mixins import (
     TestChartViewSet,

wbcore/tests/test_configs.py

@@ -27,11 +27,6 @@ def test_share_config(config_registry: ConfigRegistry):
     assert share
 
 
-def test_markdown_config(config_registry: ConfigRegistry):
-    markdown = config_registry.get_config_dict()["markdown"]
-    assert markdown["blockdiag"]
-
-
 def test_menu_calendar_config(config_registry: ConfigRegistry):
     menu_calendar = config_registry.get_config_dict()["menu_calendar"]
     assert menu_calendar

wbcore/urls.py

@@ -15,7 +15,6 @@ from .frontend_user_configuration import FrontendUserConfigurationModelViewSet
 from .markdown.views import (
     AssetCreateView,
     AssetRetrieveView,
-    BlockDiag,
     TemplateTagView,
 )
 from .menus.views import MenuAPIView
@@ -65,7 +64,6 @@ urlpatterns = [
     path("menu/", MenuAPIView.as_view(), name="menu"),
     path("preset/<str:display_identifier_path>/", PresetAPIView.as_view(), name="preset"),
     path("share/", ShareAPIView.as_view(), name="share"),
-    path("markdown/blockdiag/", BlockDiag.as_view(), name="blockdiag"),
     path("markdown/asset/", AssetCreateView.as_view(), name="markdown-asset-upload"),
     path("markdown/asset/<uuid>/", AssetRetrieveView.as_view(), name="asset-retrieve"),
     path("markdown/templatetag/", TemplateTagView.as_view(), name="markdown-tags"),

wbcore/utils/figures.py

@@ -83,8 +83,7 @@ def get_timeseries_chart(x_data, y_data, red, green, blue):
         paper_bgcolor="rgba(0,0,0,0)",
         plot_bgcolor="rgba(0,0,0,0)",
         yaxis=dict(
-            title="",
-            titlefont=dict(color="#000000"),
+            title=dict(text="", font=dict(color="#000000")),
             tickfont=dict(color="#000000"),
             anchor="x",
             side="right",
@@ -94,8 +93,7 @@ def get_timeseries_chart(x_data, y_data, red, green, blue):
         ),
         yaxis_type="log",
         xaxis=dict(
-            title="",
-            titlefont=dict(color="#000000"),
+            title=dict(text="", font=dict(color="#000000")),
             tickfont=dict(color="#000000"),
             showline=True,
             linewidth=0.5,
@@ -158,13 +156,11 @@ def get_factsheet_timeseries_chart(df, color="rgb(120,214,255)", fillcolor="rgba
             ),
             rangeslider=dict(visible=True),
             type="date",
-            title="",
-            titlefont=dict(color="#000000"),
+            title=dict(text="", font=dict(color="#000000")),
             tickfont=dict(color="#000000"),
         ),
         yaxis=dict(
-            title="",
-            titlefont=dict(color="#000000"),
+            title=dict(text="", font=dict(color="#000000")),
             tickfont=dict(color="#000000"),
             anchor="x",
             side="right",

{wbcore-1.59.5.dist-info → wbcore-1.59.6.dist-info}/METADATA

@@ -1,25 +1,25 @@
 Metadata-Version: 2.4
 Name: wbcore
-Version: 1.59.5
+Version: 1.59.6
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
-Requires-Dist: boto3==1.35.*
 Requires-Dist: celery[redis]==5.*
 Requires-Dist: croniter==2.*
 Requires-Dist: django-admin-inline-paginator==0.4.0
-Requires-Dist: django-anymail==12.*
+Requires-Dist: django-anymail==13.*
 Requires-Dist: django-better-admin-arrayfield==1.4.*
 Requires-Dist: django-celery-beat==2.*
-Requires-Dist: django-colorfield==0.11.*
+Requires-Dist: django-colorfield==0.14.*
 Requires-Dist: django-configurations[database]==2.5.*
-Requires-Dist: django-cors-headers==4.6.*
-Requires-Dist: django-dynamic-preferences==1.16.*
-Requires-Dist: django-extensions==3.2.*
-Requires-Dist: django-filter==24.*
+Requires-Dist: django-cors-headers==4.9.*
+Requires-Dist: django-dynamic-preferences==1.17.*
+Requires-Dist: django-eventtools==1.*
+Requires-Dist: django-extensions==4.1.*
+Requires-Dist: django-filter==25.*
 Requires-Dist: django-fsm==2.*
-Requires-Dist: django-guardian==2.4.*
+Requires-Dist: django-guardian==3.2.*
 Requires-Dist: django-import-export==4.*
-Requires-Dist: django-maintenance-mode==0.21.*
-Requires-Dist: django-modeltrans>=0.8
+Requires-Dist: django-maintenance-mode==0.22.*
+Requires-Dist: django-modeltrans>=0.9
 Requires-Dist: django-mptt==0.*
 Requires-Dist: django-ordered-model==3.7.*
 Requires-Dist: django-picklefield==3.*
@@ -27,40 +27,39 @@ Requires-Dist: django-rest-fuzzysearch==0.5.*
 Requires-Dist: django-reversion-compare==0.18.*
 Requires-Dist: django-reversion==5.1.*
 Requires-Dist: django-storages[boto3]==1.14.*
-Requires-Dist: django==5.0.*
-Requires-Dist: djangorestframework-guardian==0.3.*
+Requires-Dist: django==5.2.*
+Requires-Dist: djangorestframework-guardian==0.4.*
 Requires-Dist: djangorestframework-simplejwt==5.*
 Requires-Dist: djangorestframework==3.15.*
 Requires-Dist: fabric==3.2.*
-Requires-Dist: faker==25.*
+Requires-Dist: faker==38.*
 Requires-Dist: firebase-admin==6.*
 Requires-Dist: graphviz==0.*
 Requires-Dist: humanize==4.*
 Requires-Dist: ics==0.*
-Requires-Dist: igraph==0.*
+Requires-Dist: igraph==1.*
 Requires-Dist: inscriptis==1.*
-Requires-Dist: langchain-openai>=0.3
-Requires-Dist: langchain>=0.3
-Requires-Dist: markdown-blockdiag
-Requires-Dist: markdown>=3.8
+Requires-Dist: langchain-openai==1.0.*
+Requires-Dist: langchain==1.0.*
+Requires-Dist: markdown==3.10.*
 Requires-Dist: openpyxl==3.*
-Requires-Dist: phonenumbers==8.*
-Requires-Dist: pillow==11.*
-Requires-Dist: plotly==5.*
-Requires-Dist: prettytable==0.*
+Requires-Dist: phonenumbers==9.*
+Requires-Dist: plotly==6.*
+Requires-Dist: prettytable==3.*
 Requires-Dist: psycopg[binary]==3.*
-Requires-Dist: pycountry==23.*
+Requires-Dist: pycountry==24.*
 Requires-Dist: pyjwt==2.*
 Requires-Dist: pytest-sftpserver==1.*
 Requires-Dist: python-magic==0.*
 Requires-Dist: python-slugify==8.*
-Requires-Dist: redis==4.*
+Requires-Dist: redis==7.*
+Requires-Dist: reportlab==4.*
 Requires-Dist: requests==2.*
 Requires-Dist: rstr==3.2.*
-Requires-Dist: schwifty==2024.*
+Requires-Dist: schwifty==2025.*
 Requires-Dist: tatsu==5.*
 Requires-Dist: tqdm==4.*
-Requires-Dist: weasyprint==65.*
+Requires-Dist: weasyprint==66.*
 Provides-Extra: pandas
 Requires-Dist: numpy==1.*; extra == 'pandas'
 Requires-Dist: pandas==2.2.*; extra == 'pandas'