Skip to content

Commit 5648d1a

Browse files
BordaBorda
committed
fixing source
1 parent f896881 commit 5648d1a

File tree

18 files changed

+39
-40
lines changed

18 files changed

+39
-40
lines changed

‎src/lightning/app/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
_logger.propagate = False
2222

2323

24-
from lightning.app import components # noqa: E402, F401
25-
2624
if os.path.isfile(os.path.join(os.path.dirname(__file__), "__about__.py")):
2725
from lightning.app.__about__ import * # noqa: F403
2826
if "__version__" not in locals():

‎src/lightning/app/components/multi_node/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import warnings
1616
from typing import Any, Type
1717

18-
from lightning.app import structures
1918
from lightning.app.core.flow import LightningFlow
2019
from lightning.app.core.work import LightningWork
20+
from lightning.app.structures import List as _List
2121
from lightning.app.utilities.cloud import is_running_in_cloud
2222
from lightning.app.utilities.packaging.cloud_compute import CloudCompute
2323

@@ -77,7 +77,7 @@ def run(
7777
" To run on multiple nodes in the cloud, launch your app with `--cloud`."
7878
)
7979
num_nodes = 1
80-
self.ws = structures.List(
80+
self.ws = _List(
8181
*[
8282
work_cls(
8383
*work_args,

‎src/lightning/app/components/training.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import os
1616
from typing import Any, Dict, List, Optional, Tuple, Type, Union
1717

18-
from lightning.app import structures
1918
from lightning.app.components.python import TracerPythonScript
2019
from lightning.app.core.flow import LightningFlow
2120
from lightning.app.storage.path import Path
21+
from lightning.app.structures import List as _List
2222
from lightning.app.utilities.app_helpers import Logger
2323
from lightning.app.utilities.packaging.cloud_compute import CloudCompute
2424

@@ -169,7 +169,7 @@ def __init__(
169169
self._script_runner = script_runner
170170
self._script_runner_kwargs = script_runner_kwargs
171171

172-
self.ws = structures.List()
172+
self.ws = _List()
173173
for node_rank in range(self.num_nodes):
174174
self.ws.append(
175175
self._script_runner(

‎src/lightning/app/core/queues.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def __init__(
246246
self.redis = redis.Redis(host=self.host, port=self.port, password=self.password)
247247

248248
def put(self, item: Any) -> None:
249-
from lightning.app import LightningWork
249+
from lightning.app.core.work import LightningWork
250250

251251
is_work = isinstance(item, LightningWork)
252252

‎src/lightning/app/frontend/frontend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from typing import Optional, TYPE_CHECKING
1717

1818
if TYPE_CHECKING:
19-
from lightning.app import LightningFlow
19+
from lightning.app.core.flow import LightningFlow
2020

2121

2222
class Frontend(ABC):

‎src/lightning/app/launcher/launcher.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
ENABLE_MULTIPLE_WORKS_IN_DEFAULT_CONTAINER = bool(int(os.getenv("ENABLE_MULTIPLE_WORKS_IN_DEFAULT_CONTAINER", "0")))
1313

14-
if True: # Avoid Module level import not at top of file
15-
from lightning.app import LightningFlow
14+
if True: # ToDo: Avoid Module level import not at top of file
1615
from lightning.app.core import constants
1716
from lightning.app.core.api import start_server
17+
from lightning.app.core.flow import LightningFlow
1818
from lightning.app.core.queues import MultiProcessQueue, QueuingSystem
1919
from lightning.app.storage.orchestrator import StorageOrchestrator
2020
from lightning.app.utilities.app_commands import run_app_commands

‎src/lightning/app/launcher/lightning_backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
)
3535
from lightning_cloud.openapi.rest import ApiException
3636

37-
from lightning.app import LightningApp, LightningWork
37+
from lightning.app.core import LightningApp, LightningWork
3838
from lightning.app.core.queues import QueuingSystem
3939
from lightning.app.runners.backends.backend import Backend
4040
from lightning.app.storage import Drive, Mount

‎src/lightning/app/runners/runtime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from threading import Thread
2121
from typing import Any, Dict, List, Optional, Type, TYPE_CHECKING, Union
2222

23-
from lightning.app import LightningApp, LightningFlow
23+
from lightning.app.core import LightningApp, LightningFlow
2424
from lightning.app.core.constants import APP_SERVER_HOST, APP_SERVER_PORT
2525
from lightning.app.runners.backends import Backend, BackendType
2626
from lightning.app.utilities.app_helpers import Logger

‎src/lightning/app/storage/orchestrator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from lightning.app.utilities.enum import WorkStageStatus
2727

2828
if TYPE_CHECKING:
29-
from lightning.app import LightningApp
29+
from lightning.app.core.app import LightningApp
3030

3131

3232
_PathRequest = Union[_GetRequest, _ExistsRequest]

‎src/lightning/app/structures/dict.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def __init__(self, **kwargs: T):
7070
_set_child_name(self, v, k)
7171

7272
def __setitem__(self, k, v):
73-
from lightning.app import LightningFlow, LightningWork
73+
from lightning.app.core import LightningFlow, LightningWork
7474

7575
if not isinstance(k, str):
7676
raise Exception("The provided key should be an string")
@@ -89,7 +89,7 @@ def __setitem__(self, k, v):
8989

9090
@property
9191
def works(self):
92-
from lightning.app import LightningFlow, LightningWork
92+
from lightning.app.core import LightningFlow, LightningWork
9393

9494
works = [item for item in self.values() if isinstance(item, LightningWork)]
9595
for flow in [item for item in self.values() if isinstance(item, LightningFlow)]:
@@ -99,16 +99,17 @@ def works(self):
9999

100100
@property
101101
def flows(self):
102-
from lightning.app import LightningFlow
103-
from lightning.app.structures import Dict, List
102+
from lightning.app.core.flow import LightningFlow
103+
from lightning.app.structures import Dict as _Dict
104+
from lightning.app.structures import List as _List
104105

105106
flows = {}
106107
for item in self.values():
107108
if isinstance(item, LightningFlow):
108109
flows[item.name] = item
109110
for child_flow in item.flows.values():
110111
flows[child_flow.name] = child_flow
111-
if isinstance(item, (Dict, List)):
112+
if isinstance(item, (_Dict, _List)):
112113
for child_flow in item.flows.values():
113114
flows[child_flow.name] = child_flow
114115
return flows
@@ -120,7 +121,7 @@ def name(self):
120121
@property
121122
def state(self):
122123
"""Returns the state of its flows and works."""
123-
from lightning.app import LightningFlow, LightningWork
124+
from lightning.app.core import LightningFlow, LightningWork
124125

125126
return {
126127
"works": {key: item.state for key, item in self.items() if isinstance(item, LightningWork)},
@@ -129,7 +130,7 @@ def state(self):
129130

130131
@property
131132
def state_vars(self):
132-
from lightning.app import LightningFlow, LightningWork
133+
from lightning.app.core import LightningFlow, LightningWork
133134

134135
return {
135136
"works": {key: item.state_vars for key, item in self.items() if isinstance(item, LightningWork)},
@@ -138,7 +139,7 @@ def state_vars(self):
138139

139140
@property
140141
def state_with_changes(self):
141-
from lightning.app import LightningFlow, LightningWork
142+
from lightning.app.core import LightningFlow, LightningWork
142143

143144
return {
144145
"works": {key: item.state_with_changes for key, item in self.items() if isinstance(item, LightningWork)},

‎src/lightning/app/structures/list.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __init__(self, *items: T):
6969
self.append(item)
7070

7171
def append(self, v):
72-
from lightning.app import LightningFlow, LightningWork
72+
from lightning.app.core import LightningFlow, LightningWork
7373

7474
_set_child_name(self, v, str(self._last_index))
7575
if self._backend:
@@ -88,7 +88,7 @@ def name(self):
8888

8989
@property
9090
def works(self):
91-
from lightning.app import LightningFlow, LightningWork
91+
from lightning.app.core import LightningFlow, LightningWork
9292

9393
works = [item for item in self if isinstance(item, LightningWork)]
9494
for flow in [item for item in self if isinstance(item, LightningFlow)]:
@@ -98,24 +98,25 @@ def works(self):
9898

9999
@property
100100
def flows(self):
101-
from lightning.app import LightningFlow
102-
from lightning.app.structures import Dict, List
101+
from lightning.app.core import LightningFlow
102+
from lightning.app.structures import Dict as _Dict
103+
from lightning.app.structures import List as _List
103104

104105
flows = {}
105106
for item in self:
106107
if isinstance(item, LightningFlow):
107108
flows[item.name] = item
108109
for child_flow in item.flows.values():
109110
flows[child_flow.name] = child_flow
110-
if isinstance(item, (Dict, List)):
111+
if isinstance(item, (_Dict, _List)):
111112
for child_flow in item.flows.values():
112113
flows[child_flow.name] = child_flow
113114
return flows
114115

115116
@property
116117
def state(self):
117118
"""Returns the state of its flows and works."""
118-
from lightning.app import LightningFlow, LightningWork
119+
from lightning.app.core import LightningFlow, LightningWork
119120

120121
works = [item for item in self if isinstance(item, LightningWork)]
121122
children = [item for item in self if isinstance(item, LightningFlow)]
@@ -126,7 +127,7 @@ def state(self):
126127

127128
@property
128129
def state_vars(self):
129-
from lightning.app import LightningFlow, LightningWork
130+
from lightning.app.core import LightningFlow, LightningWork
130131

131132
works = [item for item in self if isinstance(item, LightningWork)]
132133
children = [item for item in self if isinstance(item, LightningFlow)]
@@ -137,7 +138,7 @@ def state_vars(self):
137138

138139
@property
139140
def state_with_changes(self):
140-
from lightning.app import LightningFlow, LightningWork
141+
from lightning.app.core import LightningFlow, LightningWork
141142

142143
works = [item for item in self if isinstance(item, LightningWork)]
143144
children = [item for item in self if isinstance(item, LightningFlow)]
@@ -148,7 +149,7 @@ def state_with_changes(self):
148149

149150
def set_state(self, state):
150151
"""Method to set the state of the list and its children."""
151-
from lightning.app import LightningFlow, LightningWork
152+
from lightning.app.core import LightningFlow, LightningWork
152153

153154
works = [item for item in self if isinstance(item, LightningWork)]
154155
children = [item for item in self if isinstance(item, LightningFlow)]

‎src/lightning/app/testing/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from packaging.version import Version
2121

22-
from lightning.app import LightningFlow, LightningWork
22+
from lightning.app.core import LightningFlow, LightningWork
2323
from lightning.app.core.queues import BaseQueue
2424
from lightning.app.utilities.imports import (
2525
_CLOUD_TEST_RUN,

‎src/lightning/app/testing/testing.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@
3535
from rich import print
3636
from rich.color import ANSI_COLOR_NAMES
3737

38-
from lightning.app import LightningApp, LightningFlow
3938
from lightning.app.cli.lightning_cli import run_app
40-
from lightning.app.core import constants
39+
from lightning.app.core import constants, LightningApp, LightningFlow
4140
from lightning.app.runners.multiprocess import MultiProcessRuntime
4241
from lightning.app.testing.config import _Config
4342
from lightning.app.utilities.app_logs import _app_logs_reader

‎src/lightning/app/utilities/component.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from lightning.app.utilities.tree import breadth_first
2626

2727
if TYPE_CHECKING:
28-
from lightning.app import LightningFlow
28+
from lightning.app.core import LightningFlow
2929

3030
COMPONENT_CONTEXT: Optional[ComponentContext] = None
3131

@@ -38,7 +38,7 @@ def _convert_paths_after_init(root: "LightningFlow"):
3838
consumer.
3939
4040
"""
41-
from lightning.app import LightningFlow, LightningWork
41+
from lightning.app.core import LightningFlow, LightningWork
4242
from lightning.app.storage import Path
4343

4444
for component in breadth_first(root, types=(LightningFlow, LightningWork)):

‎src/lightning/app/utilities/introspection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from typing import Any, Dict, List, Optional, Set, Type, TYPE_CHECKING, Union
1919

2020
if TYPE_CHECKING:
21-
from lightning.app import LightningFlow, LightningWork
21+
from lightning.app.core import LightningFlow, LightningWork
2222

2323

2424
class LightningVisitor(ast.NodeVisitor):

‎src/lightning/app/utilities/load_app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from lightning.app.utilities.exceptions import MisconfigurationException
2525

2626
if TYPE_CHECKING:
27-
from lightning.app import LightningApp, LightningFlow, LightningWork
27+
from lightning.app.core import LightningFlow, LightningWork, LightningApp
2828
from lightning.app.plugin.plugin import LightningPlugin
2929

3030
from lightning.app.utilities.app_helpers import _mock_missing_imports, Logger
@@ -277,7 +277,7 @@ def _patch_sys_argv():
277277

278278

279279
def component_to_metadata(obj: Union["LightningWork", "LightningFlow"]) -> Dict:
280-
from lightning.app import LightningWork
280+
from lightning.app.core import LightningWork
281281

282282
extras = {}
283283

‎src/lightning/app/utilities/proxies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
from lightning.app.utilities.exceptions import CacheMissException, LightningSigtermStateException
5151

5252
if TYPE_CHECKING:
53-
from lightning.app import LightningWork
53+
from lightning.app.core import LightningWork
5454
from lightning.app.core.queues import BaseQueue
5555

5656
from lightning.app.utilities.app_helpers import Logger

‎src/lightning/app/utilities/types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import typing as t
1616
from typing import Protocol, runtime_checkable
1717

18-
from lightning.app import LightningFlow, LightningWork
18+
from lightning.app.core import LightningFlow, LightningWork
1919
from lightning.app.structures import Dict, List
2020

2121
Component = t.Union[LightningFlow, LightningWork, Dict, List]

0 commit comments

Comments
 (0)