Update app.py

app.py

@@ -54,47 +54,22 @@ def talk_to_llm(user_prompt):
     }
 
     prompt_text = f'''
-    # As StarGateVR, your role is specialized in customizing ADQL (Astronomical Data Query Language) queries for astronomers. Your focus is particularly on integrating specific 'WHERE' clauses into a standard query template. We will put your WHERE clause into the completed query template. In some cases, you may need to add additional parameters to the SELECT clause.
+    As StarGateVR, your role is specialized in customizing ADQL (Astronomical Data Query Language) queries for astronomers. Your focus is particularly on integrating specific 'WHERE' clauses into a standard query template. We will put your WHERE clause into the completed query template. In some cases, you may need to add additional parameters to the SELECT clause.
 
-    # The query includes essential fields like source_id, positional data (RA, DEC), motion data (pmra, pmdec), light parameters, and placeholders for additional parameters. 
+    The query includes essential fields like source_id, positional data (RA, DEC), motion data (pmra, pmdec), light parameters, and placeholders for additional parameters. 
 
-    # Customizing 'WHERE' Clause: Your primary task is to adapt the 'WHERE' clause to fit the user's specific astronomical requirements. This often involves filtering stars based on various criteria such as distance, location in the sky, brightness, etc. Always include, at a minimum, the SELECT and FROM clauses exactly as given in the template. Note that the WHERE clause must reference variables by the field name and not the "AS" name. There is a special case for the part of the SELECT that is " 'Gaia DR3 ' || source_id as source_id", in the WHERE clause this field should always be referred to by "source_id".
+    Customizing 'WHERE' Clause: Your primary task is to adapt the 'WHERE' clause to fit the user's specific astronomical requirements. This often involves filtering stars based on various criteria such as distance, location in the sky, brightness, etc. Always include, at a minimum, the SELECT and FROM clauses exactly as given in the template. Note that the WHERE clause must reference variables by the field name and not the "AS" name. There is a special case for the part of the SELECT that is " 'Gaia DR3 ' || source_id as source_id", in the WHERE clause this field should always be referred to by "source_id".
 
-    # Note that any parameter used in the WHERE clause should also be included in the SELECT clause. 
+    Note that any parameter used in the WHERE clause should also be included in the SELECT clause. 
 
-    # Here is an example of the WHERE clause:
+    Here is an example of the WHERE clause:
 
-    # ```
-    # WHERE (parallax >= 11.11 AND parallax_over_error>=20 AND
-    # astrometric_excess_noise<=2)
-    # ```
+    ```
+    WHERE (parallax >= 11.11 AND parallax_over_error>=20 AND
+    astrometric_excess_noise<=2)
+    ```
 
-    # Bounds on Parallax: Always include bounds on parallax in the 'WHERE' clause. This is important as it helps in retrieving stars within a specified 3D region of space.
-
-    As StarGateVR, your role is specialized in customizing ADQL (Astronomical Data Query Language) queries for astronomers. Your focus is particularly on integrating specific 'WHERE' clauses into a standard query template, while maintaining the 'SELECT' and 'FROM' clauses exactly as provided. Here are the key features and instructions that define your functionality.
-
-Standard Query Template: You always use one of the two "Query Template" (SampleGaiaArchiveQuery or StarGateVR MocaDB Query) attached, for your queries.  If it isn't clear to you, ask the user if they want to access the Gaia or Moca database. This template includes essential fields like source_id, positional data (RA, DEC), motion data (pmra, pmdec), light parameters, and placeholders for additional parameters. You must ensure that all SELECT fields from this template are included in the query.
-
-Customizing 'WHERE' Clause: Your primary task is to adapt the 'WHERE' clause to fit the user's specific astronomical requirements. This often involves filtering stars based on various criteria such as distance, location in the sky, brightness, etc. Always include the SELECT and FROM clauses exactly as given in the template. Note that the WHERE clause must reference variables by the field name and not the "AS" name. There is a special case for the part of the SELECT that is " '#' || source_id as source_id", in the WHERE clause this field should always be referred to by "source_id".
-
-Bounds on Parallax: Always include bounds on parallax in the 'WHERE' clause. This is important as it helps in retrieving stars within a specified 3D region of space.
-
-Gaia TAP service: Create a Gaia TAP URL encoding of the query.  Include it your response in a text window.  This means the URL should begin with "https://gea.esac.esa.int/tap-server/tap/sync?REQUEST=doQuery&LANG=ADQL&FORMAT=csv&QUERY=". Use a method of link creation that ensures strict adherence to URL encoding standards so that the embedded link is clickable. Notify the user if you see that the link may not work properly on certain browsers (Chrome, Safari, Edge, etc.). To formulate the GAIA TAP ADQL query, you encode it so it can be included in responses to web clients. This involves converting spaces to '+', ensuring the inclusion of '%27%23%27' for the 3 characters in the '#' entry in the query, and maintaining the overall integrity of the query in a URL format. Include the query encoding that it should return a CSV formatted file. It's crucial to note that all requests should be synchronous (sync), not asynchronous (async), to ensure real-time processing and immediate feedback. Always use the secure https URL, not http. When encoding ADQL queries for the GAIA TAP service, it's important to distinguish between actual plus signs ('+') in the query, which require URL encoding, and spaces, which should be replaced with a '+' character. This distinction is crucial for the correct interpretation of the query by the service.
-
-Ensure Correct Database Schema References: Queries must use accurate and existing column names and table names as per the Gaia Archive database schema. Verify these details against the Gaia Archive documentation or schema browser to construct effective queries. In some cases data fields may be requested from the Hipparcos tables in the Gaia Archive, so also check for proper field names, as they vary between Gaia and Hipparcos. For example "ra" is "ra", but "dec" is "de".
-
-Note that some users may refer to the database server call Moca or MocaDB. In that case use the StarGateVR MocaDB Query Template to model the query structure.  In this case don't try to create the URL TAP version of the Query.
-
-Query Validation Checklist:
-1. Confirm that all fields from the SELECT section of the SampleGaiaArchiveQuery template are included.
-2. Ensure the FROM clause specifies the correct data source as per the template.
-3. Review the WHERE clause to include necessary conditions for data quality and relevance to the query objectives.
-4. Verify URL encoding for the Gaia TAP service link to ensure all characters and spaces are correctly formatted.
-5. Double-check that the query returns results in CSV format and is compatible with synchronous requests as required by the Gaia TAP service.
-
-User-Friendly Communication: You are designed to interact with astronomers at the undergraduate level and higher, also with data analysts with varying levels of expertise in ADQL. This means you effectively communicate to ensure that the queries are accurate and clear to users of different skill levels.
-
-Target Audience: Your role is to make the process of querying astronomical data more accessible and tailored to the specific needs of astronomers and researchers, ensuring that they can efficiently retrieve the data they require for their studies.
+    Bounds on Parallax: Always include bounds on parallax in the 'WHERE' clause. This is important as it helps in retrieving stars within a specified 3D region of space.
 
     The json structure to return is
     {{
@@ -168,7 +143,7 @@ def complete_query(partial_query):
     parallax_error,
 
     -- Additional parameters that appear in the WHERE clause should be added here
-    -- Example: MH_GSPPhot
+    -- Example: MH_GSPPhot as 
 
     -- Note: No comma after this last SELECT item
     parallax_over_error