From bc4ac2ceb422cfe32890b66b167b51589ec22749 Mon Sep 17 00:00:00 2001
From: Xi Yan <xiyan@meta.com>
Date: Fri, 20 Sep 2024 13:02:10 -0700
Subject: [PATCH] clean up

---
 llama_stack/distribution/server/server.py     |  7 +--
 llama_stack/distribution/utils/dynamic.py     |  1 -
 .../adapters/memory/pgvector/pgvector.py      | 53 +++++++++----------
 .../impls/meta_reference/memory/faiss.py      |  3 +-
 4 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/llama_stack/distribution/server/server.py b/llama_stack/distribution/server/server.py
index aef007dce..60855070e 100644
--- a/llama_stack/distribution/server/server.py
+++ b/llama_stack/distribution/server/server.py
@@ -389,12 +389,7 @@ def main(yaml_config: str, port: int = 5000, disable_ipv6: bool = False):
     cprint(f"StackRunConfig: {config}", "blue")
     app = FastAPI()
 
-    # check if routing table exists
-    if config.provider_routing_table is not None:
-        impls, specs = asyncio.run(resolve_impls_with_routing(config))
-    else:
-        # keeping this for backwards compatibility
-        impls, specs = asyncio.run(resolve_impls(config.provider_map))
+    impls, specs = asyncio.run(resolve_impls_with_routing(config))
 
     if Api.telemetry in impls:
         setup_logger(impls[Api.telemetry])
diff --git a/llama_stack/distribution/utils/dynamic.py b/llama_stack/distribution/utils/dynamic.py
index 7e1e8d253..002a738ae 100644
--- a/llama_stack/distribution/utils/dynamic.py
+++ b/llama_stack/distribution/utils/dynamic.py
@@ -33,7 +33,6 @@ async def instantiate_provider(
 
         assert isinstance(provider_config, GenericProviderConfig)
         config_type = instantiate_class_type(provider_spec.config_class)
-        print("!!!", provider_config)
         config = config_type(**provider_config.config)
         args = [config, deps]
     elif isinstance(provider_spec, RouterProviderSpec):
diff --git a/llama_stack/providers/adapters/memory/pgvector/pgvector.py b/llama_stack/providers/adapters/memory/pgvector/pgvector.py
index 0907af2e3..a5c84a1b2 100644
--- a/llama_stack/providers/adapters/memory/pgvector/pgvector.py
+++ b/llama_stack/providers/adapters/memory/pgvector/pgvector.py
@@ -128,36 +128,35 @@ class PGVectorMemoryAdapter(Memory):
         self.cache = {}
 
     async def initialize(self) -> None:
-        print("Init PGVector!")
-        # try:
-        #     self.conn = psycopg2.connect(
-        #         host=self.config.host,
-        #         port=self.config.port,
-        #         database=self.config.db,
-        #         user=self.config.user,
-        #         password=self.config.password,
-        #     )
-        #     self.cursor = self.conn.cursor()
+        try:
+            self.conn = psycopg2.connect(
+                host=self.config.host,
+                port=self.config.port,
+                database=self.config.db,
+                user=self.config.user,
+                password=self.config.password,
+            )
+            self.cursor = self.conn.cursor()
 
-        #     version = check_extension_version(self.cursor)
-        #     if version:
-        #         print(f"Vector extension version: {version}")
-        #     else:
-        #         raise RuntimeError("Vector extension is not installed.")
+            version = check_extension_version(self.cursor)
+            if version:
+                print(f"Vector extension version: {version}")
+            else:
+                raise RuntimeError("Vector extension is not installed.")
 
-        #     self.cursor.execute(
-        #         """
-        #         CREATE TABLE IF NOT EXISTS metadata_store (
-        #             key TEXT PRIMARY KEY,
-        #             data JSONB
-        #         )
-        #     """
-        #     )
-        # except Exception as e:
-        #     import traceback
+            self.cursor.execute(
+                """
+                CREATE TABLE IF NOT EXISTS metadata_store (
+                    key TEXT PRIMARY KEY,
+                    data JSONB
+                )
+            """
+            )
+        except Exception as e:
+            import traceback
 
-        #     traceback.print_exc()
-        #     raise RuntimeError("Could not connect to PGVector database server") from e
+            traceback.print_exc()
+            raise RuntimeError("Could not connect to PGVector database server") from e
 
     async def shutdown(self) -> None:
         pass
diff --git a/llama_stack/providers/impls/meta_reference/memory/faiss.py b/llama_stack/providers/impls/meta_reference/memory/faiss.py
index 0d31d40e9..ee716430e 100644
--- a/llama_stack/providers/impls/meta_reference/memory/faiss.py
+++ b/llama_stack/providers/impls/meta_reference/memory/faiss.py
@@ -68,8 +68,7 @@ class FaissMemoryImpl(Memory):
         self.config = config
         self.cache = {}
 
-    async def initialize(self) -> None:
-        print("INIT meta-reference")
+    async def initialize(self) -> None: ...
 
     async def shutdown(self) -> None: ...