components: correct imports

All imports must now be relative to work correctly with the
moonraker parent package.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>

moonraker/components/announcements.py

@@ -21,10 +21,10 @@ from typing import (
     Union
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
-    from http_client import HttpClient
+    from .http_client import HttpClient
-    from components.database import MoonrakerDatabase
+    from .database import MoonrakerDatabase
 
 
 MOONLIGHT_URL = "https://arksine.github.io/moonlight"

moonraker/components/authorization.py

@@ -34,8 +34,8 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest, WebsocketManager
+    from ..websockets import WebRequest, WebsocketManager
     from tornado.httputil import HTTPServerRequest
     from tornado.web import RequestHandler
     from .database import MoonrakerDatabase as DBComp

moonraker/components/button.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 import asyncio
 import logging
-from confighelper import SentinelClass
+from ..confighelper import SentinelClass
 
 from typing import (
     TYPE_CHECKING,
@@ -14,9 +14,9 @@ from typing import (
     Dict
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
     from .gpio import GpioFactory
-    from app import InternalTransport as ITransport
+    from ..app import InternalTransport as ITransport
 
 SENTINEL = SentinelClass.get_instance()
 

moonraker/components/data_store.py

@@ -20,10 +20,9 @@ from typing import (
     Deque,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
-    from . import klippy_apis
+    from .klippy_apis import KlippyAPI as APIComp
-    APIComp = klippy_apis.KlippyAPI
     GCQueue = Deque[Dict[str, Any]]
     TempStore = Dict[str, Dict[str, Deque[float]]]
 

moonraker/components/database.py

@@ -15,7 +15,7 @@ from io import BytesIO
 from functools import reduce
 from threading import Lock as ThreadLock
 import lmdb
-from utils import SentinelClass, ServerError
+from ..utils import SentinelClass, ServerError
 
 # Annotation imports
 from typing import (
@@ -33,8 +33,8 @@ from typing import (
     cast
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
     DBRecord = Union[int, float, bool, str, List[Any], Dict[str, Any]]
     DBType = Optional[DBRecord]
     _T = TypeVar("_T")

moonraker/components/dbus_manager.py

@@ -20,7 +20,7 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
 
 STAT_PATH = "/proc/self/stat"
 DOC_URL = (

moonraker/components/extensions.py

@@ -8,8 +8,8 @@ import asyncio
 import pathlib
 import logging
 import json
-from websockets import BaseSocketClient
+from ..websockets import BaseSocketClient
-from utils import get_unix_peer_credentials
+from ..utils import get_unix_peer_credentials
 
 # Annotation imports
 from typing import (
@@ -22,10 +22,10 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from moonraker import Server
+    from ..server import Server
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
-    from klippy_connection import KlippyConnection as Klippy
+    from ..klippy_connection import KlippyConnection as Klippy
 
 UNIX_BUFFER_LIMIT = 20 * 1024 * 1024
 

moonraker/components/file_manager/__init__.py

@@ -9,7 +9,7 @@ from . import file_manager as fm
 
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ...confighelper import ConfigHelper
 
 def load_component(config: ConfigHelper) -> fm.FileManager:
     return fm.load_component(config)

moonraker/components/file_manager/file_manager.py

@@ -18,7 +18,7 @@ import time
 from copy import deepcopy
 from inotify_simple import INotify
 from inotify_simple import flags as iFlags
-from utils import MOONRAKER_PATH
+from ...utils import MOONRAKER_PATH
 
 # Annotation imports
 from typing import (
@@ -40,14 +40,14 @@ from typing import (
 
 if TYPE_CHECKING:
     from inotify_simple import Event as InotifyEvent
-    from confighelper import ConfigHelper
+    from ...confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ...websockets import WebRequest
-    from klippy_connection import KlippyConnection
+    from ...klippy_connection import KlippyConnection
-    from components import database
+    from .. import database
-    from components import klippy_apis
+    from .. import klippy_apis
-    from components import shell_command
+    from .. import shell_command
-    from components.job_queue import JobQueue
+    from ..job_queue import JobQueue
-    from components.job_state import JobState
+    from ..job_state import JobState
     StrOrPath = Union[str, pathlib.Path]
     DBComp = database.MoonrakerDatabase
     APIComp = klippy_apis.KlippyAPI

moonraker/components/gpio.py

@@ -5,7 +5,7 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 from __future__ import annotations
 import logging
-from utils import load_system_module
+from ..utils import load_system_module
 
 # Annotation imports
 from typing import (
@@ -18,8 +18,8 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from eventloop import EventLoop
+    from ..eventloop import EventLoop
     GPIO_CALLBACK = Callable[[float, float, int], Optional[Awaitable[None]]]
 
 class GpioFactory:
@@ -267,7 +267,7 @@ class GpioEvent(GpioBase):
         self.error_count = 0
         ret = self.callback(eventtime, evt_duration, self.value)
         if ret is not None:
-            self.event_loop.create_task(ret)
+            self.event_loop.create_task(ret)  # type: ignore
 
     def _increment_error(self, eventtime: float) -> None:
         if eventtime - self.last_error_reset > ERROR_RESET_TIME:

moonraker/components/history.py

@@ -17,8 +17,8 @@ from typing import (
     List,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
     from .database import MoonrakerDatabase as DBComp
     from .job_state import JobState
     from .file_manager.file_manager import FileManager

moonraker/components/http_client.py

@@ -12,7 +12,7 @@ import asyncio
 import pathlib
 import tempfile
 import logging
-from utils import ServerError
+from ..utils import ServerError
 from tornado.escape import url_escape, url_unescape
 from tornado.httpclient import AsyncHTTPClient, HTTPRequest, HTTPError
 from tornado.httputil import HTTPHeaders
@@ -27,8 +27,8 @@ from typing import (
     Any
 )
 if TYPE_CHECKING:
-    from server import Server
+    from ..server import Server
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
     from io import BufferedWriter
     StrOrPath = Union[str, pathlib.Path]
 

moonraker/components/job_queue.py

@@ -19,8 +19,8 @@ from typing import (
     Union,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
     from .klippy_apis import KlippyAPI
     from .file_manager.file_manager import FileManager
 

moonraker/components/job_state.py

@@ -16,7 +16,7 @@ from typing import (
     List,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
     from .klippy_apis import KlippyAPI
 
 class JobState:

moonraker/components/klippy_apis.py

@@ -5,8 +5,8 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 
 from __future__ import annotations
-from utils import SentinelClass
+from ..utils import SentinelClass
-from websockets import WebRequest, Subscribable
+from ..websockets import WebRequest, Subscribable
 
 # Annotation imports
 from typing import (
@@ -20,9 +20,9 @@ from typing import (
     Mapping,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
-    from klippy_connection import KlippyConnection as Klippy
+    from ..klippy_connection import KlippyConnection as Klippy
     Subscription = Dict[str, Optional[List[Any]]]
     _T = TypeVar("_T")
 

moonraker/components/ldap.py

@@ -18,7 +18,7 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
     from ldap3.abstract.entry import Entry
 
 class MoonrakerLDAP:

moonraker/components/machine.py

@@ -21,8 +21,8 @@ import distro
 import tempfile
 import getpass
 import configparser
-from confighelper import FileSourceWrapper
+from ..confighelper import FileSourceWrapper
-from utils import MOONRAKER_PATH
+from ..utils import MOONRAKER_PATH
 
 # Annotation imports
 from typing import (
@@ -39,10 +39,10 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
-    from app import MoonrakerApp
+    from ..app import MoonrakerApp
-    from klippy_connection import KlippyConnection
+    from ..klippy_connection import KlippyConnection
     from .shell_command import ShellCommandFactory as SCMDComp
     from .database import MoonrakerDatabase
     from .file_manager.file_manager import FileManager

moonraker/components/mqtt.py

@@ -13,7 +13,7 @@ import pathlib
 import ssl
 from collections import deque
 import paho.mqtt.client as paho_mqtt
-from websockets import Subscribable, WebRequest, JsonRPC, APITransport
+from ..websockets import Subscribable, WebRequest, JsonRPC, APITransport
 
 # Annotation imports
 from typing import (
@@ -30,9 +30,9 @@ from typing import (
     Deque,
 )
 if TYPE_CHECKING:
-    from app import APIDefinition
+    from ..app import APIDefinition
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from klippy_connection import KlippyConnection as Klippy
+    from ..klippy_connection import KlippyConnection as Klippy
     FlexCallback = Callable[[bytes], Optional[Coroutine]]
     RPCCallback = Callable[..., Coroutine]
 

moonraker/components/notifier.py

@@ -12,22 +12,16 @@ import logging
 # Annotation imports
 from typing import (
     TYPE_CHECKING,
-    Type,
-    Optional,
     Dict,
     Any,
     List,
-    Union,
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
     from .http_client import HttpClient
-    from . import klippy_apis
+    from .klippy_apis import KlippyAPI as APIComp
-
-    APIComp = klippy_apis.KlippyAPI
-
 
 class Notifier:
     def __init__(self, config: ConfigHelper) -> None:

moonraker/components/octoprint_compat.py

@@ -15,8 +15,8 @@ from typing import (
     List,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
     from .klippy_apis import KlippyAPI as APIComp
     from .file_manager.file_manager import FileManager
     from .job_queue import JobQueue

moonraker/components/paneldue.py

@@ -13,7 +13,7 @@ import errno
 import logging
 import asyncio
 from collections import deque
-from utils import ServerError
+from ..utils import ServerError
 
 # Annotation imports
 from typing import (
@@ -28,11 +28,9 @@ from typing import (
     Coroutine,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from . import klippy_apis
+    from .klippy_apis import KlippyAPI as APIComp
-    from .file_manager import file_manager
+    from .file_manager.file_manager import FileManager as FMComp
-    APIComp = klippy_apis.KlippyAPI
-    FMComp = file_manager.FileManager
     FlexCallback = Callable[..., Optional[Coroutine]]
 
 MIN_EST_TIME = 10.

moonraker/components/power.py

@@ -27,15 +27,14 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
     from .machine import Machine
-    from . import klippy_apis
+    from .klippy_apis import KlippyAPI as APIComp
     from .mqtt import MQTTClient
     from .template import JinjaTemplate
     from .http_client import HttpClient
     from klippy_connection import KlippyConnection
-    APIComp = klippy_apis.KlippyAPI
 
 class PrinterPower:
     def __init__(self, config: ConfigHelper) -> None:

moonraker/components/proc_stats.py

@@ -26,8 +26,8 @@ from typing import (
     Dict,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest, WebsocketManager
+    from ..websockets import WebRequest, WebsocketManager
     from . import shell_command
     STAT_CALLBACK = Callable[[int], Optional[Awaitable]]
 

moonraker/components/secrets.py

@@ -15,7 +15,7 @@ from typing import (
     Any
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
     from .file_manager.file_manager import FileManager
 
 class Secrets:

moonraker/components/sensor.py

@@ -27,8 +27,9 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
+    from .mqtt import MQTTClient
 
 SENSOR_UPDATE_TIME = 1.0
 SENSOR_EVENT_NAME = "sensors:sensor_update"
@@ -42,12 +43,6 @@ class SensorConfiguration:
     source: str = ""
 
 
-if TYPE_CHECKING:
-    from confighelper import ConfigHelper
-
-    from .mqtt import MQTTClient
-
-
 def _set_result(
     name: str, value: Union[int, float], store: Dict[str, Union[int, float]]
 ) -> None:

moonraker/components/shell_command.py

@@ -10,7 +10,7 @@ import shlex
 import logging
 import signal
 import asyncio
-from utils import ServerError
+from ..utils import ServerError
 
 # Annotation imports
 from typing import (
@@ -24,7 +24,7 @@ from typing import (
     Set,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
     OutputCallback = Optional[Callable[[bytes], None]]
 
 class ShellCommandError(ServerError):

moonraker/components/simplyprint.py

@@ -14,7 +14,7 @@ import pathlib
 import base64
 import tornado.websocket
 from tornado.escape import url_escape
-from websockets import Subscribable, WebRequest
+from ..websockets import Subscribable, WebRequest
 
 import logging.handlers
 import tempfile
@@ -31,20 +31,20 @@ from typing import (
     Any,
 )
 if TYPE_CHECKING:
-    from app import InternalTransport
+    from ..app import InternalTransport
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebsocketManager, BaseSocketClient
+    from ..websockets import WebsocketManager, BaseSocketClient
     from tornado.websocket import WebSocketClientConnection
-    from components.database import MoonrakerDatabase
+    from .database import MoonrakerDatabase
-    from components.klippy_apis import KlippyAPI
+    from .klippy_apis import KlippyAPI
-    from components.job_state import JobState
+    from .job_state import JobState
-    from components.machine import Machine
+    from .machine import Machine
-    from components.file_manager.file_manager import FileManager
+    from .file_manager.file_manager import FileManager
-    from components.http_client import HttpClient
+    from .http_client import HttpClient
-    from components.power import PrinterPower
+    from .power import PrinterPower
-    from components.announcements import Announcements
+    from .announcements import Announcements
-    from components.webcam import WebcamManager, WebCam
+    from .webcam import WebcamManager, WebCam
-    from klippy_connection import KlippyConnection
+    from ..klippy_connection import KlippyConnection
 
 COMPONENT_VERSION = "0.0.1"
 SP_VERSION = "0.1"

moonraker/components/template.py

@@ -17,8 +17,8 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from server import Server
+    from ..server import Server
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
     from .secrets import Secrets
 
 class TemplateFactory:

moonraker/components/update_manager/__init__.py

@@ -9,7 +9,7 @@ from . import update_manager as um
 
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ...confighelper import ConfigHelper
 
 def load_component(config: ConfigHelper) -> um.UpdateManager:
     return um.load_component(config)

moonraker/components/update_manager/app_deploy.py

@@ -24,7 +24,7 @@ from typing import (
     Tuple
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ...confighelper import ConfigHelper
     from .update_manager import CommandHelper
     from ..machine import Machine
     from ..file_manager.file_manager import FileManager

moonraker/components/update_manager/base_config.py

@@ -8,15 +8,15 @@ from __future__ import annotations
 import os
 import sys
 import copy
-from utils import MOONRAKER_PATH
+from ...utils import MOONRAKER_PATH
 from typing import (
     TYPE_CHECKING,
     Dict
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ...confighelper import ConfigHelper
-    from components.database import MoonrakerDatabase
+    from ..database import MoonrakerDatabase
 
 KLIPPER_DEFAULT_PATH = os.path.expanduser("~/klipper")
 KLIPPER_DEFAULT_EXEC = os.path.expanduser("~/klippy-env/bin/python")

moonraker/components/update_manager/base_deploy.py

@@ -10,8 +10,8 @@ import time
 
 from typing import TYPE_CHECKING, Dict, Any, Optional
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ...confighelper import ConfigHelper
-    from utils import ServerError
+    from ...utils import ServerError
     from .update_manager import CommandHelper
 
 class BaseDeploy:

moonraker/components/update_manager/git_deploy.py

@@ -23,8 +23,8 @@ from typing import (
     List,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ...confighelper import ConfigHelper
-    from components import shell_command
+    from ...components import shell_command
     from .update_manager import CommandHelper
     from ..http_client import HttpClient
 

moonraker/components/update_manager/update_manager.py

@@ -14,7 +14,7 @@ import zipfile
 import time
 import tempfile
 import re
-from thirdparty.packagekit import enums as PkEnum
+from ...thirdparty.packagekit import enums as PkEnum
 from . import base_config
 from .base_deploy import BaseDeploy
 from .app_deploy import AppDeploy
@@ -37,18 +37,18 @@ from typing import (
     cast
 )
 if TYPE_CHECKING:
-    from server import Server
+    from ...server import Server
-    from confighelper import ConfigHelper
+    from ...confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ...websockets import WebRequest
-    from klippy_connection import KlippyConnection
+    from ...klippy_connection import KlippyConnection
-    from components.shell_command import ShellCommandFactory as SCMDComp
+    from ..shell_command import ShellCommandFactory as SCMDComp
-    from components.database import MoonrakerDatabase as DBComp
+    from ..database import MoonrakerDatabase as DBComp
-    from components.database import NamespaceWrapper
+    from ..database import NamespaceWrapper
-    from components.dbus_manager import DbusManager
+    from ..dbus_manager import DbusManager
-    from components.machine import Machine
+    from ..machine import Machine
-    from components.http_client import HttpClient
+    from ..http_client import HttpClient
-    from components.file_manager.file_manager import FileManager
+    from ..file_manager.file_manager import FileManager
-    from eventloop import FlexTimer
+    from ...eventloop import FlexTimer
     from dbus_next import Variant
     from dbus_next.aio import ProxyInterface
     JsonType = Union[List[Any], Dict[str, Any]]

moonraker/components/update_manager/zip_deploy.py

@@ -13,7 +13,7 @@ import re
 import time
 import zipfile
 from .app_deploy import AppDeploy
-from utils import verify_source
+from ...utils import verify_source
 
 # Annotation imports
 from typing import (
@@ -25,7 +25,7 @@ from typing import (
     List,
 )
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ...confighelper import ConfigHelper
     from .update_manager import CommandHelper
 
 RINFO_KEYS = [

moonraker/components/webcam.py

@@ -20,9 +20,9 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from server import Server
+    from ..server import Server
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
     from .database import MoonrakerDatabase
     from .machine import Machine
     from .shell_command import ShellCommandFactory

moonraker/components/wled.py

@@ -28,10 +28,8 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
-    from websockets import WebRequest
+    from ..websockets import WebRequest
-    from . import klippy_apis
-    APIComp = klippy_apis.KlippyAPI
 
 class OnOff(str, Enum):
     on: str = "on"
@@ -447,9 +445,15 @@ class WLED:
     # Full control of wled
     # state: True, False, "on", "off"
     # preset: wled preset (int) to use (ignored if state False or "Off")
-    async def set_wled_state(self: WLED, strip: str, state: str = None,
+    async def set_wled_state(
-                             preset: int = -1, brightness: int = -1,
+        self: WLED,
-                             intensity: int = -1, speed: int = -1) -> None:
+        strip: str,
+        state: Optional[str] = None,
+        preset: int = -1,
+        brightness: int = -1,
+        intensity: int = -1,
+        speed: int = -1
+    ) -> None:
         status = None
 
         if isinstance(state, bool):

moonraker/components/zeroconf.py

@@ -14,7 +14,7 @@ from zeroconf.asyncio import AsyncServiceInfo, AsyncZeroconf
 from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional
 
 if TYPE_CHECKING:
-    from confighelper import ConfigHelper
+    from ..confighelper import ConfigHelper
     from .machine import Machine