Fangrui Liu commited on
Commit
be69bb4
·
1 Parent(s): eed1a5c

upgrade to latest myscale release

Browse files
Files changed (2) hide show
  1. app.py +8 -6
  2. requirements.txt +1 -1
app.py CHANGED
@@ -74,16 +74,18 @@ def query(xq, top_k=10):
74
  print("Excluded:", exclude_list)
75
  # Using PREWHERE allows you to do column filter before vector search
76
  xc = st.session_state.index.query(f"SELECT id, url, vector,\
77
- distance('topK={top_k}')(vector, {xq_s}) AS dist\
78
  FROM {db_name_map[st.session_state.db_name_ref](feat_name_map[st.session_state.feat_name])} \
79
- PREWHERE id NOT IN ({exclude_list})").named_results()
80
  else:
81
  xc = st.session_state.index.query(f"SELECT id, url, vector,\
82
- distance('topK={top_k}')(vector, {xq_s}) AS dist\
83
- FROM {db_name_map[st.session_state.db_name_ref](feat_name_map[st.session_state.feat_name])}").named_results()
 
84
  real_xc = st.session_state.index.query(f"SELECT id, url, vector,\
85
- distance('topK={top_k}')(vector, {xq_s}) AS dist\
86
- FROM {db_name_map[st.session_state.db_name_ref](feat_name_map[st.session_state.feat_name])}").named_results()
 
87
  top_k = [{k: v for k, v in r.items()} for r in real_xc]
88
  xc = [xi for xi in xc if xi['id'] not in st.session_state.meta or
89
  st.session_state.meta[xi['id']] < 1]
 
74
  print("Excluded:", exclude_list)
75
  # Using PREWHERE allows you to do column filter before vector search
76
  xc = st.session_state.index.query(f"SELECT id, url, vector,\
77
+ distance(vector, {xq_s}) AS dist\
78
  FROM {db_name_map[st.session_state.db_name_ref](feat_name_map[st.session_state.feat_name])} \
79
+ WHERE id NOT IN ({exclude_list}) ORDER BY dist LIMIT {top_k}").named_results()
80
  else:
81
  xc = st.session_state.index.query(f"SELECT id, url, vector,\
82
+ distance(vector, {xq_s}) AS dist\
83
+ FROM {db_name_map[st.session_state.db_name_ref](feat_name_map[st.session_state.feat_name])} \
84
+ ORDER BY dist LIMIT {top_k}").named_results()
85
  real_xc = st.session_state.index.query(f"SELECT id, url, vector,\
86
+ distance(vector, {xq_s}) AS dist \
87
+ FROM {db_name_map[st.session_state.db_name_ref](feat_name_map[st.session_state.feat_name])} \
88
+ ORDER BY dist LIMIT {top_k}").named_results()
89
  top_k = [{k: v for k, v in r.items()} for r in real_xc]
90
  xc = [xi for xi in xc if xi['id'] not in st.session_state.meta or
91
  st.session_state.meta[xi['id']] < 1]
requirements.txt CHANGED
@@ -2,7 +2,7 @@ transformers
2
  tqdm
3
  parse
4
  clickhouse-connect
5
- streamlit
6
  multilingual-clip
7
  numpy
8
  torch
 
2
  tqdm
3
  parse
4
  clickhouse-connect
5
+ streamlit==1.10.0
6
  multilingual-clip
7
  numpy
8
  torch