From 6be431cfb74d218093ddc208d51c48acfa3470e5 Mon Sep 17 00:00:00 2001
From: Devis Lucato <dluc@users.noreply.github.com>
Date: Fri, 10 Nov 2023 10:55:21 -0800
Subject: [PATCH 1/2] Add missing names to error message, sorted alphabetically

---
 datastore/factory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datastore/factory.py b/datastore/factory.py
index dd4e9b538..96253db07 100644
--- a/datastore/factory.py
+++ b/datastore/factory.py
@@ -65,5 +65,5 @@ async def get_datastore() -> DataStore:
         case _:
             raise ValueError(
                 f"Unsupported vector database: {datastore}. "
-                f"Try one of the following: llama, elasticsearch, pinecone, weaviate, milvus, zilliz, redis, azuresearch, or qdrant"
+                f"Try one of the following: analyticdb, azuresearch, chroma, elasticsearch, llama, milvus, pinecone, postgres, qdrant, redis, supabase, weaviate, or zilliz"
             )

From 6f542b7f67925ed244e4e719df46858ea7543b7f Mon Sep 17 00:00:00 2001
From: Devis Lucato <dluc@users.noreply.github.com>
Date: Fri, 10 Nov 2023 10:58:39 -0800
Subject: [PATCH 2/2] Sort case statements alphabetically

---
 datastore/factory.py | 59 ++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/datastore/factory.py b/datastore/factory.py
index 96253db07..09ebf95d0 100644
--- a/datastore/factory.py
+++ b/datastore/factory.py
@@ -7,61 +7,60 @@ async def get_datastore() -> DataStore:
     assert datastore is not None
 
     match datastore:
+        case "analyticdb":
+            from datastore.providers.analyticdb_datastore import AnalyticDBDataStore
+
+            return AnalyticDBDataStore()
+        case "azuresearch":
+            from datastore.providers.azuresearch_datastore import AzureSearchDataStore
+
+            return AzureSearchDataStore()
         case "chroma":
             from datastore.providers.chroma_datastore import ChromaDataStore
 
             return ChromaDataStore()
+        case "elasticsearch":
+            from datastore.providers.elasticsearch_datastore import (
+                ElasticsearchDataStore,
+            )
+
+            return ElasticsearchDataStore()
         case "llama":
             from datastore.providers.llama_datastore import LlamaDataStore
 
             return LlamaDataStore()
-
-        case "pinecone":
-            from datastore.providers.pinecone_datastore import PineconeDataStore
-
-            return PineconeDataStore()
-        case "weaviate":
-            from datastore.providers.weaviate_datastore import WeaviateDataStore
-
-            return WeaviateDataStore()
         case "milvus":
             from datastore.providers.milvus_datastore import MilvusDataStore
 
             return MilvusDataStore()
-        case "zilliz":
-            from datastore.providers.zilliz_datastore import ZillizDataStore
+        case "pinecone":
+            from datastore.providers.pinecone_datastore import PineconeDataStore
 
-            return ZillizDataStore()
-        case "redis":
-            from datastore.providers.redis_datastore import RedisDataStore
+            return PineconeDataStore()
+        case "postgres":
+            from datastore.providers.postgres_datastore import PostgresDataStore
 
-            return await RedisDataStore.init()
+            return PostgresDataStore()
         case "qdrant":
             from datastore.providers.qdrant_datastore import QdrantDataStore
 
             return QdrantDataStore()
-        case "azuresearch":
-            from datastore.providers.azuresearch_datastore import AzureSearchDataStore
+        case "redis":
+            from datastore.providers.redis_datastore import RedisDataStore
 
-            return AzureSearchDataStore()
+            return await RedisDataStore.init()
         case "supabase":
             from datastore.providers.supabase_datastore import SupabaseDataStore
 
             return SupabaseDataStore()
-        case "postgres":
-            from datastore.providers.postgres_datastore import PostgresDataStore
-
-            return PostgresDataStore()
-        case "analyticdb":
-            from datastore.providers.analyticdb_datastore import AnalyticDBDataStore
+        case "weaviate":
+            from datastore.providers.weaviate_datastore import WeaviateDataStore
 
-            return AnalyticDBDataStore()
-        case "elasticsearch":
-            from datastore.providers.elasticsearch_datastore import (
-                ElasticsearchDataStore,
-            )
+            return WeaviateDataStore()
+        case "zilliz":
+            from datastore.providers.zilliz_datastore import ZillizDataStore
 
-            return ElasticsearchDataStore()
+            return ZillizDataStore()
         case _:
             raise ValueError(
                 f"Unsupported vector database: {datastore}. "