rhea2809 commited on
Commit
313c9fe
·
verified ·
1 Parent(s): 4b5ceaf

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +19 -9
app.py CHANGED
@@ -57,18 +57,28 @@ class DataList:
57
  df = self.table
58
  if search_query:
59
  df = df[df.name_lowercase.str.contains(search_query.lower())]
60
- df = self.filter_table(df, filter_names,filter_names2,filter_names3)
61
- result = self.to_html(df, self.table_header)
 
 
62
  return result
63
 
64
  @staticmethod
65
- def filter_table(df: pd.DataFrame, filter_names: list[str], filter_names2: list[str], filter_names3: list[str]) -> pd.DataFrame:
66
- df1 = df.loc[df.Module.isin(set(filter_names))]
67
- df1['Type'] = df1['Type'].fillna("").astype(str);
68
- df2= df1[df1.Type.str.contains('|'.join(filter_names2),case=False, regex=True)]
69
- df2['Hashtags'] = df2['Hashtags'].fillna("").astype(str);
70
- df3= df2[df2.Hashtags.str.contains('|'.join(map(re.escape, filter_names3)),case=False, regex=True)]
71
- return df3
 
 
 
 
 
 
 
 
72
 
73
  @staticmethod
74
  def to_html(df: pd.DataFrame, table_header: str) -> str:
 
57
  df = self.table
58
  if search_query:
59
  df = df[df.name_lowercase.str.contains(search_query.lower())]
60
+ df1 = self.filter_table1(df, filter_names)
61
+ df2 = self.filter_table2(df1,filter_names2)
62
+ df3 = self.filter_table3(df2,filter_names3)
63
+ result = self.to_html(df3, self.table_header)
64
  return result
65
 
66
  @staticmethod
67
+ def filter_table1(df: pd.DataFrame, filter_names: list[str]) -> pd.DataFrame:
68
+ df = df.loc[df.Module.isin(set(filter_names))]
69
+ return df
70
+
71
+ @staticmethod
72
+ def filter_table2(df: pd.DataFrame,filter_names2: list[str]) -> pd.DataFrame:
73
+ df['Type'] = df['Type'].fillna("").astype(str);
74
+ df= df[df.Type.str.contains('|'.join(filter_names2),case=False, regex=True)]
75
+ return df
76
+
77
+ @staticmethod
78
+ def filter_table3(df: pd.DataFrame,filter_names3: list[str]) -> pd.DataFrame:
79
+ df['Hashtags'] = df['Hashtags'].fillna("").astype(str);
80
+ df= df[df.Hashtags.str.contains('|'.join(map(re.escape, filter_names3)),case=False, regex=True)]
81
+ return df
82
 
83
  @staticmethod
84
  def to_html(df: pd.DataFrame, table_header: str) -> str: