eye-on-surveillance / sawt

https://sawt.eyeonsurveillance.org/
MIT License
16 stars 10 forks source link

Merging Tulane Fork into Main #168

Closed outlawhayden closed 9 months ago

outlawhayden commented 9 months ago

Hey all -

I'm opening this I think to begin the process of folding our changes into your main system. A few days ago, I tried just pulling everything in from your end onto ours first before opening this and it went pretty poorly - you can see what happened here. It says these branches can be automatically merged, but I think we shouldn't just do that, because I did a revert on that massive merge I tried, and I think that's messing with it and I don't code to just get obliterated for no reason.

I think most of the changes on your end can just pave over ours, especially with respect to the config files, AI stuff, etc., - the big concerns I think are the new web components we added, and a couple of functions we made in getanswer that allow us to iterate through the getanswer function and get responses for multiple k values and package them together.

vercel[bot] commented 9 months ago

@outlawhayden is attempting to deploy a commit to the Eye on Surveillance Team Team on Vercel.

A member of the Team first needs to authorize it.

vercel[bot] commented 9 months ago

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
sawt ❌ Failed (Inspect) Dec 4, 2023 7:24pm
outlawhayden commented 9 months ago

just dumped the ds_store - our bad. will start pulling everything apart and back together this afternoon and tomorrow