feat: adds table args (#5)

* feat: adds table args

* fix docstring

* addresses comments

* linters

Author: mekhlakapoor

aind-dataverse-service-server/pyproject.toml

@@ -17,7 +17,7 @@ readme = "README.md"
 dynamic = ["version"]
 
 dependencies = [
-    'allen-powerplatform-client>=0.1.0',
+    'allen-powerplatform-client>=0.1.4',
     'aind-settings-utils>=0.0.3',
     'httpx',
     'pydantic>=2.0',

aind-dataverse-service-server/src/aind_dataverse_service_server/route.py

@@ -2,7 +2,7 @@
 
 from typing import List
 
-from fastapi import APIRouter, HTTPException, Path, status
+from fastapi import APIRouter, HTTPException, Path, Query, status
 from aind_dataverse_service_server.models import HealthCheck, EntityTableRow
 from fastapi_cache.decorator import cache
 from azure.core.credentials import AccessToken
@@ -66,7 +66,17 @@ async def get_table(
                 "value": "cr138_projects",
             }
         },
-    )
+    ),
+    columns: str = Query(
+        default=None,
+        description="Comma-separated column names to select from the table",
+        example="modifiedon,statecode,cr138_projectname",
+    ),
+    filter: str = Query(
+        default=None,
+        description="OData-style filter expression",
+        example="cr138_projectname eq 'Barseq_GeneticTools'",
+    ),
 ):
     """
     ## Table Data
@@ -83,11 +93,13 @@ async def get_table(
     configuration.access_token = bearer_token
     with allen_powerplatform_client.ApiClient(configuration) as api_client:
         api_instance = allen_powerplatform_client.DefaultApi(api_client)
-        api_version = settings.api_version
-        body = allen_powerplatform_client.GetTableRequest(
-            table_name=entity_set_table_name
-        )
         try:
+            api_version = settings.api_version
+            body = allen_powerplatform_client.GetTableRequest(
+                table_name=entity_set_table_name,
+                columns=columns,
+                filter=filter,
+            )
             api_response = api_instance.get_table(
                 api_version=api_version, body=body, _request_timeout=10
             )

aind-dataverse-service-server/tests/test_route.py

@@ -109,10 +109,7 @@ def test_get_table_exception_response(
 
         response = client.get("/tables/non_existent_table")
         assert 404 == response.status_code
-        assert (
-            "Error fetching non_existent_table"
-            in response.json()["detail"]
-        )
+        assert "Error fetching non_existent_table" in response.json()["detail"]
 
     @patch(
         "aind_dataverse_service_server.route."
@@ -145,6 +142,39 @@ def test_get_table_info_200_response(
         assert len(response.json()) == 3
         assert response.json()[0]["entitysetname"] == "cr138_projects"
 
+    @patch(
+        "aind_dataverse_service_server.route."
+        "allen_powerplatform_client.DefaultApi"
+    )
+    @patch(
+        "aind_dataverse_service_server.route."
+        "allen_powerplatform_client.ApiClient"
+    )
+    @patch("aind_dataverse_service_server.route.get_access_token")
+    def test_get_table_with_query_params(
+        self,
+        mock_get_token: MagicMock,
+        mock_api_client: MagicMock,
+        mock_default_api: MagicMock,
+        client: TestClient,
+        mock_table_data,
+    ):
+        """Tests table data retrieval with all optional query parameters"""
+        mock_get_token.return_value = "mock_token"
+        mock_instance = MagicMock()
+        mock_instance.get_table.return_value = mock_table_data
+        mock_default_api.return_value = mock_instance
+        mock_api_client.return_value.__enter__.return_value = MagicMock()
+
+        params = {
+            "columns": "name,createdon",
+            "filter": "status eq 'Active'",
+        }
+        response = client.get("/tables/cr138_projects", params=params)
+        assert response.status_code == 200
+        assert isinstance(response.json(), list)
+        assert len(response.json()) == 2
+
 
 if __name__ == "__main__":
     pytest.main([__file__])