diff --git a/src/pydase/components/image.py b/src/pydase/components/image.py index 4131663..5fe4dd8 100644 --- a/src/pydase/components/image.py +++ b/src/pydase/components/image.py @@ -1,17 +1,19 @@ import base64 import io +import logging from pathlib import Path from typing import TYPE_CHECKING, Optional from urllib.request import urlopen import PIL.Image -from loguru import logger from pydase.data_service.data_service import DataService if TYPE_CHECKING: from matplotlib.figure import Figure +logger = logging.getLogger(__name__) + class Image(DataService): def __init__( diff --git a/src/pydase/components/number_slider.py b/src/pydase/components/number_slider.py index 6f395e2..7a2ac9e 100644 --- a/src/pydase/components/number_slider.py +++ b/src/pydase/components/number_slider.py @@ -1,9 +1,10 @@ +import logging from typing import Any, Literal -from loguru import logger - from pydase.data_service.data_service import DataService +logger = logging.getLogger(__name__) + class NumberSlider(DataService): """ diff --git a/src/pydase/data_service/callback_manager.py b/src/pydase/data_service/callback_manager.py index 94f6dc2..3715201 100644 --- a/src/pydase/data_service/callback_manager.py +++ b/src/pydase/data_service/callback_manager.py @@ -1,11 +1,10 @@ from __future__ import annotations import inspect +import logging from collections.abc import Callable from typing import TYPE_CHECKING, Any, cast -from loguru import logger - from pydase.data_service.abstract_data_service import AbstractDataService from pydase.utils.helpers import get_class_and_instance_attributes @@ -14,6 +13,8 @@ from .data_service_list import DataServiceList if TYPE_CHECKING: from .data_service import DataService +logger = logging.getLogger(__name__) + class CallbackManager: _notification_callbacks: list[Callable[[str, str, Any], Any]] = [] diff --git a/src/pydase/data_service/data_service.py b/src/pydase/data_service/data_service.py index 8dace1e..3c4a0c3 100644 --- a/src/pydase/data_service/data_service.py +++ b/src/pydase/data_service/data_service.py @@ -1,12 +1,12 @@ import asyncio import inspect import json +import logging import os from enum import Enum from typing import Any, Optional, cast, get_type_hints import rpyc -from loguru import logger import pydase.units as u from pydase.data_service.abstract_data_service import AbstractDataService @@ -27,6 +27,8 @@ from pydase.utils.warnings import ( warn_if_instance_class_does_not_inherit_from_DataService, ) +logger = logging.getLogger(__name__) + def process_callable_attribute(attr: Any, args: dict[str, Any]) -> Any: converted_args_or_error_msg = convert_arguments_to_hinted_types( diff --git a/src/pydase/data_service/task_manager.py b/src/pydase/data_service/task_manager.py index 682f067..f35d348 100644 --- a/src/pydase/data_service/task_manager.py +++ b/src/pydase/data_service/task_manager.py @@ -2,15 +2,16 @@ from __future__ import annotations import asyncio import inspect +import logging from collections.abc import Callable from functools import wraps from typing import TYPE_CHECKING, Any, TypedDict -from loguru import logger - if TYPE_CHECKING: from .data_service import DataService +logger = logging.getLogger(__name__) + class TaskDict(TypedDict): task: asyncio.Task[None] diff --git a/src/pydase/server/server.py b/src/pydase/server/server.py index c394cea..454739f 100644 --- a/src/pydase/server/server.py +++ b/src/pydase/server/server.py @@ -1,4 +1,5 @@ import asyncio +import logging import os import signal import threading @@ -8,7 +9,6 @@ from types import FrameType from typing import Any, Optional, Protocol, TypedDict import uvicorn -from loguru import logger from rpyc import ( ForkingServer, # can be used for multiprocessing, e.g. a database interface server ) @@ -21,6 +21,8 @@ from pydase.version import __version__ from .web_server import WebAPI +logger = logging.getLogger(__name__) + class AdditionalServerProtocol(Protocol): """ diff --git a/src/pydase/server/web_server.py b/src/pydase/server/web_server.py index f946fc0..a350775 100644 --- a/src/pydase/server/web_server.py +++ b/src/pydase/server/web_server.py @@ -1,3 +1,4 @@ +import logging from pathlib import Path from typing import Any, TypedDict @@ -5,11 +6,12 @@ import socketio from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware from fastapi.staticfiles import StaticFiles -from loguru import logger from pydase import DataService from pydase.version import __version__ +logger = logging.getLogger(__name__) + class UpdateDict(TypedDict): """ diff --git a/src/pydase/utils/helpers.py b/src/pydase/utils/helpers.py index 00e180e..c9a7aca 100644 --- a/src/pydase/utils/helpers.py +++ b/src/pydase/utils/helpers.py @@ -1,8 +1,9 @@ +import logging import re from itertools import chain from typing import Any, Optional, cast -from loguru import logger +logger = logging.getLogger(__name__) STANDARD_TYPES = ("int", "float", "bool", "str", "Enum", "NoneType", "Quantity") diff --git a/src/pydase/utils/warnings.py b/src/pydase/utils/warnings.py index dd1a033..0fe7eef 100644 --- a/src/pydase/utils/warnings.py +++ b/src/pydase/utils/warnings.py @@ -1,7 +1,9 @@ -from loguru import logger +import logging from pydase.utils.helpers import get_component_class_names +logger = logging.getLogger(__name__) + def warn_if_instance_class_does_not_inherit_from_DataService(__value: object) -> None: base_class_name = __value.__class__.__base__.__name__