diff --git a/.basedpyright/baseline.json b/.basedpyright/baseline.json
index 9c61a8638..bd8d76823 100644
--- a/.basedpyright/baseline.json
+++ b/.basedpyright/baseline.json
@@ -3142,47 +3142,87 @@
                 }
             },
             {
-                "code": "reportUnknownArgumentType",
+                "code": "reportUnknownVariableType",
                 "range": {
-                    "startColumn": 51,
-                    "endColumn": 57,
+                    "startColumn": 8,
+                    "endColumn": 9,
                     "lineCount": 1
                 }
             },
             {
-                "code": "reportUnknownArgumentType",
+                "code": "reportUnknownVariableType",
                 "range": {
-                    "startColumn": 51,
-                    "endColumn": 57,
+                    "startColumn": 11,
+                    "endColumn": 14,
                     "lineCount": 1
                 }
             },
             {
-                "code": "reportAssignmentType",
+                "code": "reportUnknownVariableType",
+                "range": {
+                    "startColumn": 16,
+                    "endColumn": 20,
+                    "lineCount": 1
+                }
+            },
+            {
+                "code": "reportCallIssue",
+                "range": {
+                    "startColumn": 23,
+                    "endColumn": 58,
+                    "lineCount": 1
+                }
+            },
+            {
+                "code": "reportArgumentType",
+                "range": {
+                    "startColumn": 41,
+                    "endColumn": 42,
+                    "lineCount": 1
+                }
+            },
+            {
+                "code": "reportUnknownVariableType",
                 "range": {
                     "startColumn": 8,
-                    "endColumn": 17,
+                    "endColumn": 11,
                     "lineCount": 1
                 }
             },
             {
-                "code": "reportUnknownArgumentType",
+                "code": "reportUnknownVariableType",
                 "range": {
-                    "startColumn": 49,
-                    "endColumn": 55,
+                    "startColumn": 13,
+                    "endColumn": 17,
                     "lineCount": 1
                 }
             },
             {
-                "code": "reportUnknownArgumentType",
+                "code": "reportCallIssue",
                 "range": {
-                    "startColumn": 49,
-                    "endColumn": 55,
+                    "startColumn": 20,
+                    "endColumn": 56,
                     "lineCount": 1
                 }
             },
             {
                 "code": "reportArgumentType",
+                "range": {
+                    "startColumn": 38,
+                    "endColumn": 39,
+                    "lineCount": 1
+                }
+            },
+            {
+                "code": "reportUnknownVariableType",
+                "range": {
+                    "startColumn": 4,
+                    "endColumn": 10,
+                    "lineCount": 1
+                }
+            },
+            {
+                "code": "reportUnknownArgumentType",
                 "range": {
                     "startColumn": 43,
                     "endColumn": 46,
@@ -3190,10 +3230,18 @@
                 }
             },
             {
-                "code": "reportReturnType",
+                "code": "reportUnknownArgumentType",
                 "range": {
-                    "startColumn": 14,
-                    "endColumn": 17,
+                    "startColumn": 48,
+                    "endColumn": 52,
+                    "lineCount": 1
+                }
+            },
+            {
+                "code": "reportUnknownVariableType",
+                "range": {
+                    "startColumn": 11,
+                    "endColumn": 25,
                     "lineCount": 1
                 }
             },
@@ -28761,14 +28809,6 @@
                     "lineCount": 1
                 }
             },
-            {
-                "code": "reportAbstractUsage",
-                "range": {
-                    "startColumn": 19,
-                    "endColumn": 18,
-                    "lineCount": 4
-                }
-            },
             {
                 "code": "reportCallIssue",
                 "range": {
@@ -28897,14 +28937,6 @@
                     "lineCount": 1
                 }
             },
-            {
-                "code": "reportAbstractUsage",
-                "range": {
-                    "startColumn": 19,
-                    "endColumn": 18,
-                    "lineCount": 4
-                }
-            },
             {
                 "code": "reportCallIssue",
                 "range": {