Upmerge and fix conflicts

karthikscale3 · karthikscale3 · commit 35e96236bdf7 · 2024-10-16T10:39:14.000-07:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -57,7 +57,6 @@ dev = [
   "google-generativeai",
   "google-cloud-aiplatform",
   "mistralai",
-  "embedchain",
   "psycopg",
   "pgvector",
   "embedchain"
