Merge pull request #1202 from mito-ds/add-code-key

Don't overwrite generated code

Author: marthacryan

.github/workflows/test-mitosheet-frontend.yml

@@ -16,7 +16,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        python-version: ['3.6', '3.8', '3.10']
+        python-version: ['3.7', '3.8', '3.10']
       fail-fast: false
 
     steps:

mitosheet/mitosheet/api/api.py

@@ -11,6 +11,7 @@
 from time import perf_counter
 from typing import Any, Callable, Dict, NoReturn, Optional
 
+from mitosheet.api.get_saved_analysis_code import get_saved_analysis_code
 from mitosheet.api.get_all_params_for_step_type import get_all_params_for_step_type
 from mitosheet.api.get_ai_completion import get_ai_completion
 from mitosheet.api.get_available_snowflake_options_and_defaults import \
@@ -40,6 +41,7 @@
 from mitosheet.api.get_unique_value_counts import get_unique_value_counts
 from mitosheet.api.get_validate_snowflake_credentials import \
     get_validate_snowflake_credentials
+from mitosheet.saved_analyses.save_utils import read_analysis
 from mitosheet.steps_manager import StepsManager
 # AUTOGENERATED LINE: API.PY IMPORT (DO NOT DELETE)
 from mitosheet.telemetry.telemetry_utils import log_event_processed
@@ -235,6 +237,8 @@ def handle_api_event(
             result = get_parameterizable_params(params, steps_manager)
         elif event["type"] == "get_pr_url_of_new_pr":
             result = get_pr_url_of_new_pr(params, steps_manager)
+        elif event["type"] == "get_saved_analysis_code":
+            result = get_saved_analysis_code(params, steps_manager)
         # AUTOGENERATED LINE: API.PY CALL (DO NOT DELETE)
         else:
             raise Exception(f"Event: {event} is not a valid API call")

mitosheet/mitosheet/api/get_saved_analysis_code.py

@@ -0,0 +1,9 @@
+from typing import Any, Dict, List, Union
+from mitosheet.saved_analyses.save_utils import read_analysis
+from mitosheet.types import StepsManagerType
+
+def get_saved_analysis_code(params: Dict[str, Any], steps_manager: StepsManagerType) -> Union[List[str], str, None]:
+    if steps_manager.analysis_to_replay is not None:
+        analysis = read_analysis(steps_manager.analysis_to_replay)
+        return analysis.get("code") if analysis is not None else None
+    return None

mitosheet/mitosheet/saved_analyses/save_utils.py

@@ -42,7 +42,6 @@ def read_analysis(analysis_name: str) -> Optional[Dict[str, Any]]:
     """
 
     analysis_path = f'{SAVED_ANALYSIS_FOLDER}/{analysis_name}.json'
-
     if not os.path.exists(analysis_path):
         return None
 

mitosheet/mitosheet/saved_analyses/upgrade.py

@@ -334,7 +334,7 @@ def upgrade_steps_for_new_format(saved_analysis: Optional[Dict[str, Any]]) -> Op
     }
 
 def upgrade_saved_analysis_to_have_public_interface_version(saved_analysis: Optional[Dict[str, Any]], public_interface_version: Optional[int]) -> Optional[Dict[str, Any]]:
-    
+
     if saved_analysis is None:
         return None
 
@@ -358,6 +358,18 @@ def upgrade_saved_analysis_to_have_up_to_date_args(saved_analysis: Optional[Dict
 
     return saved_analysis
 
+def upgrade_saved_analysis_to_have_code(saved_analysis: Optional[Dict[str, Any]], code: Optional[str]) -> Optional[Dict[str, Any]]:
+
+    if saved_analysis is None:
+        return None
+    
+    if code is not None:
+        saved_analysis['code'] = code
+    else:
+        saved_analysis['code'] = None
+    
+    return saved_analysis
+
 def upgrade_saved_analysis_to_have_code_options(saved_analysis: Optional[Dict[str, Any]], analysis_name: str, code_options: Optional[CodeOptions]) -> Optional[Dict[str, Any]]:
 
     if saved_analysis is None:
@@ -407,8 +419,12 @@ def upgrade_saved_analysis_to_current_version(saved_analysis: Optional[Dict[str,
         saved_analysis_with_public_interface, 
         args
     )
-    saved_analysis_with_code_options = upgrade_saved_analysis_to_have_code_options(
+    saved_analysis_with_args_with_code = upgrade_saved_analysis_to_have_code(
         saved_analysis_with_args,
+        saved_analysis.get('code', None) if saved_analysis is not None else None
+    )
+    saved_analysis_with_code_options = upgrade_saved_analysis_to_have_code_options(
+        saved_analysis_with_args_with_code,
         analysis_name,
         saved_analysis.get('code_options', None) if saved_analysis is not None else None,
     )

mitosheet/mitosheet/telemetry/private_params_map.py

@@ -11,7 +11,7 @@
 """
 
 # Params that do not need to be anonyimized
-LOG_PARAMS_PUBLIC = { 'action', 'analysis_name', 'column_header_index', 'cell_editor_location', 'checklist_id', 'completed_items', 'drop', 'tour_names', 'total_number_of_tour_steps', 'created_non_empty_dataframe', 'destination_sheet_index', 'df_index_type', 'email', 'export_type', 'error', 'error_message', 'error_name', 'error_stack', 'feedback_id', 'field', 'filter_location', 'flatten_column_headers', 'format_type', 'fullscreen', 'function_name', 'graph_id', 'graph_type', 'has_headers', 'has_non_empty_filter', 'height', 'how', 'ignore_index', 'join', 'js_error', 'js_error_info', 'js_taskpane_header', 'jupyterlab_theme', 'keep', 'level', 'log_event', 'message', 'move_to_deprecated_id_algorithm', 'new_column_index', 'new_dtype', 'new_graph_id', 'new_signup_step', 'new_version', 'num_args', 'num_df_args', 'num_str_args', 'num_usages', 'number_rendered_sheets', 'old_dtype', 'old_graph_id', 'old_signup_step', 'old_version', 'operator', 'paper_bgcolor', 'param_filtered', 'path_parts_length', 'plot_bgcolor', 'pro_button_location', 'questions_and_answers', 'safety_filter_turned_on_by_user', 'search_string', 'selected_element', 'sheet_index', 'sheet_index_one', 'sheet_index_two', 'sheet_indexes', 'showlegend', 'skiprows', 'sort', 'sort_direction', 'step_id_to_match', 'step_idx', 'step_type', 'steps_manager_analysis_name', 'title_font_color', 'user_agent', 'user_serch_term', 'view_df', 'visible', 'width', 'row_index', 'type', 'value', 'open_due_to_replay_error', 'num_invalid_imports', 'num_total_imports', 'optional_code_chunk_names', 'code_snippet_name', 'get_code_snippet_error_reason', 'completion', 'edited_completion', 'prompt', 'prompt_version', 'user_input', 'feedback', 'created_dataframe_names', 'deleted_dataframe_names', 'last_line_value', 'aiPrivacyPolicyNotAccepted', 'apiKeyNotDefined', 'feature', 'public_interface_version'}
+LOG_PARAMS_PUBLIC = { 'action', 'analysis_name', 'column_header_index', 'cell_editor_location', 'checklist_id', 'completed_items', 'drop', 'tour_names', 'total_number_of_tour_steps', 'created_non_empty_dataframe', 'destination_sheet_index', 'df_index_type', 'email', 'export_type', 'error', 'error_message', 'error_name', 'error_stack', 'feedback_id', 'field', 'filter_location', 'flatten_column_headers', 'format_type', 'fullscreen', 'function_name', 'graph_id', 'graph_type', 'has_headers', 'has_non_empty_filter', 'height', 'how', 'ignore_index', 'join', 'jupyterlab_theme', 'keep', 'level', 'log_event', 'message', 'move_to_deprecated_id_algorithm', 'new_column_index', 'new_dtype', 'new_graph_id', 'new_signup_step', 'new_version', 'num_args', 'num_df_args', 'num_str_args', 'num_usages', 'number_rendered_sheets', 'old_dtype', 'old_graph_id', 'old_signup_step', 'old_version', 'operator', 'paper_bgcolor', 'param_filtered', 'path_parts_length', 'plot_bgcolor', 'pro_button_location', 'questions_and_answers', 'safety_filter_turned_on_by_user', 'search_string', 'selected_element', 'sheet_index', 'sheet_index_one', 'sheet_index_two', 'sheet_indexes', 'showlegend', 'skiprows', 'sort', 'sort_direction', 'step_id_to_match', 'step_idx', 'step_type', 'steps_manager_analysis_name', 'title_font_color', 'user_agent', 'user_serch_term', 'view_df', 'visible', 'width', 'row_index', 'type', 'value', 'open_due_to_replay_error', 'num_invalid_imports', 'num_total_imports', 'optional_code_chunk_names', 'code_snippet_name', 'get_code_snippet_error_reason', 'completion', 'edited_completion', 'prompt', 'prompt_version', 'user_input', 'feedback', 'created_dataframe_names', 'deleted_dataframe_names', 'last_line_value', 'aiPrivacyPolicyNotAccepted', 'apiKeyNotDefined', 'feature', 'public_interface_version', 'length_of_code_with_user_edits', 'length_of_code_without_user_edits', 'js_error', 'js_error_info', 'js_taskpane_header'}
 
 # Params that we want to log the length of the first element
 LOG_PARAMS_LENGTH_FIRST_ELEMENT = {'optional_code'}

mitosheet/mitosheet/tests/saved_analyses/test_save_utils.py

@@ -281,6 +281,23 @@ def test_upgrades_old_analysis_before_replaying_it():
         pd.DataFrame({'A': [123], 'B_sum': [123]})
     )
 
+def test_save_analysis_has_code():
+    mito = create_mito_wrapper_with_data([1, 2, 3])
+    mito.filter(0, 'A', 'And', FC_NUMBER_EXACTLY, 2)
+
+    random_name = 'UUID-test_save' + str(random.random())
+    mito.save_analysis(random_name)
+
+    saved_analysis = read_and_upgrade_analysis(random_name, ['df1'])
+    assert len(saved_analysis['steps_data']) == 1
+    assert saved_analysis['code'] == [
+        'from mitosheet.public.v3 import *',
+        '',
+        '# Filtered A',
+        "df1 = df1[df1['A'] == 2]",
+        ''
+    ]
+
 def test_save_analysis_saves_skipped_steps():
     mito = create_mito_wrapper_with_data([1, 2, 3])
     mito.filter(0, 'A', 'And', FC_NUMBER_EXACTLY, 2)
@@ -331,8 +348,8 @@ def test_save_and_replay_different_interface_version_works():
     saved_analysis = read_and_upgrade_analysis(random_name, ['df1'])
     assert saved_analysis is not None
     assert len(saved_analysis['steps_data']) == 0
-    print(saved_analysis)
     assert saved_analysis['public_interface_version'] == 100
+    assert saved_analysis['code'] == []
 
     new_mito = create_mito_wrapper_with_data([1, 2, 3])
     new_mito.replay_analysis(random_name)