fix: bad import

lnbits · Oct 31, 2024 · fd4f1e6 · fd4f1e6
1 parent 2bb6377
commit fd4f1e6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/__init__.py b/__init__.py
@@ -4,7 +4,7 @@
 from loguru import logger
 
 from .crud import db
-from .nostr_client import all_routers, nostr_client
+from .router import all_routers, nostr_client
 from .tasks import check_relays, init_relays, subscribe_events
 from .views import nostrclient_generic_router
 from .views_api import nostrclient_api_router

diff --git a/nostr_client.py b/nostr_client.py
diff --git a/router.py b/router.py
@@ -6,9 +6,14 @@
 from lnbits.helpers import urlsafe_short_hash
 from loguru import logger
 
-from . import nostr_client
+from .nostr.client.client import NostrClient
+
+# from . import nostr_client
 from .nostr.message_pool import EndOfStoredEventsMessage, EventMessage, NoticeMessage
 
+nostr_client: NostrClient = NostrClient()
+all_routers: list["NostrRouter"] = []
+
 
 class NostrRouter:
     received_subscription_events: dict[str, List[EventMessage]]

diff --git a/tasks.py b/tasks.py
@@ -3,10 +3,9 @@
 
 from loguru import logger
 
-from . import nostr_client
 from .crud import get_relays
 from .nostr.message_pool import EndOfStoredEventsMessage, EventMessage, NoticeMessage
-from .router import NostrRouter
+from .router import NostrRouter, nostr_client
 
 
 async def init_relays():

diff --git a/views_api.py b/views_api.py
@@ -17,8 +17,7 @@
 from .helpers import normalize_public_key
 from .models import Config, Relay, RelayStatus, TestMessage, TestMessageResponse
 from .nostr.key import EncryptedDirectMessage, PrivateKey
-from .nostr_client import all_routers, nostr_client
-from .router import NostrRouter
+from .router import NostrRouter, all_routers, nostr_client
 
 nostrclient_api_router = APIRouter()