upgrade to latest myscale saas

query_model.py

@@ -19,10 +19,10 @@ def topk_obj_query(client, xq, IMG_DB_NAME, OBJ_DB_NAME,
             FROM {OBJ_DB_NAME}
             JOIN {IMG_DB_NAME}
             ON {IMG_DB_NAME}.img_id = {OBJ_DB_NAME}.img_id
-            PREWHERE obj_id IN (
+            WHERE obj_id IN (
                 SELECT obj_id FROM (
-                    SELECT obj_id, distance('topK={topk}', 'nprobe=32')(prelogit, {_xq}) AS dist FROM {OBJ_DB_NAME}
-                    ORDER BY dist DESC
+                    SELECT obj_id, distance(prelogit, {_xq}) AS dist FROM {OBJ_DB_NAME}
+                    ORDER BY dist DESC LIMIT {topk}
                 ) {_cond} LIMIT 10
             )
             """)
@@ -88,11 +88,11 @@ def simple_query(client, xq, IMG_DB_NAME, OBJ_DB_NAME, thresh=0.08, topk=10):
         subq_str.append(
             f"""
             SELECT {OBJ_DB_NAME}.img_id AS img_id, img_url, img_w, img_h, prelogit,
-                obj_id, box_cx, box_cy, box_w, box_h, {_l} AS l,  distance('topK={topk}', 'nprobe=32')(prelogit, {_xq}) AS dist
+                obj_id, box_cx, box_cy, box_w, box_h, {_l} AS l,  distance(prelogit, {_xq}) AS dist
             FROM {OBJ_DB_NAME}
             JOIN {IMG_DB_NAME} 
             ON {IMG_DB_NAME}.img_id = {OBJ_DB_NAME}.img_id
-            {_thresh} LIMIT 10
+            {_thresh} LIMIT {topk}
             """)
     subq_str = " UNION ALL ".join(subq_str)
     q_str = f"""