oocana 0.16.6__py3-none-any.whl → 0.16.7__py3-none-any.whl

oocana/context.py

@@ -265,6 +265,11 @@ class Context:
         )
     
     def __dataframe(self, payload: PreviewPayload) -> PreviewPayload:
+        def not_default_index(df: DataFrame) -> bool:
+            index = df.index.tolist()
+            default_index = list(range(len(df)))
+            return index != default_index
+
         if isinstance(payload, DataFrame):
             payload = { "type": "table", "data": payload }
 
@@ -276,12 +281,28 @@ class Context:
                     data = df.to_dict(orient='split')
                     columns = data.get("columns", [])
                     rows = data.get("data", [])
+                    if not_default_index(df):
+                        index = df.index.tolist()
+                        rows = [[index[i], *rows[i]] for i in range(len(rows))]
+                        columns = ["", *columns]
+
                 elif isinstance(df, PartialDataFrame):
-                    data_columns = loads(df.head(5).to_json(orient='split'))
-                    columns = data_columns.get("columns", [])
-                    rows_head = data_columns.get("data", [])
-                    data_tail = loads(df.tail(5).to_json(orient='split'))
-                    rows_tail = data_tail.get("data", [])
+                    need_add_index = not_default_index(df)
+                    head_data = df.head(5).to_dict(orient='split')
+                    columns = head_data.get("columns", [])
+
+                    rows_head = head_data.get("data", [])
+                    if need_add_index:
+                        columns = ["", *columns]
+                        head_index = head_data.get("index", [])
+                        rows_head = [[head_index[i], *rows_head[i]] for i in range(len(rows_head))]
+                    
+                    tail_data = df.tail(5).to_dict(orient='split')
+                    rows_tail = tail_data.get("data", [])
+                    if need_add_index:
+                        tail_index = tail_data.get("index", [])
+                        rows_tail = [[tail_index[i], *rows_tail[i]] for i in range(len(rows_tail))]
+
                     rows_dots = [["..."] * len(columns)]
                     rows = rows_head + rows_dots + rows_tail
                 else:

oocana/preview.py

@@ -3,20 +3,26 @@ from typing import Any, TypedDict, List, Literal, TypeAlias, Union, Protocol, ru
 
 __all__ = ["PreviewPayload", "TablePreviewPayload", "TextPreviewPayload", "JSONPreviewPayload", "ImagePreviewPayload", "MediaPreviewPayload", "PandasPreviewPayload", "DefaultPreviewPayload"]
 
+@runtime_checkable
+class DataFrameIndex(Protocol):
+    def tolist(self) -> Any:
+        ...
+
 # this class is for pandas.DataFrame
 @runtime_checkable
 class DataFrame(Protocol):
 
-    def __dataframe__(self, *args: Any, **kwargs: Any) -> Any:
+    def __len__(self) -> int:
         ...
 
-    def to_dict(self, *args: Any, **kwargs: Any) -> Any:
+    def __dataframe__(self, *args: Any, **kwargs: Any) -> Any:
         ...
 
-@runtime_checkable
-class JsonAble(Protocol):
+    @property
+    def index(self) -> DataFrameIndex:
+        ...
 
-    def to_json(self, *args: Any, **kwargs: Any) -> Any:
+    def to_dict(self, orient: Literal["split"]) -> Any:
         ...
 
 @runtime_checkable
@@ -27,11 +33,11 @@ class ShapeDataFrame(DataFrame, Protocol):
         ...
 
 @runtime_checkable
-class PartialDataFrame(Protocol):
-    def head(self, *args: Any, **kwargs: Any) -> JsonAble:
+class PartialDataFrame(DataFrame, Protocol):
+    def head(self, count: int) -> DataFrame:
         ...
     
-    def tail(self, *args: Any, **kwargs: Any) -> JsonAble:
+    def tail(self, count: int) -> DataFrame:
         ...
 
 class TablePreviewData(TypedDict):

{oocana-0.16.6.dist-info → oocana-0.16.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oocana
-Version: 0.16.6
+Version: 0.16.7
 Summary: python implement of oocana to give a context for oocana block
 License: MIT
 Requires-Python: >=3.9

{oocana-0.16.6.dist-info → oocana-0.16.7.dist-info}/RECORD

@@ -1,13 +1,13 @@
-oocana-0.16.6.dist-info/METADATA,sha256=KveWTqPJWZn9CclgQxpwJ5bJr5AhXLWWwbksOeZKvS4,221
-oocana-0.16.6.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-oocana-0.16.6.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+oocana-0.16.7.dist-info/METADATA,sha256=0_TpqDCVlfykzajr-HwTAb9844PjjmtNY9SiL93krig,221
+oocana-0.16.7.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+oocana-0.16.7.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 oocana/__init__.py,sha256=zMrQ1asZoRE91-BShf1v2ibdThaMc07YtZt5iNbbxsg,281
-oocana/context.py,sha256=a8sap8qfXWGlu3JrUgj-rgQ5AdKp8yPuiF5IZCLZQQ0,13542
+oocana/context.py,sha256=LyavX-bgqWGmQkLmE-_QNCd3aHWesShEJJToi4fc32U,14466
 oocana/data.py,sha256=0KpJyckz_X5JbrncBRFbOaU00CxcDx2UYHk6xuH1Poc,2890
 oocana/handle_data.py,sha256=p0iEvdsVV3BqcelM8rvq0a_VPI52SeahaGCszfhZ0TI,1927
 oocana/mainframe.py,sha256=Jixk9PjvJh7PnYwPGqOR5viwcOHWfaPhEiQFNHxHCxw,5219
-oocana/preview.py,sha256=sAKcVUFmOMvrzYLrvqAxd26SppSvK1qJqRTHdAS-KDc,1959
+oocana/preview.py,sha256=xTyVtf5mKMVlXRwz3JSB-n4e_6dlxalkE341nUDwtD4,2027
 oocana/schema.py,sha256=8LwMaW4eXa3EmKxR4kzyTOpZiClMRMMsMA6f9CXodW4,4332
 oocana/service.py,sha256=dPCcScQfMBlEjIodFnKU17-HlbBzrQbQK6CNRw7SmOE,2442
 oocana/throtter.py,sha256=xTldm2OZ5uYPiyC6Aatug4FJAoMylPjtXftxHvSr_50,1104
-oocana-0.16.6.dist-info/RECORD,,
+oocana-0.16.7.dist-info/RECORD,,