LCORE-1150: Schema namespace used by conversation cache

Author: tisnik

src/cache/postgres_cache.py

@@ -2,6 +2,7 @@
 
 import json
 import psycopg2
+from psycopg2.extensions import AsIs
 
 from cache.cache import Cache
 from cache.cache_error import CacheError
@@ -38,6 +39,10 @@ class PostgresCache(Cache):
     ```
     """
 
+    CREATE_SCHEMA = """
+       CREATE SCHEMA IF NOT EXISTS %s;
+       """
+
     CREATE_CACHE_TABLE = """
         CREATE TABLE IF NOT EXISTS cache (
             user_id              text NOT NULL,
@@ -133,6 +138,9 @@ def connect(self) -> None:
         # even if PostgreSQL is not alive
         self.connection = None
         config = self.postgres_config
+        namespace = "public"
+        if config.namespace is not None:
+            namespace = config.namespace
         try:
             self.connection = psycopg2.connect(
                 host=config.host,
@@ -143,8 +151,9 @@ def connect(self) -> None:
                 sslmode=config.ssl_mode,
                 sslrootcert=config.ca_cert_path,
                 gssencmode=config.gss_encmode,
+                options=f"-c search_path={namespace}",
             )
-            self.initialize_cache()
+            self.initialize_cache(namespace)
         except Exception as e:
             if self.connection is not None:
                 self.connection.close()
@@ -166,7 +175,7 @@ def connected(self) -> bool:
             logger.error("Disconnected from storage: %s", e)
             return False
 
-    def initialize_cache(self) -> None:
+    def initialize_cache(self, namespace: str) -> None:
         """Initialize cache - clean it up etc."""
         if self.connection is None:
             logger.error("Cache is disconnected")
@@ -177,6 +186,10 @@ def initialize_cache(self) -> None:
         # and it should not interfere with other statements
         cursor = self.connection.cursor()
 
+        logger.info("Initializing schema")
+        if namespace != "public":
+            cursor.execute(PostgresCache.CREATE_SCHEMA, (AsIs(namespace),))
+
         logger.info("Initializing table for cache")
         cursor.execute(PostgresCache.CREATE_CACHE_TABLE)
 

tests/unit/cache/test_postgres_cache.py

@@ -220,7 +220,7 @@ def test_initialize_cache_when_connected(
     mocker.patch("psycopg2.connect")
     cache = PostgresCache(postgres_cache_config_fixture)
     # should not fail
-    cache.initialize_cache()
+    cache.initialize_cache("public")
 
 
 def test_initialize_cache_when_disconnected(
@@ -234,7 +234,7 @@ def test_initialize_cache_when_disconnected(
     cache.connection = None
 
     with pytest.raises(CacheError, match="cache is disconnected"):
-        cache.initialize_cache()
+        cache.initialize_cache("public")
 
 
 def test_ready_method(