Merge pull request #370 from DiamondLightSource/remove-annotated

Remove use of Annotated from return types of plans

src/dodal/common/types.py

@@ -1,17 +1,14 @@
 from typing import (
-    Annotated,
     Any,
     Callable,
     Generator,
 )
 
 from bluesky.utils import Msg
 
-Group = Annotated[str, "String identifier used by 'wait' or stubs that await"]
-MsgGenerator = Annotated[
-    Generator[Msg, Any, None],
-    "A true 'plan', usually the output of a generator function",
-]
-PlanGenerator = Annotated[
-    Callable[..., MsgGenerator], "A function that generates a plan"
-]
+# String identifier used by 'wait' or stubs that await
+Group = str
+# A true 'plan', usually the output of a generator function
+MsgGenerator = Generator[Msg, Any, None]
+# A function that generates a plan
+PlanGenerator = Callable[..., MsgGenerator]