refactor: address PR comments

Author: ShriramS-Emerson

nisystemlink/clients/file/_file_client.py

@@ -148,9 +148,9 @@ def get_files(
 
     @post("service-groups/Default/query-files-linq")
     def query_files_linq(
-        self, query: models.LinqFileQueryRequest
-    ) -> models.LinqFileQueryResponse:
-        """Queries files using LINQ syntax.
+        self, query: models.FileLinqQueryRequest
+    ) -> models.FileLinqQueryResponse:
+        """Queries file using LINQ filters.
 
         Args:
             query: The LINQ query request containing the query string and optional parameters.

nisystemlink/clients/file/models/__init__.py

@@ -4,6 +4,6 @@
 from ._link import Link
 from ._operations import V1Operations
 from ._update_metadata import UpdateMetadataRequest
-from ._linq_file_query import LinqFileQueryRequest, LinqFileQueryResponse
+from ._file_linq_query import FileLinqQueryRequest, FileLinqQueryResponse
 
 # flake8: noqa

…/clients/file/models/_linq_file_query.py …/clients/file/models/_file_linq_query.pynisystemlink/clients/file/models/_linq_file_query.py renamed to nisystemlink/clients/file/models/_file_linq_query.py nisystemlink/clients/file/models/_linq_file_query.py renamed to nisystemlink/clients/file/models/_file_linq_query.py

@@ -1,11 +1,11 @@
 from typing import List, Optional
 
 from nisystemlink.clients.core._uplink._json_model import JsonModel
-from nisystemlink.clients.file.models._file_metadata import LinqFileMetadata
+from nisystemlink.clients.file.models._file_metadata import FileLinqQueryMetadata
 from nisystemlink.clients.file.models._file_query_order_by import FileLinqQueryOrderBy
 
 
-class LinqFileQueryRequest(JsonModel):
+class FileLinqQueryRequest(JsonModel):
     filter: Optional[str] = None
     """
     The filter criteria for files. Consists of a string of queries composed using AND/OR operators.
@@ -15,11 +15,11 @@ class LinqFileQueryRequest(JsonModel):
     Example Filter syntax: '[property name][operator][operand] and [property name][operator][operand]'
     """
 
-    ordery_by: Optional[FileLinqQueryOrderBy] = None
+    order_by: Optional[FileLinqQueryOrderBy] = None
     """The property by which to order the files in the response."""
 
     order_by_descending: Optional[bool] = False
-    """If true, the files are ordered in descending order based on the property specified in `ordery_by`."""
+    """If true, the files are ordered in descending order based on the property specified in `order_by`."""
 
     take: Optional[int] = None
     """The maximum number of files to return in the response. Default value is 1000"""
@@ -45,8 +45,8 @@ class TotalCount(JsonModel):
     """Describes the number of files that were returned as a result of the query in the database"""
 
 
-class LinqFileQueryResponse(JsonModel):
-    available_files: List[LinqFileMetadata]
+class FileLinqQueryResponse(JsonModel):
+    available_files: List[FileLinqQueryMetadata]
     """The list of files returned by the query"""
 
     total_count: TotalCount

nisystemlink/clients/file/models/_file_metadata.py

@@ -85,7 +85,7 @@ class FileMetadata(BaseFileMetadata):
     """
 
 
-class LinqFileMetadata(BaseFileMetadata):
+class FileLinqQueryMetadata(BaseFileMetadata):
     """Metadata for a file returned by a LINQ query."""
 
     updated: Optional[datetime] = None

tests/integration/file/test_file_client.py

@@ -8,7 +8,7 @@
 import pytest  # type: ignore
 from nisystemlink.clients.core import ApiException
 from nisystemlink.clients.file import FileClient
-from nisystemlink.clients.file.models import LinqFileQueryRequest, UpdateMetadataRequest
+from nisystemlink.clients.file.models import FileLinqQueryRequest, UpdateMetadataRequest
 from nisystemlink.clients.file.utilities import rename_file
 
 FILE_NOT_FOUND_ERR = "Not Found"
@@ -209,47 +209,38 @@ def test__back_off_retry__works(self, client: FileClient, test_file):
     def test__query_files_linq__filter_by_name_succeeds(
         self, client: FileClient, test_file, random_filename_extension: str
     ):
-        """Test LINQ query filtering by file name."""
-        # Upload the test file with random name
         file_id = test_file(file_name=random_filename_extension, cleanup=False)
 
-        try:
-            # Query by exact name match
-            query_request = LinqFileQueryRequest(
-                filter=f'name == "{random_filename_extension}"'
-            )
-            response = client.query_files_linq(query=query_request)
-
-            assert response.available_files is not None
-            assert len(response.available_files) == 1
-            assert response.available_files[0].id == file_id
-            assert response.available_files[0].properties is not None
-            assert (
-                response.available_files[0].properties["Name"]
-                == random_filename_extension
-            )
-            assert response.total_count.value == 1
-            assert response.total_count.relation == "eq"
-
-        finally:
-            client.delete_file(id=file_id)
+        query_request = FileLinqQueryRequest(
+            filter=f'name == "{random_filename_extension}"'
+        )
+        response = client.query_files_linq(query=query_request)
+
+        assert response.available_files is not None
+        assert len(response.available_files) == 1
+        assert response.available_files[0].id == file_id
+        assert response.available_files[0].properties is not None
+        assert (
+            response.available_files[0].properties["Name"]
+            == random_filename_extension
+        )
+        assert response.total_count.value == 1
+        assert response.total_count.relation == "eq"
+
+        client.delete_file(id=file_id)
 
     def test__query_files_linq__invalid_filter_raises(self, client: FileClient):
-        """Test LINQ query with invalid filter syntax raises exception."""
-        # Query with malformed filter
-        query_request = LinqFileQueryRequest(filter="invalid filter syntax:")
+        query_request = FileLinqQueryRequest(filter="invalid filter syntax:")
 
         with pytest.raises(ApiException):
             client.query_files_linq(query=query_request)
 
     def test__query_files_linq__filter_returns_no_results(self, client: FileClient):
-        """Test LINQ query with valid filter that matches no files."""
-        # Query with a filter that should match no existing files
         unique_nonexistent_name = (
             f"{PREFIX}nonexistent_file_{randint(100000, 999999)}.random_extension"
         )
 
-        query_request = LinqFileQueryRequest(
+        query_request = FileLinqQueryRequest(
             filter=f'name == "{unique_nonexistent_name}"'
         )
         response = client.query_files_linq(query=query_request)