Fix streamlit deploy failure when pages/*.py overlaps with pages/ directory by sfc-gh-moczko · Pull Request #2780 · snowflakedb/snowflake-cli

sfc-gh-moczko · 2026-02-24T01:14:50Z

Summary

snow streamlit deploy fails with NotInDeployRootError when both pages/ (directory) and pages/*.py (glob) appear in artifacts and a pages/ directory exists on disk.

Root cause

_ArtifactPathMap.put() walks directory sources to mark children in _dest_is_dir, but does not register those children in __dest_to_src. When a glob like pages/*.py later resolves to the same files, __dest_to_src.get(dest) returns None instead of the existing source, so the duplicate mapping is silently added. During symlink_or_copy(), the second mapping calls Path.resolve() on an already-created symlink, which follows it back to the project source directory -- outside the deploy root -- and raises NotInDeployRootError.

Fix

_ArtifactPathMap.put() (bundle_map.py) -- Three changes in the put() method:

Directory walk now registers children in __dest_to_src: Each file discovered during os.walk is recorded as __dest_to_src[child_dest] = child_src. If a different source already maps to that destination, TooManyFilesError is raised immediately.
File-to-file branch returns early on same-source duplicates: When current_source == src, the mapping is redundant (already covered by a parent directory walk), so put() returns without adding a duplicate entry.
Directory-to-directory branch handles glob-then-directory order: When individual files from a glob (e.g. pages/*.py) are added first and then the parent directory (pages/) is added, the directory destination is already marked in _dest_is_dir. Instead of raising TooManyFilesError, we now verify all children of the new directory source are consistent with existing mappings and skip the duplicate if they are.

convert_streamlit_to_v2_data() (definition_conversion.py) -- Defense-in-depth:

Adds _is_path_covered_by_directory() helper. During V1-to-V2 definition conversion, additional_source_files entries like pages/*.py are skipped if they fall under a directory already included as an artifact (e.g. pages/). This prevents the overlapping mappings from reaching _ArtifactPathMap in the first place.

Pre-review checklist

I've confirmed that instructions included in README.md are still correct after my changes in the codebase.
I've added or updated automated unit tests to verify correctness of my new code.
I've added or updated integration tests to verify correctness of my new code.
I've confirmed that my changes are working by executing CLI's commands manually on MacOS.
I've confirmed that my changes are working by executing CLI's commands manually on Windows.
I've confirmed that my changes are up-to-date with the target branch.
I've described my changes in the release notes.
I've described my changes in the section below.
I've described my changes in the documentation.

Test plan

test_bundle_map_deduplicates_directory_and_glob_overlap -- directory first, then explicit file; verifies duplicate is silently deduplicated
test_bundle_map_deduplicates_glob_and_directory_overlap -- glob/files first, then directory; verifies reverse order also deduplicates
test_bundle_map_disallows_different_source_collision_with_directory_child -- different source, same dest; verifies TooManyFilesError is raised
test_bundle_deduplicates_pages_directory_and_glob -- end-to-end StreamlitEntity.bundle() with artifacts in dir-then-glob order
test_bundle_deduplicates_pages_glob_and_directory -- end-to-end with reversed glob-then-dir order
test_v1_to_v2_streamlit_conversion_deduplicates_pages -- V1-to-V2 conversion filters overlapping pages/*.py
test_v1_to_v2_streamlit_conversion_keeps_non_overlapping_additional_files -- non-overlapping files preserved

src/snowflake/cli/_plugins/stage/manager.py

sfc-gh-kolszewski · 2026-02-27T11:47:47Z

src/snowflake/cli/_plugins/stage/manager.py

            if stage_path.is_user_stage():
                path = StagePath.get_user_stage() / file["name"]
-            else:
+            elif stage_path.is_git_repo():


Looks like you included entire #2777 in this PR

Rebased onto main — the #2777 commit is now dropped from this branch.

sfc-gh-kolszewski · 2026-02-27T14:55:04Z

Please, do not remove Pre-review checklist from the PR description and fill it

Pre-review checklist

I've confirmed that instructions included in README.md are still correct after my changes in the codebase.
I've added or updated automated unit tests to verify correctness of my new code.
I've added or updated integration tests to verify correctness of my new code.
I've confirmed that my changes are working by executing CLI's commands manually on MacOS.
I've confirmed that my changes are working by executing CLI's commands manually on Windows.
I've confirmed that my changes are up-to-date with the target branch.
I've described my changes in the release notes.
I've described my changes in the section below.
I've described my changes in the documentation.

sfc-gh-kolszewski · 2026-02-27T15:33:02Z

tests/streamlit/test_streamlit_entity.py

+                type="streamlit",
+                identifier="test_streamlit",
+                main_file="streamlit_app.py",
+                artifacts=["streamlit_app.py", "pages/", "pages/*.py"],


I've done some testing and this fails with:

│ Multiple file or directories were mapped to one output destination. │ │ │ destination = pages

if the order is swapped to ["streamlit_app.py", "pages/*.py", "pages/"]. I think we should make the behaviour consistent so that the order of artifacts does not matter

Fixed — the directory-to-directory branch in _ArtifactPathMap.put() now handles the case where individual files from a glob were registered first. Instead of immediately raising TooManyFilesError, it checks whether all children of the new directory source are consistent with existing mappings and skips the duplicate if they match. Added test_bundle_map_deduplicates_glob_and_directory_overlap and test_bundle_deduplicates_pages_glob_and_directory to cover both orderings.

@sfc-gh-moczko Hm, I don't see any changes compared to the last time I reviewed and these two new tests are missing - did you push the changes?

@sfc-gh-kolszewski Good catch! I've just pushed the changes (commit adbcc79). The implementation is now complete with both tests you mentioned:

Tests added:

test_bundle_map_deduplicates_glob_and_directory_overlap (tests/api/artifacts/test_bundle_map.py:484)

Unit test for glob-first ordering (file added before directory)

test_bundle_deduplicates_pages_glob_and_directory (tests/streamlit/test_streamlit_entity.py:102)

End-to-end test with artifacts=["streamlit_app.py", "pages/*.py", "pages/"]

Tests the exact scenario you reported

Fix details:

The issue was in _ArtifactPathMap.put() (bundle_map.py:447-465). When individual files are added via glob before
their parent directory, _update_dest_is_dir() recursively marks the parent as a directory. The old code immediately
raised TooManyFilesError when the directory was later added.

The fix walks the directory to verify all children either:

Are not yet mapped, OR

Map from the same child source

If consistent, it skips the duplicate via early return. If any child maps from a different source, it raises
TooManyFilesError as before.

Result: Both orderings now work correctly:

["pages/", "pages/*.py"] — directory-first ✓ (existing code path)

["pages/*.py", "pages/"] — glob-first ✓ (new code path)

Let me know if you'd like me to clarify anything!

sfc-gh-moczko · 2026-03-03T09:26:18Z

Done — added the pre-review checklist to the PR description.

…ectory (#2741) When both `pages/` and `pages/*.py` appear in artifacts, the bundle map created duplicate destination mappings that caused `NotInDeployRootError` during symlink resolution. Fix by tracking directory-walked children in `__dest_to_src` to detect and deduplicate overlapping mappings, and by filtering redundant `additional_source_files` during V1-to-V2 definition conversion. .... Generated with [Cortex Code](https://docs.snowflake.com/en/user-guide/cortex-code/cortex-code) Co-Authored-By: Cortex Code <noreply@snowflake.com>

When individual files are added via glob (e.g., pages/*.py) before their parent directory (pages/), the directory destination is already marked in _dest_is_dir due to recursive parent marking in _update_dest_is_dir(). The previous code immediately raised TooManyFilesError, even though the mappings were from the same source and thus not a conflict. Changes: - _ArtifactPathMap.put(): Replace immediate error with consistency check when current_is_dir=True. Walk the directory to verify all children either (a) are not yet mapped, or (b) map from the same child source. If consistent, skip duplicate via early return. If any child maps from a different source, raise TooManyFilesError. - test_bundle_map_deduplicates_glob_and_directory_overlap: Unit test for glob-first ordering (adds file, then directory). - test_bundle_deduplicates_pages_glob_and_directory: End-to-end test with artifacts=["streamlit_app.py", "pages/*.py", "pages/"] to verify StreamlitEntity.bundle() handles both orderings. Addresses reviewer feedback: artifact order is now consistent. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

…appings The previous fix walked the new source directory to detect conflicts, but missed cases where existing dest files came from sources outside the new source directory. Reverse the check: iterate existing dest mappings and verify each is consistent with what the new source would produce. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

sfc-gh-jwilkowski

Thanks for your contribution! Please address one issue with local imports and add a note to RELEASE_NOTES.md about this change

sfc-gh-jwilkowski · 2026-03-20T15:31:38Z

tests/project/test_project_definition_v2.py

+    from snowflake.cli.api.project.definition_conversion import (
+        convert_streamlit_to_v2_data,
+    )
+    from snowflake.cli.api.project.schemas.v1.streamlit.streamlit import Streamlit


Are those local imports needed? Please move them to the top of the file if not

sfc-gh-moczko requested a review from a team as a code owner February 24, 2026 01:14

sfc-gh-moczko force-pushed the fix/2741-streamlit-deploy-pages-collision branch from 5ee660a to 26c478a Compare February 24, 2026 05:21

graphite-app bot reviewed Feb 24, 2026

View reviewed changes

src/snowflake/cli/_plugins/stage/manager.py Show resolved Hide resolved

sfc-gh-moczko force-pushed the fix/2741-streamlit-deploy-pages-collision branch 2 times, most recently from 35039f3 to a4780e7 Compare February 26, 2026 15:33

sfc-gh-kolszewski self-assigned this Feb 27, 2026

sfc-gh-kolszewski reviewed Feb 27, 2026

View reviewed changes

sfc-gh-moczko force-pushed the fix/2741-streamlit-deploy-pages-collision branch from a4780e7 to 27e803a Compare March 3, 2026 09:35

sfc-gh-moczko requested a review from sfc-gh-kolszewski March 3, 2026 10:33

sfc-gh-moczko force-pushed the fix/2741-streamlit-deploy-pages-collision branch from adbcc79 to f799315 Compare March 6, 2026 22:10

Maciej Oczko and others added 2 commits March 18, 2026 17:43

sfc-gh-moczko force-pushed the fix/2741-streamlit-deploy-pages-collision branch from f799315 to cec4b50 Compare March 18, 2026 17:59

sfc-gh-jwilkowski approved these changes Mar 20, 2026

View reviewed changes

sfc-gh-jwilkowski self-assigned this Mar 20, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix streamlit deploy failure when pages/*.py overlaps with pages/ directory#2780

Fix streamlit deploy failure when pages/*.py overlaps with pages/ directory#2780
sfc-gh-moczko wants to merge 3 commits intomainfrom
fix/2741-streamlit-deploy-pages-collision

sfc-gh-moczko commented Feb 24, 2026 •

edited

Loading

Uh oh!

Uh oh!

sfc-gh-kolszewski Feb 27, 2026

Uh oh!

sfc-gh-moczko Mar 3, 2026

Uh oh!

sfc-gh-kolszewski commented Feb 27, 2026

Uh oh!

sfc-gh-kolszewski Feb 27, 2026

Uh oh!

sfc-gh-moczko Mar 3, 2026

Uh oh!

sfc-gh-kolszewski Mar 3, 2026 •

edited

Loading

Uh oh!

sfc-gh-moczko Mar 6, 2026 •

edited

Loading

Uh oh!

sfc-gh-moczko commented Mar 3, 2026

Uh oh!

sfc-gh-jwilkowski left a comment

Uh oh!

sfc-gh-jwilkowski Mar 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

sfc-gh-moczko commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Root cause

Fix

Pre-review checklist

Test plan

Uh oh!

Uh oh!

sfc-gh-kolszewski Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

sfc-gh-moczko Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

sfc-gh-kolszewski commented Feb 27, 2026

Pre-review checklist

Uh oh!

sfc-gh-kolszewski Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

sfc-gh-moczko Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

sfc-gh-kolszewski Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sfc-gh-moczko Mar 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sfc-gh-moczko commented Mar 3, 2026

Uh oh!

sfc-gh-jwilkowski left a comment

Choose a reason for hiding this comment

Uh oh!

sfc-gh-jwilkowski Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

sfc-gh-moczko commented Feb 24, 2026 •

edited

Loading

sfc-gh-kolszewski Mar 3, 2026 •

edited

Loading

sfc-gh-moczko Mar 6, 2026 •

edited

Loading