Removed ListOptions from model amd Updated Cancel and force cancel option

Author: aayushsingh2502

src/pytfe/models/__init__.py

@@ -149,11 +149,8 @@
 from .query_run import (
     QueryRun,
     QueryRunActions,
-    QueryRunCancelOptions,
     QueryRunCreateOptions,
-    QueryRunForceCancelOptions,
     QueryRunIncludeOpt,
-    QueryRunList,
     QueryRunListOptions,
     QueryRunReadOptions,
     QueryRunSource,
@@ -435,11 +432,8 @@
     # Query runs
     "QueryRun",
     "QueryRunActions",
-    "QueryRunCancelOptions",
     "QueryRunCreateOptions",
-    "QueryRunForceCancelOptions",
     "QueryRunIncludeOpt",
-    "QueryRunList",
     "QueryRunListOptions",
     "QueryRunReadOptions",
     "QueryRunSource",

src/pytfe/models/query_run.py

@@ -157,9 +157,6 @@ class QueryRunListOptions(BaseModel):
 
     model_config = ConfigDict(populate_by_name=True)
 
-    page_number: int | None = Field(
-        None, alias="page[number]", description="Page number to retrieve", ge=1
-    )
     page_size: int | None = Field(
         None, alias="page[size]", description="Number of items per page", ge=1, le=100
     )
@@ -176,38 +173,3 @@ class QueryRunReadOptions(BaseModel):
     include: list[QueryRunIncludeOpt] | None = Field(
         None, description="List of related resources to include"
     )
-
-
-class QueryRunCancelOptions(BaseModel):
-    """Options for canceling a query run."""
-
-    model_config = ConfigDict(populate_by_name=True)
-
-    comment: str | None = Field(
-        None, description="Optional comment about why the query run was canceled"
-    )
-
-
-class QueryRunForceCancelOptions(BaseModel):
-    """Options for force canceling a query run."""
-
-    model_config = ConfigDict(populate_by_name=True)
-
-    comment: str | None = Field(
-        None, description="Optional comment about why the query run was force canceled"
-    )
-
-
-class QueryRunList(BaseModel):
-    """Represents a paginated list of query runs."""
-
-    model_config = ConfigDict(populate_by_name=True)
-
-    items: list[QueryRun] = Field(
-        default_factory=list, description="List of query runs"
-    )
-    current_page: int | None = Field(None, description="Current page number")
-    total_pages: int | None = Field(None, description="Total number of pages")
-    prev_page: int | str | None = Field(None, description="Previous page number or URL")
-    next_page: int | str | None = Field(None, description="Next page number or URL")
-    total_count: int | None = Field(None, description="Total number of items")

src/pytfe/resources/query_run.py

@@ -10,9 +10,7 @@
 )
 from ..models.query_run import (
     QueryRun,
-    QueryRunCancelOptions,
     QueryRunCreateOptions,
-    QueryRunForceCancelOptions,
     QueryRunListOptions,
     QueryRunReadOptions,
 )
@@ -152,46 +150,28 @@ def logs(self, query_run_id: str) -> io.IOBase:
         # Return the content as a BytesIO stream
         return io.BytesIO(r.content)
 
-    def cancel(
-        self, query_run_id: str, options: QueryRunCancelOptions | None = None
-    ) -> None:
+    def cancel(self, query_run_id: str) -> None:
         """Cancel a query run.
 
         Returns 202 on success with empty body.
         """
         if not valid_string_id(query_run_id):
             raise InvalidQueryRunIDError()
 
-        body: dict[str, Any] | None = None
-        if options:
-            attrs = options.model_dump(by_alias=True, exclude_none=True)
-            if attrs:
-                body = {"data": {"attributes": attrs}}
-
         self.t.request(
             "POST",
             f"/api/v2/queries/{query_run_id}/actions/cancel",
-            json_body=body,
         )
 
-    def force_cancel(
-        self, query_run_id: str, options: QueryRunForceCancelOptions | None = None
-    ) -> None:
+    def force_cancel(self, query_run_id: str) -> None:
         """Force cancel a query run.
 
         Returns 202 on success with empty body.
         """
         if not valid_string_id(query_run_id):
             raise InvalidQueryRunIDError()
 
-        body: dict[str, Any] | None = None
-        if options:
-            attrs = options.model_dump(by_alias=True, exclude_none=True)
-            if attrs:
-                body = {"data": {"attributes": attrs}}
-
         self.t.request(
             "POST",
             f"/api/v2/queries/{query_run_id}/actions/force-cancel",
-            json_body=body,
         )

tests/units/test_query_run.py

@@ -21,9 +21,7 @@
 from pytfe.errors import InvalidQueryRunIDError, InvalidWorkspaceIDError
 from pytfe.models import (
     QueryRun,
-    QueryRunCancelOptions,
     QueryRunCreateOptions,
-    QueryRunForceCancelOptions,
     QueryRunIncludeOpt,
     QueryRunListOptions,
     QueryRunReadOptions,
@@ -431,26 +429,6 @@ def test_cancel_success(self, query_runs_service, mock_transport):
         mock_transport.request.assert_called_once_with(
             "POST",
             "/api/v2/queries/qr-123abc456def/actions/cancel",
-            json_body=None,
-        )
-
-    def test_cancel_with_comment(self, query_runs_service, mock_transport):
-        """Test cancellation with comment."""
-        mock_response = Mock()
-        mock_transport.request.return_value = mock_response
-
-        options = QueryRunCancelOptions(comment="Canceling due to configuration error")
-
-        query_runs_service.cancel("qr-123abc456def", options)
-
-        # Verify the request includes comment
-        call_args = mock_transport.request.call_args
-        assert call_args[0][0] == "POST"
-        assert call_args[0][1] == "/api/v2/queries/qr-123abc456def/actions/cancel"
-        json_body = call_args[1]["json_body"]
-        assert (
-            json_body["data"]["attributes"]["comment"]
-            == "Canceling due to configuration error"
         )
 
     def test_cancel_invalid_id(self, query_runs_service):
@@ -478,26 +456,6 @@ def test_force_cancel_success(self, query_runs_service, mock_transport):
         mock_transport.request.assert_called_once_with(
             "POST",
             "/api/v2/queries/qr-123abc456def/actions/force-cancel",
-            json_body=None,
-        )
-
-    def test_force_cancel_with_comment(self, query_runs_service, mock_transport):
-        """Test force cancellation with comment."""
-        mock_response = Mock()
-        mock_transport.request.return_value = mock_response
-
-        options = QueryRunForceCancelOptions(comment="Force canceling stuck query run")
-
-        query_runs_service.force_cancel("qr-123abc456def", options)
-
-        # Verify the request includes comment
-        call_args = mock_transport.request.call_args
-        assert call_args[0][0] == "POST"
-        assert call_args[0][1] == "/api/v2/queries/qr-123abc456def/actions/force-cancel"
-        json_body = call_args[1]["json_body"]
-        assert (
-            json_body["data"]["attributes"]["comment"]
-            == "Force canceling stuck query run"
         )
 
     def test_force_cancel_invalid_id(self, query_runs_service):