Merge pull request neptyneco#6 from neptyneco/sync-with-upstream-10-10

Sync with upstream

Author: jamadeo

neptyne_kernel/__init__.py

@@ -1,4 +1,4 @@
-def init_notebook(api_key: str = "", api_host="https://app.neptyne.com") -> None:
+def init_notebook(api_key: str = "", api_host: str = "https://app.neptyne.com") -> None:
     import os
 
     from IPython import get_ipython

neptyne_kernel/cell_execution_graph.py

@@ -1,7 +1,6 @@
 from collections import defaultdict
 from typing import TYPE_CHECKING, Any, Sequence
 
-
 from .cell_address import Address
 from .ops import ClearOp, ExecOp
 
@@ -16,8 +15,8 @@ def __init__(
         cell_ids: set[Address],
         pre_clear: Sequence[Address] | None,
     ) -> None:
-        from graphlib import CycleError, TopologicalSorter
         import networkx as nx
+        from graphlib import CycleError, TopologicalSorter
 
         self.dash = dash
         self.cell_ids = cell_ids

neptyne_kernel/cell_range.py

@@ -42,11 +42,12 @@
 from .transformation import Transformation, is_insert_delete_unbounded
 
 if TYPE_CHECKING:
+    from geopandas import GeoDataFrame
+
     from .dash import Dash
     from .dash_ref import DashRef
     from .formulas.helpers import SimpleCellValue
     from .gsheets_api import GSheetRef
-    from geopandas import GeoDataFrame
 
 
 T = TypeVar("T")
@@ -850,9 +851,15 @@ def __setitem__(
         self.ref.setitem(key, value)
 
     def __iter__(self) -> Iterator:
-        from .dash_ref import DashRef
+        from .gsheets_api import GSheetRef
+
+        if isinstance(self.ref, GSheetRef):
+            # self.ref can be a GSheetRef in case of sheets. That's broken there but hard to fix.
+            # We can however cheaply create the right cell range here and let that do the work.
+            gsheet_range = CellRangeGSheet(self.ref)
+            yield from gsheet_range
+            return
 
-        assert isinstance(self.ref, DashRef)
         # if we have -1 in the range, loop through it even if it is one dimensional:
         max_col, max_row = self.ref.current_max_col_row()
         if max_row == -1 or max_col == -1:

neptyne_kernel/dash.py

@@ -39,6 +39,7 @@
 
 import dateutil.parser
 import dateutil.tz
+import ipykernel
 import numpy as np
 import pandas as pd
 import plotly.io as pio
@@ -84,12 +85,6 @@
     tokenize_with_ranges,
     try_parse_capitalized_range,
 )
-from .spreadsheet_datetime import SpreadsheetDateTimeBase
-from .spreadsheet_error import (
-    PYTHON_ERROR,
-    SheetDoesNotExist,
-    SpreadsheetError,
-)
 from .get_ipython_mockable import get_ipython_mockable
 from .gsheets_api import (
     GSheetNamedRanges,
@@ -99,6 +94,7 @@
     replace_refs,
 )
 from .insert_delete_helper import add_delete_cells_helper
+from .json_tools import json_clean
 from .kernel_runtime import get_kernel, send_sync_request
 from .linter import TyneCachingCompiler
 from .mime_handling import (
@@ -157,6 +153,12 @@
 from .renderers import InlineWrapper, WithSourceMixin
 from .session_info import NeptyneSessionInfo
 from .sheet_api import NeptyneSheetCollection
+from .spreadsheet_datetime import SpreadsheetDateTimeBase
+from .spreadsheet_error import (
+    PYTHON_ERROR,
+    SheetDoesNotExist,
+    SpreadsheetError,
+)
 from .transformation import (
     Transformation,
     insert_delete_content_to_sheet_transform,
@@ -196,16 +198,13 @@
     widget_name_from_code,
     widget_registry,
 )
-from .json_tools import json_clean
-
-import ipykernel
 
 IPYKERNEL_MAJOR_VERSION = int(ipykernel.__version__.split(".")[0])
 
 try:
     from .formulas.sheets import SvgImage
 except ImportError:
-    SvgImage = None
+    SvgImage = None  # type: ignore
 
 try:
     from shapely.geometry.base import BaseGeometry as ShapelyBaseGeometry
@@ -249,7 +248,7 @@
 pio.templates.default = "plotly"
 
 
-def get_parent_shim(self: Kernel, channel: str | None = None):
+def get_parent_shim(self: Kernel, channel: str | None = None) -> dict:
     return self._parent_header
 
 
@@ -531,7 +530,7 @@ def __init__(self, silent: bool = False) -> None:
                 ip.SyntaxTB = DashSyntaxTB(color_scheme="LightBG", parent=parent)
 
             try:
-                import matplotlib
+                import matplotlib  # noqa: F401
 
                 ip.run_line_magic("matplotlib", "inline")
             except ImportError:
@@ -876,6 +875,8 @@ def add_delete_cells_internal(
         )
 
     def undo_msg(self, msg_type: MessageTypes, payload: dict) -> dict[str, Any]:
+        if not self.kernel.session:
+            return {}
         msg = self.kernel.session.msg(msg_type.value, payload)
         parent_header = self.shell.parent_header["header"]
         msg["header"]["msg_id"] = parent_header["msg_id"]
@@ -959,13 +960,14 @@ def load_values(self, sheets: TyneSheets) -> None:
     def broadcast_init_stage(self, state: KernelInitState) -> None:
         parent = self.kernel.get_parent("shell")
         parent["header"]["init_phase"] = state.value
-        self.kernel.session.send(
-            self.kernel.iopub_socket,
-            "status",
-            {"execution_state": "busy"},
-            parent=parent,
-            ident=f"kernel.{self.kernel.ident}.status".encode(),
-        )
+        if self.kernel.session:
+            self.kernel.session.send(
+                self.kernel.iopub_socket,
+                "status",
+                {"execution_state": "busy"},
+                parent=parent,
+                ident=f"kernel.{self.kernel.ident}.status".encode(),
+            )
 
     def pip_install(self, requirements_txt: str, silent: bool = False) -> None:
         neptyne_pip_install(requirements_txt, silent=silent)

neptyne_kernel/expression_compiler.py

@@ -29,8 +29,8 @@
     replace_negative_bounds_with_grid_size,
 )
 from .formula_names import FORMULA_NAMES
-from .spreadsheet_error import SheetDoesNotExist
 from .neptyne_protocol import Dimension, WidgetRegistry
+from .spreadsheet_error import SheetDoesNotExist
 from .transformation import Transformation
 
 N_RE = re.compile(r"N_[ \t]*\[(?P<addr>\-?\d+(?:[ \t]*,[ \t]*((\-?\d+)|\'\w+\'))+)\]")

neptyne_kernel/formulas/database.py

@@ -4,8 +4,8 @@
 from statistics import StatisticsError, mean, pstdev, pvariance, stdev, variance
 
 from ..cell_range import CellRange
-from .helpers import Numeric, SimpleCellValue, criteria_func, parse_criteria
 from ..spreadsheet_error import NUM_ERROR, VALUE_ERROR
+from .helpers import Numeric, SimpleCellValue, criteria_func, parse_criteria
 
 DBField = int | str
 

neptyne_kernel/formulas/database_test.py

@@ -1,6 +1,7 @@
 import pytest
 
 from ..cell_range import CellRange
+from ..spreadsheet_error import NUM_ERROR, VALUE_ERROR
 from .database import (
     DAVERAGE,
     DCOUNT,
@@ -15,7 +16,6 @@
     DVAR,
     DVARP,
 )
-from ..spreadsheet_error import NUM_ERROR, VALUE_ERROR
 from .test_helpers import approx_or_error
 
 DAVERAGE_RANGE = CellRange(

neptyne_kernel/formulas/date_time.py

@@ -6,6 +6,15 @@
 from numpy import busday_count, busday_offset
 
 from ..cell_range import CellRange
+from ..spreadsheet_datetime import (
+    EPOCH_FIRST_YEAR,
+    SEC_IN_HOUR,
+    SpreadsheetDate,
+    SpreadsheetDateTime,
+    SpreadsheetTime,
+    timedelta,
+)
+from ..spreadsheet_error import NUM_ERROR, VALUE_ERROR, SpreadsheetError
 from .boolean import FALSE, BooleanValue
 from .date_time_helpers import (
     _DAY_COUNT,
@@ -18,15 +27,6 @@
     date_diff360eu,
     date_diff360us,
 )
-from ..spreadsheet_datetime import (
-    EPOCH_FIRST_YEAR,
-    SEC_IN_HOUR,
-    SpreadsheetDate,
-    SpreadsheetDateTime,
-    SpreadsheetTime,
-    timedelta,
-)
-from ..spreadsheet_error import NUM_ERROR, VALUE_ERROR, SpreadsheetError
 
 __all__ = [
     "DATE",

neptyne_kernel/formulas/date_time_helpers.py

@@ -7,14 +7,14 @@
 from dateutil.parser import ParserError
 from dateutil.relativedelta import relativedelta
 
-from .helpers import Numeric, _flatten_range
 from ..spreadsheet_datetime import (
     SpreadsheetDate,
     SpreadsheetDateTime,
     excel2date,
     excel2datetime,
 )
 from ..spreadsheet_error import VALUE_ERROR, SpreadsheetError
+from .helpers import Numeric, _flatten_range
 
 BaseType = int | float | str
 DateTimeValue = BaseType | SpreadsheetDateTime

neptyne_kernel/formulas/datetime_test.py

@@ -3,6 +3,16 @@
 import pytest
 
 from ..cell_range import CellRange
+from ..spreadsheet_datetime import (
+    SpreadsheetDate,
+    SpreadsheetDateTime,
+    SpreadsheetTime,
+    datetime,
+    excel2date,
+    excel2datetime,
+    timedelta,
+)
+from ..spreadsheet_error import NUM_ERROR, VALUE_ERROR
 from .boolean import FALSE, TRUE
 from .date_time import (
     DATE,
@@ -29,16 +39,6 @@
     YEAR,
     YEARFRAC,
 )
-from ..spreadsheet_datetime import (
-    SpreadsheetDate,
-    SpreadsheetDateTime,
-    SpreadsheetTime,
-    datetime,
-    excel2date,
-    excel2datetime,
-    timedelta,
-)
-from ..spreadsheet_error import NUM_ERROR, VALUE_ERROR
 
 WORKDAY_INTL_RANGE = CellRange(
     [