Upload folder using huggingface_hub

app.py

@@ -122,7 +122,15 @@ def setup_mkslides():
         # Install dependencies and mkslides
         subprocess.run(["pip", "install", "./external/mkslides"])
     else:
-        print("mkslides already present.")
+        print("mkslides directory already present. Ensuring it is installed...")
+        subprocess.run(["pip", "install", "./external/mkslides"])
+    
+    # Verify installation
+    res = subprocess.run(["which", "mkslides"], capture_output=True, text=True)
+    if res.returncode == 0:
+        print(f"mkslides verified at: {res.stdout.strip()}")
+    else:
+        print("WARNING: mkslides CLI not found in PATH after installation.")
 
 setup_mkslides()
 
@@ -689,6 +697,16 @@ def get_reports_in_branch(repo_full_name, branch_name, filter_type=None):
         
         # Method 1: Check user_experience_reports directory
         reports = []
+        
+        # Check for merged slides folder first if we are looking for slides
+        if filter_type == "slides":
+            try:
+                repo.get_contents("user_experience_reports/slides", ref=branch_name)
+                reports.append("user_experience_reports/slides")
+                add_log("Detected 'user_experience_reports/slides' directory. Added as merged presentation option.")
+            except:
+                pass
+
         try:
             contents = repo.get_contents("user_experience_reports", ref=branch_name)
             for content_file in contents:
@@ -730,6 +748,7 @@ def get_reports_in_branch(repo_full_name, branch_name, filter_type=None):
             # Highest priority: specific report.md and slides.md in user_experience_reports
             if filter_type == "report" and p_lower == "user_experience_reports/report.md": score -= 1000
             if filter_type == "slides" and p_lower == "user_experience_reports/slides.md": score -= 1000
+            if filter_type == "slides" and p_lower == "user_experience_reports/slides": score -= 2000
             
             # High priority: other files in user_experience_reports
             if "user_experience_reports" in p_lower: score -= 100
@@ -819,7 +838,12 @@ def render_slides(repo_full_name, branch_name, report_path):
         # Method 1: Check for multi-file slides folder
         # We check this first if the report_path is in user_experience_reports or if it's default
         if "user_experience_reports" in report_path:
-            slides_folder = "user_experience_reports/slides"
+            # If the user selected the folder itself or a file within a folder that has a slides subfolder
+            if report_path.endswith("/slides") or report_path.endswith("/slides/"):
+                slides_folder = report_path
+            else:
+                slides_folder = "user_experience_reports/slides"
+                
             try:
                 folder_contents = repo.get_contents(slides_folder, ref=branch_name)
                 if isinstance(folder_contents, list):
@@ -892,8 +916,12 @@ def render_slides(repo_full_name, branch_name, report_path):
         
         if os.path.exists(f"{output_dir}/index.html"):
             # Return IFrame pointing to the generated site. 
-            # We use /file= prefix which Gradio uses to serve files in allowed_paths.
-            return f'<iframe src="/file={os.path.abspath(output_dir)}/index.html" width="100%" height="600px"></iframe>'
+            # Use a path relative to the current working directory for Gradio's /file endpoint
+            rel_path = os.path.relpath(f"{output_dir}/index.html", os.getcwd())
+            add_log(f"Slides rendered. Serving from relative path: {rel_path}")
+            
+            # Use 'file={rel_path}' which is more robust in HF Spaces than '/file={abs_path}'
+            return f'<iframe src="file={rel_path}" width="100%" height="600px" frameborder="0"></iframe>'
         else:
             return "Failed to render slides."
             

verify_slides_logic.py

@@ -0,0 +1,102 @@
+import os
+import unittest
+from unittest.mock import MagicMock, patch
+
+# Mock Gradio and other imports that might fail or are not needed for logic test
+import sys
+sys.modules['gradio'] = MagicMock()
+sys.modules['github'] = MagicMock()
+sys.modules['openai'] = MagicMock()
+sys.modules['chevron'] = MagicMock()
+
+# Import the functions from app.py
+# We need to handle the global variables in app.py
+with patch('app.gh', MagicMock()):
+    import app
+
+class TestSlidesLogic(unittest.TestCase):
+    def setUp(self):
+        self.repo_name = "test/repo"
+        self.branch_name = "main"
+        app.gh = MagicMock()
+        self.mock_repo = MagicMock()
+        app.gh.get_repo.return_value = self.mock_repo
+
+    def test_get_reports_in_branch_with_slides_folder(self):
+        # Mock successful detection of slides folder
+        def get_contents_mock(path, ref=None):
+            if path == "user_experience_reports/slides":
+                return MagicMock() # directory exists
+            if path == "user_experience_reports":
+                mock_file = MagicMock()
+                mock_file.name = "report.md"
+                return [mock_file]
+            raise Exception("404 Not Found")
+        
+        self.mock_repo.get_contents.side_effect = get_contents_mock
+        
+        # Mock tree for recursive scan
+        mock_tree_element = MagicMock()
+        mock_tree_element.type = "blob"
+        mock_tree_element.path = "user_experience_reports/slides/01_intro.md"
+        self.mock_repo.get_git_tree.return_value.tree = [mock_tree_element]
+
+        reports = app.get_reports_in_branch(self.repo_name, self.branch_name, filter_type="slides")
+        
+        self.assertIn("user_experience_reports/slides", reports)
+        # Should be at the top due to score -2000
+        self.assertEqual(reports[0], "user_experience_reports/slides")
+
+    @patch('subprocess.run')
+    @patch('os.makedirs')
+    @patch('os.path.exists')
+    @patch('shutil.rmtree')
+    @patch('builtins.open', new_callable=unittest.mock.mock_open)
+    def test_render_slides_merging(self, mock_open, mock_rmtree, mock_exists, mock_makedirs, mock_run):
+        # Mock exists to say index.html is created
+        mock_exists.side_effect = lambda p: True if "index.html" in p else False
+        
+        # Mock slides folder contents
+        slide1 = MagicMock()
+        slide1.name = "01_slide.md"
+        slide1.path = "user_experience_reports/slides/01_slide.md"
+        
+        slide2 = MagicMock()
+        slide2.name = "02_slide.md"
+        slide2.path = "user_experience_reports/slides/02_slide.md"
+        
+        def get_contents_mock(path, ref=None):
+            if path == "user_experience_reports/slides":
+                return [slide1, slide2]
+            if "01_slide.md" in path:
+                m = MagicMock()
+                m.decoded_content = b"Slide 1 Content"
+                return m
+            if "02_slide.md" in path:
+                m = MagicMock()
+                m.decoded_content = b"Slide 2 Content"
+                return m
+            return MagicMock()
+
+        self.mock_repo.get_contents.side_effect = get_contents_mock
+        
+        # We also need to mock add_log to avoid errors if it tries to print
+        with patch('app.add_log', MagicMock()):
+            result = app.render_slides(self.repo_name, self.branch_name, "user_experience_reports/slides")
+        
+        # Verify merging logic
+        mock_open.assert_any_call(unittest.mock.ANY, "w")
+        handle = mock_open()
+        
+        # Check if Slide 1 and Slide 2 are merged with ---
+        written_content = "".join(call.args[0] for call in handle.write.call_args_list)
+        self.assertIn("Slide 1 Content", written_content)
+        self.assertIn("Slide 2 Content", written_content)
+        self.assertIn("\n\n---\n\n", written_content)
+        
+        # Verify IFrame URL is relative
+        self.assertIn('src="file=slides_site_', result)
+        self.assertNotIn('src="/file=', result)
+
+if __name__ == "__main__":
+    unittest.main()