ucampostgresvro 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

ucampostgresvro/__init__.py

@@ -1 +1 @@
-VERSION = "0.1.1"
+VERSION = "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/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.dist-info → ucampostgresvro-0.1.2.dist-info}/METADATA

@@ -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.dist-info → ucampostgresvro-0.1.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ucampostgresvro/DBA.py,sha256=LGj2JpP2B-6z7CFV-zloLNmW8dPcIyuItVRi5x0KQT0,30876
-ucampostgresvro/__init__.py,sha256=K4bqp4JdOs9KHYMltFboNleHcCgvR1V7uAJwB8wlYQw,18
-ucampostgresvro/__main__.py,sha256=bTpOR1L6o5nZhM391sdZA6G3861jdwHQRdgAuXvL_dQ,4395
+ucampostgresvro/__init__.py,sha256=3ITyQfKn-h4AMdaHk5rHJaliZbCnbLZ7O3QQnAJH8yI,18
+ucampostgresvro/__main__.py,sha256=oEX2F0_bl2Xrq6_l9YZb1ZBIhxRwzuSPpauqjCm0YjE,2780
 ucampostgresvro/ca.crt,sha256=pVDr3AsvwCqJ36JTifsAzIiS2ve_fWC1CBfVI0cnVmY,1135
 ucampostgresvro/exceptions.py,sha256=XVi8Sk_gg3VE4ryTtiYOnGbmCPIsfFt2AE5sOoqQDuI,39
 ucampostgresvro/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,8 +9,8 @@ ucampostgresvro/tests/dbconnect.py,sha256=T2rVoUmG6mHwS-i4h8R4O4GuEhuucCd3zyrFUM
 ucampostgresvro/tests/test_DB.py,sha256=SLi5C0NO0dIeIQOfywkAPWKznfANopVEnHOxCD-EZpU,12134
 ucampostgresvro/tests/utils.py,sha256=lpcvf6HPOOtxAwSwvoAUhil1zQ6Qfr0ZILa0qDVdES0,3722
 ucampostgresvro/tools.py,sha256=Y8MUK1lIG10A-724yrhve8LfjQUmFwpqi19UIO5DeuI,153
-ucampostgresvro/utils.py,sha256=d49ecdYfFXHK0H4Huc7x2C9sEc_R_3MG3lyNgBvWSyg,6907
-ucampostgresvro-0.1.1.dist-info/LICENSE,sha256=CVTj8C-BHEJjzYlYtHnfykxKkfmk-ImXOs5rcMgXebY,1094
-ucampostgresvro-0.1.1.dist-info/METADATA,sha256=7rwwVHjjXwx5GQp1ymgdOgwb9KSEtf5o9cMtdLOcw9g,7594
-ucampostgresvro-0.1.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-ucampostgresvro-0.1.1.dist-info/RECORD,,
+ucampostgresvro/utils.py,sha256=ZHS9D3Eplyk3Ck-AoVG_2YgVJJNmuO6J-FaZGsJKGs4,8439
+ucampostgresvro-0.1.2.dist-info/LICENSE,sha256=CVTj8C-BHEJjzYlYtHnfykxKkfmk-ImXOs5rcMgXebY,1094
+ucampostgresvro-0.1.2.dist-info/METADATA,sha256=ICcEjopmJAXYGhqzbGO-H3JSFO2dBV33vuV8qslIEAw,7649
+ucampostgresvro-0.1.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+ucampostgresvro-0.1.2.dist-info/RECORD,,