ex4nicegui 0.6.7__py3-none-any.whl → 0.6.8__py3-none-any.whl

ex4nicegui/reactive/officials/expansion.py

@@ -1,7 +1,6 @@
 from typing import Any, Optional, Callable
 from nicegui import ui
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -53,7 +52,7 @@ class ExpansionBindableUi(BindableUi[ui.expansion]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/grid.py

@@ -3,7 +3,7 @@ from typing import (
     Optional,
 )
 
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 
 from nicegui import ui
 from .base import BindableUi

ex4nicegui/reactive/officials/html.py

@@ -1,5 +1,3 @@
-from ex4nicegui.utils.apiEffect import ui_effect
-
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
     to_value,
@@ -20,7 +18,7 @@ class html(BindableUi[HtmlComponent]):
 
         super().__init__(element)
 
-        @ui_effect
+        @self._ui_effect
         def _():
             element._props["content"] = to_value(content)
             element.update()

ex4nicegui/reactive/officials/icon.py

@@ -2,9 +2,7 @@ from typing import (
     Optional,
     cast,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -14,7 +12,8 @@ from nicegui import ui
 from nicegui.elements.mixins.color_elements import (
     TextColorElement,
 )
-from .base import BindableUi, _bind_color
+from .base import BindableUi
+from ex4nicegui.reactive.services import color_service
 
 
 class IconBindableUi(BindableUi[ui.icon]):
@@ -45,10 +44,10 @@ class IconBindableUi(BindableUi[ui.icon]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_color(self, ref_ui: TGetterOrReadonlyRef):
-        return _bind_color(self, ref_ui)
+        return color_service.bind_color(self, ref_ui)
 
     def bind_name(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             ele = cast(TextColorElement, self.element)
             ele._props["name"] = to_value(ref_ui)

ex4nicegui/reactive/officials/image.py

@@ -2,9 +2,7 @@ from pathlib import Path
 from typing import (
     Union,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -34,6 +32,6 @@ class ImageBindableUi(BindableUi[ui.image]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_source(self, ref_ui: TGetterOrReadonlyRef[Union[str, Path]]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_source(to_value(ref_ui))

ex4nicegui/reactive/officials/input.py

@@ -1,12 +1,10 @@
 from typing import Any, Callable, List, Optional, Dict, cast
-from ex4nicegui.utils.apiEffect import ui_effect
 
 
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     Ref,
     _TMaybeRef as TMaybeRef,
-    effect,
     is_setter_ref,
     to_value,
 )
@@ -14,7 +12,7 @@ from ex4nicegui.utils.signals import (
 from nicegui import ui
 from nicegui.events import handle_event
 from .base import BindableUi, DisableableMixin
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 
 
 class InputBindableUi(BindableUi[ui.input], DisableableMixin):
@@ -62,7 +60,7 @@ class InputBindableUi(BindableUi[ui.input], DisableableMixin):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[str]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
             self.element.update()
@@ -70,7 +68,7 @@ class InputBindableUi(BindableUi[ui.input], DisableableMixin):
         return self
 
     def bind_password(self, ref_ui: TGetterOrReadonlyRef[bool]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element._props["type"] = "password" if to_value(ref_ui) else "text"
             self.element.update()
@@ -116,7 +114,7 @@ class LazyInputBindableUi(InputBindableUi):
 
             ele = self.element
 
-            @effect
+            @self._ui_effect
             def _():
                 ele.value = ref.value
 

ex4nicegui/reactive/officials/knob.py

@@ -3,9 +3,7 @@ from typing import (
     Callable,
     Optional,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
     to_value,
@@ -68,7 +66,7 @@ class KnobBindableUi(
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[float]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/label.py

@@ -1,5 +1,5 @@
 from typing import Any
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     to_value,

ex4nicegui/reactive/officials/linear_progress.py

@@ -1,9 +1,7 @@
 from typing import (
     Optional,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -11,7 +9,8 @@ from ex4nicegui.utils.signals import (
 )
 from nicegui import ui
 
-from .base import BindableUi, _bind_color
+from .base import BindableUi
+from ex4nicegui.reactive.services import color_service
 
 
 class LinearProgressBindableUi(BindableUi[ui.linear_progress]):
@@ -57,10 +56,10 @@ class LinearProgressBindableUi(BindableUi[ui.linear_progress]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_color(self, ref_ui: TGetterOrReadonlyRef):
-        return _bind_color(self, ref_ui)
+        return color_service.bind_color(self, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/number.py

@@ -6,14 +6,11 @@ from typing import (
     Dict,
     Union,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
     to_value,
-    on,
 )
 from nicegui import ui
 from .base import BindableUi
@@ -83,14 +80,14 @@ class NumberBindableUi(BindableUi[ui.number]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[float]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 
         return self
 
     def _bind_precision(self, ref_ui: TGetterOrReadonlyRef[int]):
-        @on(ref_ui, onchanges=True)
+        @self._ui_signal_on(ref_ui, onchanges=True)
         def _():
             self.element.precision = to_value(ref_ui)
             self.element.sanitize()

ex4nicegui/reactive/officials/radio.py

@@ -8,9 +8,7 @@ from typing import (
     Dict,
     Union,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -63,14 +61,14 @@ class RadioBindableUi(BindableUi[ui.radio]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_options(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_options(to_value(ref_ui))
 
         return self
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             cast(ValueElement, self.element).set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/row.py

@@ -1,7 +1,7 @@
 from typing import (
     Any,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
 )

ex4nicegui/reactive/officials/select.py

@@ -8,9 +8,7 @@ from typing import (
     Dict,
     Union,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -85,14 +83,14 @@ class SelectBindableUi(BindableUi[ui.select]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_options(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect()
+        @self._ui_effect()
         def _():
             self.element.set_options(to_value(ref_ui))
 
         return self
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect()
+        @self._ui_effect()
         def _():
             cast(ValueElement, self.element).set_value(to_value(ref_ui) or None)
 

ex4nicegui/reactive/officials/slider.py

@@ -5,9 +5,7 @@ from typing import (
     TypeVar,
     cast,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     Ref,
@@ -67,7 +65,7 @@ class SliderBindableUi(
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[float]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
             self.element.update()
@@ -95,7 +93,7 @@ class LazySliderBindableUi(SliderBindableUi):
             ref = cast(Ref, org_value)
             ele = self.element
 
-            @ui_effect
+            @self._ui_effect
             def _():
                 ele.value = ref.value
 

ex4nicegui/reactive/officials/switch.py

@@ -4,9 +4,7 @@ from typing import (
     Optional,
     TypeVar,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -56,7 +54,7 @@ class SwitchBindableUi(BindableUi[ui.switch]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[bool]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/tab.py

@@ -1,5 +1,5 @@
 from typing import Dict, Optional
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     to_value,
     _TMaybeRef as TMaybeRef,

ex4nicegui/reactive/officials/tab_panel.py

@@ -1,4 +1,4 @@
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
 )

ex4nicegui/reactive/officials/tab_panels.py

@@ -1,5 +1,5 @@
 from typing import Any, Callable, Optional
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     to_value,

ex4nicegui/reactive/officials/table.py

@@ -6,18 +6,19 @@ from typing import (
     Dict,
 )
 from typing_extensions import Literal
-from ex4nicegui.reactive.utils import ParameterClassifier, dataframe2col_str
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
+from ex4nicegui.reactive.services.pandas_service import dataframe2col_str
+
 import ex4nicegui.utils.common as utils_common
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
-    ReadonlyRef,
+    TReadonlyRef,
     is_ref,
     ref_computed,
     to_ref,
     _TMaybeRef as TMaybeRef,
     to_value,
     to_raw,
-    on,
     RefWrapper,
 )
 from nicegui import ui
@@ -67,7 +68,7 @@ class TableBindableUi(BindableUi[ui.table]):
 
         self._arg_selection = selection
         self._arg_row_key = row_key
-        self._selection_ref: ReadonlyRef[List[Any]] = to_ref([])  # type: ignore
+        self._selection_ref: TReadonlyRef[List[Any]] = to_ref([])  # type: ignore
 
         def on_selection(_):
             self._selection_ref.value = self.element.selected  # type: ignore
@@ -182,7 +183,7 @@ class TableBindableUi(BindableUi[ui.table]):
         return self
 
     def bind_rows(self, ref_ui: TGetterOrReadonlyRef[List[Dict]]):
-        @on(ref_ui, deep=True)
+        @self._ui_signal_on(ref_ui, deep=True)
         def _():
             ele = self.element
             ele._props["rows"] = list(to_raw(to_value(ref_ui)))
@@ -191,7 +192,7 @@ class TableBindableUi(BindableUi[ui.table]):
         return self
 
     def bind_columns(self, ref_ui: TGetterOrReadonlyRef[List[Dict]]):
-        @on(ref_ui, deep=True)
+        @self._ui_signal_on(ref_ui, deep=True)
         def _():
             ele = self.element
             ele._props["columns"] = list(to_raw(to_value(ref_ui)))

ex4nicegui/reactive/officials/tabs.py

@@ -1,5 +1,5 @@
 from typing import Any, Callable, Optional
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     to_value,

ex4nicegui/reactive/officials/textarea.py

@@ -5,13 +5,11 @@ from typing import (
     Dict,
     cast,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     Ref,
     _TMaybeRef as TMaybeRef,
-    effect,
     is_setter_ref,
     to_value,
 )
@@ -61,7 +59,7 @@ class TextareaBindableUi(BindableUi[ui.textarea]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[str]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 
@@ -95,7 +93,7 @@ class LazyTextareaBindableUi(TextareaBindableUi):
             ref = cast(Ref, org_value)
             ele = self.element
 
-            @effect
+            @self._ui_effect
             def _():
                 ele.value = ref.value
 

ex4nicegui/reactive/officials/upload.py

@@ -11,7 +11,7 @@ from ex4nicegui.utils.signals import (
 from nicegui import ui
 from nicegui.events import handle_event
 from .base import BindableUi
-from .utils import _convert_kws_ref2value
+from ex4nicegui.reactive.systems.reactive_system import convert_kws_ref2value
 
 
 class UploadResult:
@@ -57,7 +57,7 @@ class UploadBindableUi(BindableUi[ui.upload]):
             "auto_upload": auto_upload,
         }
 
-        value_kws = _convert_kws_ref2value(kws)
+        value_kws = convert_kws_ref2value(kws)
 
         self._on_upload_callbacks = []
 

ex4nicegui/reactive/q_pagination.py

@@ -1,9 +1,9 @@
 from typing import Any, Optional, Callable
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     to_value,
-    _TMaybeRef as TMaybeRef,
+    TMaybeRef,
 )
 from nicegui import ui
 from ex4nicegui.reactive.officials.base import BindableUi

ex4nicegui/reactive/scopedStyle.js

@@ -0,0 +1,55 @@
+
+const REGEX_NEWLINE = /[\r\n]/g;
+const REGEX_START_SPACES = /^\s+/gm;
+
+function getClasses(id) {
+    return `ex4ng-scoped-style-${id}`;
+}
+
+function removeInvalidChars(str) {
+    str = str.replace(REGEX_START_SPACES, '');
+    return str.replace(REGEX_NEWLINE, '');
+}
+
+function appendCSS(styleElement, cssText) {
+    // 获取已有的 CSS 内容
+    let existingCSS = styleElement.textContent || '';
+
+    // 如果已有的 CSS 内容不为空，添加一个空行作为分隔符
+    if (existingCSS.trim() !== '') {
+        existingCSS += '\n';
+    }
+
+    // 拼接新的 CSS 内容
+    existingCSS += cssText;
+
+    // 将新的 CSS 内容设置回 style 标签
+    styleElement.textContent = existingCSS;
+}
+
+export default {
+    template: `<template></template>`,
+    methods: {
+        createStyle(id, css) {
+            css = removeInvalidChars(css);
+
+            const classes = getClasses(id);
+            const target = document.querySelector(`style.${classes}`);
+            if (target) {
+                appendCSS(target, css);
+            } else {
+                const style = document.createElement('style');
+                style.classList.add(classes);
+                style.innerHTML = css;
+                document.head.appendChild(style);
+            }
+        },
+        removeStyle(id) {
+            const classes = getClasses(id);
+            const target = document.querySelector(`style.${classes}`);
+            if (target) {
+                target.remove();
+            }
+        },
+    },
+};

ex4nicegui/reactive/scopedStyle.py

@@ -0,0 +1,22 @@
+from nicegui.element import Element
+from ex4nicegui.helper import client_instance_locker
+
+
+class ScopedStyle(Element, component="scopedStyle.js"):
+    pass
+
+    @staticmethod
+    def get():
+        return _scoped_style_factory.get_object()
+
+    def create_style(self, element: Element, css: str):
+        element_id = f"c{element.id}"
+
+        self.run_method("createStyle", element_id, css)
+
+    def remove_style(self, element: Element):
+        element_id = f"c{element.id}"
+        self.run_method("removeStyle", element_id)
+
+
+_scoped_style_factory = client_instance_locker.ClientInstanceLocker(ScopedStyle)

ex4nicegui/reactive/services/color_service.py

@@ -0,0 +1,56 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING, Literal, cast
+from ex4nicegui.utils.signals import to_value
+from nicegui.elements.mixins.color_elements import (
+    TextColorElement,
+    QUASAR_COLORS,
+    TAILWIND_COLORS,
+)
+
+if TYPE_CHECKING:
+    from ex4nicegui.reactive.officials.base import BindableUi
+    from ex4nicegui import TGetterOrReadonlyRef
+
+
+_color_sys_type = Literal["QUASAR", "TAILWIND", "STYLE"]
+_color_attr_name = "data-ex4ng-color"
+
+
+def bind_color(bindable_ui: BindableUi, ref_ui: TGetterOrReadonlyRef):
+    @bindable_ui._ui_effect
+    def _():
+        ele = cast(TextColorElement, bindable_ui.element)
+        color = to_value(ref_ui)
+
+        # get exists color
+        # e.g 'QUASAR:red'
+        pre_color = ele._props.get(_color_attr_name)  # type: str | None
+        if pre_color:
+            color_sys, value = pre_color.split(":")  # type: ignore
+            color_sys: _color_sys_type
+
+            if color_sys == "QUASAR":
+                del ele._props[ele.TEXT_COLOR_PROP]
+            elif color_sys == "TAILWIND":
+                ele.classes(remove=value)
+            else:
+                del ele._style["color"]
+
+        cur_sys: _color_sys_type = "STYLE"
+        cur_color = color
+
+        if color in QUASAR_COLORS:
+            ele._props[ele.TEXT_COLOR_PROP] = color
+            cur_sys = "QUASAR"
+        elif color in TAILWIND_COLORS:
+            cur_color = f"text-{color}"
+            ele.classes(replace=cur_color)
+            cur_sys = "TAILWIND"
+        elif color is not None:
+            ele._style["color"] = color
+
+        ele._props[_color_attr_name] = f"{cur_sys}:{color}"
+
+        ele.update()
+
+    return bindable_ui

ex4nicegui/reactive/services/pandas_service.py

@@ -0,0 +1,31 @@
+try:
+    import pandas as pd
+except ImportError:
+    pass
+
+
+def dataframe2col_str(df, copy=True):
+    if isinstance(df.columns, pd.MultiIndex):
+        raise ValueError(
+            "MultiIndex columns are not supported. "
+            "You can convert them to strings using something like "
+            '`df.columns = ["_".join(col) for col in df.columns.values]`.'
+        )
+
+    date_cols = df.columns[df.dtypes == "datetime64[ns]"]
+    time_cols = df.columns[df.dtypes == "timedelta64[ns]"]
+    complex_cols = df.columns[df.dtypes == "complex128"]
+    period_cols = df.columns[df.dtypes == "period[M]"]
+    if (
+        len(date_cols) != 0
+        or len(time_cols) != 0
+        or len(complex_cols) != 0
+        or len(period_cols) != 0
+    ):
+        df = df.copy() if copy else df
+        df[date_cols] = df[date_cols].astype(str)
+        df[time_cols] = df[time_cols].astype(str)
+        df[complex_cols] = df[complex_cols].astype(str)
+        df[period_cols] = df[period_cols].astype(str)
+
+    return df