Add unit test to smoke test the tool RPC handler

Author: wesm

extensions/positron-python/python_files/posit/positron/data_explorer.py

@@ -267,7 +267,7 @@ def get_schema(self, params: GetSchemaParams):
             column_schemas.append(self._get_single_column_schema(column_index))
 
         # Return the column schemas.
-        return TableSchema(columns=column_schemas).dict()
+        return TableSchema(columns=column_schemas)
 
     def _get_single_column_schema(self, column_index: int) -> ColumnSchema:
         raise NotImplementedError
@@ -289,7 +289,7 @@ def search_schema(self, params: SearchSchemaParams):
         return SearchSchemaResult(
             matches=TableSchema(columns=[self._get_single_column_schema(i) for i in matches_slice]),
             total_num_matches=len(matches),
-        ).dict()
+        )
 
     def _column_filter_get_matches(self, filters: list[ColumnFilter]):
         matchers = self._get_column_filter_functions(filters)
@@ -429,7 +429,7 @@ def _set_row_filters(self, filters: list[RowFilter]):
             # Simply reset if empty filter set passed
             self.filtered_indices = None
             self._update_row_view_indices()
-            return FilterResult(selected_num_rows=len(self.table), had_errors=False).dict()
+            return FilterResult(selected_num_rows=len(self.table), had_errors=False)
 
         # Evaluate all the filters and combine them using the
         # indicated conditions
@@ -469,7 +469,7 @@ def _set_row_filters(self, filters: list[RowFilter]):
 
         # Update the view indices, re-sorting if needed
         self._update_row_view_indices()
-        return FilterResult(selected_num_rows=selected_num_rows, had_errors=had_errors).dict()
+        return FilterResult(selected_num_rows=selected_num_rows, had_errors=had_errors)
 
     def _mask_to_indices(self, mask):
         raise NotImplementedError
@@ -582,7 +582,7 @@ def get_state(self, _unused):
             row_filters=self.state.row_filters,
             sort_keys=self.state.sort_keys,
             supported_features=self.FEATURES,
-        ).dict()
+        )
 
     def _recompute(self):
         # Re-setting the column filters will trigger filtering AND
@@ -1583,10 +1583,10 @@ def _export_tabular(self, row_selector, column_selector, fmt: ExportFormat):
         if result[-1] == "\n":
             result = result[:-1]
 
-        return ExportedData(data=result, format=fmt).dict()
+        return ExportedData(data=result, format=fmt)
 
     def _export_cell(self, row_index: int, column_index: int, fmt: ExportFormat):
-        return ExportedData(data=str(self.table.iloc[row_index, column_index]), format=fmt).dict()
+        return ExportedData(data=str(self.table.iloc[row_index, column_index]), format=fmt)
 
     def _mask_to_indices(self, mask):
         if mask is not None:
@@ -2415,10 +2415,10 @@ def _export_tabular(self, row_selector, column_selector, fmt: ExportFormat):
         elif fmt == ExportFormat.Html:
             raise NotImplementedError(f"Unsupported export format {fmt}")
 
-        return ExportedData(data=result, format=fmt).dict()
+        return ExportedData(data=result, format=fmt)
 
     def _export_cell(self, row_index: int, column_index: int, fmt: ExportFormat):
-        return ExportedData(data=str(self.table[row_index, column_index]), format=fmt).dict()
+        return ExportedData(data=str(self.table[row_index, column_index]), format=fmt)
 
     SUPPORTED_FILTERS = frozenset(
         {
@@ -3032,6 +3032,9 @@ def handle_msg(self, msg: CommMessage[DataExplorerBackendMessageContent], _raw_m
 
         # To help remember to convert pydantic types to dicts
         if result is not None:
+            # Convert pydantic types to dict
+            if not isinstance(result, dict):
+                result = result.dict()
             if isinstance(result, list):
                 for x in result:
                     assert isinstance(x, dict)

extensions/positron-python/python_files/posit/positron/tests/test_variables.py

@@ -915,7 +915,7 @@ def _assign_variables(shell: PositronShell, variables_comm: DummyComm, **variabl
 def test_query_table_summary(shell: PositronShell, variables_comm: DummyComm):
     from .test_data_explorer import SIMPLE_PANDAS_DF
 
-    _assign_variables(shell, variables_comm, df=SIMPLE_PANDAS_DF)
+    _assign_variables(shell, variables_comm, df=SIMPLE_PANDAS_DF.iloc[:, :2])
 
     msg = json_rpc_request(
         "query_table_summary",
@@ -927,8 +927,16 @@ def test_query_table_summary(shell: PositronShell, variables_comm: DummyComm):
     assert variables_comm.messages == [
         json_rpc_response(
             {
-                "summary": ANY,
-                "version": 0,
+                "num_rows": 5,
+                "num_columns": 2,
+                "column_schemas": [
+                    '{"column_name": "a", "column_index": 0, "type_name": "int64", "type_display": "number", "description": null, "children": null, "precision": null, "scale": null, "timezone": null, "type_size": null}',
+                    '{"column_name": "b", "column_index": 1, "type_name": "bool", "type_display": "boolean", "description": null, "children": null, "precision": null, "scale": null, "timezone": null, "type_size": null}',
+                ],
+                "column_profiles": [
+                    '{"column_name": "a", "type_display": "number", "summary_stats": {"type_display": "number", "number_stats": {"min_value": "1.0000", "max_value": "5.0000", "mean": "3.0000", "median": "3.0000", "stdev": "1.5811"}, "string_stats": null, "boolean_stats": null, "date_stats": null, "datetime_stats": null, "other_stats": null}}',
+                    '{"column_name": "b", "type_display": "boolean", "summary_stats": {"type_display": "boolean", "number_stats": null, "string_stats": null, "boolean_stats": {"true_count": 3, "false_count": 1}, "date_stats": null, "datetime_stats": null, "other_stats": null}}',
+                ],
             }
         )
     ]

extensions/positron-python/python_files/posit/positron/variables.py

@@ -714,12 +714,14 @@ def _send_details(self, _path: list[str], value: Any = None):
 
     def _perform_get_table_summary(self, path: list[str], query_types: list[str]) -> None:
         """RPC handler for getting table summary."""
+        import traceback
+
         try:
             self._get_table_summary(path, query_types)
         except Exception as err:
             self._send_error(
                 JsonRpcErrorCode.INTERNAL_ERROR,
-                f"Error summarizing table at '{path}': {err}",
+                f"Error summarizing table at '{path}': {err}\n{traceback.format_exc()}",
             )
 
     def _get_table_summary(self, path: list[str], query_types: list[str]) -> None:
@@ -750,7 +752,7 @@ def _get_table_summary(self, path: list[str], query_types: list[str]) -> None:
         # Get schema using the helper function
         num_rows = table_view.table.shape[0]
         num_columns = table_view.table.shape[1]
-        schema = table_view.get_schema(GetSchemaParams(list(range(num_columns))))
+        schema = table_view.get_schema(GetSchemaParams(column_indices=list(range(num_columns))))
 
         # Create default format options
         format_options = FormatOptions(