Use object to upload documents

Author: jerome-white

backend/app/tests/api/routes/documents/test_upload.py

@@ -6,28 +6,29 @@
 
 import boto3
 import pytest
-from sqlmodel import Session, select
 from moto import mock_aws
+from sqlmodel import Session, select
+from fastapi.testclient import TestClient
 
 from app.core.cloud import AmazonCloudStorageClient
 from app.core.config import settings
 from app.models import Document
 from app.tests.utils.document import (
     Route,
     WebCrawler,
-    crawler,
 )
 
-def upload(route: Route, scratch: Path, crawler: WebCrawler):
-    (mtype, _) = mimetypes.guess_type(str(scratch))
-    with scratch.open('rb') as fp:
-        return crawler.client.post(
-            str(route),
-            headers=crawler.superuser_token_headers,
-            files={
-                'src': (str(scratch), fp, mtype),
-            },
-        )
+class WebUploader(WebCrawler):
+    def put(self, route: Route, scratch: Path):
+        (mtype, _) = mimetypes.guess_type(str(scratch))
+        with scratch.open('rb') as fp:
+            return self.client.post(
+                str(route),
+                headers=self.superuser_token_headers,
+                files={
+                    'src': (str(scratch), fp, mtype),
+                },
+            )
 
 @pytest.fixture
 def scratch():
@@ -39,6 +40,10 @@ def scratch():
 def route():
     return Route('cp')
 
+@pytest.fixture
+def uploader(client: TestClient, superuser_token_headers: dict[str, str]):
+    return WebUploader(client, superuser_token_headers)
+
 @pytest.fixture(scope='class')
 def aws_setup():
     os.environ['AWS_ACCESS_KEY_ID']     = 'testing'
@@ -55,12 +60,12 @@ def test_adds_to_database(
             db: Session,
             route: Route,
             scratch: Path,
-            crawler: WebCrawler,
+            uploader: WebUploader,
     ):
         aws = AmazonCloudStorageClient()
         aws.create()
 
-        response = upload(route, scratch, crawler)
+        response = uploader.put(route, scratch)
         doc_id = (response
                   .json()
                   .get('id'))
@@ -76,12 +81,12 @@ def test_adds_to_S3(
             self,
             route: Route,
             scratch: Path,
-            crawler: Route,
+            uploader: WebUploader,
     ):
         aws = AmazonCloudStorageClient()
         aws.create()
 
-        response = upload(route, scratch, crawler)
+        response = uploader.put(route, scratch)
         url = urlparse(response.json().get('object_store_url'))
         key = Path(url.path)
         key = key.relative_to(key.root)