Michelangiolo commited on
Commit
39a7cf9
1 Parent(s): a2175e5

filter bug solved

Browse files
Files changed (3) hide show
  1. _test.ipynb +17 -55
  2. a.ipynb +0 -0
  3. app.py +7 -7
_test.ipynb CHANGED
@@ -2,7 +2,7 @@
2
  "cells": [
3
  {
4
  "cell_type": "code",
5
- "execution_count": null,
6
  "metadata": {},
7
  "outputs": [],
8
  "source": [
@@ -46,53 +46,8 @@
46
  " distances, indices = nbrs.kneighbors([product]) #input the vector of the reference object\n",
47
  "\n",
48
  " #print out the description of every recommended product\n",
49
- " return df.iloc[list(indices)[0]][['name', 'raised', 'target', 'size', 'stage', 'country', 'source', 'description', 'tags']]"
50
- ]
51
- },
52
- {
53
- "cell_type": "code",
54
- "execution_count": 47,
55
- "metadata": {},
56
- "outputs": [
57
- {
58
- "name": "stderr",
59
- "output_type": "stream",
60
- "text": [
61
- "c:\\Users\\ardit\\AppData\\Local\\Programs\\Python\\Python39\\lib\\site-packages\\gradio\\deprecation.py:43: UserWarning: You have unused kwarg parameters in Radio, please remove them: {'multiselect': False}\n",
62
- " warnings.warn(\n"
63
- ]
64
- },
65
- {
66
- "name": "stdout",
67
- "output_type": "stream",
68
- "text": [
69
- "Running on local URL: http://127.0.0.1:7887\n",
70
- "\n",
71
- "To create a public link, set `share=True` in `launch()`.\n"
72
- ]
73
- },
74
- {
75
- "data": {
76
- "text/html": [
77
- "<div><iframe src=\"http://127.0.0.1:7887/\" width=\"100%\" height=\"500\" allow=\"autoplay; camera; microphone; clipboard-read; clipboard-write;\" frameborder=\"0\" allowfullscreen></iframe></div>"
78
- ],
79
- "text/plain": [
80
- "<IPython.core.display.HTML object>"
81
- ]
82
- },
83
- "metadata": {},
84
- "output_type": "display_data"
85
- },
86
- {
87
- "data": {
88
- "text/plain": []
89
- },
90
- "execution_count": 47,
91
- "metadata": {},
92
- "output_type": "execute_result"
93
- }
94
- ],
95
- "source": [
96
  "def filter_df(df, column_name, filter_type, filter_value, minimum_acceptable_size=0):\n",
97
  " if filter_type == '==':\n",
98
  " df_filtered = df[df[column_name]==filter_value]\n",
@@ -106,8 +61,15 @@
106
  " if df_filtered.size >= minimum_acceptable_size:\n",
107
  " return df_filtered\n",
108
  " else:\n",
109
- " return df\n",
110
- "\n",
 
 
 
 
 
 
 
111
  "#the first module becomes text1, the second module file1\n",
112
  "def greet(size, target, stage, query): \n",
113
  " def raised_zero(x):\n",
@@ -118,20 +80,20 @@
118
  " df_knn = search(df, query)\n",
119
  " df_knn['raised'] = df_knn['raised'].apply(lambda x : raised_zero(x))\n",
120
  "\n",
121
- " df_size = filter_df(df_knn, 'size', '==', size, 1000)\n",
122
- " df_target = filter_df(df_size, 'target', 'contains', target, 20)\n",
123
- "\n",
124
  " if stage != 'ALL':\n",
125
- " df_stage = filter_df(df_target, 'stage', '==', stage.lower(), 10)\n",
126
  " else:\n",
127
  " #we bypass the filter\n",
128
  " df_stage = df_target\n",
 
 
129
  " \n",
130
  " # display(df_stage)\n",
131
  " # df_raised = df_target[(df_target['raised'] >= raised) | (df_target['raised'] == 0)]\n",
132
  "\n",
133
  " #we live the sorting for last\n",
134
- " return df_stage[0:100].sort_values('raised', ascending=False)\n",
135
  "\n",
136
  "with gr.Blocks(theme=gr.themes.Soft(primary_hue='amber', secondary_hue='gray', neutral_hue='amber')) as demo:\n",
137
  " gr.Markdown(\n",
 
2
  "cells": [
3
  {
4
  "cell_type": "code",
5
+ "execution_count": 49,
6
  "metadata": {},
7
  "outputs": [],
8
  "source": [
 
46
  " distances, indices = nbrs.kneighbors([product]) #input the vector of the reference object\n",
47
  "\n",
48
  " #print out the description of every recommended product\n",
49
+ " return df.iloc[list(indices)[0]][['name', 'raised', 'target', 'size', 'stage', 'country', 'source', 'description', 'tags']]\n",
50
+ "\n",
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
51
  "def filter_df(df, column_name, filter_type, filter_value, minimum_acceptable_size=0):\n",
52
  " if filter_type == '==':\n",
53
  " df_filtered = df[df[column_name]==filter_value]\n",
 
61
  " if df_filtered.size >= minimum_acceptable_size:\n",
62
  " return df_filtered\n",
63
  " else:\n",
64
+ " return df"
65
+ ]
66
+ },
67
+ {
68
+ "cell_type": "code",
69
+ "execution_count": null,
70
+ "metadata": {},
71
+ "outputs": [],
72
+ "source": [
73
  "#the first module becomes text1, the second module file1\n",
74
  "def greet(size, target, stage, query): \n",
75
  " def raised_zero(x):\n",
 
80
  " df_knn = search(df, query)\n",
81
  " df_knn['raised'] = df_knn['raised'].apply(lambda x : raised_zero(x))\n",
82
  "\n",
83
+ " df_target = filter_df(df_knn, 'target', 'contains', target, 500)\n",
 
 
84
  " if stage != 'ALL':\n",
85
+ " df_stage = filter_df(df_target, 'stage', '==', stage.lower(), 40)\n",
86
  " else:\n",
87
  " #we bypass the filter\n",
88
  " df_stage = df_target\n",
89
+ "\n",
90
+ " df_size = filter_df(df_stage, 'size', '==', size, 20)\n",
91
  " \n",
92
  " # display(df_stage)\n",
93
  " # df_raised = df_target[(df_target['raised'] >= raised) | (df_target['raised'] == 0)]\n",
94
  "\n",
95
  " #we live the sorting for last\n",
96
+ " return df_size[0:100] #.sort_values('raised', ascending=False)\n",
97
  "\n",
98
  "with gr.Blocks(theme=gr.themes.Soft(primary_hue='amber', secondary_hue='gray', neutral_hue='amber')) as demo:\n",
99
  " gr.Markdown(\n",
a.ipynb ADDED
File without changes
app.py CHANGED
@@ -1,6 +1,6 @@
1
  import os
2
- os.system('pip install openpyxl')
3
- os.system('pip install sentence-transformers')
4
  import pandas as pd
5
  import gradio as gr
6
  from sentence_transformers import SentenceTransformer
@@ -65,20 +65,20 @@ def greet(size, target, stage, query):
65
  df_knn = search(df, query)
66
  df_knn['raised'] = df_knn['raised'].apply(lambda x : raised_zero(x))
67
 
68
- df_size = filter_df(df_knn, 'size', '==', size, 1000)
69
- df_target = filter_df(df_size, 'target', 'contains', target, 20)
70
-
71
  if stage != 'ALL':
72
- df_stage = filter_df(df_target, 'stage', '==', stage.lower(), 10)
73
  else:
74
  #we bypass the filter
75
  df_stage = df_target
 
 
76
 
77
  # display(df_stage)
78
  # df_raised = df_target[(df_target['raised'] >= raised) | (df_target['raised'] == 0)]
79
 
80
  #we live the sorting for last
81
- return df_stage[0:100] #.sort_values('raised', ascending=False)
82
 
83
  with gr.Blocks(theme=gr.themes.Soft(primary_hue='amber', secondary_hue='gray', neutral_hue='amber')) as demo:
84
  gr.Markdown(
 
1
  import os
2
+ # os.system('pip install openpyxl')
3
+ # os.system('pip install sentence-transformers')
4
  import pandas as pd
5
  import gradio as gr
6
  from sentence_transformers import SentenceTransformer
 
65
  df_knn = search(df, query)
66
  df_knn['raised'] = df_knn['raised'].apply(lambda x : raised_zero(x))
67
 
68
+ df_target = filter_df(df_knn, 'target', 'contains', target, 5000)
 
 
69
  if stage != 'ALL':
70
+ df_stage = filter_df(df_target, 'stage', '==', stage.lower(), 40)
71
  else:
72
  #we bypass the filter
73
  df_stage = df_target
74
+
75
+ df_size = filter_df(df_stage, 'size', '==', size, 0)
76
 
77
  # display(df_stage)
78
  # df_raised = df_target[(df_target['raised'] >= raised) | (df_target['raised'] == 0)]
79
 
80
  #we live the sorting for last
81
+ return df_size[0:100] #.sort_values('raised', ascending=False)
82
 
83
  with gr.Blocks(theme=gr.themes.Soft(primary_hue='amber', secondary_hue='gray', neutral_hue='amber')) as demo:
84
  gr.Markdown(