Merge pull request #17107 from jdavcs/23.2_filename_dswrapper

[23.2] Expose file_name property in DatasetFilenameWrapper

lib/galaxy/tools/wrappers.py

@@ -470,11 +470,12 @@ def __str__(self) -> str:
         else:
             return str(self.unsanitized.get_file_name())
 
+    @property
+    def file_name(self) -> str:
+        return str(self)
+
     def __getattr__(self, key: Any) -> Any:
-        if self.false_path is not None and key == "get_file_name":
-            # Path to dataset was rewritten for this job.
-            return lambda *args, **kwargs: self.false_path
-        elif key in ("extra_files_path", "files_path"):
+        if key in ("extra_files_path", "files_path"):
             if not self.compute_environment:
                 # Only happens in WrappedParameters context, refactor!
                 return self.unsanitized.extra_files_path

test/functional/tools/md5sum.xml

@@ -1,6 +1,6 @@
 <tool id="md5sum" name="md5sum" version="1.0.0">
     <command>
-        cp $input $output
+        cp '$input.file_name' '$output'
     </command>
     <inputs>
         <param name="input" type="data" format="txt" />

test/unit/app/tools/test_wrappers.py

@@ -207,7 +207,7 @@ def test_dataset_wrapper():
     dataset = cast(DatasetInstance, MockDataset())
     wrapper = DatasetFilenameWrapper(dataset)
     assert str(wrapper) == MOCK_DATASET_PATH
-    assert wrapper.get_file_name() == MOCK_DATASET_PATH
+    assert wrapper.file_name == MOCK_DATASET_PATH
 
     assert wrapper.ext == MOCK_DATASET_EXT
 
@@ -219,7 +219,7 @@ def test_dataset_wrapper_false_path():
         dataset, compute_environment=cast(ComputeEnvironment, MockComputeEnvironment(false_path=new_path))
     )
     assert str(wrapper) == new_path
-    assert wrapper.get_file_name() == new_path
+    assert wrapper.file_name == new_path
 
 
 class MockComputeEnvironment:

tools/data_source/upload.xml

@@ -14,7 +14,7 @@
     #while $varExists('output%i' % $outnum):
         #set $output = $getVar('output%i' % $outnum)
         #set $outnum += 1
-        #set $file_name = $output.get_file_name()
+        #set $file_name = str($output)
         ## FIXME: This is not future-proof for other uses of external_filename (other than for use by the library upload's "link data" feature)
         #if $output.dataset.dataset.external_filename:
             #set $file_name = "None"