arcade-postgres 0.2.0__tar.gz → 0.3.0__tar.gz

{arcade_postgres-0.2.0 → arcade_postgres-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arcade_postgres
-Version: 0.2.0
+Version: 0.3.0
 Summary: Tools to query and explore a postgres database
 Author-email: evantahler <support@arcade.dev>
 Requires-Python: >=3.10

{arcade_postgres-0.2.0 → arcade_postgres-0.3.0}/arcade_postgres/tools/postgres.py

@@ -8,19 +8,19 @@ from sqlalchemy.ext.asyncio import AsyncEngine
 from ..database_engine import MAX_ROWS_RETURNED, DatabaseEngine
 
 
-@tool(requires_secrets=["DATABASE_CONNECTION_STRING"])
+@tool(requires_secrets=["POSTGRES_DATABASE_CONNECTION_STRING"])
 async def discover_schemas(
     context: ToolContext,
 ) -> list[str]:
     """Discover all the schemas in the postgres database."""
     async with await DatabaseEngine.get_engine(
-        context.get_secret("DATABASE_CONNECTION_STRING")
+        context.get_secret("POSTGRES_DATABASE_CONNECTION_STRING")
     ) as engine:
         schemas = await _get_schemas(engine)
         return schemas
 
 
-@tool(requires_secrets=["DATABASE_CONNECTION_STRING"])
+@tool(requires_secrets=["POSTGRES_DATABASE_CONNECTION_STRING"])
 async def discover_tables(
     context: ToolContext,
     schema_name: Annotated[
@@ -32,13 +32,13 @@ async def discover_tables(
     ALWAYS use this tool before any other tool that requires a table name.
     """
     async with await DatabaseEngine.get_engine(
-        context.get_secret("DATABASE_CONNECTION_STRING")
+        context.get_secret("POSTGRES_DATABASE_CONNECTION_STRING")
     ) as engine:
         tables = await _get_tables(engine, schema_name)
         return tables
 
 
-@tool(requires_secrets=["DATABASE_CONNECTION_STRING"])
+@tool(requires_secrets=["POSTGRES_DATABASE_CONNECTION_STRING"])
 async def get_table_schema(
     context: ToolContext,
     schema_name: Annotated[str, "The database schema to get the table schema of"],
@@ -50,12 +50,12 @@ async def get_table_schema(
     This tool should ALWAYS be used before executing any query.  All tables in the query must be discovered first using the <DiscoverTables> tool.
     """
     async with await DatabaseEngine.get_engine(
-        context.get_secret("DATABASE_CONNECTION_STRING")
+        context.get_secret("POSTGRES_DATABASE_CONNECTION_STRING")
     ) as engine:
         return await _get_table_schema(engine, schema_name, table_name)
 
 
-@tool(requires_secrets=["DATABASE_CONNECTION_STRING"])
+@tool(requires_secrets=["POSTGRES_DATABASE_CONNECTION_STRING"])
 async def execute_select_query(
     context: ToolContext,
     select_clause: Annotated[
@@ -116,7 +116,7 @@ async def execute_select_query(
     * Only join on columns that are indexed or the primary key.  Do not join on arbitrary columns.
     """
     async with await DatabaseEngine.get_engine(
-        context.get_secret("DATABASE_CONNECTION_STRING")
+        context.get_secret("POSTGRES_DATABASE_CONNECTION_STRING")
     ) as engine:
         try:
             return await _execute_query(
@@ -171,6 +171,8 @@ async def _get_tables(engine: AsyncEngine, schema_name: str) -> list[str]:
 
                 these_tables = await conn.run_sync(get_table_names)
                 tables.extend(these_tables)
+
+        tables.sort()
         return tables
 
 

{arcade_postgres-0.2.0 → arcade_postgres-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arcade_postgres"
-version = "0.2.0"
+version = "0.3.0"
 description = "Tools to query and explore a postgres database"
 requires-python = ">=3.10"
 dependencies = [

{arcade_postgres-0.2.0 → arcade_postgres-0.3.0}/tests/test_postgres.py

@@ -15,7 +15,7 @@ from arcade_tdk.errors import RetryableToolError
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import create_async_engine
 
-DATABASE_CONNECTION_STRING = (
+POSTGRES_DATABASE_CONNECTION_STRING = (
     environ.get("TEST_POSTGRES_DATABASE_CONNECTION_STRING")
     or "postgresql://evan@localhost:5432/postgres"
 )
@@ -26,7 +26,9 @@ def mock_context():
     context = ToolContext()
     context.secrets = []
     context.secrets.append(
-        ToolSecretItem(key="DATABASE_CONNECTION_STRING", value=DATABASE_CONNECTION_STRING)
+        ToolSecretItem(
+            key="POSTGRES_DATABASE_CONNECTION_STRING", value=POSTGRES_DATABASE_CONNECTION_STRING
+        )
     )
 
     return context
@@ -37,7 +39,9 @@ def mock_context():
 async def restore_database():
     with open(f"{os.path.dirname(__file__)}/dump.sql") as f:
         engine = create_async_engine(
-            DATABASE_CONNECTION_STRING.replace("postgresql", "postgresql+asyncpg").split("?")[0]
+            POSTGRES_DATABASE_CONNECTION_STRING.replace("postgresql", "postgresql+asyncpg").split(
+                "?"
+            )[0]
         )
         async with engine.connect() as c:
             queries = f.read().split(";")
@@ -64,7 +68,7 @@ async def test_discover_schemas(mock_context) -> None:
 
 @pytest.mark.asyncio
 async def test_discover_tables(mock_context) -> None:
-    assert await discover_tables(mock_context) == ["users", "messages"]
+    assert await discover_tables(mock_context) == ["messages", "users"]
 
 
 @pytest.mark.asyncio