Reorganisation of module to better fit to the TS lib

forman · forman · commit d64cb66e4f12 · 2024-10-15T13:21:47.000+02:00
diff --git a/dashipy/dashipy/__init__.py b/dashipy/dashipy/__init__.py
@@ -1 +1,12 @@
-__version__ = "0.0.2.dev0"
+from .callback import Callback
+from .callback import Input
+from .callback import Output
+from .component import Component
+from .container import Container
+from .extension import Contribution
+from .extension import Extension
+from .extensioncontext import ExtensionContext
+from .response import Response
+from .version import version
+
+__version__ = version
diff --git a/dashipy/dashipy/callback.py b/dashipy/dashipy/callback.py
diff --git a/dashipy/dashipy/component.py b/dashipy/dashipy/component.py
diff --git a/dashipy/dashipy/components/box.py b/dashipy/dashipy/components/box.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from dashipy.lib import Container
+from dashipy import Container
 
 
 @dataclass(frozen=True)
diff --git a/dashipy/dashipy/components/button.py b/dashipy/dashipy/components/button.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from dashipy.lib import Component
+from dashipy import Component
 
 
 @dataclass(frozen=True)
diff --git a/dashipy/dashipy/components/checkbox.py b/dashipy/dashipy/components/checkbox.py
@@ -1,6 +1,6 @@
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 
-from dashipy.lib import Component
+from dashipy import Component
 
 
 @dataclass(frozen=True)
diff --git a/dashipy/dashipy/components/dropdown.py b/dashipy/dashipy/components/dropdown.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 
-from dashipy.lib import Component
+from dashipy import Component
 
 
 @dataclass(frozen=True)
diff --git a/dashipy/dashipy/components/plot.py b/dashipy/dashipy/components/plot.py
@@ -1,10 +1,9 @@
-import json
 from dataclasses import dataclass
 from typing import Any
 
 import plotly.graph_objects as go
 
-from dashipy.lib import Component
+from dashipy import Component
 
 
 @dataclass(frozen=True)
diff --git a/dashipy/dashipy/container.py b/dashipy/dashipy/container.py
diff --git a/dashipy/dashipy/contribution.py b/dashipy/dashipy/contribution.py
diff --git a/dashipy/dashipy/controllers/__init__.py b/dashipy/dashipy/controllers/__init__.py
@@ -1,5 +1,3 @@
 from .callback import get_callback_results
 from .contributions import get_contributions
-from .extensioncontext import ExtensionContext
 from .layout import get_layout
-from .response import Response
diff --git a/dashipy/dashipy/controllers/callback.py b/dashipy/dashipy/controllers/callback.py
@@ -1,7 +1,7 @@
 from typing import Any
 
-from .extensioncontext import ExtensionContext
-from .response import Response
+from dashipy.extensioncontext import ExtensionContext
+from dashipy.response import Response
 
 
 # POST /dashi/callback
diff --git a/dashipy/dashipy/controllers/contributions.py b/dashipy/dashipy/controllers/contributions.py
@@ -1,5 +1,5 @@
-from .extensioncontext import ExtensionContext
-from .response import Response
+from dashipy.extensioncontext import ExtensionContext
+from dashipy.response import Response
 
 
 def get_contributions(ext_ctx: ExtensionContext) -> Response:
diff --git a/dashipy/dashipy/controllers/layout.py b/dashipy/dashipy/controllers/layout.py
@@ -1,7 +1,7 @@
 from typing import Any
 
-from .extensioncontext import ExtensionContext
-from .response import Response
+from dashipy.extensioncontext import ExtensionContext
+from dashipy.response import Response
 
 
 def get_layout(
diff --git a/dashipy/dashipy/demo/contribs/panel.py b/dashipy/dashipy/demo/contribs/panel.py
@@ -1,6 +1,4 @@
-from typing import Any
-
-from dashipy.lib import Contribution
+from dashipy import Contribution
 
 
 class Panel(Contribution):
diff --git a/dashipy/dashipy/demo/server.py b/dashipy/dashipy/demo/server.py
@@ -9,12 +9,12 @@
 import yaml
 
 from dashipy import __version__
-from dashipy.controllers import ExtensionContext
-from dashipy.controllers import Response
+from dashipy import ExtensionContext
+from dashipy import Response
+from dashipy import Extension
 from dashipy.controllers import get_callback_results
 from dashipy.controllers import get_contributions
 from dashipy.controllers import get_layout
-from dashipy.lib import Extension
 from dashipy.demo.context import Context
 from dashipy.demo.contribs import Panel
 from dashipy.demo.utils import NumpyJSONEncoder
diff --git a/dashipy/dashipy/extension.py b/dashipy/dashipy/extension.py
@@ -1,6 +1,6 @@
 from typing import Any
 
-from dashipy.lib.contribution import Contribution
+from dashipy.contribution import Contribution
 
 
 class Extension:
diff --git a/dashipy/dashipy/extensioncontext.py b/dashipy/dashipy/extensioncontext.py
@@ -1,7 +1,7 @@
 import importlib
 from typing import Any
 
-from dashipy.lib import Extension, Contribution
+from dashipy import Extension, Contribution
 
 
 class ExtensionContext:
diff --git a/dashipy/dashipy/lib/__init__.py b/dashipy/dashipy/lib/__init__.py
diff --git a/dashipy/dashipy/response.py b/dashipy/dashipy/response.py
diff --git a/dashipy/dashipy/version.py b/dashipy/dashipy/version.py
@@ -0,0 +1 @@
+version = "0.0.3"
diff --git a/dashipy/my_extension/__init__.py b/dashipy/my_extension/__init__.py
@@ -1,4 +1,4 @@
-from dashipy.lib.extension import Extension
+from dashipy import Extension
 from .my_panel_1 import panel as my_panel_1
 from .my_panel_2 import panel as my_panel_2
 
diff --git a/dashipy/my_extension/my_panel_1.py b/dashipy/my_extension/my_panel_1.py
@@ -1,10 +1,10 @@
 import plotly.graph_objects as go
 from plotly.graph_objs import Layout
 
-from dashipy.components import Plot, Box, Dropdown
+from dashipy import (Component, Input, Output)
+from dashipy.components import (Plot, Box, Dropdown)
 from dashipy.demo.contribs import Panel
 from dashipy.demo.context import Context
-from dashipy.lib import Output, Input, Component
 
 
 panel = Panel(__name__, title="Panel A")
diff --git a/dashipy/my_extension/my_panel_2.py b/dashipy/my_extension/my_panel_2.py
@@ -1,10 +1,10 @@
 import plotly.express as pe
 import plotly.graph_objects as go
 
-from dashipy.components import Plot, Box, Dropdown
+from dashipy import (Component, Input, Output)
+from dashipy.components import (Plot, Box, Dropdown)
 from dashipy.demo.contribs import Panel
 from dashipy.demo.context import Context
-from dashipy.lib import Output, Input, Component
 
 
 panel = Panel(__name__, title="Panel B")
diff --git a/dashipy/tests/contribs/panel_test.py b/dashipy/tests/contribs/panel_test.py
@@ -1,7 +1,7 @@
 import unittest
 
 from dashipy.demo.contribs import Panel
-from dashipy.lib.callback import Input, Callback, Output
+from dashipy.callback import Input, Callback, Output
 
 
 def my_callback_1(ctx):
diff --git a/dashipy/tests/lib/callback_test.py b/dashipy/tests/lib/callback_test.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from dashipy.lib.callback import Input, Callback
+from dashipy.callback import Input, Callback
 
 
 def my_callback(
diff --git a/dashipy/tests/lib/component_test.py b/dashipy/tests/lib/component_test.py
@@ -1,12 +1,7 @@
-import inspect
 import unittest
 from dataclasses import dataclass
-from typing import Any
 
-import pytest
-
-from dashipy.lib import Component
-from dashipy.lib.callback import Input, Callback
+from dashipy import Component
 
 
 @dataclass(frozen=True)
diff --git a/dashipy/tests/lib/container_test.py b/dashipy/tests/lib/container_test.py
@@ -1,7 +1,7 @@
 import unittest
 from dataclasses import dataclass
 
-from dashipy.lib import Component, Container
+from dashipy import Component, Container
 
 
 @dataclass(frozen=True)
