Revert "feat(cli): ship files directly in evals/ too"

This reverts commit b1890f1.

Files directly in the root `evals` folder break Studio Web's project
migration ("Project storage is corrupted", SRE-522088), which is why
`uipath push` skips them (#1356). A packed project can be imported
into Studio Web too, so `uipath pack` keeps skipping them as well.
Everything under `evals/` subfolders, where Studio Web writes its
datasets, still ships.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LCRTCKqfp7xdLeHQZ6MGUy

Author: claude

packages/uipath/src/uipath/_cli/_push/sw_file_handler.py

@@ -534,12 +534,25 @@ async def upload_source_files(
         remote_files = self._get_remote_files(structure)
 
         # Get files to upload and process them
-        local_files = files_to_include(
+        local_files, skipped_files = files_to_include(
             pack_options,
             self.directory,
             self.include_uv_lock,
         )
 
+        # Log skipped files from root evals folder
+        if skipped_files:
+            evals_folder_path = os.path.join(self.directory, LEGACY_EVAL_FOLDER)
+            logger.info(
+                f"Skipping {len(skipped_files)} file(s) in evals folder ({evals_folder_path}): {', '.join(skipped_files)}"
+            )
+            for skipped_file in skipped_files:
+                yield UpdateEvent(
+                    file_path=skipped_file,
+                    status="skipped",
+                    message=f"Skipping '{skipped_file}' (evals folder)",
+                )
+
         updates = await self._process_file_uploads(local_files, remote_files)
 
         # Yield all updates

packages/uipath/src/uipath/_cli/_utils/_project_files.py

@@ -14,6 +14,7 @@
 from uipath._cli.models.uipath_json_schema import PackOptions, UiPathJsonConfig
 from uipath.platform.common import UiPathConfig
 from uipath.platform.constants import (
+    LEGACY_EVAL_FOLDER,
     PYTHON_CONFIGURATION_FILE,
     UIPATH_CONFIG_FILE,
 )
@@ -406,7 +407,7 @@ def files_to_include(
     directory: str,
     include_uv_lock: bool = True,
     directories_to_ignore: list[str] | None = None,
-) -> list[FileInfo]:
+) -> tuple[list[FileInfo], list[str]]:
     """Get list of files to include in the project based on configuration.
 
     Walks through the directory tree and identifies files to include based on extensions
@@ -419,7 +420,7 @@ def files_to_include(
         directories_to_ignore: List of directories to ignore
 
     Returns:
-        list[FileInfo]: Files to include
+        tuple[list[FileInfo], list[str]]: Tuple of (included files, skipped file paths)
     """
     file_extensions_included = [".py", ".mermaid", ".json", ".yaml", ".yml", ".md"]
     files_included = [PYTHON_CONFIGURATION_FILE]
@@ -455,9 +456,15 @@ def is_venv_dir(d: str) -> bool:
         )
 
     extra_files: list[FileInfo] = []
+    skipped_files: list[str] = []
 
     # Walk through directory and return all files in the allowlist
     for root, dirs, files in os.walk(directory):
+        # Determine if we're in the root evals folder
+        root_rel_path = os.path.relpath(root, directory)
+        normalized_root_rel_path = root_rel_path.replace(os.sep, "/")
+        is_root_evals_folder = normalized_root_rel_path == LEGACY_EVAL_FOLDER
+
         # Skip all directories that start with . or are a venv or are excluded
         included_dirs = []
         for d in dirs:
@@ -498,6 +505,11 @@ def is_venv_dir(d: str) -> bool:
             # Normalize the path
             normalized_rel_path = rel_path.replace(os.sep, "/")
 
+            # Skip files in the root evals folder (but allow eval-set and evaluators subdirectories)
+            if is_root_evals_folder:
+                skipped_files.append(normalized_rel_path)
+                continue
+
             # Check inclusion: by extension, by filename (for base directory), or by relative path
             should_include = (
                 file_extension in file_extensions_included
@@ -526,7 +538,7 @@ def is_venv_dir(d: str) -> bool:
                         is_binary=is_binary_file(file_extension),
                     )
                 )
-    return extra_files
+    return extra_files, skipped_files
 
 
 def compute_normalized_hash(content: str) -> str:

packages/uipath/src/uipath/_cli/cli_pack.py

@@ -319,9 +319,9 @@ def pack_fn(
     metadata_files["_rels/.rels"] = rels_content
 
     # Studio Web's Evaluations panel stores a project's datasets under `evals/`,
-    # so that whole folder ships with the package, as `uip solution pack` does.
-    # `evaluations/`, the folder `uipath eval` reads, stays out of it.
-    files = files_to_include(
+    # so that folder ships with the package. `evaluations/`, the folder
+    # `uipath eval` reads, stays out of it.
+    files, skipped_files = files_to_include(
         config_data.pack_options,
         directory,
         include_uv_lock,

packages/uipath/tests/cli/test_files_to_include.py

@@ -10,7 +10,7 @@ def test_hidden_files_are_excluded(self, tmp_path):
         open(os.path.join(project_dir, ".hidden_file.py"), "w").close()
         open(os.path.join(project_dir, ".env"), "w").close()
 
-        included = files_to_include(None, project_dir, include_uv_lock=False)
+        included, _ = files_to_include(None, project_dir, include_uv_lock=False)
         included_names = [f.file_name for f in included]
 
         assert "main.py" in included_names
@@ -24,7 +24,7 @@ def test_hidden_files_in_subdirectory_are_excluded(self, tmp_path):
         open(os.path.join(sub_dir, "app.py"), "w").close()
         open(os.path.join(sub_dir, ".secret.json"), "w").close()
 
-        included = files_to_include(None, project_dir, include_uv_lock=False)
+        included, _ = files_to_include(None, project_dir, include_uv_lock=False)
         included_names = [f.file_name for f in included]
 
         assert "app.py" in included_names

packages/uipath/tests/cli/test_pack.py

@@ -1106,13 +1106,14 @@ def test_evals_directory_ships_and_evaluations_directory_excluded(
             # the dataset would change these bytes.
             eval_set_json = '{\n  "name": "smoke",\n  "rows": [{ "x": 1 }]\n}\n'
 
-            # Where Studio Web's Evaluations panel writes datasets: ships, files
-            # directly in evals/ included.
+            # Where Studio Web's Evaluations panel writes datasets: ships.
             os.makedirs("evals/default/eval-sets")
             with open("evals/default/eval-sets/x.json", "w") as f:
                 f.write(eval_set_json)
-            with open("evals/root.json", "w") as f:
-                f.write('{"at": "root"}')
+            # A stray file directly in evals/ breaks Studio Web's project
+            # migration (SRE-522088), so it stays out, as it does on push.
+            with open("evals/stray.json", "w") as f:
+                f.write("{}")
             # The folder `uipath eval` reads, and local-only state: none of it ships.
             os.makedirs("evaluations/eval-sets")
             with open("evaluations/eval-sets/legacy.json", "w") as f:
@@ -1146,7 +1147,7 @@ def test_evals_directory_ships_and_evaluations_directory_excluded(
                     z.read("content/evals/default/eval-sets/x.json").decode("utf-8")
                     == eval_set_json
                 )
-                assert "content/evals/root.json" in z.namelist()
+                assert "content/evals/stray.json" not in z.namelist()
                 assert "content/other_dir/included.json" in z.namelist()
 
                 excluded_folders = (

packages/uipath/tests/cli/test_push.py

@@ -1630,15 +1630,15 @@ def test_push_shows_up_to_date_for_unchanged_files(
             assert "Updating 'main.py'" not in result.output
             assert "Updating 'helper.py'" not in result.output
 
-    def test_push_uploads_root_evals_folder_files(
+    def test_push_skips_root_evals_folder_files(
         self,
         runner: CliRunner,
         temp_dir: str,
         project_details: ProjectDetails,
         mock_env_vars: dict[str, str],
         httpx_mock: HTTPXMock,
     ) -> None:
-        """Test that files directly in the evals folder are uploaded during push."""
+        """Test that files in root evals folder are skipped during push."""
         base_url = "https://cloud.uipath.com/organization"
         project_id = "test-project-id"
 
@@ -1693,11 +1693,11 @@ def test_push_uploads_root_evals_folder_files(
             os.makedirs("evals/eval-sets")
             os.makedirs("evals/evaluators")
 
-            # Create files in root evals folder (should be included)
+            # Create files in root evals folder (should be skipped)
             with open("evals/root_file1.json", "w") as f:
-                f.write('{"should": "be included"}')
+                f.write('{"should": "be skipped"}')
             with open("evals/root_file2.py", "w") as f:
-                f.write("print('should be included')")
+                f.write("print('should be skipped')")
 
             # Create files in eval-sets (should be included)
             with open("evals/eval-sets/test_eval.json", "w") as f:
@@ -1713,10 +1713,9 @@ def test_push_uploads_root_evals_folder_files(
             result = runner.invoke(cli, ["push", "./", "--ignore-resources"])
             assert result.exit_code == 0
 
-            # Verify root evals files are uploaded
-            assert "Uploading 'root_file1.json'" in result.output
-            assert "Uploading 'root_file2.py'" in result.output
-            assert "Skipping" not in result.output
+            # Verify root evals files are skipped
+            assert "Skipping 'evals/root_file1.json' (evals folder)" in result.output
+            assert "Skipping 'evals/root_file2.py' (evals folder)" in result.output
 
             # Verify eval-sets and evaluators files are uploaded
             assert "Uploading 'test_eval.json'" in result.output
@@ -1725,6 +1724,169 @@ def test_push_uploads_root_evals_folder_files(
             # Verify main.py is uploaded
             assert "Uploading 'main.py'" in result.output
 
+    def test_push_skips_only_root_evals_files_not_subdirectories(
+        self,
+        runner: CliRunner,
+        temp_dir: str,
+        project_details: ProjectDetails,
+        mock_env_vars: dict[str, str],
+        httpx_mock: HTTPXMock,
+    ) -> None:
+        """Test that only files directly in evals folder are skipped, not files in subdirectories."""
+        base_url = "https://cloud.uipath.com/organization"
+        project_id = "test-project-id"
+
+        mock_structure = {
+            "id": "root",
+            "name": "root",
+            "folders": [],
+            "files": [
+                {
+                    "id": "123",
+                    "name": "pyproject.toml",
+                    "isMain": False,
+                    "fileType": "1",
+                    "isEntryPoint": False,
+                    "ignoredFromPublish": False,
+                },
+            ],
+            "folderType": "0",
+        }
+
+        httpx_mock.add_response(
+            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/Structure",
+            json=mock_structure,
+        )
+
+        self._mock_lock_retrieval(httpx_mock, base_url, project_id, times=1)
+        self._mock_file_download(httpx_mock, "123")
+
+        httpx_mock.add_response(
+            method="POST",
+            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/StructuralMigration",
+            status_code=200,
+            json={"success": True},
+        )
+
+        httpx_mock.add_response(
+            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/Structure",
+            json=mock_structure,
+        )
+
+        with runner.isolated_filesystem(temp_dir=temp_dir):
+            self._create_required_files()
+
+            with open("pyproject.toml", "w") as f:
+                f.write(project_details.to_toml())
+
+            # Create evals folder with various subdirectories
+            os.makedirs("evals/eval-sets")
+            os.makedirs("evals/evaluators")
+            os.makedirs("evals/custom-subfolder")
+
+            # Files directly in evals (should be skipped)
+            with open("evals/config.json", "w") as f:
+                f.write('{"root": "file"}')
+
+            # Files in subdirectories (should be included)
+            with open("evals/eval-sets/test.json", "w") as f:
+                f.write('{"eval": "set"}')
+            with open("evals/evaluators/eval.py", "w") as f:
+                f.write("def evaluate(): pass")
+            with open("evals/custom-subfolder/data.json", "w") as f:
+                f.write('{"custom": "data"}')
+
+            configure_env_vars(mock_env_vars)
+            os.environ["UIPATH_PROJECT_ID"] = project_id
+
+            result = runner.invoke(cli, ["push", "./", "--ignore-resources"])
+            assert result.exit_code == 0
+
+            # Verify root file is skipped
+            assert "Skipping 'evals/config.json' (evals folder)" in result.output
+
+            # Verify subdirectory files are included
+            assert "Uploading 'test.json'" in result.output
+            assert "Uploading 'eval.py'" in result.output
+            assert "Uploading 'data.json'" in result.output
+
+    def test_push_logs_skipped_files_count(
+        self,
+        runner: CliRunner,
+        temp_dir: str,
+        project_details: ProjectDetails,
+        mock_env_vars: dict[str, str],
+        httpx_mock: HTTPXMock,
+    ) -> None:
+        """Test that push logs the count of skipped files from root evals folder."""
+        base_url = "https://cloud.uipath.com/organization"
+        project_id = "test-project-id"
+
+        mock_structure = {
+            "id": "root",
+            "name": "root",
+            "folders": [],
+            "files": [
+                {
+                    "id": "123",
+                    "name": "pyproject.toml",
+                    "isMain": False,
+                    "fileType": "1",
+                    "isEntryPoint": False,
+                    "ignoredFromPublish": False,
+                },
+            ],
+            "folderType": "0",
+        }
+
+        httpx_mock.add_response(
+            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/Structure",
+            json=mock_structure,
+        )
+
+        self._mock_lock_retrieval(httpx_mock, base_url, project_id, times=1)
+        self._mock_file_download(httpx_mock, "123")
+
+        httpx_mock.add_response(
+            method="POST",
+            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/StructuralMigration",
+            status_code=200,
+            json={"success": True},
+        )
+
+        httpx_mock.add_response(
+            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/Structure",
+            json=mock_structure,
+        )
+
+        with runner.isolated_filesystem(temp_dir=temp_dir):
+            self._create_required_files()
+
+            with open("pyproject.toml", "w") as f:
+                f.write(project_details.to_toml())
+
+            # Create evals folder with multiple files
+            os.makedirs("evals")
+
+            # Create 3 files in root evals
+            with open("evals/file1.json", "w") as f:
+                f.write("{}")
+            with open("evals/file2.py", "w") as f:
+                f.write("pass")
+            with open("evals/file3.yaml", "w") as f:
+                f.write("key: value")
+
+            configure_env_vars(mock_env_vars)
+            os.environ["UIPATH_PROJECT_ID"] = project_id
+
+            result = runner.invoke(cli, ["push", "./", "--ignore-resources"])
+            assert result.exit_code == 0
+
+            # Verify individual files are skipped
+            assert "Skipping 'evals/file1.json' (evals folder)" in result.output
+            assert "Skipping 'evals/file2.py' (evals folder)" in result.output
+            assert "Skipping 'evals/file3.yaml' (evals folder)" in result.output
+
     def test_push_preserves_remote_evals_when_no_local_evals(
         self,
         runner: CliRunner,