fix:PRComments

Author: RSam-NI

nisystemlink/clients/file/models/_base_file_request.py

@@ -1,7 +1,5 @@
 from nisystemlink.clients.core._uplink._json_model import JsonModel
 
-from ._file_query_order_by import FileLinqQueryOrderBy, SearchFilesOrderBy
-
 
 class BaseFileRequest(JsonModel):
     """Base class for file request models containing common query parameters."""
@@ -21,11 +19,6 @@ class BaseFileRequest(JsonModel):
     How many files to return in the result.
     """
 
-    order_by: FileLinqQueryOrderBy | SearchFilesOrderBy | None = None
-    """
-    The property by which to order the files in the response.
-    """
-
     order_by_descending: bool | None = False
     """
     Whether to sort in descending order.

nisystemlink/clients/file/models/_file_linq_query.py

@@ -1,11 +1,15 @@
 from nisystemlink.clients.file.models._base_file_request import BaseFileRequest
 from nisystemlink.clients.file.models._base_file_response import BaseFileResponse
+from nisystemlink.clients.file.models._file_query_order_by import FileLinqQueryOrderBy
 
 
 class FileLinqQueryRequest(BaseFileRequest):
     """Request model for LINQ query operations."""
 
-    pass
+    order_by: FileLinqQueryOrderBy | None = None
+    """
+    The property by which to order the files in the response.
+    """
 
 
 class FileLinqQueryResponse(BaseFileResponse):

nisystemlink/clients/file/models/_search_files_request.py

@@ -1,7 +1,11 @@
 from nisystemlink.clients.file.models._base_file_request import BaseFileRequest
+from nisystemlink.clients.file.models._file_query_order_by import SearchFilesOrderBy
 
 
 class SearchFilesRequest(BaseFileRequest):
     """Request model for searching files."""
 
-    pass
+    order_by: SearchFilesOrderBy | None = None
+    """
+    The property by which to order the files in the response.
+    """

tests/integration/file/test_file_client.py

@@ -268,6 +268,28 @@ def test__query_files_linq__filter_returns_no_results(self, client: FileClient):
         assert response.total_count.value == 0
         assert response.total_count.relation == TotalCountRelation.EQUALS
 
+    def test__query_files_linq__total_count_relation_accepts_string(
+        self, client: FileClient, test_file, random_filename_extension
+    ):
+        """Test backward compatibility: TotalCountRelation should accept string values.
+
+        TotalCountRelation was previously a plain str type. This test ensures that string
+        values like 'eq' and 'gte' are still accepted for backward compatibility.
+        """
+        test_file(file_name=random_filename_extension)
+
+        query_request = FileLinqQueryRequest(
+            filter=f'name == "{random_filename_extension}"',
+        )
+        response = client.query_files_linq(query=query_request)
+
+        assert response.total_count is not None
+        # Test that the relation can be compared with string values
+        assert response.total_count.relation == "eq"
+        assert response.total_count.relation in ["eq", "gte"]
+        # Also verify enum comparison still works
+        assert response.total_count.relation == TotalCountRelation.EQUALS  # type: ignore[comparison-overlap]
+
     def test__query_files_linq__skip_and_take_pagination(
         self, client: FileClient, test_file
     ):