rgwfuncs 0.0.110__py3-none-any.whl → 0.0.112__py3-none-any.whl

rgwfuncs/df_lib.py

@@ -315,7 +315,7 @@ def load_data_from_query(
     preset: Optional[str] = None,
     db_type: Optional[str] = None,
     host: Optional[str] = None,
-    username: Optional[str] = None,
+    user: Optional[str] = None,
     password: Optional[str] = None,
     database: Optional[str] = None
 ) -> pd.DataFrame:
@@ -327,7 +327,7 @@ def load_data_from_query(
         preset (Optional[str]): The name of the database preset in the .rgwfuncsrc file.
         db_type (Optional[str]): The database type ('mssql', 'mysql', or 'clickhouse').
         host (Optional[str]): Database host.
-        username (Optional[str]): Database username.
+        user (Optional[str]): Database username.
         password (Optional[str]): Database password.
         database (Optional[str]): Database name.
 
@@ -374,15 +374,15 @@ def load_data_from_query(
     def validate_credentials(
         db_type: str,
         host: Optional[str] = None,
-        username: Optional[str] = None,
+        user: Optional[str] = None,
         password: Optional[str] = None,
         database: Optional[str] = None
     ) -> dict:
         """Validate credentials and return a credentials dictionary."""
         required_fields = {
-            'mssql': ['host', 'username', 'password'],
-            'mysql': ['host', 'username', 'password'],
-            'clickhouse': ['host', 'username', 'password', 'database']
+            'mssql': ['host', 'user', 'password'],
+            'mysql': ['host', 'user', 'password'],
+            'clickhouse': ['host', 'user', 'password', 'database']
         }
         if db_type not in required_fields:
             raise ValueError(f"Unsupported db_type: {db_type}")
@@ -390,7 +390,7 @@ def load_data_from_query(
         credentials = {
             'db_type': db_type,
             'host': host,
-            'username': username,
+            'user': user,
             'password': password,
             'database': database
         }
@@ -400,7 +400,7 @@ def load_data_from_query(
         return credentials
 
     # Validate input parameters
-    all_credentials = [host, username, password, database]
+    all_credentials = [host, user, password, database]
     if preset and any(all_credentials):
         raise ValueError("Cannot specify both preset and direct credentials")
     if not preset and not db_type:
@@ -417,7 +417,7 @@ def load_data_from_query(
         credentials = validate_credentials(
             db_type=db_type,
             host=host,
-            username=username,
+            user=user,
             password=password,
             database=database
         )
@@ -425,7 +425,7 @@ def load_data_from_query(
     # Query functions
     def query_mssql(credentials: dict, query: str) -> pd.DataFrame:
         server = credentials['host']
-        user = credentials['username']
+        user = credentials['user']
         password = credentials['password']
         database = credentials.get('database', '')
         with pymssql.connect(server=server, user=user, password=password, database=database) as conn:
@@ -437,7 +437,7 @@ def load_data_from_query(
 
     def query_mysql(credentials: dict, query: str) -> pd.DataFrame:
         host = credentials['host']
-        user = credentials['username']
+        user = credentials['user']
         password = credentials['password']
         database = credentials.get('database', '')
         with mysql.connector.connect(host=host, user=user, password=password, database=database) as conn:
@@ -449,7 +449,7 @@ def load_data_from_query(
 
     def query_clickhouse(credentials: dict, query: str) -> pd.DataFrame:
         host = credentials['host']
-        user = credentials['username']
+        user = credentials['user']
         password = credentials['password']
         database = credentials['database']
         max_retries = 5

{rgwfuncs-0.0.110.dist-info → rgwfuncs-0.0.112.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rgwfuncs
-Version: 0.0.110
+Version: 0.0.112
 Summary: A functional programming paradigm for mathematical modelling and data science
 Home-page: https://github.com/ryangerardwilson/rgwfuncs
 Author: Ryan Gerard Wilson

rgwfuncs-0.0.112.dist-info/RECORD

@@ -0,0 +1,11 @@
+rgwfuncs/__init__.py,sha256=WafmLtqJRnQ7LWU7Son0inje75tF-m6qHJqrmCgiM84,1354
+rgwfuncs/df_lib.py,sha256=lcKrMj8IpxWxnWkBFekWBQd9-Ed2nXTsHo57gTeATjE,85153
+rgwfuncs/docs_lib.py,sha256=i63NzX-V8cGhikYdtkRGAEe2VcuwpXxDUyTRa9xI7l8,1972
+rgwfuncs/interactive_shell_lib.py,sha256=YeJBW9YgH5Nv77ONdOyIKFgtf0ItXStdlKGN9GGf8bU,4228
+rgwfuncs/str_lib.py,sha256=rfzRd7bOc0KQ7UxUN-J6yxY23pHEUHqerVR1u-TyIAY,10690
+rgwfuncs-0.0.112.dist-info/licenses/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
+rgwfuncs-0.0.112.dist-info/METADATA,sha256=m6mY9nOaQYzPpXJ1grlouqQ6JpQUYFLFK4cvxVpiZrA,42972
+rgwfuncs-0.0.112.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rgwfuncs-0.0.112.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.112.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.112.dist-info/RECORD,,

rgwfuncs-0.0.110.dist-info/RECORD

@@ -1,11 +0,0 @@
-rgwfuncs/__init__.py,sha256=WafmLtqJRnQ7LWU7Son0inje75tF-m6qHJqrmCgiM84,1354
-rgwfuncs/df_lib.py,sha256=RFCgVcx_NphJ4Q7O6tP8rplBcx1qA4xHtNyjS8lHStY,85209
-rgwfuncs/docs_lib.py,sha256=i63NzX-V8cGhikYdtkRGAEe2VcuwpXxDUyTRa9xI7l8,1972
-rgwfuncs/interactive_shell_lib.py,sha256=YeJBW9YgH5Nv77ONdOyIKFgtf0ItXStdlKGN9GGf8bU,4228
-rgwfuncs/str_lib.py,sha256=rfzRd7bOc0KQ7UxUN-J6yxY23pHEUHqerVR1u-TyIAY,10690
-rgwfuncs-0.0.110.dist-info/licenses/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
-rgwfuncs-0.0.110.dist-info/METADATA,sha256=nhEZlnLfErGyCrSsbBw-k4Ah5HZ49oiJpj1yqpZGD-k,42972
-rgwfuncs-0.0.110.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rgwfuncs-0.0.110.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
-rgwfuncs-0.0.110.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
-rgwfuncs-0.0.110.dist-info/RECORD,,