kubernetes-watch 0.1.13__tar.gz → 0.1.14__tar.gz

{kubernetes_watch-0.1.13 → kubernetes_watch-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kubernetes-watch
-Version: 0.1.13
+Version: 0.1.14
 Summary: 
 Author: bmotevalli
 Author-email: b.motevalli@gmail.com

kubernetes_watch-0.1.14/kube_watch/modules/database/model.py

@@ -0,0 +1,13 @@
+from typing import Union, Optional
+from pydantic import BaseModel
+
+class TableQuery(BaseModel):
+    table_name: str
+    column_name: str
+    db_url: Optional[str] = None
+    db_host: Optional[str] = None
+    db_port: Optional[int] = None
+    db_name: Optional[str] = None
+    db_user: Optional[str] = None
+    db_pass: Optional[str] = None
+

{kubernetes_watch-0.1.13 → kubernetes_watch-0.1.14}/kube_watch/modules/database/postgre.py

@@ -1,23 +1,26 @@
 import psycopg2
 import psycopg2.extras
 from prefect import get_run_logger
+from urllib.parse import urlparse, unquote
 
 from .model import TableQuery
 
 logger = get_run_logger()
 
 
-def execute_query(db_user, db_pass, db_query, db_host="localhost", db_port=5432, db_name="postgres"):
+def execute_query(db_query, db_url=None, db_user=None, db_pass=None, db_host="localhost", db_port=5432, db_name="postgres"):
     """
     Connect to PostgreSQL database, execute a query, and return status message.
     
     Args:
-        db_user (str): Database username
-        db_pass (str): Database password
         db_query (str): SQL query to execute
-        db_host (str): Database host (default: localhost)
-        db_port (int): Database port (default: 5432)
-        db_name (str): Database name (default: postgres)
+        db_url (str, optional): Database connection URL (e.g., postgresql://user:pass@host:port/dbname)
+                                Supports postgresql+asyncpg:// format as well
+        db_user (str, optional): Database username (used if db_url is not provided)
+        db_pass (str, optional): Database password (used if db_url is not provided)
+        db_host (str): Database host (default: localhost, used if db_url is not provided)
+        db_port (int): Database port (default: 5432, used if db_url is not provided)
+        db_name (str): Database name (default: postgres, used if db_url is not provided)
     
     Returns:
         dict: Status message with success/failure information
@@ -26,6 +29,18 @@ def execute_query(db_user, db_pass, db_query, db_host="localhost", db_port=5432,
     cursor = None
     
     try:
+        # Parse connection URL if provided
+        if db_url:
+            # Handle SQLAlchemy-style URLs (postgresql+asyncpg://)
+            url = db_url.replace('postgresql+asyncpg://', 'postgresql://')
+            parsed = urlparse(url)
+            
+            db_host = parsed.hostname
+            db_port = parsed.port or 5432
+            db_name = parsed.path.lstrip('/')
+            db_user = unquote(parsed.username) if parsed.username else None
+            db_pass = unquote(parsed.password) if parsed.password else None
+        
         # Establish database connection
         connection = psycopg2.connect(
             host=db_host,
@@ -125,19 +140,37 @@ def delete_on_retention_period(table_delete: dict, batch_size: int = 100000, int
         table_query = TableQuery(**table_delete)
     except Exception as e:
         logger.error(f"Error creating TableQuery object: {str(e)}")
-        raise ValueError("Invalid table_delete data format. Expected a dictionary with 'name', 'column_name', 'db_host', 'db_port', 'db_name', 'db_user', and 'db_pass' keys.")
+        raise ValueError("Invalid table_delete data format. Expected a dictionary with 'table_name', 'column_name', and either 'db_url' or ('db_host', 'db_port', 'db_name', 'db_user', 'db_pass') keys.")
 
     connection = None
     cursor = None
 
     try:
+        # Parse connection URL if provided
+        if table_query.db_url:
+            # Handle SQLAlchemy-style URLs (postgresql+asyncpg://)
+            url = table_query.db_url.replace('postgresql+asyncpg://', 'postgresql://')
+            parsed = urlparse(url)
+            
+            db_host = parsed.hostname
+            db_port = parsed.port or 5432
+            db_name = parsed.path.lstrip('/')
+            db_user = unquote(parsed.username) if parsed.username else None
+            db_pass = unquote(parsed.password) if parsed.password else None
+        else:
+            db_host = table_query.db_host
+            db_port = table_query.db_port
+            db_name = table_query.db_name
+            db_user = table_query.db_user
+            db_pass = table_query.db_pass
+        
         # Establish database connection
         connection = psycopg2.connect(
-            host=table_query.db_host,
-            port=table_query.db_port,
-            database=table_query.db_name,
-            user=table_query.db_user,
-            password=table_query.db_pass
+            host=db_host,
+            port=db_port,
+            database=db_name,
+            user=db_user,
+            password=db_pass
         )
 
         cursor = connection.cursor()

{kubernetes_watch-0.1.13 → kubernetes_watch-0.1.14}/kube_watch/standalone/metarecogen/ckan_to_gn.py

@@ -92,7 +92,7 @@ def insert_gn_record(session, xsrf_token, xml_string):
     }
 
     # Send a put request to the endpoint to create record
-    response = session.put(GN_URL + '/geonetwork/srv/api/0.1/records',
+    response = session.put(GN_URL + '/geonetwork/srv/api/records',
                         data=xml_string,
                         params=params,
                         auth=(GN_USERNAME, GN_PASSWORD),

{kubernetes_watch-0.1.13 → kubernetes_watch-0.1.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kubernetes-watch"
-version = "0.1.13"
+version = "0.1.14"
 description = ""
 authors = ["bmotevalli <b.motevalli@gmail.com>"]
 packages = [{include = "kube_watch"}]

kubernetes_watch-0.1.13/kube_watch/modules/database/model.py

@@ -1,12 +0,0 @@
-from typing import Union
-from pydantic import BaseModel
-
-class TableQuery(BaseModel):
-    name: str
-    column_name: str
-    db_host: str
-    db_port: int
-    db_name: str
-    db_user: str
-    db_pass: str
-