Fix typing error: use Session instead of scoped_session

No need to pass around scoped_session as arguments

lib/galaxy/managers/hdas.py

@@ -178,7 +178,7 @@ class HDAManager(
             True,  # attached...
             object_store=self.app.object_store,
             file_sources=self.app.file_sources,
-            sa_session=self.app.model.context,
+            sa_session=self.app.model.session(),
         )
         user = self.user_manager.by_id(request_user.user_id)
         if request.source == DatasetSourceType.hda:

lib/galaxy/model/deferred.py

@@ -11,7 +11,6 @@ from typing import (
 
 from sqlalchemy.orm import object_session
 from sqlalchemy.orm.exc import DetachedInstanceError
-from sqlalchemy.orm.scoping import scoped_session
 
 from galaxy.datatypes.sniff import (
     convert_function,
@@ -278,7 +277,7 @@ def materializer_factory(
     transient_path_mapper: Optional[TransientPathMapper] = None,
     transient_directory: Optional[str] = None,
     file_sources: Optional[ConfiguredFileSources] = None,
-    sa_session: Optional[scoped_session] = None,
+    sa_session: Optional[Session] = None,
 ) -> DatasetInstanceMaterializer:
     if object_store_populator is None and object_store is not None:
         object_store_populator = ObjectStorePopulator(object_store, None)

test/unit/data/test_dataset_materialization.py

@@ -134,7 +134,7 @@ def test_deferred_hdas_basic_attached_from_detached_hda():
 
     assert deferred_hda.dataset.state == "deferred"
     materializer = materializer_factory(
-        True, object_store=fixture_context.app.object_store, sa_session=fixture_context.sa_session
+        True, object_store=fixture_context.app.object_store, sa_session=fixture_context.sa_session()
     )
     materialized_hda = materializer.ensure_materialized(deferred_hda)
     materialized_dataset = materialized_hda.dataset