Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3268783cbe
|
||
|
|
a48182a4e3
|
||
|
|
205d19fb72
|
@@ -38,7 +38,7 @@ alias RawData = Frame[
|
||||
|
||||
alias Data = Frame[
|
||||
station_id: StationID,
|
||||
timestamp: object,
|
||||
timestamp: Any,
|
||||
temperature: Temperature,
|
||||
pressure: Pressure,
|
||||
humidity: Humidity,
|
||||
@@ -46,7 +46,7 @@ alias Data = Frame[
|
||||
|
||||
alias DataWithHI = Frame[
|
||||
station_id: StationID,
|
||||
timestamp: object,
|
||||
timestamp: Any,
|
||||
temperature: Temperature,
|
||||
pressure: Pressure,
|
||||
humidity: Humidity,
|
||||
@@ -54,7 +54,7 @@ alias DataWithHI = Frame[
|
||||
]
|
||||
|
||||
alias DailyAverages = Frame[
|
||||
timestamp: object,
|
||||
timestamp: Any,
|
||||
temperature: Mean[Temperature],
|
||||
pressure: Mean[Pressure],
|
||||
humidity: Mean[Humidity],
|
||||
|
||||
@@ -47,7 +47,7 @@ def daily_avg(df: DataWithHI):
|
||||
DailyAverages,
|
||||
df.groupby(
|
||||
by=[
|
||||
df["station_id"],
|
||||
"station_id",
|
||||
df["timestamp"].dt.day.rename("day"),
|
||||
],
|
||||
)
|
||||
|
||||
@@ -598,8 +598,48 @@ class FrameMethodRegistry(MethodRegistry[Call]):
|
||||
)
|
||||
return result.result
|
||||
|
||||
def _filter_groupby_columns(
|
||||
self, frame: DataFrameType, by: TypedExpr
|
||||
) -> DataFrameType:
|
||||
by_columns: list[str] = []
|
||||
|
||||
by_expr, _ = by
|
||||
|
||||
if not isinstance(by_expr, p.ListExpr):
|
||||
return frame
|
||||
|
||||
for item in by_expr.items:
|
||||
match item:
|
||||
case p.LiteralExpr(value=str() as name):
|
||||
by_columns.append(name)
|
||||
|
||||
new_columns: list[DataFrameType.Column] = []
|
||||
for column in frame.columns:
|
||||
if column.name in by_columns:
|
||||
continue
|
||||
new_columns.append(
|
||||
DataFrameType.Column(
|
||||
index=len(new_columns),
|
||||
name=column.name,
|
||||
type=column.type,
|
||||
)
|
||||
)
|
||||
|
||||
return DataFrameType(columns=new_columns)
|
||||
|
||||
@method()
|
||||
def groupby(self, call: Call) -> Type:
|
||||
new_frame: DataFrameType = call.frame
|
||||
|
||||
by: Optional[TypedExpr] = None
|
||||
if len(call.positional) != 0:
|
||||
by = call.positional[0]
|
||||
elif "by" in call.keywords:
|
||||
by = call.keywords["by"]
|
||||
|
||||
if by is not None:
|
||||
new_frame = self._filter_groupby_columns(call.frame, by)
|
||||
|
||||
bool_: Type = self.types.get_type("bool")
|
||||
function: Function = Function(
|
||||
params=ParamSpec(
|
||||
@@ -629,7 +669,7 @@ class FrameMethodRegistry(MethodRegistry[Call]):
|
||||
)
|
||||
],
|
||||
),
|
||||
returns=FrameGroupBy(frame=call.frame),
|
||||
returns=FrameGroupBy(frame=new_frame),
|
||||
)
|
||||
|
||||
result: CallResult = self.dispatcher.get_result(
|
||||
|
||||
@@ -257,6 +257,9 @@ class PythonTyper(
|
||||
"""
|
||||
unfolded: Type = unfold_type(obj[1])
|
||||
match unfolded:
|
||||
case TopType() | UnknownType():
|
||||
return UnknownType()
|
||||
|
||||
case DataFrameType():
|
||||
return self.frame_mgr.call(
|
||||
method=method_name,
|
||||
|
||||
Reference in New Issue
Block a user