and so it begins...

.gitignore

@@ -0,0 +1,3 @@
+*.db
+.ipynb_checkpoints
+

README.md

@@ -1,13 +0,0 @@
----
-title: Fiboa
-emoji: 📊
-colorFrom: blue
-colorTo: green
-sdk: streamlit
-sdk_version: 1.37.1
-app_file: app.py
-pinned: false
-license: bsd
----
-
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference

app.py

@@ -10,10 +10,12 @@ import ibis
 from ibis import _
 geoparquet = "https://data.source.coop/fiboa/be-vlg/be_vlg.parquet"
 con = ibis.duckdb.connect("duck.db", extensions = ["spatial"])
+#con.raw_sql(f'CREATE OR REPLACE VIEW crops AS SELECT *, ST_GEOMFROMWKB(geometry) AS "geometry" FROM read_parquet("{geoparquet}")')
 crops = con.read_parquet(geoparquet, "crops").cast({"geometry": "geometry"})
 # df = crops.to_pandas()
 
-df = crops.to_pandas()
+# +
+# df = crops.to_pandas()
 
 # +
 #gdf = gpd.read_parquet("be_vlg.parquet")
@@ -24,7 +26,7 @@ st.set_page_config(
     page_title="fiboa chat tool",
     page_icon="🦜",
 )
-st.title("🚧 Early prototype 🚧")
+st.title("FiobaGPT Prototype")
 
 # +
 # from langchain.chains.sql_database.prompt import PROMPT # peek at the default
@@ -34,31 +36,32 @@ new_prompt = PromptTemplate(input_variables=['dialect', 'input', 'table_info', '
                         template=
 '''
 Given an input question, first create a syntactically correct {dialect} query to run, then look at the results of the query
-and return the answer. Never use limit for {top_k}. You can order the results by a relevant column to return the most interesting
-examples in the database. This duckdb database includes full support for spatial queries, so it will understand most PostGIS-type
-queries as well.
+and return the answer. Only limit for {top_k} when asked for "some" or "examples". 
+
+This duckdb database includes full support for spatial queries, so it will understand most PostGIS-type
+queries as well.  Remember that you must cast blob column to a geom type using ST_GeomFromWKB(geometry)
+before any spatial operations.
+
+
+If you are asked to "map" or "show on a map", then be select the "geometry" column in your query.
+If asked to show a "table", you must not include the "geometry" column from the query results.  
+
+Use the following format: return only the SQLQuery to run. DO NOT use the prefix with "SQLQuery:".  
+Do not include an explanation.  
 
-If you are asked to "map" or "show on a map", be sure to alway select the "geometry" column in your query.
-In the response, return only the SQLQuery to run.
 
 Pay attention to use only the column names that you can see in the schema description. Be careful to
 not query for columns that do not exist. Also, pay attention to which column is in which table.
 
-Use the following format:
-Question: Question here
-SQLQuery: SQL Query to run
-SQLResult: Result of the SQLQuery
-Answer: Final answer here
-
-Only use the following tables:
-{table_info}
+Tables include {table_info}. The data you should use always comes from the table called "crops".
+Only use that table, do not use the "testing" table.
 
 Question: {input}
 '''
 )
 # -
 
-llm = ChatOpenAI(temperature=0, api_key=st.secrets["OPENAI_API_KEY"])
+llm = ChatOpenAI(model="gpt-4o-mini", temperature=0, api_key=st.secrets["OPENAI_API_KEY"])
 
 # +
 # Create the SQL query chain with the custom prompt
@@ -72,28 +75,20 @@ chain = create_sql_query_chain(llm, db, prompt=new_prompt, k= 11)
 # 
 
 
+# -
 
 
-# +
-import lonboard
-
-def map_layer(gdf):
-    layer = lonboard.PolygonLayer.from_geopandas(
-        gdf,
-        get_line_width=20,  # width in default units (meters)
-        line_width_min_pixels=0.2,  # minimum width when zoomed out
-        get_fill_color=[204, 251, 254],  # light blue
-        get_line_color=[37, 36, 34],  # dark border color
-    )
-    m = lonboard.Map(layer)
-    return m
 
 
-# -
-
+# +
 import geopandas as gpd
 from ibis import _
+import re
+import leafmap.maplibregl as leafmap
+m = leafmap.Map()
+
 def as_geopandas(response):
+    response = re.sub(";$", "", response)
     sql_query = f"CREATE OR REPLACE VIEW testing AS ({response})"
     con.raw_sql(sql_query)
     gdf = con.table("testing")
@@ -101,18 +96,31 @@ def as_geopandas(response):
         gdf = (gdf
                .cast({"geometry": "geometry"})
                .mutate(geometry = _.geometry.convert("EPSG:31370", "EPSG:4326"))
-               .to_pandas())
-        gdf.set_crs(epsg=4326, inplace=True) 
-        return map_layer(gdf)
-    return gdf
+               .to_pandas()
+              ).set_crs(epsg=4326, inplace=True) 
+        return gdf
+    return gdf.to_pandas()
 
 
-# +
-#response = "SELECT * FROM crops LIMIT 100"
-#fields = as_geopandas(response)
-#fields
 # -
 
+response = "SELECT geometry, area FROM crops ORDER BY area DESC LIMIT 10;"
+as_geopandas(response)
+#if 'geometry' in gdf.columns:
+#    m.add_gdf(gdf)
+#    m
+#gdf
+
+# +
+'''
+Ask me about fiboa data! Request "a map" to get map output, or table for tabular output, e.g.
+
+- "Show a map with the 10 largest fields"
+- "Show a table of the total area by crop type"
+- "Compute the perimeters of all fields and determine which have the longest"
+
+'''
+
 example = "Which are the 10 largest fields?"
 with st.container():  
     if prompt := st.chat_input(example, key="chain"):
@@ -120,7 +128,18 @@ with st.container():
         with st.chat_message("assistant"):
             response = chain.invoke({"question": prompt})
             st.write(response)
-            result = as_geopandas(response)
-            result
+            gdf = as_geopandas(response)
+            if 'geometry' in gdf.columns:
+                m.add_gdf(gdf)
+                m.to_streamlit()
+            else:
+                st.dataframe(gdf)
 
+# +
 st.divider()
+
+'''
+Data sources: https://beta.source.coop/fiboa/be-vlg
+Software License: BSD
+
+'''

france_eurocrops_2018_fiboa.parquet

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08e11429d0bbea61d8024cfa3c2868230fd948e355161c1f2d5c144283978c92
-size 2314670497

requirements.txt

@@ -6,4 +6,4 @@ duckdb_engine
 duckdb
 altair
 ibis-framework[duckdb]
-lonboard
+leafmap[maplibre]