Merge pull request neptyneco#3 from neptyneco/split-requirements

Split requirements

Author: DOsinga

.gitignore

@@ -6,3 +6,6 @@ venv
 build/
 dist/
 *.egg-info/
+
+.idea
+.ipynb_checkpoints

neptyne_kernel/__init__.py

@@ -0,0 +1,15 @@
+def init_notebook(api_key: str = "", api_host="https://app.neptyne.com") -> None:
+    import os
+
+    from IPython import get_ipython
+
+    from .kernel import compile_jupyter
+
+    ip = get_ipython()
+    ip.run_cell("from neptyne_kernel.kernel_init import *")
+    ip.input_transformers_cleanup.append(compile_jupyter)
+    os.environ["NEPTYNE_LOCAL_REPL"] = "1"
+    if api_key:
+        import neptyne as nt
+
+        nt.connect_kernel(api_key, api_host)

neptyne_kernel/bokeh_formatter.py

@@ -1,11 +1,14 @@
 from typing import Any
 
-from bokeh.embed import file_html
-from bokeh.plotting import figure
-from bokeh.resources import CDN
-
 
 def maybe_format_bokeh(value: Any) -> str | None:
+    try:
+        from bokeh.embed import file_html
+        from bokeh.plotting import figure
+        from bokeh.resources import CDN
+    except ImportError:
+        return None
+
     if not isinstance(value, figure):
         return None
     try:

neptyne_kernel/cell_api.py

@@ -23,7 +23,7 @@
 UNCONNECTED_MSG = " object not associated directly with a sheet"
 
 if TYPE_CHECKING:
-    from .formulas.spreadsheet_datetime import SpreadsheetDateTime
+    from .spreadsheet_datetime import SpreadsheetDateTime
 
 
 @dataclass
@@ -291,7 +291,7 @@ def xy(self) -> tuple[int, int]:
     def _get_event(self) -> CellEvent:
         from neptyne_kernel.kernel_runtime import get_user
 
-        from .formulas.spreadsheet_datetime import SpreadsheetDateTime
+        from .spreadsheet_datetime import SpreadsheetDateTime
 
         return CellEvent(self, get_user(), SpreadsheetDateTime())
 

neptyne_kernel/cell_execution_graph.py

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

neptyne_kernel/cell_range.py

@@ -26,10 +26,8 @@
     TypeVar,
 )
 
-import geopandas as gpd
 import numpy as np
 import pandas as pd
-from shapely.geometry.base import BaseGeometry
 
 from .api_ref import ApiRef, Int, IntOrSlice, shape, slice_or_int_to_range
 from .cell_address import Address, Range
@@ -48,6 +46,7 @@
     from .dash_ref import DashRef
     from .formulas.helpers import SimpleCellValue
     from .gsheets_api import GSheetRef
+    from geopandas import GeoDataFrame
 
 
 T = TypeVar("T")
@@ -626,8 +625,15 @@ def pivot_table(self, *args: Any, **kwargs: Any) -> pd.DataFrame:
 
     def to_geodataframe(
         self, header: bool = True, crs: str = "epsg:4326"
-    ) -> gpd.GeoDataFrame:
+    ) -> "GeoDataFrame":
         """@private"""
+        try:
+            import geopandas as gpd
+            from shapely.geometry.base import BaseGeometry
+        except ImportError:
+            raise ImportError(
+                "Geopandas is not installed. Please install it using 'pip install geopandas'"
+            )
         df = self.to_dataframe(header=header)
         geom_col = next(
             (
@@ -951,13 +957,13 @@ def __init__(self, init_value: "GSheetRef | CellRange", *args: Any, **kwargs: An
         if isinstance(init_value, CellRange):
             super().__init__(init_value)
         else:
-            self.gspread_ref = init_value
+            self.gsheet_ref = init_value
             super().__init__(init_value.values)
             self.two_dimensional = init_value.range.dimensions() > 1
 
     @property
     def ref(self) -> ApiRef:  # type: ignore
-        return self.gspread_ref
+        return self.gsheet_ref
 
     @property
     def range(self) -> Range:
@@ -968,9 +974,9 @@ def __iter__(self) -> Iterator:
             for row_idx, row in enumerate(self._values):
                 min_row = self.ref.range.min_row + row_idx
                 yield CellRangeGSheet(
-                    self.gspread_ref.with_range(
+                    self.gsheet_ref.with_range(
                         replace(
-                            self.gspread_ref.range, min_row=min_row, max_row=min_row
+                            self.gsheet_ref.range, min_row=min_row, max_row=min_row
                         ),
                         [*row],
                     )
@@ -983,7 +989,7 @@ def __iter__(self) -> Iterator:
                     self.range.min_row + (idx if not horizontal else 0),
                     0,
                 )
-                yield self.gspread_ref.with_value(address, val)
+                yield self.gsheet_ref.with_value(address, val)
 
     def __setitem__(
         self, key: tuple[IntOrSlice, IntOrSlice] | IntOrSlice | str, value: Any
@@ -1032,15 +1038,15 @@ def _insert_delete_row_column(
         from .gsheets_api import insert_delete_row_column
 
         return insert_delete_row_column(
-            self.gspread_ref.service,
-            self.gspread_ref.spreadsheet_id,
-            self.gspread_ref.range,
+            self.gsheet_ref.service,
+            self.gsheet_ref.spreadsheet_id,
+            self.gsheet_ref.range,
             dimension,
             transform,
             index,
             amount,
             data,
-            self.gspread_ref.sheet_prefix,
+            self.gsheet_ref.sheet_prefix,
         )