agenthink 0.1.21__py3-none-any.whl → 0.1.25__py3-none-any.whl

agenthink/connection.py

@@ -125,6 +125,17 @@ class DBConnector:
                         logger.info("Added MSSQL connection for database '%s' to connection_object_dict", db_name)
                 except Exception as e:
                     logger.exception("Unable to create connection object for MSSQL secret: %s", e)
+            elif datastore_type == "postgresql":
+                try:
+                    connection_object = self.__connect_postgresql(secret)
+                    if connection_object:
+                        db_name = secret.get("database_name", "unknown")
+                        connection_dict = {"database_type": "postgresql", "connection_object": connection_object}
+                        self.connection_object_dict[f"{db_name}"] = connection_dict
+                        logger.info("Added PostgreSQL connection for database '%s' to connection_object_dict", db_name)
+                except Exception as e:
+                    logger.exception("Unable to create connection object for PostgreSQL secret: %s", e)
+      
             else:
                 logger.warning("Unsupported datastore_type '%s' for key '%s'", datastore_type, cleaned_key)
 
@@ -180,6 +191,37 @@ class DBConnector:
         except Exception as e:
             logger.exception("MS SQL Connection failed: %s", e)
             return None
+        
+    def __connect_postgresql(self, secret):
+        """
+        Establish a connection to a PostgreSQL database.
+
+        Parameters
+        ----------
+        secret : dict
+            Dictionary containing PostgreSQL connection credentials.
+
+        Returns
+        -------
+        psycopg2.connection or None
+            PostgreSQL connection object if successful, otherwise None.
+        """
+        config = {
+            "host": secret.get("cluster_ip"),
+            "port": secret.get("port"),
+            "user": secret.get("username"),
+            "password": secret.get("password"),
+            "database": secret.get("database_name")
+        }
+
+        try:
+            conn = psycopg2.connect(**config)
+            logger.info("PostgreSQL connection successfully established to database '%s' on host '%s'",
+                        config["database"], config["host"])
+            return conn
+        except Exception as e:
+            logger.exception("PostgreSQL connection failed: %s", e)
+            return None
 
     def __sanitize_secret_name(self, secret_name: str) -> str:
         """
@@ -284,11 +326,27 @@ class DBConnector:
             finally:
                 if cursor:
                     cursor.close()
+
+        elif database_type == "postgresql":
+            try:
+                cursor = database_connection.cursor()
+                cursor.execute(query)
+                results = cursor.fetchall()
+                logger.info("Executed query on PostgreSQL database '%s': %s", db_name, query)
+                return results
+            except Exception as e:
+                logger.exception("Failed to execute query on PostgreSQL database '%s': %s", db_name, e)
+                return None
+            finally:
+                if cursor:
+                    cursor.close()
             
         else:
             logger.error("Unsupported database type '%s' for database '%s'", database_type, db_name)
             return None
         
+        
+        
     def display_tables(self,db_name:str):
         """
         Retrieve a list of user tables from a MySQL or MSSQL database.
@@ -334,6 +392,22 @@ class DBConnector:
                 logger.exception("Failed to retrieve tables from MSSQL database '%s': %s", db_name, e)
                 return None
             
+        elif database_type == "postgresql":
+            try:
+                cursor = database_connection.cursor()
+                cursor.execute("""
+                    SELECT table_name 
+                    FROM information_schema.tables 
+                    WHERE table_schema = 'public' 
+                    AND table_type = 'BASE TABLE'
+                """)
+                tables = cursor.fetchall()
+                table_list = [table[0] for table in tables]
+                return table_list
+            except Exception as e:
+                logger.exception("Failed to retrieve tables from PostgreSQL database '%s': %s", db_name, e)
+                return None
+            
 
     def insert_data(self,db_name:str,table_name:str,data:dict):
         """
@@ -370,7 +444,7 @@ class DBConnector:
                 logger.debug("Data inserted into MySQL database '%s', table '%s'", db_name, table_name)
             except Exception as e:
                 logger.exception("Failed to insert data into MySQL database '%s', table '%s': %s", db_name, table_name, e)
-        if database_type == "mssql":
+        elif database_type == "mssql":
             try:
                 cursor = database_connection.cursor()
                 columns_sql = ", ".join(f"[{c}]" for c in data.keys())
@@ -391,6 +465,27 @@ class DBConnector:
             except Exception as e:
                 logger.exception("Insert failed for %s database '%s', table '%s'", database_type, db_name, table_name)
 
+        elif database_type == "postgresql":
+            try:
+                cursor = database_connection.cursor()
+                columns_sql = ", ".join(f'"{c}"' for c in data.keys())
+                placeholders = ", ".join("%s" for _ in data)
+                values = tuple(data.values())
+
+                sql = f'INSERT INTO "{table_name}" ({columns_sql}) VALUES ({placeholders})'
+
+                cursor.execute(sql, values)
+                database_connection.commit()
+
+                logger.info(
+                    "Data inserted into PostgreSQL database '%s', table '%s'",
+                    db_name,
+                    table_name
+                )
+                cursor.close()
+            except Exception as e:
+                logger.exception("Insert failed for PostgreSQL database '%s', table '%s'", db_name, table_name)
+
     def get_data(self, db_name: str, table_name: str, num_rows: int = 5):
         """
         Retrieve a limited number of rows from a table for display.
@@ -421,6 +516,9 @@ class DBConnector:
             elif db_type == "mssql":
                 sql = f"SELECT TOP ({num_rows}) * FROM [{table_name}]"
                 cursor.execute(sql)
+            elif db_type == "postgresql":
+                sql = f'SELECT * FROM "{table_name}" LIMIT %s'
+                cursor.execute(sql, (num_rows,))
             else:
                 return None
 
@@ -474,7 +572,7 @@ class DBConnector:
                     """
                 cursor.execute(sql, (table_name,))
                 result =  cursor.fetchall()
-            if db_type == "mssql":
+            elif db_type == "mssql":
                 sql = """
                     SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE
                     FROM INFORMATION_SCHEMA.COLUMNS
@@ -483,6 +581,16 @@ class DBConnector:
                     """
                 cursor.execute(sql, (table_name,))
                 result = cursor.fetchall()
+            elif db_type == "postgresql":
+                sql = """
+                    SELECT column_name, data_type, is_nullable
+                    FROM information_schema.columns
+                    WHERE table_schema = 'public'
+                    AND table_name = %s
+                    ORDER BY ordinal_position
+                    """
+                cursor.execute(sql, (table_name,))
+                result = cursor.fetchall()
         except Exception:
             logger.exception(
                 "Failed to retrieve schema from %s database '%s', table '%s'",

agenthink/data_source.py

@@ -1,24 +1,38 @@
-# ...existing code...
-import json
-from fastapi import FastAPI
-from pydantic import BaseModel
-import mysql.connector
-from fastapi import APIRouter
-import mysql.connector
-from azure.identity import ClientSecretCredential
-from azure.keyvault.secrets import SecretClient
-from mysql.connector import pooling
-import json
-from azure.storage.blob import BlobServiceClient
-from azure.storage.blob import BlobPrefix
-import pyodbc
-import agenthink.utils as utils
-import os
-import json
-import dotenv
-import logging
-import re
-dotenv.load_dotenv()
+import uuid
+from agenthink.models import ConnectionRequest
 
+def build_d365_read_call(
+    data: ConnectionRequest,
+    primary_key: str = "Entry_No",
+    filter_query: str | None = None
+) -> dict:
+    """
+    Builds a d365_execute tool-call response from ConnectionRequest
+    """
 
+    if not data.d365request or not isinstance(data.d365request, list):
+        raise ValueError("d365request must be a non-empty list")
 
+    target_url = data.d365request[0].get("url")
+    if not target_url:
+        raise ValueError("Missing url in d365request")
+
+    return {
+        "status": "tool_calls_pending",
+        "session_id": data.session_id,
+        "tools_used": ["d365_execute"],
+        "tool_call_plan": [
+            {
+                "tool_call_id": f"call_{uuid.uuid4().hex}",
+                "params": {
+                    "name": "d365_execute",
+                    "arguments": {
+                        "operation": "read",
+                        "target_url": target_url,
+                        "primary_key": primary_key,
+                        "filter_query": filter_query,
+                    }
+                }
+            }
+        ]
+    }

agenthink/models.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel
 from typing import List, Optional
+from typing import Any, Dict
 
 # class ConnectionRequest(BaseModel):
 #     query: str
@@ -9,11 +10,22 @@ from typing import List, Optional
 #     datastore: Optional[List] = []
 #     tools: Optional[List] = []
 
+# class ConnectionRequest(BaseModel):
+#     query: Optional[str] = None
+#     user_id: Optional[str] = None
+#     session_id: Optional[str] = None
+#     workflow_id: Optional[str] = None
+#     datastore: Optional[List] = None
+#     tools: Optional[List] = None
+#     d365request: Optional[dict] = None
+
+
 class ConnectionRequest(BaseModel):
     query: Optional[str] = None
     user_id: Optional[str] = None
     session_id: Optional[str] = None
     workflow_id: Optional[str] = None
-    datastore: Optional[List] = None
-    tools: Optional[List] = None
-    d365request: Optional[dict] = None
+    datastore_id: Optional[str] = None
+    datastore: Optional[List[Dict[str, Any]]] = None
+    tools: Optional[List[Dict[str, Any]]] = None
+    d365request: Optional[List[Dict[str, Any]]] = None

{agenthink-0.1.21.dist-info → agenthink-0.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agenthink
-Version: 0.1.21
+Version: 0.1.25
 Summary: A unified agent framework for connecting workflows, databases, and agents
 Author: Ritobroto
 Requires-Python: >=3.10

agenthink-0.1.25.dist-info/RECORD

@@ -0,0 +1,9 @@
+agenthink/__init__.py,sha256=6oUldrZgE76j8OhwsQgVY5vdaPTDFyChOljske-so8U,78
+agenthink/connection.py,sha256=sh4sbc7y-BVyCTMMjTSMMEJYeedB6_XBOKpdBb2jKEY,25477
+agenthink/data_source.py,sha256=hSlpKcS_I6ws9vSKeMnt7EwSHcfO-fFKF8jfXNUE7DI,1196
+agenthink/models.py,sha256=7jm3FPQS50h0t-oCi2SjYW_SmU0nH0d7Hxvqgh15DAw,991
+agenthink/utils.py,sha256=r5o74RbenFhQ7E3N7naoLJ-fYEe9otz0nkcvwKHDTaU,911
+agenthink-0.1.25.dist-info/METADATA,sha256=S9uDnN2gs-F8YlCBkRk2ivQjHezPYnpnm9P0JYEkMFY,1722
+agenthink-0.1.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agenthink-0.1.25.dist-info/top_level.txt,sha256=rYw4Lx2uqOzbGCSoJEaikme7vS9NvgbVMc26QUIZoZM,10
+agenthink-0.1.25.dist-info/RECORD,,

agenthink-0.1.21.dist-info/RECORD

@@ -1,9 +0,0 @@
-agenthink/__init__.py,sha256=6oUldrZgE76j8OhwsQgVY5vdaPTDFyChOljske-so8U,78
-agenthink/connection.py,sha256=5EIZkthtAf_bCICCcEHaLRxP_tEflpJNA1hPHMGDf44,20895
-agenthink/data_source.py,sha256=HDi-UDAphTCKiFqWEB_-MfHwXpJKqfn_i05-LdID3M0,561
-agenthink/models.py,sha256=O5lWUNP1soAxU1X0iuE_lxYoyuXiKI0LXI6S_6zmxiE,559
-agenthink/utils.py,sha256=r5o74RbenFhQ7E3N7naoLJ-fYEe9otz0nkcvwKHDTaU,911
-agenthink-0.1.21.dist-info/METADATA,sha256=KLsNFvne6GMA0zrxB77X7TRgsC02Gy26HRdaGPnKa70,1722
-agenthink-0.1.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agenthink-0.1.21.dist-info/top_level.txt,sha256=rYw4Lx2uqOzbGCSoJEaikme7vS9NvgbVMc26QUIZoZM,10
-agenthink-0.1.21.dist-info/RECORD,,