ucampostgresvro 0.1.1__tar.gz → 0.1.2__tar.gz

{ucampostgresvro-0.1.1 → ucampostgresvro-0.1.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.3
 Name: ucampostgresvro
-Version: 0.1.1
-Summary: 
+Version: 0.1.2
+Summary: To connect with postgresql for the billing report
 Author: Ishan Mahajan
 Author-email: mahanishanmahajan@gmail.com
 Requires-Python: >=3.10
@@ -38,7 +38,7 @@ Description-Content-Type: text/markdown
 
 - To setup database 
 ```
-from ucampostgresvro import pre_setupconfig
+from ucampostgresvro.utils import pre_setupconfig
 from ucampostgresvro.DBA import DB
 db_params = {
     "dbname": "vrapricing",

{ucampostgresvro-0.1.1 → ucampostgresvro-0.1.2}/README.md

@@ -23,7 +23,7 @@
 
 - To setup database 
 ```
-from ucampostgresvro import pre_setupconfig
+from ucampostgresvro.utils import pre_setupconfig
 from ucampostgresvro.DBA import DB
 db_params = {
     "dbname": "vrapricing",

{ucampostgresvro-0.1.1 → ucampostgresvro-0.1.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "ucampostgresvro"
-version = "0.1.1"
-description = ""
+version = "0.1.2"
+description = "To connect with postgresql for the billing report"
 authors = [
     {name = "Ishan Mahajan",email = "mahanishanmahajan@gmail.com"}
 ]

ucampostgresvro-0.1.2/ucampostgresvro/__init__.py

@@ -0,0 +1 @@
+VERSION = "0.1.2"

{ucampostgresvro-0.1.1 → ucampostgresvro-0.1.2}/ucampostgresvro/__main__.py

@@ -1,12 +1,10 @@
 import logging
 import sys
-from typing import Dict
 
 from ucampostgresvro import VERSION, utils
 from ucampostgresvro.DBA import DB
 from ucampostgresvro.exceptions import DbException
 from ucampostgresvro.secrets import password
-from ucampostgresvro.tools import DEFAULT_TABLES
 
 
 def setloggerdetail():
@@ -21,52 +19,6 @@ def setloggerdetail():
     return LOG
 
 
-def pre_setupconfig(db_params: Dict[str, str]) -> bool:
-    """Create the Database
-
-    Args:
-        db_params (Dict[str, str]): provide parameters for DB connection.
-
-    Returns:
-        bool: True if creation of database is suceess else False
-    """
-    result = []
-    if not utils.check_table_exists(DEFAULT_TABLES.get("user"), db_params):
-        result.append(utils.create_user_table(DEFAULT_TABLES.get("user"), db_params))
-
-    if not utils.check_table_exists(DEFAULT_TABLES.get("deploymentid"), db_params):
-        result.append(
-            utils.create_deployment_table(DEFAULT_TABLES.get("deploymentid"), db_params)
-        )
-
-    if not utils.check_table_exists(DEFAULT_TABLES.get("proj"), db_params):
-        result.append(
-            utils.create_project_table(
-                DEFAULT_TABLES.get("proj"), DEFAULT_TABLES.get("user"), db_params
-            )
-        )
-
-    if not utils.check_table_exists(DEFAULT_TABLES.get("grant"), db_params):
-        result.append(
-            utils.create_grant_table(
-                DEFAULT_TABLES.get("grant"), DEFAULT_TABLES.get("user"), db_params
-            )
-        )
-
-    if not utils.check_table_exists(DEFAULT_TABLES.get("costing"), db_params):
-        result.append(
-            utils.create_costing_table(
-                DEFAULT_TABLES.get("costing"),
-                DEFAULT_TABLES.get("deploymentid"),
-                DEFAULT_TABLES.get("proj"),
-                DEFAULT_TABLES.get("grant"),
-                db_params,
-            )
-        )
-
-    return False not in result
-
-
 def main():
     LOG = setloggerdetail()
     LOG.info(f"VERSION : {VERSION}")
@@ -81,7 +33,7 @@ def main():
     }
     db = DB(db_params)
 
-    if not pre_setupconfig(db_params):
+    if not utils.pre_setupconfig(db_params):
         raise DbException("ERROR: Tables are not created successfully")
 
     # db.insert_vrauser("ll220", "len")

{ucampostgresvro-0.1.1 → ucampostgresvro-0.1.2}/ucampostgresvro/utils.py

@@ -3,10 +3,52 @@ from typing import Callable, Dict
 
 from ucampostgresvro.DBA import DB
 from ucampostgresvro.exceptions import DbException
+from ucampostgresvro.tools import DEFAULT_TABLES
 
 LOG = logging.getLogger(__name__)
 
 
+def pre_setupconfig(db_params: Dict[str, str]) -> bool:
+    """Create the Database
+
+    Args:
+        db_params (Dict[str, str]): provide parameters for DB connection.
+
+    Returns:
+        bool: True if creation of database is suceess else False
+    """
+    result = []
+    if not check_table_exists(DEFAULT_TABLES.get("user"), db_params):
+        result.append(create_user_table(DEFAULT_TABLES.get("user"), db_params))
+    if not check_table_exists(DEFAULT_TABLES.get("deploymentid"), db_params):
+        result.append(
+            create_deployment_table(DEFAULT_TABLES.get("deploymentid"), db_params)
+        )
+    if not check_table_exists(DEFAULT_TABLES.get("proj"), db_params):
+        result.append(
+            create_project_table(
+                DEFAULT_TABLES.get("proj"), DEFAULT_TABLES.get("user"), db_params
+            )
+        )
+    if not check_table_exists(DEFAULT_TABLES.get("grant"), db_params):
+        result.append(
+            create_grant_table(
+                DEFAULT_TABLES.get("grant"), DEFAULT_TABLES.get("user"), db_params
+            )
+        )
+    if not check_table_exists(DEFAULT_TABLES.get("costing"), db_params):
+        result.append(
+            create_costing_table(
+                DEFAULT_TABLES.get("costing"),
+                DEFAULT_TABLES.get("deploymentid"),
+                DEFAULT_TABLES.get("proj"),
+                DEFAULT_TABLES.get("grant"),
+                db_params,
+            )
+        )
+    return False not in result
+
+
 def create_table(tablename: str, db_params: Dict[str, str], design: str) -> bool:
     """Creation of table with provided design
 

ucampostgresvro-0.1.1/ucampostgresvro/__init__.py

@@ -1 +0,0 @@
-VERSION = "0.1.1"