using logging instead of loguru

This commit is contained in:
Mose Müller
2023-10-16 15:51:37 +02:00
parent cdd60190a7
commit 1241d7a128
9 changed files with 26 additions and 12 deletions

View File

@ -1,17 +1,19 @@
import base64 import base64
import io import io
import logging
from pathlib import Path from pathlib import Path
from typing import TYPE_CHECKING, Optional from typing import TYPE_CHECKING, Optional
from urllib.request import urlopen from urllib.request import urlopen
import PIL.Image import PIL.Image
from loguru import logger
from pydase.data_service.data_service import DataService from pydase.data_service.data_service import DataService
if TYPE_CHECKING: if TYPE_CHECKING:
from matplotlib.figure import Figure from matplotlib.figure import Figure
logger = logging.getLogger(__name__)
class Image(DataService): class Image(DataService):
def __init__( def __init__(

View File

@ -1,9 +1,10 @@
import logging
from typing import Any, Literal from typing import Any, Literal
from loguru import logger
from pydase.data_service.data_service import DataService from pydase.data_service.data_service import DataService
logger = logging.getLogger(__name__)
class NumberSlider(DataService): class NumberSlider(DataService):
""" """

View File

@ -1,11 +1,10 @@
from __future__ import annotations from __future__ import annotations
import inspect import inspect
import logging
from collections.abc import Callable from collections.abc import Callable
from typing import TYPE_CHECKING, Any, cast from typing import TYPE_CHECKING, Any, cast
from loguru import logger
from pydase.data_service.abstract_data_service import AbstractDataService from pydase.data_service.abstract_data_service import AbstractDataService
from pydase.utils.helpers import get_class_and_instance_attributes from pydase.utils.helpers import get_class_and_instance_attributes
@ -14,6 +13,8 @@ from .data_service_list import DataServiceList
if TYPE_CHECKING: if TYPE_CHECKING:
from .data_service import DataService from .data_service import DataService
logger = logging.getLogger(__name__)
class CallbackManager: class CallbackManager:
_notification_callbacks: list[Callable[[str, str, Any], Any]] = [] _notification_callbacks: list[Callable[[str, str, Any], Any]] = []

View File

@ -1,12 +1,12 @@
import asyncio import asyncio
import inspect import inspect
import json import json
import logging
import os import os
from enum import Enum from enum import Enum
from typing import Any, Optional, cast, get_type_hints from typing import Any, Optional, cast, get_type_hints
import rpyc import rpyc
from loguru import logger
import pydase.units as u import pydase.units as u
from pydase.data_service.abstract_data_service import AbstractDataService 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, warn_if_instance_class_does_not_inherit_from_DataService,
) )
logger = logging.getLogger(__name__)
def process_callable_attribute(attr: Any, args: dict[str, Any]) -> Any: def process_callable_attribute(attr: Any, args: dict[str, Any]) -> Any:
converted_args_or_error_msg = convert_arguments_to_hinted_types( converted_args_or_error_msg = convert_arguments_to_hinted_types(

View File

@ -2,15 +2,16 @@ from __future__ import annotations
import asyncio import asyncio
import inspect import inspect
import logging
from collections.abc import Callable from collections.abc import Callable
from functools import wraps from functools import wraps
from typing import TYPE_CHECKING, Any, TypedDict from typing import TYPE_CHECKING, Any, TypedDict
from loguru import logger
if TYPE_CHECKING: if TYPE_CHECKING:
from .data_service import DataService from .data_service import DataService
logger = logging.getLogger(__name__)
class TaskDict(TypedDict): class TaskDict(TypedDict):
task: asyncio.Task[None] task: asyncio.Task[None]

View File

@ -1,4 +1,5 @@
import asyncio import asyncio
import logging
import os import os
import signal import signal
import threading import threading
@ -8,7 +9,6 @@ from types import FrameType
from typing import Any, Optional, Protocol, TypedDict from typing import Any, Optional, Protocol, TypedDict
import uvicorn import uvicorn
from loguru import logger
from rpyc import ( from rpyc import (
ForkingServer, # can be used for multiprocessing, e.g. a database interface server 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 from .web_server import WebAPI
logger = logging.getLogger(__name__)
class AdditionalServerProtocol(Protocol): class AdditionalServerProtocol(Protocol):
""" """

View File

@ -1,3 +1,4 @@
import logging
from pathlib import Path from pathlib import Path
from typing import Any, TypedDict from typing import Any, TypedDict
@ -5,11 +6,12 @@ import socketio
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from loguru import logger
from pydase import DataService from pydase import DataService
from pydase.version import __version__ from pydase.version import __version__
logger = logging.getLogger(__name__)
class UpdateDict(TypedDict): class UpdateDict(TypedDict):
""" """

View File

@ -1,8 +1,9 @@
import logging
import re import re
from itertools import chain from itertools import chain
from typing import Any, Optional, cast from typing import Any, Optional, cast
from loguru import logger logger = logging.getLogger(__name__)
STANDARD_TYPES = ("int", "float", "bool", "str", "Enum", "NoneType", "Quantity") STANDARD_TYPES = ("int", "float", "bool", "str", "Enum", "NoneType", "Quantity")

View File

@ -1,7 +1,9 @@
from loguru import logger import logging
from pydase.utils.helpers import get_component_class_names 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: def warn_if_instance_class_does_not_inherit_from_DataService(__value: object) -> None:
base_class_name = __value.__class__.__base__.__name__ base_class_name = __value.__class__.__base__.__name__