aipscan 0.9.0.dev4__tar.gz → 0.9.0.dev10__tar.gz

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/.gitignore

@@ -3,6 +3,7 @@ celerytasks.db
 AIPscan/Aggregator/downloads/
 AIPscan/static/dist/
 
+/.env
 [.]venv/
 node_modules/
 .tox/

aipscan-0.9.0.dev10/AIPscan/Aggregator/celery_helpers.py

@@ -0,0 +1,46 @@
+import logging
+from functools import wraps
+
+from AIPscan import db
+from AIPscan.models import package_tasks
+
+logger = logging.getLogger(__name__)
+
+
+def write_celery_update(package_lists_task, workflow_coordinator):
+    # Write status update to celery model.
+    package_task = package_tasks(
+        package_task_id=package_lists_task.id,
+        workflow_coordinator_id=workflow_coordinator.request.id,
+    )
+    db.session.add(package_task)
+    db.session.commit()
+
+
+def with_db_session(func):
+    """Ensure the scoped session is cleaned up around each call."""
+
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        func_name = func.__name__
+        try:
+            return func(*args, **kwargs)
+        except Exception:
+            logger.exception("Unhandled exception in %s", func_name)
+            try:
+                db.session.rollback()
+                logger.debug("Rolled back session after error in %s", func_name)
+            except Exception:
+                logger.exception(
+                    "Failed to rollback session after error in %s", func_name
+                )
+            raise
+        finally:
+            try:
+                db.session.remove()
+            except Exception:
+                logger.exception(
+                    "Failed to dispose session after call to %s", func_name
+                )
+
+    return wrapper

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Aggregator/database_helpers.py

@@ -300,7 +300,7 @@ def _add_normalization_date(file_id):
 
     :param file_id: File ID
     """
-    file_ = File.query.get(file_id)
+    file_ = db.session.get(File, file_id)
     creation_event = Event.query.filter_by(file_id=file_.id, type="creation").first()
     if creation_event is not None:
         file_.date_created = creation_event.date
@@ -309,7 +309,7 @@ def _add_normalization_date(file_id):
 
 def _add_premis_object_xml(fs_entry, file_id):
     """Add string representation of PREMIS Object to File object."""
-    file_ = File.query.get(file_id)
+    file_ = db.session.get(File, file_id)
 
     if hasattr(fs_entry, "amdsecs"):
         for ss in fs_entry.amdsecs[0].subsections:

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Aggregator/mets_parse_helpers.py

@@ -2,13 +2,15 @@
 information from an AIP METS file.
 """
 
+import os
+
 import lxml
 import metsrw
 import requests
 
 from AIPscan.Aggregator.task_helpers import create_numbered_subdirs
 from AIPscan.Aggregator.task_helpers import get_mets_url
-from AIPscan.Aggregator.task_helpers import write_mets
+from AIPscan.helpers import stream_write_and_hash
 
 
 class METSError(Exception):
@@ -83,17 +85,23 @@ def get_aip_original_name(mets):
 def download_mets(
     storage_service, package_uuid, relative_path_to_mets, timestamp, package_list_no
 ):
-    """Download METS from the storage service."""
+    """Download METS from the storage service.
 
-    # Request the METS file.
-    mets_response = requests.get(
-        get_mets_url(storage_service, package_uuid, relative_path_to_mets)
-    )
+    The METS document is streamed directly to disk while its SHA256 digest is
+    computed so that the caller can avoid re-reading the file.
+    """
 
-    # Create a directory to download the METS to.
     numbered_subdir = create_numbered_subdirs(timestamp, package_list_no)
+    download_file = os.path.join(numbered_subdir, f"METS.{package_uuid}.xml")
 
-    # Output METS to a convenient location to later be parsed.
-    download_file = write_mets(mets_response, package_uuid, numbered_subdir)
+    mets_response = requests.get(
+        get_mets_url(storage_service, package_uuid, relative_path_to_mets),
+        stream=True,
+    )
+
+    try:
+        mets_hash = stream_write_and_hash(mets_response, download_file)
+    finally:
+        mets_response.close()
 
-    return download_file
+    return download_file, mets_hash

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Aggregator/task_helpers.py

@@ -142,17 +142,5 @@ def create_numbered_subdirs(timestamp, package_list_number):
     return numbered_subdir
 
 
-def write_mets(http_response, package_uuid, subdir):
-    """Given a http response containing our METS data, create the path
-    we want to store our METS at, and then stream the response into a
-    file.
-    """
-    mets_file = f"METS.{package_uuid}.xml"
-    download_file = os.path.join(subdir, mets_file)
-    with open(download_file, "wb") as file:
-        file.write(http_response.content)
-    return download_file
-
-
 def summarize_fetch_job_results(fetch_job):
     return f"aips: '{fetch_job.total_aips}'; sips: '{fetch_job.total_sips}'; dips: '{fetch_job.total_dips}'; deleted: '{fetch_job.total_deleted_aips}'; replicated: '{fetch_job.total_replicas}'"

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Aggregator/tasks.py

@@ -9,6 +9,7 @@ from celery.utils.log import get_task_logger
 from AIPscan import db
 from AIPscan import typesense_helpers
 from AIPscan.Aggregator import database_helpers
+from AIPscan.Aggregator.celery_helpers import with_db_session
 from AIPscan.Aggregator.celery_helpers import write_celery_update
 from AIPscan.Aggregator.mets_parse_helpers import METSError
 from AIPscan.Aggregator.mets_parse_helpers import download_mets
@@ -19,7 +20,6 @@ from AIPscan.Aggregator.task_helpers import parse_package_list_file
 from AIPscan.Aggregator.task_helpers import process_package_object
 from AIPscan.Aggregator.task_helpers import summarize_fetch_job_results
 from AIPscan.celery import celery
-from AIPscan.helpers import file_sha256_hash
 from AIPscan.models import AIP
 from AIPscan.models import Agent
 from AIPscan.models import FetchJob
@@ -63,7 +63,7 @@ def start_mets_task(
     """Initiate a get_mets task worker and record the event in the
     celery database.
     """
-    storage_service = StorageService.query.get(storage_service_id)
+    storage_service = db.session.get(StorageService, storage_service_id)
     storage_location = database_helpers.create_or_update_storage_location(
         current_location, storage_service
     )
@@ -111,6 +111,7 @@ def delete_aip(uuid):
 
 
 @celery.task(bind=True)
+@with_db_session
 def workflow_coordinator(
     self, timestamp, storage_service_id, fetch_job_id, packages_directory
 ):
@@ -179,6 +180,7 @@ def make_request(request_url, request_url_without_api_key):
 
 
 @celery.task(bind=True)
+@with_db_session
 def package_lists_request(self, storage_service_id, timestamp, packages_directory):
     """Request package lists from the storage service. Package lists
     will contain details of the AIPs that we want to download.
@@ -188,7 +190,7 @@ def package_lists_request(self, storage_service_id, timestamp, packages_director
     COUNT = "total_count"
     IN_PROGRESS = "IN PROGRESS"
 
-    storage_service = StorageService.query.get(storage_service_id)
+    storage_service = db.session.get(StorageService, storage_service_id)
 
     (
         base_url,
@@ -245,6 +247,7 @@ def start_index_task(fetch_job_id):
 
 
 @celery.task()
+@with_db_session
 def index_task(fetch_job_id):
     # Update Typesense index
     typesense_helpers.initialize_index()
@@ -268,6 +271,7 @@ def index_task(fetch_job_id):
 
 
 @celery.task()
+@with_db_session
 def get_mets(
     package_uuid,
     aip_size,
@@ -300,8 +304,8 @@ def get_mets(
         tasklogger = customlogger
 
     # Download METS file
-    storage_service = StorageService.query.get(storage_service_id)
-    download_file = download_mets(
+    storage_service = db.session.get(StorageService, storage_service_id)
+    download_file, mets_hash = download_mets(
         storage_service,
         package_uuid,
         relative_path_to_mets,
@@ -309,7 +313,6 @@ def get_mets(
         package_list_no,
     )
     mets_name = os.path.basename(download_file)
-    mets_hash = file_sha256_hash(download_file)
 
     # If METS file's hash matches an existing value, this is a duplicate of an
     # existing AIP and we can safely ignore it.
@@ -370,8 +373,9 @@ def get_mets(
 
 
 @celery.task()
+@with_db_session
 def delete_fetch_job(fetch_job_id):
-    fetch_job = FetchJob.query.get(fetch_job_id)
+    fetch_job = db.session.get(FetchJob, fetch_job_id)
     if os.path.exists(fetch_job.download_directory):
         shutil.rmtree(fetch_job.download_directory)
     db.session.delete(fetch_job)
@@ -379,8 +383,9 @@ def delete_fetch_job(fetch_job_id):
 
 
 @celery.task()
+@with_db_session
 def delete_storage_service(storage_service_id):
-    storage_service = StorageService.query.get(storage_service_id)
+    storage_service = db.session.get(StorageService, storage_service_id)
     mets_fetch_jobs = FetchJob.query.filter_by(
         storage_service_id=storage_service_id
     ).all()

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Aggregator/templates/storage_service.html

@@ -21,7 +21,7 @@
     </td>
     <td>
       <span id="apikey">&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull; </span>
-      <i id="apikeyBtn" class="fa fa-eye" aria-hidden="true"></i>
+      <i id="apikeyBtn" class="fa-solid fa-eye" aria-hidden="true"></i>
     </td>
   </tr>
   <tr><td width=20%><strong>Download limit</strong></td><td>{{ storage_service.download_limit}}</td></tr>
@@ -62,7 +62,7 @@
         <td>{{ mets_fetch_job.download_start }}</td>
         <td>{% if mets_fetch_job.download_end %} {{ mets_fetch_job.download_end - mets_fetch_job.download_start }} {% endif %}</td>
         <td>{{ mets_fetch_job.total_packages }} packages
-          <i class="fa fa-info-circle fa-lg" id="{{ mets_fetch_job.id }}" style="margin-left: 5px;"></i><br/>
+          <i class="fa-solid fa-circle-info fa-lg" id="{{ mets_fetch_job.id }}" style="margin-left: 5px;"></i><br/>
           <div class="stats" id="stats-{{ mets_fetch_job.id }}">
             <span class="text-muted">
               <small>

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Aggregator/tests/test_database_helpers.py

@@ -5,6 +5,7 @@ from datetime import datetime
 import metsrw
 import pytest
 
+from AIPscan import db
 from AIPscan.Aggregator import database_helpers
 from AIPscan.Aggregator import types
 from AIPscan.conftest import ORIGIN_PIPELINE
@@ -294,7 +295,7 @@ def test_create_or_update_storage_location(
         "AIPscan.Aggregator.database_helpers.create_storage_location_object"
     )
 
-    storage_service = StorageService.query.get(1)
+    storage_service = db.session.get(StorageService, 1)
 
     storage_location = database_helpers.create_or_update_storage_location(
         current_location=current_location, storage_service=storage_service
@@ -331,7 +332,7 @@ def test_create_or_update_pipeline(
     )
     get_storage_service_api_url.return_value = (None, None)
 
-    storage_service = StorageService.query.get(1)
+    storage_service = db.session.get(StorageService, 1)
 
     pipeline = database_helpers.create_or_update_pipeline(
         origin_pipeline=origin_pipeline, storage_service=storage_service

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Aggregator/tests/test_task_helpers.py

@@ -1,6 +1,5 @@
 import json
 import os
-import uuid
 from datetime import datetime
 
 import pytest
@@ -175,20 +174,6 @@ def test_create_numbered_subdirs(timestamp, package_list_number, result, mocker)
     assert subdir_string == result
 
 
-def test_write_mets(mocker, tmpdir):
-    """Ensure that METS is written to expected location."""
-    CONTENT = b"test content"
-    http_response = mocker.MagicMock()
-    http_response.content = CONTENT
-    package_uuid = str(uuid.uuid4())
-    expected_path = os.path.join(tmpdir, f"METS.{package_uuid}.xml")
-
-    actual_path = task_helpers.write_mets(http_response, package_uuid, tmpdir)
-    assert expected_path == actual_path
-    with open(actual_path, "rb") as mets_file:
-        assert mets_file.read() == CONTENT
-
-
 @pytest.fixture()
 def packages():
     fixtures_path = os.path.join("package_json", "packages.json")

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Aggregator/tests/test_tasks.py

@@ -7,6 +7,7 @@ from datetime import datetime
 import celery
 import pytest
 
+from AIPscan import db
 from AIPscan import test_helpers
 from AIPscan.Aggregator.tasks import TaskError
 from AIPscan.Aggregator.tasks import delete_aip
@@ -67,16 +68,21 @@ def test_get_mets_task(app_instance, tmpdir, mocker, fixture_path, package_uuid)
         timestamp_str,
         package_list_no,
     ):
-        return mets_file
+        return mets_file, test_helpers.file_sha256_hash(mets_file)
 
     mocker.patch("AIPscan.Aggregator.tasks.download_mets", mock_download_mets)
     delete_mets_file = mocker.patch("AIPscan.Aggregator.tasks.os.remove")
 
     storage_service = test_helpers.create_test_storage_service()
+    storage_service_id = storage_service.id
+
     storage_location = test_helpers.create_test_storage_location(
-        storage_service_id=storage_service.id
+        storage_service_id=storage_service_id
     )
-    pipeline = test_helpers.create_test_pipeline(storage_service_id=storage_service.id)
+    storage_location_id = storage_location.id
+
+    pipeline = test_helpers.create_test_pipeline(storage_service_id=storage_service_id)
+    pipeline_id = pipeline.id
 
     get_storage_location = mocker.patch(
         "AIPscan.Aggregator.database_helpers.create_or_update_storage_location"
@@ -84,7 +90,7 @@ def test_get_mets_task(app_instance, tmpdir, mocker, fixture_path, package_uuid)
     get_storage_location.return_value = storage_location
 
     # No AIPs should exist at this point.
-    aips = _get_aips(storage_service.id)
+    aips = _get_aips(storage_service_id)
     assert not aips
 
     # Set up custom logger and add handler to capture output
@@ -93,8 +99,9 @@ def test_get_mets_task(app_instance, tmpdir, mocker, fixture_path, package_uuid)
 
     # Create AIP and verify record.
     fetch_job1 = test_helpers.create_test_fetch_job(
-        storage_service_id=storage_service.id
+        storage_service_id=storage_service_id
     )
+    fetch_job1_id = fetch_job1.id
     get_mets(
         package_uuid=package_uuid,
         aip_size=1000,
@@ -103,22 +110,24 @@ def test_get_mets_task(app_instance, tmpdir, mocker, fixture_path, package_uuid)
         .replace(microsecond=0)
         .strftime("%Y-%m-%d-%H-%M-%S"),
         package_list_no=1,
-        storage_service_id=storage_service.id,
-        storage_location_id=storage_location.id,
-        fetch_job_id=fetch_job1.id,
-        origin_pipeline_id=pipeline.id,
+        storage_service_id=storage_service_id,
+        storage_location_id=storage_location_id,
+        fetch_job_id=fetch_job1_id,
+        origin_pipeline_id=pipeline_id,
         customlogger=customlogger,
     )
-    aips = _get_aips(storage_service.id)
+    aips = _get_aips(storage_service_id)
     assert len(aips) == 1
-    assert len(fetch_job1.aips) == 1
+    fetch_job1_refreshed = db.session.get(FetchJob, fetch_job1_id)
+    assert len(fetch_job1_refreshed.aips) == 1
 
     original_mets_sha256 = aips[0].mets_sha256
 
     # Try to create AIP again and verify no duplicate is created.
     fetch_job2 = test_helpers.create_test_fetch_job(
-        storage_service_id=storage_service.id
+        storage_service_id=storage_service_id
     )
+    fetch_job2_id = fetch_job2.id
     get_mets(
         package_uuid=package_uuid,
         aip_size=1000,
@@ -127,23 +136,26 @@ def test_get_mets_task(app_instance, tmpdir, mocker, fixture_path, package_uuid)
         .replace(microsecond=0)
         .strftime("%Y-%m-%d-%H-%M-%S"),
         package_list_no=1,
-        storage_service_id=storage_service.id,
-        storage_location_id=storage_location.id,
-        fetch_job_id=fetch_job2.id,
-        origin_pipeline_id=pipeline.id,
+        storage_service_id=storage_service_id,
+        storage_location_id=storage_location_id,
+        fetch_job_id=fetch_job2_id,
+        origin_pipeline_id=pipeline_id,
     )
-    aips = _get_aips(storage_service.id)
+    aips = _get_aips(storage_service_id)
     assert len(aips) == 1
     assert aips[0].mets_sha256 == original_mets_sha256
-    assert len(fetch_job1.aips) == 1
-    assert len(fetch_job2.aips) == 0
+    fetch_job1_refreshed = db.session.get(FetchJob, fetch_job1_id)
+    fetch_job2_refreshed = db.session.get(FetchJob, fetch_job2_id)
+    assert len(fetch_job1_refreshed.aips) == 1
+    assert len(fetch_job2_refreshed.aips) == 0
 
     # Replace METS with a new METS file and run again. The old AIP record
     # should be deleted and replaced with one from the new METS.
     mets_file = os.path.join(FIXTURES_DIR, "iso_mets", "iso_mets.xml")
     fetch_job3 = test_helpers.create_test_fetch_job(
-        storage_service_id=storage_service.id
+        storage_service_id=storage_service_id
     )
+    fetch_job3_id = fetch_job3.id
     get_mets(
         package_uuid=package_uuid,
         aip_size=1000,
@@ -152,17 +164,20 @@ def test_get_mets_task(app_instance, tmpdir, mocker, fixture_path, package_uuid)
         .replace(microsecond=0)
         .strftime("%Y-%m-%d-%H-%M-%S"),
         package_list_no=1,
-        storage_service_id=storage_service.id,
-        storage_location_id=storage_location.id,
-        fetch_job_id=fetch_job3.id,
-        origin_pipeline_id=pipeline.id,
+        storage_service_id=storage_service_id,
+        storage_location_id=storage_location_id,
+        fetch_job_id=fetch_job3_id,
+        origin_pipeline_id=pipeline_id,
     )
-    aips = _get_aips(storage_service.id)
+    aips = _get_aips(storage_service_id)
     assert len(aips) == 1
     assert aips[0].mets_sha256 != original_mets_sha256
-    assert len(fetch_job1.aips) == 0
-    assert len(fetch_job2.aips) == 0
-    assert len(fetch_job3.aips) == 1
+    fetch_job1_refreshed = db.session.get(FetchJob, fetch_job1_id)
+    fetch_job2_refreshed = db.session.get(FetchJob, fetch_job2_id)
+    fetch_job3_refreshed = db.session.get(FetchJob, fetch_job3_id)
+    assert len(fetch_job1_refreshed.aips) == 0
+    assert len(fetch_job2_refreshed.aips) == 0
+    assert len(fetch_job3_refreshed.aips) == 1
 
     delete_calls = [
         mocker.call(os.path.join(FIXTURES_DIR, fixture_path)),
@@ -369,22 +384,24 @@ def test_start_index_task(app_instance, mocker):
 
     # Create test fetch job
     storage_service = test_helpers.create_test_storage_service()
+    storage_service_id = storage_service.id
 
     fetch_job = test_helpers.create_test_fetch_job(
-        storage_service_id=storage_service.id
+        storage_service_id=storage_service_id
     )
+    fetch_job_id = fetch_job.id
 
     # At this point no index_tasks should exist for the fetch job
-    index_task_obj = index_tasks.query.filter_by(fetch_job_id=fetch_job.id).first()
+    index_task_obj = index_tasks.query.filter_by(fetch_job_id=fetch_job_id).first()
     assert index_task_obj is None
 
     # Start mock index task, making sure it got started with the right value
-    start_index_task(fetch_job.id)
+    start_index_task(fetch_job_id)
 
-    mock_index_task.assert_called_with(fetch_job.id)
+    mock_index_task.assert_called_with(fetch_job_id)
 
     # At this point an index_tasks should exist for the fetch job
-    index_task_obj = index_tasks.query.filter_by(fetch_job_id=fetch_job.id).first()
+    index_task_obj = index_tasks.query.filter_by(fetch_job_id=fetch_job_id).first()
     assert type(index_task_obj) is index_tasks
 
 

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Aggregator/views.py

@@ -87,7 +87,7 @@ def ss_default():
 
 @aggregator.route("/storage_service/<storage_service_id>", methods=["GET"])
 def storage_service(storage_service_id):
-    storage_service = StorageService.query.get(storage_service_id)
+    storage_service = db.session.get(StorageService, storage_service_id)
 
     if storage_service is None:
         abort(404)
@@ -111,7 +111,7 @@ def storage_services():
 @aggregator.route("/edit_storage_service/<storage_service_id>", methods=["GET", "POST"])
 def edit_storage_service(storage_service_id):
     form = StorageServiceForm()
-    storage_service = StorageService.query.get(storage_service_id)
+    storage_service = db.session.get(StorageService, storage_service_id)
 
     if storage_service is None:
         abort(404)
@@ -175,7 +175,7 @@ def new_storage_service():
     "aggregator.ss_default",
 )
 def delete_storage_service(storage_service_id):
-    storage_service = StorageService.query.get(storage_service_id)
+    storage_service = db.session.get(StorageService, storage_service_id)
 
     if storage_service is None:
         abort(404)
@@ -192,7 +192,7 @@ def delete_storage_service(storage_service_id):
 @aggregator.route("/new_fetch_job/<fetch_job_id>", methods=["POST"])
 def new_fetch_job(fetch_job_id):
     """Fetch and process AIP METS files from Storage Service."""
-    storage_service = StorageService.query.get(fetch_job_id)
+    storage_service = db.session.get(StorageService, fetch_job_id)
 
     # Check Storage Service credentials and return 400 if invalid prior to
     # creating the Fetch Job and kicking off the Celery task.
@@ -251,12 +251,12 @@ def new_fetch_job(fetch_job_id):
     "aggregator.ss_default",
 )
 def delete_fetch_job(fetch_job_id):
-    fetch_job = FetchJob.query.get(fetch_job_id)
+    fetch_job = db.session.get(FetchJob, fetch_job_id)
 
     if fetch_job is None:
         abort(404)
 
-    storage_service = StorageService.query.get(fetch_job.storage_service_id)
+    storage_service = db.session.get(StorageService, fetch_job.storage_service_id)
     tasks.delete_fetch_job.delay(fetch_job_id)
 
     flash(f"Fetch job {fetch_job.download_start} is being deleted")

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Data/__init__.py

@@ -1,3 +1,4 @@
+from AIPscan import db
 from AIPscan.Data import fields
 from AIPscan.models import StorageLocation
 from AIPscan.models import StorageService
@@ -14,7 +15,7 @@ def _get_storage_service(storage_service_id):
 
     :returns: StorageService object or None
     """
-    return StorageService.query.get(storage_service_id)
+    return db.session.get(StorageService, storage_service_id)
 
 
 def get_storage_service_name(storage_service_id):
@@ -29,7 +30,7 @@ def get_storage_service_name(storage_service_id):
 
 def _get_storage_location(storage_location_id):
     """Return Storage Location with ID or None."""
-    return StorageLocation.query.get(storage_location_id)
+    return db.session.get(StorageLocation, storage_location_id)
 
 
 def get_storage_location_description(storage_location_id):

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Data/report_data.py

@@ -270,7 +270,7 @@ def largest_files(
         except AttributeError:
             pass
 
-        matching_aip = AIP.query.get(file_.aip_id)
+        matching_aip = db.session.get(AIP, file_.aip_id)
         if matching_aip is not None:
             file_info[fields.FIELD_AIP_NAME] = matching_aip.transfer_name
             file_info[fields.FIELD_AIP_UUID] = matching_aip.uuid
@@ -684,7 +684,7 @@ def _get_days_covered_by_date_range(storage_service_id, start_date, end_date):
     :returns: List of strings like "YYYY-MM-DD"
     """
     if start_date == datetime.min:
-        storage_service = StorageService.query.get(storage_service_id)
+        storage_service = db.session.get(StorageService, storage_service_id)
         start_date = storage_service.earliest_aip_created
     if end_date >= datetime.now():
         end_date = datetime.now()

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Data/tests/test_largest_aips.py

@@ -1,5 +1,6 @@
 import pytest
 
+from AIPscan import db
 from AIPscan import typesense_helpers
 from AIPscan import typesense_test_helpers
 from AIPscan.Data import fields
@@ -48,7 +49,7 @@ def test_largest_aips(
 
 
 def test_largest_aips_typesense(app_with_populated_files, enable_typesense, mocker):
-    doc = typesense_helpers.model_instance_to_document(AIP, AIP.query.get(1))
+    doc = typesense_helpers.model_instance_to_document(AIP, db.session.get(AIP, 1))
     fake_results = {"hits": [{"document": doc}]}
 
     typesense_test_helpers.fake_collection(mocker, fake_results)

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Data/tests/test_largest_files.py

@@ -3,6 +3,7 @@ import uuid
 
 import pytest
 
+from AIPscan import db
 from AIPscan import typesense_helpers
 from AIPscan import typesense_test_helpers
 from AIPscan.Data import fields
@@ -116,7 +117,7 @@ def test_largest_files_elements(
     mock_get_ss_name = mocker.patch("AIPscan.Data._get_storage_service")
     mock_get_ss_name.return_value = MOCK_STORAGE_SERVICE
 
-    mock_get_aip = mocker.patch("sqlalchemy.orm.query.Query.get")
+    mock_get_aip = mocker.patch("AIPscan.Data.report_data.db.session.get")
     mock_get_aip.return_value = MOCK_AIP
 
     report = report_data.largest_files(
@@ -147,7 +148,7 @@ def test_largest_files_elements(
 
 
 def test_largest_files_typesense(app_with_populated_files, enable_typesense, mocker):
-    doc = typesense_helpers.model_instance_to_document(File, File.query.get(1))
+    doc = typesense_helpers.model_instance_to_document(File, db.session.get(File, 1))
     doc["transfer_name"] = "Test AIP"
     doc["aip_uuid"] = "111111111111-1111-1111-11111111"
 

{aipscan-0.9.0.dev4 → aipscan-0.9.0.dev10}/AIPscan/Reporter/templates/aips.html

@@ -12,14 +12,14 @@
 
   <div class="float-end">
     <form action="{{ url_for('reporter.view_aips') }}" method="GET" class="pr-3" id="queryform">
-      <i class="fas fa-search"></i> Search <input name="query" id="query"/><input type="submit" hidden/>
+      <i class="fa-solid fa-magnifying-glass"></i> Search <input name="query" id="query"/><input type="submit" hidden/>
     </form>
   </div>
 
   <div class="report-opts" style="margin-bottom: 0.2em;">
     <div>
       <span class="fixed-width-menu-span-left">
-        <i class="fa fa-database" aria-hidden="true"></i>
+        <i class="fa-solid fa-database" aria-hidden="true"></i>
         Storage Service
       </span>
       <select id="ss" method="GET" action="/">
@@ -36,7 +36,7 @@
   <div class="report-opts" style="margin-bottom: 1em;">
     <div>
       <span class="fixed-width-menu-span-left">
-        <i class="fa fa-archive" aria-hidden="true"></i>
+        <i class="fa-solid fa-box-archive" aria-hidden="true"></i>
         Location
       </span>
       <select id="sl" method="GET" action="/">