mitosheet: fix types for python 3.6

joaraf · Mar 18, 2024 · f0dda17 · f0dda17
1 parent 97b6765
commit f0dda17
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/mitosheet/mitosheet/mito_backend.py b/mitosheet/mitosheet/mito_backend.py
@@ -12,7 +12,7 @@
 import re
 import time
 from sysconfig import get_python_version
-from typing import Any, Dict, List, Literal, Optional, Union, Callable
+from typing import Any, Dict, List, Optional, Union, Callable
 
 import numpy as np
 import pandas as pd
@@ -29,7 +29,7 @@
 from mitosheet.steps_manager import StepsManager
 from mitosheet.telemetry.telemetry_utils import (log, log_event_processed,
                                                  telemetry_turned_on)
-from mitosheet.types import CodeOptions, ColumnDefinintion, ColumnDefinitions, ConditionalFormat, MitoTheme, ParamMetadata
+from mitosheet.types import CodeOptions, ColumnDefinintion, ColumnDefinitions, ConditionalFormat, DefaultEditingMode, MitoTheme, ParamMetadata
 from mitosheet.updates.replay_analysis import REPLAY_ANALYSIS_UPDATE
 from mitosheet.user.create import try_create_user_json_file
 from mitosheet.user.db import USER_JSON_PATH, get_user_field
@@ -58,7 +58,7 @@ def __init__(
             user_defined_editors: Optional[List[Callable]]=None,
             code_options: Optional[CodeOptions]=None,
             column_definitions: Optional[List[ColumnDefinitions]]=None,
-            default_editing_mode: Optional[Literal['cell', 'column']]=None,
+            default_editing_mode: Optional[DefaultEditingMode]=None,
             theme: Optional[MitoTheme]=None,
         ):
         """

diff --git a/mitosheet/mitosheet/streamlit/v1/spreadsheet.py b/mitosheet/mitosheet/streamlit/v1/spreadsheet.py
@@ -7,13 +7,13 @@
 import os
 import pickle
 import re
-from typing import Any, Dict, List, Callable, Literal, Optional, Tuple, Union
+from typing import Any, Dict, List, Callable, Optional, Tuple, Union
 
 import pandas as pd
 
 from mitosheet.mito_backend import MitoBackend
 from mitosheet.selection_utils import get_selected_element
-from mitosheet.types import CodeOptions, ColumnDefinitions, ConditionalFormat, ParamMetadata, ParamType
+from mitosheet.types import CodeOptions, ColumnDefinitions, ConditionalFormat, DefaultEditingMode, ParamMetadata, ParamType
 from mitosheet.user.utils import is_pro
 from mitosheet.utils import get_new_id
 
@@ -271,7 +271,7 @@ def _get_mito_backend(
             _sheet_functions: Optional[List[Callable]]=None, 
             _code_options: Optional[CodeOptions]=None,
             _column_definitions: Optional[List[ColumnDefinitions]]=None,
-            _default_editing_mode: Optional[Literal['cell', 'column']]=None,
+            _default_editing_mode: Optional[DefaultEditingMode]=None,
             import_folder: Optional[str]=None,
             df_names: Optional[List[str]]=None,
             session_id: Optional[str]=None,
@@ -326,7 +326,7 @@ def spreadsheet( # type: ignore
             import_folder: Optional[str]=None,
             code_options: Optional[CodeOptions]=None,
             column_definitions: Optional[List[ColumnDefinitions]]=None,
-            default_editing_mode: Optional[Literal['cell', 'column']]=None,
+            default_editing_mode: Optional[DefaultEditingMode]=None,
             return_type: str='default',
             height: Optional[str]=None,
             key=None

diff --git a/mitosheet/mitosheet/types.py b/mitosheet/mitosheet/types.py
@@ -383,9 +383,10 @@ class ColumnDefinintion(TypedDict):
         columns: List[ColumnHeader]
         conditional_formats: List[ColumnDefinitionConditionalFormats]
 
-    # TODO: This is a confusing name. Think of a better one.
     ColumnDefinitions = List[ColumnDefinintion]
 
+    DefaultEditingMode = Literal['cell', 'column']
+
     UserDefinedFunctionParamType = Literal['any', 'str', 'int', 'float', 'bool', 'DataFrame', 'ColumnHeader']
 
     class MitoTheme(TypedDict):
@@ -455,6 +456,7 @@ class ExecuteThroughTranspileNewDataframeParams(TypedDict):
     ColumnDefinitionConditionalFormats = Any # type: ignore
     ColumnDefinintion = Any # type: ignore
     ColumnDefinitions = Any # type: ignore
+    DefaultEditingMode = Any # type: ignore
 
     ParamName = str # type: ignore
     ParamType = str # type: ignore