Upmerge and fix conflicts

karthikscale3 · karthikscale3 · commit 0ffb7da2bd25 · 2024-10-16T10:38:46.000-07:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -59,7 +59,7 @@ dev = [
   "mistralai",
   "embedchain",
   "psycopg",
-  "pgvector"
+  "pgvector",
   "embedchain"
 ]
 
