Skip to content

Conversation

@mohamedawnallah
Copy link
Contributor

@mohamedawnallah mohamedawnallah commented Jul 15, 2025

Description

I forgot to update the marker. It is follow-up on #35585


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@github-actions github-actions bot added the build label Jul 15, 2025
@mohamedawnallah
Copy link
Contributor Author

cc @damccorm

Copy link
Contributor

@damccorm damccorm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@damccorm damccorm merged commit 8930c8d into apache:master Jul 15, 2025
3 checks passed
'apache_beam/ml/ -m ''not require_non_self_hosted''' ||
'apache_beam/ml/ -m ''require_non_self_hosted'''
'apache_beam/ml/ -m ''not require_docker_in_docker''' ||
'apache_beam/ml/ -m ''require_docker_in_docker'''
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, it looks like this will currently not work because of

echo "$0 cannot be called with -m as it interferes with 'no_xdist' logic, see BEAM-12985."

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a simple fix would be to replace

echo "$0 cannot be called with -m as it interferes with 'no_xdist' logic, see BEAM-12985."

and instead of failing, collect the extra -m arguments and add the appropriate not no_xdist and no_xdist flags in

pytest -v -rs -o junit_suite_name=${envname} \
--junitxml=pytest_${envname}.xml -m 'not no_xdist' -n 6 --import-mode=importlib ${pytest_args} --pyargs ${posargs}
status1=$?
pytest -v -rs -o junit_suite_name=${envname}_no_xdist \
--junitxml=pytest_${envname}_no_xdist.xml -m 'no_xdist' --import-mode=importlib ${pytest_args} --pyargs ${posargs}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just seen this notification comments...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a simple fix would be to replace

echo "$0 cannot be called with -m as it interferes with 'no_xdist' logic, see BEAM-12985."

and instead of failing, collect the extra -m arguments and add the appropriate not no_xdist and no_xdist flags in

pytest -v -rs -o junit_suite_name=${envname} \
--junitxml=pytest_${envname}.xml -m 'not no_xdist' -n 6 --import-mode=importlib ${pytest_args} --pyargs ${posargs}
status1=$?
pytest -v -rs -o junit_suite_name=${envname}_no_xdist \
--junitxml=pytest_${envname}_no_xdist.xml -m 'no_xdist' --import-mode=importlib ${pytest_args} --pyargs ${posargs}

This approach looks good 👍

Copy link
Contributor Author

@mohamedawnallah mohamedawnallah Jul 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've also another approach of just using -k instead -m for keyword matching but I think your approach is more reliable in the future

(.venv) dev@dev:~/beam_dev/beam/sdks/python/apache_beam/ml/rag/enrichment$ pytest -v -k "require_docker_in_docker"  --test-pipeline-options="--runner=DirectRunner"
====================================================== test session starts =======================================================
platform linux -- Python 3.9.22, pytest-7.4.4, pluggy-1.6.0 -- /home/dev/beam_dev/beam/sdks/python/.venv/bin/python
cachedir: .pytest_cache
hypothesis profile 'default'
rootdir: /home/dev/beam_dev/beam/sdks/python
configfile: pytest.ini
plugins: xdist-3.8.0, requests-mock-1.12.1, timeout-2.4.0, anyio-4.9.0, hypothesis-6.135.31
timeout: 600.0s
timeout method: signal
timeout func_only: False
collected 36 items / 27 deselected / 9 selected

milvus_search_it_test.py::TestMilvusSearchEnrichment::test_empty_input_chunks PASSED                                       [ 11%]
milvus_search_it_test.py::TestMilvusSearchEnrichment::test_filtered_search_with_bm25_full_text_and_batching PASSED         [ 22%]
milvus_search_it_test.py::TestMilvusSearchEnrichment::test_filtered_search_with_cosine_similarity_and_batching PASSED      [ 33%]
milvus_search_it_test.py::TestMilvusSearchEnrichment::test_hybrid_search PASSED                                            [ 44%]
milvus_search_it_test.py::TestMilvusSearchEnrichment::test_invalid_query_on_non_existent_collection PASSED                 [ 55%]
milvus_search_it_test.py::TestMilvusSearchEnrichment::test_invalid_query_on_non_existent_field PASSED                      [ 66%]
milvus_search_it_test.py::TestMilvusSearchEnrichment::test_keyword_search_with_inner_product_sparse_embedding PASSED       [ 77%]
milvus_search_it_test.py::TestMilvusSearchEnrichment::test_vector_search_with_euclidean_distance PASSED                    [ 88%]
milvus_search_it_test.py::TestMilvusSearchEnrichment::test_vector_search_with_inner_product_similarity PASSED              [100%]

=============================================== 9 passed, 27 deselected in 30.26s ================================================

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants