pyegeria 0.8.4.32__tar.gz → 0.8.4.34__tar.gz

{pyegeria-0.8.4.32 → pyegeria-0.8.4.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.8.4.32
+Version: 0.8.4.34
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0
@@ -19,6 +19,7 @@ Requires-Dist: confluent-kafka (>=2.5.0,<3.0.0)
 Requires-Dist: httpx (>=0.27.0,<0.28.0)
 Requires-Dist: jupyter (>=1.0.0,<2.0.0)
 Requires-Dist: mermaid-py (>=0.5.3,<0.6.0)
+Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
 Requires-Dist: pytest (>=8.2.2,<9.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: rich (>=13.8.1,<14.0.0)

{pyegeria-0.8.4.32 → pyegeria-0.8.4.34}/pyegeria/core_omag_server_config.py

@@ -10,6 +10,9 @@ deployed to take effect.
 """
 
 import json
+import psycopg2
+from psycopg2 import sql
+from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 # import json
 from pyegeria._client import Client
@@ -1340,15 +1343,18 @@ class CoreServerConfig(Client):
         self.make_request("POST", url, xtdb_config_body)
 
     def set_xtdb_pg_repository(
-        self, host: str, pg_user: str, pg_pwd: str, server_name: str = None
+        self, host: str, port: str, pg_user: str, pg_pwd: str, server_name: str = None
     ) -> None:
-        """Set the local repository connection to be XTDB using PostgresSQL Server, passing in basic parameters
+        """Set the local repository connection to be XTDB using PostgresSQL Server, passing in basic parameters.
+            A postgres database with the name of the metadata server will be created if it doesn't exist.
+
 
         Parameters
         ----------
         host : str
-            the full hostname and port of the postgres server
-
+            the full hostname of the postgres server
+        port: str
+            the port number of the postgres server
         pg_user : str
             postgresql user name
 
@@ -1379,16 +1385,42 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
+
         validate_name(pg_pwd)
         validate_name(pg_user)
         validate_name(host)
         pg_db = server_name.lower()
 
-        jdbc_url = (
-            f'"jdbc:postgresql://{host}/{pg_db}?user={pg_user}&password={pg_pwd}"'
+        # Connect to the PostgreSQL server
+        conn = psycopg2.connect(
+            host=host,
+            port=port,
+            user=pg_user,
+            password=pg_pwd,
+            dbname="postgres",  # Connect to the default 'postgres' database to perform operations
         )
-        index_dir = f'"data/servers/{server_name}/repository/xtdb/rdb-index"'
-        lucene_dir = f'"data/servers/{server_name}/repository/xtdb/lucene"'
+        conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)  # Enable autocommit mode
+
+        cursor = conn.cursor()
+
+        # Check if database exists
+        cursor.execute(sql.SQL("SELECT 1 FROM pg_database WHERE datname = %s"), [pg_db])
+        database_exists = cursor.fetchone()
+
+        # If the database does not exist, create it
+        if not database_exists:
+            cursor.execute(sql.SQL("CREATE DATABASE {}").format(sql.Identifier(pg_db)))
+            print(f"Database '{pg_db}' created.")
+        else:
+            print(f"Database '{pg_db}' already exists.")
+
+        # Close the connection to the server
+        cursor.close()
+        conn.close()
+
+        jdbc_url = f'"jdbc:postgresql://{host}:{port}/{pg_db}?user={pg_user}&password={pg_pwd}"'
+        index_dir = f'"data/servers/{server_name}/repository/{pg_db}/rdb-index"'
+        lucene_dir = f'"data/servers/{server_name}/repository/{pg_db}/lucene"'
 
         index_str = "{:xtdb/index-store {:kv-store {:xtdb/module xtdb.rocksdb/->kv-store :db-dir "
         index_str2 = index_str + index_dir + "}}"

{pyegeria-0.8.4.32 → pyegeria-0.8.4.34}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.8.4.32"
+version = "0.8.4.34"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -38,6 +38,7 @@ trogon = "^0.5.0"
 textual-forms = "^0.3.0"
 textual = "^0.75.1"
 mermaid-py = "^0.5.3"
+psycopg2-binary = "^2.9.9"
 
 [build-system]
 requires = ["poetry-core"]