From fe5b6c591d2e86cbe181e6b5215e11757c5bac7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mose=20M=C3=BCller?= <mosemueller@gmail.com>
Date: Mon, 18 Sep 2023 18:24:40 +0200
Subject: [PATCH] fix: flake8 errors

---
 src/pydase/data_service/abstract_data_service.py |  9 ++++++++-
 src/pydase/data_service/callback_manager.py      |  6 ++++--
 src/pydase/data_service/data_service.py          |  9 ++++++++-
 src/pydase/data_service/data_service_list.py     |  8 +++++---
 src/pydase/server/server.py                      | 10 +++++++++-
 src/pydase/server/web_server.py                  |  8 +++++++-
 src/pydase/utils/helpers.py                      | 10 +++++++++-
 7 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/pydase/data_service/abstract_data_service.py b/src/pydase/data_service/abstract_data_service.py
index 88683ef..b02f2ce 100644
--- a/src/pydase/data_service/abstract_data_service.py
+++ b/src/pydase/data_service/abstract_data_service.py
@@ -1,8 +1,15 @@
 from __future__ import annotations
 
+import sys
 from abc import ABC
 from typing import TYPE_CHECKING, Any
 
+if sys.version_info < (3, 9):
+    from typing import Dict  # noqa
+else:
+    Dict = dict
+
+
 if TYPE_CHECKING:
     from .callback_manager import CallbackManager
     from .data_service import DataService
@@ -13,4 +20,4 @@ class AbstractDataService(ABC):
     __root__: DataService
     _task_manager: TaskManager
     _callback_manager: CallbackManager
-    _autostart_tasks: dict[str, tuple[Any]]
+    _autostart_tasks: Dict[str, tuple[Any]]
diff --git a/src/pydase/data_service/callback_manager.py b/src/pydase/data_service/callback_manager.py
index 28d612c..76b41a9 100644
--- a/src/pydase/data_service/callback_manager.py
+++ b/src/pydase/data_service/callback_manager.py
@@ -4,10 +4,12 @@ import inspect
 import sys
 
 if sys.version_info < (3, 9):
-    from typing import Callable  # noqa
+    from typing import Callable, Dict  # noqa
 else:
     from collections.abc import Callable
 
+    Dict = dict
+
 from typing import TYPE_CHECKING, Any, Union
 
 from loguru import logger
@@ -43,7 +45,7 @@ class CallbackManager:
     This implementation follows the observer pattern, with the DataService instance as
     the "subject" and the callback functions as the "observers".
     """
-    _list_mapping: dict[int, DataServiceList] = {}
+    _list_mapping: Dict[int, DataServiceList] = {}
     """
     A dictionary mapping the id of the original lists to the corresponding
     DataServiceList instances.
diff --git a/src/pydase/data_service/data_service.py b/src/pydase/data_service/data_service.py
index 892ceb0..df08409 100644
--- a/src/pydase/data_service/data_service.py
+++ b/src/pydase/data_service/data_service.py
@@ -2,8 +2,15 @@ import asyncio
 import inspect
 import json
 import os
+import sys
 from enum import Enum
-from typing import Any, Dict, List, Optional, cast, get_type_hints
+from typing import Any, Optional, cast, get_type_hints
+
+if sys.version_info < (3, 9):
+    from typing import Dict, List  # noqa
+else:
+    Dict = dict
+    List = list
 
 import rpyc
 from loguru import logger
diff --git a/src/pydase/data_service/data_service_list.py b/src/pydase/data_service/data_service_list.py
index 67c664d..0df3723 100644
--- a/src/pydase/data_service/data_service_list.py
+++ b/src/pydase/data_service/data_service_list.py
@@ -1,11 +1,13 @@
 import sys
 
-if sys.version_info < (3, 10):
-    from typing import Callable
+if sys.version_info < (3, 9):
+    from typing import Callable, List  # noqa
 else:
     from collections.abc import Callable
 
-from typing import Any, List, Union
+    List = list
+
+from typing import Any, Union
 
 from pydase.utils.warnings import (
     warn_if_instance_class_does_not_inherit_from_DataService,
diff --git a/src/pydase/server/server.py b/src/pydase/server/server.py
index 6d37ab0..ec0de83 100644
--- a/src/pydase/server/server.py
+++ b/src/pydase/server/server.py
@@ -1,11 +1,19 @@
 import asyncio
 import os
 import signal
+import sys
 import threading
 from concurrent.futures import ThreadPoolExecutor
 from enum import Enum
 from types import FrameType
-from typing import Any, Dict, List, Optional, Protocol, Type, TypedDict, Union
+from typing import Any, Optional, Protocol, TypedDict, Union
+
+if sys.version_info < (3, 9):
+    from typing import Dict, List, Type  # noqa
+else:
+    Dict = dict
+    List = list
+    Type = type
 
 import uvicorn
 from loguru import logger
diff --git a/src/pydase/server/web_server.py b/src/pydase/server/web_server.py
index 1d8dac2..808f778 100644
--- a/src/pydase/server/web_server.py
+++ b/src/pydase/server/web_server.py
@@ -1,5 +1,11 @@
+import sys
 from pathlib import Path
-from typing import Any, Dict, TypedDict, Union
+from typing import Any, TypedDict, Union
+
+if sys.version_info < (3, 9):
+    from typing import Dict  # noqa
+else:
+    Dict = dict
 
 import socketio
 from fastapi import FastAPI
diff --git a/src/pydase/utils/helpers.py b/src/pydase/utils/helpers.py
index 6ad96a9..f3c1ea0 100644
--- a/src/pydase/utils/helpers.py
+++ b/src/pydase/utils/helpers.py
@@ -1,6 +1,14 @@
 import re
+import sys
 from itertools import chain
-from typing import Any, Dict, List, Optional, Tuple, Union, cast
+from typing import Any, Optional, Union, cast
+
+if sys.version_info < (3, 9):
+    from typing import Dict, List, Tuple  # noqa
+else:
+    Dict = dict
+    List = list
+    Tuple = tuple
 
 from loguru import logger