Updated tests for new data structure return

Cyrus Radfar · Cyrus Radfar · commit af8340340141 · 2024-12-12T17:31:23.000-08:00
diff --git a/python_anvil/tests/test_models.py b/python_anvil/tests/test_models.py
@@ -3,6 +3,7 @@
 from pydantic import BaseModel
 from python_anvil.models import FileCompatibleBaseModel
 from typing import Any, Optional, List
+import base64
 
 def test_file_compat_base_model_handles_regular_data():
     class TestModel(FileCompatibleBaseModel):
@@ -22,18 +23,17 @@ class FileModel(FileCompatibleBaseModel):
         model = FileModel(file=test_file)
         data = model.model_dump()
         
-        # First verify we got a BufferedReader back, not a SerializationIterator
-        assert isinstance(data['file'], BufferedReader), \
-            f"Expected BufferedReader but got {type(data['file'])}"
+        # Verify we got a dictionary with the expected structure
+        assert isinstance(data['file'], dict)
+        assert 'data' in data['file']
+        assert 'mimetype' in data['file']
+        assert 'filename' in data['file']
         
-        # Verify the file is still readable
-        data['file'].seek(0)
-        content = data['file'].read()
-        assert len(content) > 0, "File should be readable"
-        
-        # verify the content is the same as the original file
+        # Verify the content matches
         with open(__file__, 'rb') as original_file:
-            assert content == original_file.read(), "File content should match original"
+            original_content = original_file.read()
+            decoded_content = base64.b64decode(data['file']['data'].encode('utf-8'))
+            assert decoded_content == original_content, "File content should match original"
 
 def test_file_compat_base_model_validates_types():
     class TestModel(FileCompatibleBaseModel):
@@ -106,14 +106,17 @@ def test_document_upload_handles_file_objects():
         
         data = doc.model_dump()
         
-        # Verify file object is preserved
-        assert isinstance(data['file'], BufferedReader), \
-            f"Expected BufferedReader but got {type(data['file'])}"
+        # Verify file is converted to expected dictionary format
+        assert isinstance(data['file'], dict)
+        assert 'data' in data['file']
+        assert 'mimetype' in data['file']
+        assert 'filename' in data['file']
         
-        # Verify file is still readable
-        data['file'].seek(0)
-        content = data['file'].read()
-        assert len(content) > 0, "File should be readable"
+        # Verify content matches
+        with open(__file__, 'rb') as original_file:
+            original_content = original_file.read()
+            decoded_content = base64.b64decode(data['file']['data'].encode('utf-8'))
+            assert decoded_content == original_content
         
         # Verify other fields are correct
         assert data['id'] == "doc1"
@@ -174,17 +177,16 @@ def test_create_etch_packet_payload_handles_nested_file_objects():
         file_data = data['files'][0]
         assert file_data['id'] == "doc1"
         assert file_data['title'] == "Test Document"
-        assert isinstance(file_data['file'], BufferedReader), \
-            f"Expected BufferedReader but got {type(file_data['file'])}"
-        
-        # Verify file is still readable
-        file_data['file'].seek(0)
-        content = file_data['file'].read()
-        assert len(content) > 0, "File should be readable"
+        assert isinstance(file_data['file'], dict)
+        assert 'data' in file_data['file']
+        assert 'mimetype' in file_data['file']
+        assert 'filename' in file_data['file']
         
-        # Verify the content matches the original file
+        # Verify content matches
         with open(__file__, 'rb') as original_file:
-            assert content == original_file.read(), "File content should match original"            
+            original_content = original_file.read()
+            decoded_content = base64.b64decode(file_data['file']['data'].encode('utf-8'))
+            assert decoded_content == original_content
 
 def test_create_etch_packet_payload_handles_multiple_files():
     from python_anvil.api_resources.payload import (
@@ -250,10 +252,13 @@ def test_create_etch_packet_payload_handles_multiple_files():
         for i, file_data in enumerate(data['files'], 1):
             assert file_data['id'] == f"doc{i}"
             assert file_data['title'] == f"Test Document {i}"
-            assert isinstance(file_data['file'], BufferedReader), \
-                f"File {i}: Expected BufferedReader but got {type(file_data['file'])}"
+            assert isinstance(file_data['file'], dict)
+            assert 'data' in file_data['file']
+            assert 'mimetype' in file_data['file']
+            assert 'filename' in file_data['file']
             
-            # Verify file is readable
-            file_data['file'].seek(0)
-            content = file_data['file'].read()
-            assert len(content) > 0, f"File {i} should be readable"
+            # Verify content matches
+            with open(__file__, 'rb') as original_file:
+                original_content = original_file.read()
+                decoded_content = base64.b64decode(file_data['file']['data'].encode('utf-8'))
+                assert decoded_content == original_content
