better prompts / questions

.gitignore

@@ -5,3 +5,4 @@
 *.pyc
 duck.db.wal
 __pycache__/
+.DS_Store

fiboa/app.py

@@ -22,10 +22,10 @@ con.read_parquet(geoparquet, "crops").cast({"geometry": "geometry"})
 #     tbl = con.read_parquet(url, code).cast({"geometry": "geometry"})
 
 st.set_page_config(
-    page_title="fiboaGPT",
+    page_title="fiboaGPT - Netherlands",
     page_icon="🦜",
 )
-st.title("fiboaGPT")
+st.title("fiboaGPT - Netherlands")
 
 # Read the instructions from 'hcat-instructions.txt'
 hcat_instructions = ""
@@ -58,11 +58,10 @@ The column "area" is in the unit hectares, you may need to convert it to other u
 There is no other column related to area information, especially not total_area or similar!
 If you need to compute the total area, do it manually, with a SUM of the area column. You should always use the 'area' column - never use a 'total_area' column.
 The column "perimeter" is in the unit meters, you may need to convert it to other units, e.g. kilometers.
-The column "collection" contains the country codes for the Baltic states:
-"ec_lt" for Latvia, "ec_lv" for Lithuania, "ec_es" for Estonia.
-Be sure to always include the collection with the right country for any query about a specific country, including it in the WHERE clause.
+You must always include the year in the WHERE clause. The column "year" contains the 3 years - 2018, 2019 and 2021. If no year is specified always use 2021.
 
-If the user asks for 'percent' of crops or fields for one of the countries you must always calculate the percentage manually, by summing up the area manually. You total number of hectares to calculate the percentage from is 1583923 for Lithuania,  1788859 for latvia and  973945 for Estonia. If they don't specify a country use 4346727. If you use one of these be sure to always include the right collection in the where clause.
+If the user asks for 'percent' of crops or fields for one of the countries you must always calculate the percentage manually, by summing up the area manually. You total number of hectares to calculate the percentage from is 1559575 for 2018, 1604600 for 2019 and 1595051 for 2021. 
+If the users asks for the percent of crops excluding silo maize & pasture use 505624 for the total area.
 There is no 'percent' column, so when you calculate the percentage manually you must sum the crop area and then use the total area of the country.
 
 If the user asks for the 'top 10' (or other number) of a crop then sum by area and then sort by that sum.
@@ -75,7 +74,9 @@ You should use CTE (computed_quantiles) to do this compute the row_number and qu
   Be sure to  avoid row_number in GROUP BY: The intermediate result in the WITH clause computes quantile so the outer query only groups by quantile. A sample query is 'WITH computed_quantiles AS SELECT area, CEIL(ROW_NUMBER() OVER (ORDER BY area)::FLOAT / (COUNT(*) OVER () / 5)) AS quantile FROM testing) SELECT quantile, AVG(area) AS average_field_area FROM computed_quantiles GROUP BY quantile ORDER BY quantile;
   Adjust the 5 of 'count(*) over () / 5' to 10 for decile or for other numbers the user requests.
 Generally you should use a Common Table Expression (CTE) or subquery to compute the things like ranks first and then filter the results in the main query as  DuckDB does not allow window functions (like ROW_NUMBER()) directly inside a WHERE clause
-  
+
+This dataset includes data from the Netherlands only, so if the user asks for the netherlands just ignore it.
+
 '''
 + hcat_instructions +  # Concatenate the instructions here
 '''
@@ -91,18 +92,16 @@ db = SQLDatabase.from_uri("duckdb:///duck.db", view_support=True)
 chain = create_sql_query_chain(llm, db, prompt=new_prompt, k=100)
 
 '''
-Ask me about fiboa data (here: all baltic states)!
-Request "a map" to get map output, or table for tabular output, e.g.
-
-- Show a map with the 10 largest sugar beet fields
-- Show a map with the largest field in Estonia
-- Show a table of the top ten crops
-- What are the top ten crops that have a field size over 10 hectares?
-- Compute the total area of all fields in km² and compute the percentage the total area of the baltic states (175015 km²)
+Ask me about fiboa data for the Netherlands with crops from 2018, 2019 and 2021.
+- what is the number of tulip fields by year?
+- what are the quantiles of average field size?
+- What is the total area of potatoes by year?
+- What crops have the largest average field sizes?
+- What is the average field size of strawberry fields by year?
 
 '''
 
-example = "Which are the 10 largest fields?"
+example = "What are the top ten flowers in the netherlands?"
 with st.container():  
     if prompt := st.chat_input(example, key="chain"):
         st.chat_message("user").write(prompt)