Skip to content

Commit 1074366

Browse files
committed
rename server to backend
1 parent e43bcc0 commit 1074366

28 files changed

+47
-47
lines changed

docs/app.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from sanic import Sanic, response
66

77
from idom import component
8+
from idom.backend.sanic import Options, configure, use_request
89
from idom.core.types import ComponentConstructor
9-
from idom.server.sanic import Options, configure, use_request
1010

1111
from .examples import get_normalized_example_name, load_examples
1212

docs/source/guides/getting-started/_examples/run_fastapi.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# :lines: 11-
22

33
from idom import run
4-
from idom.server import fastapi as fastapi_server
4+
from idom.backend import fastapi as fastapi_server
55

66

77
# the run() function is the entry point for examples
@@ -11,7 +11,7 @@
1111
from fastapi import FastAPI
1212

1313
from idom import component, html
14-
from idom.server.fastapi import configure
14+
from idom.backend.fastapi import configure
1515

1616

1717
@component

docs/source/guides/getting-started/_examples/run_flask.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# :lines: 11-
22

33
from idom import run
4-
from idom.server import flask as flask_server
4+
from idom.backend import flask as flask_server
55

66

77
# the run() function is the entry point for examples
@@ -11,7 +11,7 @@
1111
from flask import Flask
1212

1313
from idom import component, html
14-
from idom.server.flask import configure
14+
from idom.backend.flask import configure
1515

1616

1717
@component

docs/source/guides/getting-started/_examples/run_sanic.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# :lines: 11-
22

33
from idom import run
4-
from idom.server import sanic as sanic_server
4+
from idom.backend import sanic as sanic_server
55

66

77
# the run() function is the entry point for examples
@@ -11,7 +11,7 @@
1111
from sanic import Sanic
1212

1313
from idom import component, html
14-
from idom.server.sanic import configure
14+
from idom.backend.sanic import configure
1515

1616

1717
@component

docs/source/guides/getting-started/_examples/run_starlette.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# :lines: 11-
22

33
from idom import run
4-
from idom.server import starlette as starlette_server
4+
from idom.backend import starlette as starlette_server
55

66

77
# the run() function is the entry point for examples
@@ -11,7 +11,7 @@
1111
from starlette.applications import Starlette
1212

1313
from idom import component, html
14-
from idom.server.starlette import configure
14+
from idom.backend.starlette import configure
1515

1616

1717
@component

docs/source/guides/getting-started/_examples/run_tornado.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# :lines: 11-
22

33
from idom import run
4-
from idom.server import tornado as tornado_server
4+
from idom.backend import tornado as tornado_server
55

66

77
# the run() function is the entry point for examples
@@ -12,7 +12,7 @@
1212
import tornado.web
1313

1414
from idom import component, html
15-
from idom.server.tornado import configure
15+
from idom.backend.tornado import configure
1616

1717

1818
@component

docs/source/guides/getting-started/_static/embed-idom-view/main.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from sanic.response import file
33

44
from idom import component, html
5-
from idom.server.sanic import Options, configure
5+
from idom.backend.sanic import Options, configure
66

77

88
app = Sanic("MyApp")

docs/source/guides/getting-started/index.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ Section 2: Running IDOM
106106

107107
Once you've :ref:`installed IDOM <Installing IDOM>`, you'll want to learn how to run an
108108
application. Throughout most of the examples in this documentation, you'll see the
109-
:func:`~idom.server.utils.run` function used. While it's convenient tool for development
110-
it shouldn't be used in production settings - it's slow, and could leak secrets through
111-
debug log messages.
109+
:func:`~idom.backend.utils.run` function used. While it's convenient tool for
110+
development it shouldn't be used in production settings - it's slow, and could leak
111+
secrets through debug log messages.
112112

113113
.. idom:: _examples/hello_world
114114

docs/source/guides/getting-started/running-idom.rst

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Running IDOM
22
============
33

4-
The simplest way to run IDOM is with the :func:`~idom.server.utils.run` function. This
4+
The simplest way to run IDOM is with the :func:`~idom.backend.utils.run` function. This
55
is the method you'll see used throughout this documentation. However, this executes your
66
application using a development server which is great for testing, but probably not what
77
if you're :ref:`deploying in production <Running IDOM in Production>`. Below are some
@@ -20,10 +20,10 @@ will follow a pattern similar to the following:
2020

2121
.. code-block::
2222
23-
from my_chosen_server import Application
23+
from my_chosen_backend import Application
2424
2525
from idom import component, html
26-
from idom.server.my_chosen_server import configure
26+
from idom.backend.my_chosen_backend import configure
2727
2828
2929
@component
@@ -151,17 +151,17 @@ respective ``configure()`` functions in the following way:
151151

152152
.. code-block::
153153
154-
from idom.server.<implementation> import configure, Options
154+
from idom.backend.<implementation> import configure, Options
155155
156156
configure(app, MyComponent, Options(...))
157157
158-
To learn more read about the options for your chosen server ``<implementation>``:
158+
To learn more read about the options for your chosen backend ``<implementation>``:
159159

160-
- :class:`idom.server.fastapi.Options`
161-
- :class:`idom.server.flask.Options`
162-
- :class:`idom.server.sanic.Options`
163-
- :class:`idom.server.starlette.Options`
164-
- :class:`idom.server.tornado.Options`
160+
- :class:`idom.backend.fastapi.Options`
161+
- :class:`idom.backend.flask.Options`
162+
- :class:`idom.backend.sanic.Options`
163+
- :class:`idom.backend.starlette.Options`
164+
- :class:`idom.backend.tornado.Options`
165165

166166

167167
Embed in an Existing Webpage

scripts/live_docs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
)
1515

1616
from docs.app import IDOM_MODEL_SERVER_URL_PREFIX, Example, make_app, reload_examples
17-
from idom.server.sanic import Options, configure, serve_development_app
17+
from idom.backend.sanic import Options, configure, serve_development_app
1818
from idom.testing import clear_idom_web_modules_dir
1919

2020

src/idom/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from . import config, html, logging, sample, server, types, web
1+
from . import backend, config, html, logging, sample, types, web
2+
from .backend.utils import run
23
from .core import hooks
34
from .core.component import component
45
from .core.events import event
@@ -15,7 +16,6 @@
1516
from .core.layout import Layout
1617
from .core.serve import Stop
1718
from .core.vdom import vdom
18-
from .server.utils import run
1919
from .utils import Ref, html_to_vdom
2020
from .widgets import hotswap
2121

@@ -37,7 +37,7 @@
3737
"Ref",
3838
"run",
3939
"sample",
40-
"server",
40+
"backend",
4141
"Stop",
4242
"types",
4343
"use_callback",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/idom/server/flask.py renamed to src/idom/backend/flask.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
from werkzeug.serving import BaseWSGIServer, make_server
2626

2727
import idom
28+
from idom.backend.types import Location
2829
from idom.core.hooks import Context, create_context, use_context
2930
from idom.core.layout import LayoutEvent, LayoutUpdate
3031
from idom.core.serve import serve_json_patch
3132
from idom.core.types import ComponentType, RootComponentConstructor
32-
from idom.server.types import Location
3333
from idom.utils import Ref
3434

3535
from .utils import safe_client_build_dir_path, safe_web_modules_dir_path

src/idom/server/sanic.py renamed to src/idom/backend/sanic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from sanic_cors import CORS
1515
from websockets.legacy.protocol import WebSocketCommonProtocol
1616

17+
from idom.backend.types import Location
1718
from idom.core.hooks import Context, create_context, use_context
1819
from idom.core.layout import Layout, LayoutEvent
1920
from idom.core.serve import (
@@ -24,7 +25,6 @@
2425
serve_json_patch,
2526
)
2627
from idom.core.types import RootComponentConstructor
27-
from idom.server.types import Location
2828

2929
from ._asgi import serve_development_asgi
3030
from .utils import safe_client_build_dir_path, safe_web_modules_dir_path

src/idom/server/starlette.py renamed to src/idom/backend/starlette.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from starlette.types import Receive, Scope, Send
1313
from starlette.websockets import WebSocket, WebSocketDisconnect
1414

15+
from idom.backend.types import Location
1516
from idom.config import IDOM_WEB_MODULES_DIR
1617
from idom.core.hooks import Context, create_context, use_context
1718
from idom.core.layout import Layout, LayoutEvent
@@ -22,7 +23,6 @@
2223
serve_json_patch,
2324
)
2425
from idom.core.types import RootComponentConstructor
25-
from idom.server.types import Location
2626

2727
from ._asgi import serve_development_asgi
2828
from .utils import CLIENT_BUILD_DIR, safe_client_build_dir_path

src/idom/server/tornado.py renamed to src/idom/backend/tornado.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
from tornado.websocket import WebSocketHandler
1717
from tornado.wsgi import WSGIContainer
1818

19+
from idom.backend.types import Location
1920
from idom.config import IDOM_WEB_MODULES_DIR
2021
from idom.core.hooks import Context, create_context, use_context
2122
from idom.core.layout import Layout, LayoutEvent
2223
from idom.core.serve import VdomJsonPatch, serve_json_patch
2324
from idom.core.types import ComponentConstructor
24-
from idom.server.types import Location
2525

2626
from .utils import CLIENT_BUILD_DIR, safe_client_build_dir_path
2727

File renamed without changes.
File renamed without changes.

src/idom/testing/server.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
from typing import Any, Optional, Tuple, Type, Union
88
from urllib.parse import urlencode, urlunparse
99

10-
from idom.server import default as default_server
11-
from idom.server.types import ServerImplementation
12-
from idom.server.utils import find_available_port
10+
from idom.backend import default as default_server
11+
from idom.backend.types import ServerImplementation
12+
from idom.backend.utils import find_available_port
1313
from idom.widgets import hotswap
1414

1515
from .logs import LogAssertionError, capture_idom_logs, list_logged_exceptions

src/idom/types.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- :mod:`idom.server.types`
55
"""
66

7+
from .backend.types import Location, ServerImplementation
78
from .core.hooks import Context
89
from .core.types import (
910
ComponentConstructor,
@@ -23,7 +24,6 @@
2324
VdomDict,
2425
VdomJson,
2526
)
26-
from .server.types import Location, ServerImplementation
2727

2828

2929
__all__ = [

temp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from idom import component, html, run
2-
from idom.server import starlette as server
2+
from idom.backend import starlette as server
33

44

55
@component

tests/test_server/test_common.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
import idom
66
from idom import html
7-
from idom.server import default as default_implementation
8-
from idom.server.types import Location
9-
from idom.server.utils import all_implementations
7+
from idom.backend import default as default_implementation
8+
from idom.backend.types import Location
9+
from idom.backend.utils import all_implementations
1010
from idom.testing import DisplayFixture, ServerFixture, poll
1111

1212

tests/test_server/test_utils.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import pytest
77
from playwright.async_api import Page
88

9+
from idom.backend import flask as flask_implementation
10+
from idom.backend.utils import find_available_port
11+
from idom.backend.utils import run as sync_run
12+
from idom.backend.utils import traversal_safe_path
913
from idom.sample import SampleApp as SampleApp
10-
from idom.server import flask as flask_implementation
11-
from idom.server.utils import find_available_port
12-
from idom.server.utils import run as sync_run
13-
from idom.server.utils import traversal_safe_path
1414
from tests.tooling.loop import open_event_loop
1515

1616

tests/test_testing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import pytest
55

66
from idom import testing
7+
from idom.backend import starlette as starlette_implementation
78
from idom.logging import ROOT_LOGGER
89
from idom.sample import SampleApp as SampleApp
9-
from idom.server import starlette as starlette_implementation
1010

1111

1212
def test_assert_idom_logged_does_not_supress_errors():

tests/test_web/test_module.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from sanic import Sanic
55

66
import idom
7-
from idom.server import sanic as sanic_implementation
7+
from idom.backend import sanic as sanic_implementation
88
from idom.testing import (
99
DisplayFixture,
1010
ServerFixture,

0 commit comments

Comments
 (0)