Cfb 230

heat-stack/README.md

@@ -44,6 +44,9 @@ npm run buildpy # to build rules engine into `public/pyodide-env`
 npm run dev
 ```
 
+After you run the build for python. you'll just need to make sure the newest rules-engine wheel is in the JS context. 
+All we need to do is run `node ./other/utils/update-pyodide-lock.js`
+
 ### Set up in a new GitHub CodingSpace:
 
 ```

heat-stack/app/routes/_heat+/single.tsx

@@ -13,8 +13,7 @@
 import { ErrorList } from '#app/components/ui/heat/CaseSummaryComponents/ErrorList.tsx'
 import GeocodeUtil from '#app/utils/GeocodeUtil'
 import WeatherUtil from '#app/utils/WeatherUtil'
-
-
+import PyodideUtil from '#app/utils/pyodide.util.js'
 
 // TODO NEXT WEEK
 // - [x] Server side error checking/handling
@@ -112,17 +111,6 @@
             console.error('submission failed', submission)
         }
         return submission.reply()
-        // submission.reply({
-        // 	// You can also pass additional error to the `reply` method
-        // 	formErrors: ['Submission failed'],
-        // 	fieldErrors: {
-        // 		address: ['Address is invalid'],
-        // 	},
-
-        // 	// or avoid sending the the field value back to client by specifying the field names
-        // 	hideFields: ['password'],
-        // }),
-        // {status: submission.status === "error" ? 400 : 200}
     }
 
     const {
@@ -147,27 +135,14 @@
 
     console.log('loading geocodeUtil/weatherUtil')
 
+    const pyodideUtil: PyodideUtil = PyodideUtil.getInstance();
     const geocodeUtil = new GeocodeUtil()
     const weatherUtil = new WeatherUtil()
-    ////////////////////////
-    const getPyodide = async () => {
-        return await pyodideModule.loadPyodide({
-            // This path is actually `public/pyodide-env`, but the browser knows where `public` is. Note that remix server needs `public/`
-            // TODO: figure out how to determine if we're in browser or remix server and use ternary.
-            indexURL: 'public/pyodide-env/',
-        })
-    }
-    const runPythonScript = async () => {
-        const pyodide: any = await getPyodide()
-        return pyodide
-    }
-    // consider running https://github.com/codeforboston/home-energy-analysis-tool/blob/main/rules-engine/tests/test_rules_engine/test_engine.py
-    const pyodide: any = await runPythonScript()
-    //////////////////////
-
-    let {coordinates, state_id, county_id}  = await geocodeUtil.getLL(address)
-    let {x, y} = coordinates ?? {x: 0, y: 0};
+    const pyodide = await pyodideUtil.getPyodideModule();
+    const pyHelpers = await pyodideUtil.getHelpersModule();
 
+    let { coordinates, state_id, county_id }  = await geocodeUtil.getLL(address)
+    let { x, y } = coordinates;
     console.log('geocoded', x, y)
 
     // CSV entrypoint parse_gas_bill(data: str, company: NaturalGasCompany)
@@ -190,10 +165,6 @@
 
     // console.log('parsedAndValidatedFormSchema', parsedAndValidatedFormSchema)
 
-    await pyodide.loadPackage(
-        'public/pyodide-env/pydantic_core-2.14.5-cp311-cp311-emscripten_3_1_32_wasm32.whl',
-    )
-
     /* NOTES for pydantic, typing-extensions, annotated_types: 
         pyodide should match pyodide-core somewhat. 
         typing-extensions needs specific version per https://github.com/pyodide/pyodide/issues/4234#issuecomment-1771735148
@@ -202,19 +173,6 @@
            - https://pypi.org/project/typing-extensions/
            - https://pypi.org/project/annotated-types/#files
     */
-    await pyodide.loadPackage(
-        'public/pyodide-env/pydantic-2.5.2-py3-none-any.whl',
-    )
-    await pyodide.loadPackage(
-        'public/pyodide-env/typing_extensions-4.8.0-py3-none-any.whl',
-    )
-    await pyodide.loadPackage(
-        'public/pyodide-env/annotated_types-0.5.0-py3-none-any.whl',
-    )
-
-    await pyodide.loadPackage(
-        'public/pyodide-env/rules_engine-0.0.1-py3-none-any.whl',
-    )
 
     // console.log("uploadedTextFile", uploadedTextFile)
 

heat-stack/app/utils/GeocodeUtil.ts

@@ -1,5 +1,6 @@
 const BASE_URL = 'https://geocoding.geo.census.gov'
 const ADDRESS_ENDPOINT = '/geocoder/geographies/onelineaddress'
+const LAYERS_COUNTY = 82;
 
 // example: https://geocoding.geo.census.gov/geocoder/geographies/onelineaddress?address=1%20broadway%2C%20cambridge%2C%20ma%2002142&benchmark=4&vintage=4&format=json
 interface CensusGeocoderResponse {
@@ -26,54 +27,53 @@ interface CensusGeocoderResponse {
 }
 
 interface AddressMatch {
-	tigerLine: {
-		side: string
-		tigerLineId: string
-	}
-	geographies: {
-		'State Legislative Districts - Upper': Geography[]
-		States: Geography[]
-		'Combined Statistical Areas': Geography[]
-		'2020 Urban Areas - Corrected': Geography[]
-		'County Subdivisions': Geography[]
-		'State Legislative Districts - Lower': Geography[]
-		'Incorporated Places': Geography[]
-		Counties: Geography[]
-		'116th Congressional Districts': Geography[]
-		'Census Tracts': Geography[]
-		'Census Blocks': Geography[]
-	}
-	coordinates: {
-		x: number
-		y: number
-	}
-	addressComponents: {
-		zip: string
-		streetName: string
-		preType: string
-		city: string
-		preDirection: string
-		suffixDirection: string
-		fromAddress: string
-		state: string
-		suffixType: string
-		toAddress: string
-		suffixQualifier: string
-		preQualifier: string
-	}
-	matchedAddress: string
+  tigerLine: {
+    side: string
+    tigerLineId: string
+  }
+  geographies: {
+    Counties: Geography[]
+  }
+  coordinates: {
+    x: number
+    y: number
+  }
+  addressComponents: {
+    zip: string
+    streetName: string
+    preType: string
+    city: string
+    preDirection: string
+    suffixDirection: string
+    fromAddress: string
+    state: string
+    suffixType: string
+    toAddress: string
+    suffixQualifier: string
+    preQualifier: string
+  }
+  matchedAddress: string
 }
 
 interface Geography {
-	GEOID: string
-	CENTLAT: string
-	AREAWATER: number
-	STATE: string
-	BASENAME: string
-	OID: string
-	LSADC: string
-	[key: string]: string | number /* a bit dubious catchall by the
-                                     LLM for all the semi-optional keys */
+  GEOID: string
+  CENTLAT: string
+  AREAWATER: number
+  STATE: string
+  BASENAME: string
+  OID: string
+  LSADC: string
+  FUNCSTAT: string;
+  INTPTLAT: string;
+  NAME: string;
+  OBJECTID: number;
+  CENTLON: string;
+  COUNTYCC: string;
+  COUNTYNS: string;
+  AREALAND: number;
+  INTPTLON: string;
+  MTFCC: string;
+  COUNTY: string;
 }
 
 class GeocodeUtil {
@@ -86,29 +86,25 @@ class GeocodeUtil {
 	async getLL(address: string) {
 		const params = new URLSearchParams()
 
-		params.append('address', address)
-		params.append('format', 'json')
-		params.append('benchmark', '2020')
-		params.append('vintage', 'Census2020_Census2020')
+    params.append('address', address)
+    params.append('format', 'json')
+    params.append('benchmark', '2020')
+    params.append('vintage', 'Census2020_Census2020')
+    params.append('layers',[LAYERS_COUNTY].toString()); // Right now we only care aboot the 'Counties' obj in the census return. Providing no layers param gives us a lotta data that we don't need.
 
-		/**  TODO: note that for this Census API you can specify particular parts of this that
-     we want (x, y, state_id, and county_id for now), read the docs */
-		let url = new URL(BASE_URL + ADDRESS_ENDPOINT + '?' + params.toString())
-		let rezzy = await fetch(url)
-		let jrez = (await rezzy.json()) as CensusGeocoderResponse
-		// TODO: Return all addresses and let the user choose the right one
-		let coordz = jrez?.result?.addressMatches?.[0]?.coordinates
-		// console.log(JSON.stringify(jrez, null, 2));
-		return {
-			coordinates: coordz,
-			state_id:
-				jrez?.result?.addressMatches?.[0]?.geographies.Counties?.[0]?.['STATE'],
-			county_id:
-				jrez?.result?.addressMatches?.[0]?.geographies?.Counties?.[0]?.[
-					'COUNTY'
-				],
-		}
-	}
+    let url = new URL(BASE_URL + ADDRESS_ENDPOINT + '?' + params.toString())
+    let rezzy = await fetch(url)
+    let jrez = (await rezzy.json()) as CensusGeocoderResponse
+    // TODO: Return all addresses and let the user choose the right one
+    let coordz = jrez.result.addressMatches[0].coordinates
+    // console.log(JSON.stringify(jrez, null, 2));
+    return {
+      coordinates: coordz,
+      state_id: jrez.result.addressMatches[0].geographies.Counties[0].STATE,
+      county_id:
+        jrez.result.addressMatches[0].geographies.Counties[0].COUNTY,
+    }
+  }
 }
 
 export default GeocodeUtil