Merge pull request #24 from stanford-oval/wip/swap-opening-hours

Wip/swap opening hours

setup.py

@@ -2,7 +2,7 @@
 
 # Package metadata
 name = "suql"
-version = "1.1.7a3"
+version = "1.1.7a4"
 description = "Structured and Unstructured Query Language (SUQL) Python API"
 author = "Shicheng Liu"
 author_email = "shicheng@cs.stanford.edu"

src/suql/agent.py

@@ -370,7 +370,7 @@ def convert_opening_hours_query(opening_hours_query):
             )
             return response
 
-        pattern = r"'([^']*)'\s*=\s*ANY\(CAST opening_hours AS ARRAY\)"
+        pattern = r"'([^']*)'\s*=\s*opening_hours"
 
         def replacer(match):
             opening_hours_query = match.group(0).split(" = ")[0]

src/suql/prompts/parser_suql.prompt

@@ -16,6 +16,7 @@ CREATE TABLE restaurants (
 
 Do not generate fields beyond the given fields. The `answer` function can be used on FREE_TEXT fields. 
 Use `location = 'some place'` to search restaurants that are geographically close, don't use other operations on the location field.
+Use `'some string' = opening_hours` to search restaurants open at certain time, don't use other operations on the opening_hours field.
 
 {# Basic example #}
 User: Where is Burguer King?
@@ -67,11 +68,11 @@ Target: SELECT *, answer(popular_dishes, 'does this restaurant serve salmon?'),
 --
 {# How to search by opening hours #}
 User: What restaurants are open after 2pm on Monday?
-Target: SELECT * FROM restaurants WHERE 'after 2pm on Monday' = ANY(CAST opening_hours AS ARRAY);
+Target: SELECT * FROM restaurants WHERE 'after 2pm on Monday' = opening_hours;
 __
 {# How to search by opening hours - segments #}
 User: restaurants open after 3am and before 7am on Monday?
-Target: SELECT * FROM restaurants WHERE 'after 3am and before 7am on Monday' = ANY(CAST opening_hours AS ARRAY);
+Target: SELECT * FROM restaurants WHERE 'after 3am and before 7am on Monday' = opening_hours;
 __
 
 {% for dlg_turn in dlg[:-1] %}