Update app.py
Browse files
app.py
CHANGED
|
@@ -45,22 +45,21 @@ class DataList:
|
|
| 45 |
|
| 46 |
def render(self, search_query: str,
|
| 47 |
case_sensitive: bool,
|
| 48 |
-
filter_names: list[str]
|
| 49 |
-
|
| 50 |
df = self.table
|
| 51 |
if search_query:
|
| 52 |
if case_sensitive:
|
| 53 |
df = df[df.name.str.contains(search_query)]
|
| 54 |
else:
|
| 55 |
df = df[df.name_lowercase.str.contains(search_query.lower())]
|
| 56 |
-
df = self.filter_table(df, filter_names
|
| 57 |
result = self.to_html(df, self.table_header)
|
| 58 |
return result
|
| 59 |
|
| 60 |
@staticmethod
|
| 61 |
-
def filter_table(df: pd.DataFrame, filter_names: list[str]
|
| 62 |
df = df.loc[df.Type.isin(set(filter_names))]
|
| 63 |
-
df = df.loc[df.Tags.isin(set(data_types))]
|
| 64 |
return df
|
| 65 |
|
| 66 |
@staticmethod
|
|
|
|
| 45 |
|
| 46 |
def render(self, search_query: str,
|
| 47 |
case_sensitive: bool,
|
| 48 |
+
filter_names: list[str]
|
| 49 |
+
) -> tuple[int, str]:
|
| 50 |
df = self.table
|
| 51 |
if search_query:
|
| 52 |
if case_sensitive:
|
| 53 |
df = df[df.name.str.contains(search_query)]
|
| 54 |
else:
|
| 55 |
df = df[df.name_lowercase.str.contains(search_query.lower())]
|
| 56 |
+
df = self.filter_table(df, filter_names)
|
| 57 |
result = self.to_html(df, self.table_header)
|
| 58 |
return result
|
| 59 |
|
| 60 |
@staticmethod
|
| 61 |
+
def filter_table(df: pd.DataFrame, filter_names: list[str]) -> pd.DataFrame:
|
| 62 |
df = df.loc[df.Type.isin(set(filter_names))]
|
|
|
|
| 63 |
return df
|
| 64 |
|
| 65 |
@staticmethod
|